diff options
| author |   Alan Alberghini <414N@slacky.it> | 2017-01-15 22:56:36 +0000 |
|---|---|---|
| committer |   Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2017-01-21 07:04:20 +0700 |
| commit | 1d8c745ffffe90c733314765b92bf931c6f80871 (patch) | |
| tree | 041ae7d52e5743ceab2afb43f87da3ac19a25c20 /libraries/FreeImage/FreeImage.SlackBuild | |
| parent | 6e9c5b7638cda2040c244370d978149d9316a8c4 (diff) | |
| download | slackbuilds-1d8c745ffffe90c733314765b92bf931c6f80871.tar.gz slackbuilds-1d8c745ffffe90c733314765b92bf931c6f80871.tar.xz | |
libraries/FreeImage: Updated for version 3.17.0.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
Diffstat (limited to 'libraries/FreeImage/FreeImage.SlackBuild')
| -rw-r--r-- | libraries/FreeImage/FreeImage.SlackBuild | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/libraries/FreeImage/FreeImage.SlackBuild b/libraries/FreeImage/FreeImage.SlackBuild index 831e9c0f6e..9787e0772a 100644 --- a/libraries/FreeImage/FreeImage.SlackBuild +++ b/libraries/FreeImage/FreeImage.SlackBuild @@ -2,10 +2,10 @@ # Slackware build script for FreeImage/FreeImagePlus # Written by Phillip Warner <pc_warner@yahoo.com> -# Taken over in 2011 by Alan Alberghini <414N@slacky.it +# Taken over in 2011 by Alan Alberghini <414N@slacky.it> PRGNAM=FreeImage -VERSION=${VERSION:-3.15.0} +VERSION=${VERSION:-3.17.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -13,7 +13,7 @@ DOCS="README.linux license-*.txt Whatsnew.txt Examples/ TestAPI/" if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -24,8 +24,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -48,10 +48,14 @@ unzip $CWD/${PRGNAM}$(echo $VERSION | tr -d .) cd $PRGNAM chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 \ - -o -perm 400 \) -exec chmod 644 {} \; + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +# Patch in order to compile on gcc >= 5.1 environments +# Thanks to Christoph Willing +patch -p0 < $CWD/010_avoid-raw-literal.diff CFLAGS="$SLKCFLAGS -fexceptions -fvisibility=hidden -DNO_LCMS" \ CXXFLAGS="$SLKCFLAGS -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy" \ @@ -63,7 +67,7 @@ CXXFLAGS="$SLKCFLAGS -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy" \ make -f Makefile.fip INSTALLDIR=$PKG/usr/lib${LIBDIRSUFFIX} DESTDIR=$PKG make -f Makefile.fip install INSTALLDIR=$PKG/usr/lib${LIBDIRSUFFIX} DESTDIR=$PKG -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION |