summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libraries/FreeImage/FreeImage.SlackBuild15
-rw-r--r--libraries/FreeImage/FreeImage.info8
2 files changed, 15 insertions, 8 deletions
diff --git a/libraries/FreeImage/FreeImage.SlackBuild b/libraries/FreeImage/FreeImage.SlackBuild
index 46b6b1927d..c34940693d 100644
--- a/libraries/FreeImage/FreeImage.SlackBuild
+++ b/libraries/FreeImage/FreeImage.SlackBuild
@@ -7,10 +7,11 @@
# with two patches to fix up DESTDIR support :-)
PRGNAM=FreeImage
-VERSION=3.10.0
+VERSION=3.11.0
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
@@ -20,6 +21,8 @@ if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
fi
set -e
@@ -31,7 +34,11 @@ rm -rf $PRGNAM
unzip $CWD/${PRGNAM}$(echo $VERSION | tr -d .)
cd $PRGNAM
chown -R root:root .
-chmod -R a-s,u+rw,go-w .
+find . \
+ \( -perm 777 -o -perm 775 -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 {} \;
patch -p1 < $CWD/Makefile.gnu.DESTDIR.diff
patch -p1 < $CWD/Makefile.fip.DESTDIR.diff
@@ -42,12 +49,12 @@ CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" make -f Makefile.fip
make -f Makefile.fip install DESTDIR=$PKG
( cd $PKG
- find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+ find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
)
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README.linux license-*.txt Whatsnew.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.linux license-*.txt Whatsnew.txt Examples/ TestAPI/ $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/libraries/FreeImage/FreeImage.info b/libraries/FreeImage/FreeImage.info
index 665dc05654..0ed67665be 100644
--- a/libraries/FreeImage/FreeImage.info
+++ b/libraries/FreeImage/FreeImage.info
@@ -1,8 +1,8 @@
PRGNAM="FreeImage"
-VERSION="3.10.0"
+VERSION="3.11.0"
HOMEPAGE="http://freeimage.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/freeimage/FreeImage3100.zip"
-MD5SUM="2e57135e26bb487cc8e13ee7b7e0a595"
+DOWNLOAD="http://downloads.sourceforge.net/freeimage/FreeImage3110.zip"
+MD5SUM="ad1db36414391417654ba7bf1c0277d3"
MAINTAINER="Phil Warner"
EMAIL="pc_warner@yahoo.com"
-APPROVED="rworkman"
+APPROVED="David Somero" \ No newline at end of file