hollalinux
/
slackbuilds
mirror of https://github.com/SlackBuildsOrg/slackbuilds.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libraries/FreeImage: Updated for version 3.12.0

This commit is contained in:
Phillip Warner 2010-05-13 00:28:31 +02:00 committed by David Somero
parent ff3b69ded4
commit 82a3389257
4 changed files with 55 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libraries/FreeImage/FreeImage.SlackBuild
View File

@ -1,13 +1,13 @@
#!/bin/sh #!/bin/sh
# Slackware build script for FreeImage/FreeImagePlus # Slackware build script for FreeImage/FreeImagePlus
# Written by Phil Warner <pc_warner@yahoo.com> # Written by Phillip Warner <pc_warner@yahoo.com>
# Modified by Robby Workman <rworkman@slackbuilds.org> # Modified by Robby Workman <rworkman@slackbuilds.org>
# with two patches to fix up DESTDIR support :-) # with two patches to fix up DESTDIR support :-)
PRGNAM=FreeImage PRGNAM=FreeImage
VERSION=3.11.0 VERSION=3.12.0
ARCH=${ARCH:-i486} ARCH=${ARCH:-i486}
BUILD=${BUILD:-1} BUILD=${BUILD:-1}
TAG=${TAG:-_SBo} TAG=${TAG:-_SBo}
@ -30,7 +30,7 @@ fi
set -e set -e
rm -rf $PKG rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT mkdir -p $TMP $PKG $OUTPUT
cd $TMP cd $TMP
rm -rf $PRGNAM rm -rf $PRGNAM
@ -46,10 +46,13 @@ find . \
patch -p1 < $CWD/Makefile.gnu.DESTDIR.diff patch -p1 < $CWD/Makefile.gnu.DESTDIR.diff
patch -p1 < $CWD/Makefile.fip.DESTDIR.diff patch -p1 < $CWD/Makefile.fip.DESTDIR.diff
CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" make INSTALLDIR=/usr/lib${LIBDIRSUFFIX} CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" \
make install INSTALLDIR=/usr/lib${LIBDIRSUFFIX} DESTDIR=$PKG make INSTALLDIR=/usr/lib${LIBDIRSUFFIX} INCDIR=/usr/include
CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" make -f Makefile.fip INSTALLDIR=/usr/lib${LIBDIRSUFFIX} make install INSTALLDIR=/usr/lib${LIBDIRSUFFIX} INCDIR=/usr/include DESTDIR=$PKG
make -f Makefile.fip install INSTALLDIR=/usr/lib${LIBDIRSUFFIX} 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 ( cd $PKG
find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ 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 cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG 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}

12
libraries/FreeImage/FreeImage.info
View File

@ -1,8 +1,10 @@
PRGNAM="FreeImage" PRGNAM="FreeImage"
VERSION="3.11.0" VERSION="3.12.0"
HOMEPAGE="http://freeimage.sourceforge.net/" HOMEPAGE="http://freeimage.sourceforge.net/"
DOWNLOAD="http://downloads.sourceforge.net/freeimage/FreeImage3110.zip" DOWNLOAD="http://downloads.sourceforge.net/freeimage/FreeImage3120.zip"
MD5SUM="ad1db36414391417654ba7bf1c0277d3" DOWNLOAD_x86_64=""
MAINTAINER="Phil Warner" MD5SUM="47b259102f776a4bcd7affc00942f3b4"
MD5SUM_x86_64=""
MAINTAINER="Phillip Warner"
EMAIL="pc_warner@yahoo.com" EMAIL="pc_warner@yahoo.com"
APPROVED="dsomero,rworkman" APPROVED="dsomero"

39
libraries/FreeImage/Makefile.fip.DESTDIR.diff
View File

