From 82a3389257dcc55831395a57f6925ac58671f595 Mon Sep 17 00:00:00 2001 From: Phillip Warner Date: Thu, 13 May 2010 00:28:31 +0200 Subject: libraries/FreeImage: Updated for version 3.12.0 --- libraries/FreeImage/FreeImage.SlackBuild | 19 +++++++------ libraries/FreeImage/FreeImage.info | 12 ++++---- libraries/FreeImage/Makefile.fip.DESTDIR.diff | 39 ++++++++++++------------- libraries/FreeImage/Makefile.gnu.DESTDIR.diff | 41 +++++++++++++-------------- 4 files changed, 55 insertions(+), 56 deletions(-) (limited to 'libraries') diff --git a/libraries/FreeImage/FreeImage.SlackBuild b/libraries/FreeImage/FreeImage.SlackBuild index eafea1183e..ad97922c92 100644 --- a/libraries/FreeImage/FreeImage.SlackBuild +++ b/libraries/FreeImage/FreeImage.SlackBuild @@ -1,13 +1,13 @@ #!/bin/sh # Slackware build script for FreeImage/FreeImagePlus -# Written by Phil Warner +# Written by Phillip Warner # Modified by Robby Workman # with two patches to fix up DESTDIR support :-) PRGNAM=FreeImage -VERSION=3.11.0 +VERSION=3.12.0 ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -30,7 +30,7 @@ fi set -e -rm -rf $PKG +rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM @@ -46,10 +46,13 @@ find . \ patch -p1 < $CWD/Makefile.gnu.DESTDIR.diff patch -p1 < $CWD/Makefile.fip.DESTDIR.diff -CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" make INSTALLDIR=/usr/lib${LIBDIRSUFFIX} -make install INSTALLDIR=/usr/lib${LIBDIRSUFFIX} DESTDIR=$PKG -CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" make -f Makefile.fip INSTALLDIR=/usr/lib${LIBDIRSUFFIX} -make -f Makefile.fip install INSTALLDIR=/usr/lib${LIBDIRSUFFIX} DESTDIR=$PKG +CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" \ +make INSTALLDIR=/usr/lib${LIBDIRSUFFIX} INCDIR=/usr/include +make install INSTALLDIR=/usr/lib${LIBDIRSUFFIX} INCDIR=/usr/include DESTDIR=$PKG + +CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" \ +make -f Makefile.fip INSTALLDIR=/usr/lib${LIBDIRSUFFIX} INCDIR=/usr/include +make -f Makefile.fip install INSTALLDIR=/usr/lib${LIBDIRSUFFIX} INCDIR=/usr/include DESTDIR=$PKG ( cd $PKG find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ @@ -66,4 +69,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/libraries/FreeImage/FreeImage.info b/libraries/FreeImage/FreeImage.info index 1cc6f652ac..c4cb295784 100644 --- a/libraries/FreeImage/FreeImage.info +++ b/libraries/FreeImage/FreeImage.info @@ -1,8 +1,10 @@ PRGNAM="FreeImage" -VERSION="3.11.0" +VERSION="3.12.0" HOMEPAGE="http://freeimage.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/freeimage/FreeImage3110.zip" -MD5SUM="ad1db36414391417654ba7bf1c0277d3" -MAINTAINER="Phil Warner" +DOWNLOAD="http://downloads.sourceforge.net/freeimage/FreeImage3120.zip" +DOWNLOAD_x86_64="" +MD5SUM="47b259102f776a4bcd7affc00942f3b4" +MD5SUM_x86_64="" +MAINTAINER="Phillip Warner" EMAIL="pc_warner@yahoo.com" -APPROVED="dsomero,rworkman" +APPROVED="dsomero" diff --git a/libraries/FreeImage/Makefile.fip.DESTDIR.diff b/libraries/FreeImage/Makefile.fip.DESTDIR.diff index acb9af1a4a..4861adf272 100644 --- a/libraries/FreeImage/Makefile.fip.DESTDIR.diff +++ b/libraries/FreeImage/Makefile.fip.DESTDIR.diff @@ -1,36 +1,33 @@ -Patch generated 20071214 by Robby Workman -Permission granted to use this patch as you see fit. - ---- FreeImage/Makefile.fip.orig 2007-12-14 13:53:23.424826247 -0600 -+++ FreeImage/Makefile.fip 2007-12-14 14:21:10.427625070 -0600 -@@ -14,13 +14,13 @@ - # Converts cr/lf to just lf - DOS2UNIX = dos2unix - --COMPILERFLAGS = -O3 -fexceptions -fvisibility=hidden -+COMPILERFLAGS = -fexceptions -fvisibility=hidden - LIBRARIES = -lstdc++ +--- FreeImage/Makefile.fip.orig 2009-09-07 01:09:47.000000000 -0500 ++++ FreeImage/Makefile.fip 2009-09-07 01:27:12.000000000 -0500 +@@ -15,16 +15,11 @@ MODULES = $(SRCS:.c=.o) MODULES := $(MODULES:.cpp=.o) --CFLAGS = $(COMPILERFLAGS) $(INCLUDE) --CXXFLAGS = $(COMPILERFLAGS) -Wno-ctor-dtor-privacy $(INCLUDE) -+CFLAGS += $(COMPILERFLAGS) $(INCLUDE) -+CXXFLAGS += $(COMPILERFLAGS) -Wno-ctor-dtor-privacy $(INCLUDE) +-CFLAGS ?= -O3 -fexceptions -fvisibility=hidden ++CFLAGS ?= -fexceptions -fvisibility=hidden + CFLAGS += $(INCLUDE) +-CXXFLAGS ?= -O3 -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy ++CXXFLAGS ?= -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy + CXXFLAGS += $(INCLUDE) +-ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64) +- CFLAGS += -fPIC +- CXXFLAGS += -fPIC +-endif +- TARGET = freeimageplus STATICLIB = lib$(TARGET).a -@@ -59,13 +59,14 @@ - $(CC) -s -shared -Wl,-soname,$(VERLIBNAME) -o $@ $(MODULES) $(LIBRARIES) + SHAREDLIB = lib$(TARGET)-$(VER_MAJOR).$(VER_MINOR).so +@@ -62,11 +57,14 @@ + $(CC) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES) install: +- install -d $(INCDIR) $(INSTALLDIR) - install -m 644 -o root -g root $(HEADER) $(INCDIR) - install -m 644 -o root -g root $(HEADERFIP) $(INCDIR) - install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR) - install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR) -- ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME) -- ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME) -- ldconfig + install -d 755 $(DESTDIR)/$(INCDIR) + install -m 644 $(HEADER) $(DESTDIR)/$(INCDIR) + install -m 644 $(HEADERFIP) $(DESTDIR)/$(INCDIR) diff --git a/libraries/FreeImage/Makefile.gnu.DESTDIR.diff b/libraries/FreeImage/Makefile.gnu.DESTDIR.diff index d9e94b4483..07d2579cf9 100644 --- a/libraries/FreeImage/Makefile.gnu.DESTDIR.diff +++ b/libraries/FreeImage/Makefile.gnu.DESTDIR.diff @@ -1,42 +1,39 @@ -Patch generated 20071214 by Robby Workman -Permission granted to use this patch as you see fit. - ---- FreeImage/Makefile.gnu.orig 2007-12-14 13:34:39.717234989 -0600 -+++ FreeImage/Makefile.gnu 2007-12-14 13:52:18.417121669 -0600 -@@ -14,13 +14,13 @@ - # Converts cr/lf to just lf - DOS2UNIX = dos2unix - --COMPILERFLAGS = -O3 -fPIC -fexceptions -fvisibility=hidden -+COMPILERFLAGS = -fPIC -fexceptions -fvisibility=hidden - LIBRARIES = -lstdc++ +--- FreeImage/Makefile.gnu.orig 2009-09-07 01:09:57.000000000 -0500 ++++ FreeImage/Makefile.gnu 2009-09-07 01:27:41.000000000 -0500 +@@ -15,16 +15,11 @@ MODULES = $(SRCS:.c=.o) MODULES := $(MODULES:.cpp=.o) --CFLAGS = $(COMPILERFLAGS) $(INCLUDE) --CXXFLAGS = $(COMPILERFLAGS) -Wno-ctor-dtor-privacy $(INCLUDE) -+CFLAGS += $(COMPILERFLAGS) $(INCLUDE) -+CXXFLAGS += $(COMPILERFLAGS) -Wno-ctor-dtor-privacy $(INCLUDE) +-CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden ++CFLAGS ?= -fPIC -fexceptions -fvisibility=hidden + CFLAGS += $(INCLUDE) +-CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy ++CXXFLAGS ?= -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy + CXXFLAGS += $(INCLUDE) +-ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64) +- CFLAGS += -fPIC +- CXXFLAGS += -fPIC +-endif +- TARGET = freeimage STATICLIB = lib$(TARGET).a -@@ -58,12 +58,13 @@ - $(CC) -s -shared -Wl,-soname,$(VERLIBNAME) -o $@ $(MODULES) $(LIBRARIES) + SHAREDLIB = lib$(TARGET)-$(VER_MAJOR).$(VER_MINOR).so +@@ -61,10 +56,13 @@ + $(CC) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES) install: +- install -d $(INCDIR) $(INSTALLDIR) - install -m 644 -o root -g root $(HEADER) $(INCDIR) - install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR) - install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR) -- ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME) -- ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME) -- ldconfig + install -d 755 $(DESTDIR)/$(INCDIR) + install -m 644 $(HEADER) $(DESTDIR)/$(INCDIR) + install -d 755 $(DESTDIR)/$(INSTALLDIR) + install -m 644 $(STATICLIB) $(DESTDIR)/$(INSTALLDIR) + install -m 755 $(SHAREDLIB) $(DESTDIR)/$(INSTALLDIR) + cd $(DESTDIR)/$(INSTALLDIR) ; ln -sf $(SHAREDLIB) $(VERLIBNAME) -+ cd $(DESTDIR)/$(INSTALLDIR) ; ln -sf $(VERLIBNAME) $(LIBNAME) ++ cd $(DESTDIR)/$(INSTALLDIR) ; ln -sf $(VERLIBNAME) $(LIBNAME) clean: rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME) -- cgit v1.2.3