@ -1,36 +1,33 @@
Patch generated 20071214 by Robby Workman <rworkman@slackbuilds.org> --- FreeImage/Makefile.fip.orig 2009-09-07 01:09:47.000000000 -0500
Permission granted to use this patch as you see fit. +++ FreeImage/Makefile.fip 2009-09-07 01:27:12.000000000 -0500
@@ -15,16 +15,11 @@
--- 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++
MODULES = $(SRCS:.c=.o) MODULES = $(SRCS:.c=.o)
MODULES := $(MODULES:.cpp=.o) MODULES := $(MODULES:.cpp=.o)
-CFLAGS = $(COMPILERFLAGS) $(INCLUDE) -CFLAGS ?= -O3 -fexceptions -fvisibility=hidden
-CXXFLAGS = $(COMPILERFLAGS) -Wno-ctor-dtor-privacy $(INCLUDE) +CFLAGS ?= -fexceptions -fvisibility=hidden
+CFLAGS += $(COMPILERFLAGS) $(INCLUDE) CFLAGS += $(INCLUDE)
+CXXFLAGS += $(COMPILERFLAGS) -Wno-ctor-dtor-privacy $(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 TARGET = freeimageplus
STATICLIB = lib$(TARGET).a STATICLIB = lib$(TARGET).a
@@ -59,13 +59,14 @@ SHAREDLIB = lib$(TARGET)-$(VER_MAJOR).$(VER_MINOR).so
$(CC) -s -shared -Wl,-soname,$(VERLIBNAME) -o $@ $(MODULES) $(LIBRARIES) @@ -62,11 +57,14 @@
$(CC) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
install: install:
- install -d $(INCDIR) $(INSTALLDIR)
- install -m 644 -o root -g root $(HEADER) $(INCDIR) - 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 $(HEADERFIP) $(INCDIR)
- install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR) - install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
- install -m 755 -o root -g root $(SHAREDLIB) $(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 -d 755 $(DESTDIR)/$(INCDIR)
+ install -m 644 $(HEADER) $(DESTDIR)/$(INCDIR) + install -m 644 $(HEADER) $(DESTDIR)/$(INCDIR)
+ install -m 644 $(HEADERFIP) $(DESTDIR)/$(INCDIR) + install -m 644 $(HEADERFIP) $(DESTDIR)/$(INCDIR)

41
libraries/FreeImage/Makefile.gnu.DESTDIR.diff
View File

@ -1,42 +1,39 @@
Patch generated 20071214 by Robby Workman <rworkman@slackbuilds.org> --- FreeImage/Makefile.gnu.orig 2009-09-07 01:09:57.000000000 -0500
Permission granted to use this patch as you see fit. +++ FreeImage/Makefile.gnu 2009-09-07 01:27:41.000000000 -0500
@@ -15,16 +15,11 @@
--- 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++
MODULES = $(SRCS:.c=.o) MODULES = $(SRCS:.c=.o)
MODULES := $(MODULES:.cpp=.o) MODULES := $(MODULES:.cpp=.o)
-CFLAGS = $(COMPILERFLAGS) $(INCLUDE) -CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden
-CXXFLAGS = $(COMPILERFLAGS) -Wno-ctor-dtor-privacy $(INCLUDE) +CFLAGS ?= -fPIC -fexceptions -fvisibility=hidden
+CFLAGS += $(COMPILERFLAGS) $(INCLUDE) CFLAGS += $(INCLUDE)
+CXXFLAGS += $(COMPILERFLAGS) -Wno-ctor-dtor-privacy $(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 TARGET = freeimage
STATICLIB = lib$(TARGET).a STATICLIB = lib$(TARGET).a
@@ -58,12 +58,13 @@ SHAREDLIB = lib$(TARGET)-$(VER_MAJOR).$(VER_MINOR).so
$(CC) -s -shared -Wl,-soname,$(VERLIBNAME) -o $@ $(MODULES) $(LIBRARIES) @@ -61,10 +56,13 @@
$(CC) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
install: install:
- install -d $(INCDIR) $(INSTALLDIR)
- install -m 644 -o root -g root $(HEADER) $(INCDIR) - install -m 644 -o root -g root $(HEADER) $(INCDIR)
- install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR) - install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
- install -m 755 -o root -g root $(SHAREDLIB) $(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 -d 755 $(DESTDIR)/$(INCDIR)
+ install -m 644 $(HEADER) $(DESTDIR)/$(INCDIR) + install -m 644 $(HEADER) $(DESTDIR)/$(INCDIR)
+ install -d 755 $(DESTDIR)/$(INSTALLDIR) + install -d 755 $(DESTDIR)/$(INSTALLDIR)
+ install -m 644 $(STATICLIB) $(DESTDIR)/$(INSTALLDIR) + install -m 644 $(STATICLIB) $(DESTDIR)/$(INSTALLDIR)
+ install -m 755 $(SHAREDLIB) $(DESTDIR)/$(INSTALLDIR) + install -m 755 $(SHAREDLIB) $(DESTDIR)/$(INSTALLDIR)
+ cd $(DESTDIR)/$(INSTALLDIR) ; ln -sf $(SHAREDLIB) $(VERLIBNAME) + cd $(DESTDIR)/$(INSTALLDIR) ; ln -sf $(SHAREDLIB) $(VERLIBNAME)
+ cd $(DESTDIR)/$(INSTALLDIR) ; ln -sf $(VERLIBNAME) $(LIBNAME) + cd $(DESTDIR)/$(INSTALLDIR) ; ln -sf $(VERLIBNAME) $(LIBNAME)
clean: clean:
rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME) rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)