libraries/FreeImage: Updated for version 3.17.0.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

4 files changed, 65 insertions, 17 deletions

diff --git a/libraries/FreeImage/010_avoid-raw-literal.diff b/libraries/FreeImage/010_avoid-raw-literal.diff
new file mode 100644
index 0000000000000..a22d3f58a88e8
--- /dev/null
+++ b/libraries/FreeImage/010_avoid-raw-literal.diff
@@ -0,0 +1,44 @@
+# See: https://sourceforge.net/p/freeimage/discussion/36110/thread/605ef8e4
+#
+--- Source/LibWebP/src/dsp/dsp.yuv_mips_dsp_r2.c.orig	2015-02-20 03:34:38.000000000 +1000
++++ Source/LibWebP/src/dsp/dsp.yuv_mips_dsp_r2.c	2016-11-20 08:42:49.733624164 +1000
+@@ -54,9 +54,9 @@
+   "srl              %[temp5],   %[temp5],       24              \n\t"          \

+   "srl              %[temp6],   %[temp6],       24              \n\t"          \

+   "srl              %[temp7],   %[temp7],       24              \n\t"          \

+-  "sb               %[temp5],   "#R"(%[dst])                    \n\t"          \

+-  "sb               %[temp6],   "#G"(%[dst])                    \n\t"          \

+-  "sb               %[temp7],   "#B"(%[dst])                    \n\t"          \

++  "sb               %[temp5],   " #R "(%[dst])                    \n\t"          \

++  "sb               %[temp6],   " #G "(%[dst])                    \n\t"          \

++  "sb               %[temp7],   " #B "(%[dst])                    \n\t"          \

+ 

+ #define ASM_CLOBBER_LIST()                                                     \

+   : [temp0]"=&r"(temp0), [temp1]"=&r"(temp1), [temp2]"=&r"(temp2),             \

+--- Source/LibWebP/src/dsp/dsp.upsampling_mips_dsp_r2.c.orig	2015-02-20 03:34:36.000000000 +1000
++++ Source/LibWebP/src/dsp/dsp.upsampling_mips_dsp_r2.c	2016-11-20 08:39:33.163757201 +1000
+@@ -34,15 +34,15 @@
+     G = G - t2 + kGCst;                                                        \

+     B = B + kBCst;                                                             \

+     __asm__ volatile (                                                         \

+-      "shll_s.w         %["#R"],      %["#R"],        9              \n\t"     \

+-      "shll_s.w         %["#G"],      %["#G"],        9              \n\t"     \

+-      "shll_s.w         %["#B"],      %["#B"],        9              \n\t"     \

+-      "precrqu_s.qb.ph  %["#R"],      %["#R"],        $zero          \n\t"     \

+-      "precrqu_s.qb.ph  %["#G"],      %["#G"],        $zero          \n\t"     \

+-      "precrqu_s.qb.ph  %["#B"],      %["#B"],        $zero          \n\t"     \

+-      "srl              %["#R"],      %["#R"],        24             \n\t"     \

+-      "srl              %["#G"],      %["#G"],        24             \n\t"     \

+-      "srl              %["#B"],      %["#B"],        24             \n\t"     \

++      "shll_s.w         %[" #R "],      %[" #R "],        9              \n\t"     \

++      "shll_s.w         %[" #G "],      %[" #G "],        9              \n\t"     \

++      "shll_s.w         %[" #B "],      %[" #B "],        9              \n\t"     \

++      "precrqu_s.qb.ph  %[" #R "],      %[" #R "],        $zero          \n\t"     \

++      "precrqu_s.qb.ph  %[" #G "],      %[" #G "],        $zero          \n\t"     \

++      "precrqu_s.qb.ph  %[" #B "],      %[" #B "],        $zero          \n\t"     \

++      "srl              %[" #R "],      %[" #R "],        24             \n\t"     \

++      "srl              %[" #G "],      %[" #G "],        24             \n\t"     \

++      "srl              %[" #B "],      %[" #B "],        24             \n\t"     \

+       : [R]"+r"(R), [G]"+r"(G), [B]"+r"(B)                                     \

+       :                                                                        \

+     );                                                                         \

diff --git a/libraries/FreeImage/FreeImage.SlackBuild b/libraries/FreeImage/FreeImage.SlackBuild
index 831e9c0f6ea13..9787e0772aff7 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
diff --git a/libraries/FreeImage/FreeImage.info b/libraries/FreeImage/FreeImage.info
index dbd3f1579c2fc..283734d52bebf 100644
--- a/libraries/FreeImage/FreeImage.info
+++ b/libraries/FreeImage/FreeImage.info
@@ -1,9 +1,9 @@
 PRGNAM="FreeImage"
-VERSION="3.15.0"
+VERSION="3.17.0"
 HOMEPAGE="http://freeimage.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/freeimage/FreeImage3150.zip"
+DOWNLOAD="http://downloads.sourceforge.net/freeimage/FreeImage3170.zip"
 DOWNLOAD_x86_64=""
-MD5SUM="3b4f08e4985b269beb29a2fced1ef888"
+MD5SUM="459e15f0ec75d6efa3c7bd63277ead86"
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Alan Alberghini"
diff --git a/libraries/FreeImage/README b/libraries/FreeImage/README
index 160f7cb416e5c..ef52eb1e48768 100644
--- a/libraries/FreeImage/README
+++ b/libraries/FreeImage/README
@@ -1,8 +1,8 @@
 FreeImage - image library
 
-FreeImage is an Open Source library project for developers who would like 
-to support popular graphics image formats like PNG, BMP, JPEG, TIFF and 
-others as needed by today's multimedia applications. FreeImage is easy to 
-use, fast, and multithreading safe. 
+FreeImage is an Open Source library project for developers who would like
+to support popular graphics image formats like PNG, BMP, JPEG, TIFF and
+others as needed by today's multimedia applications. FreeImage is easy to
+use, fast, and multithreading safe.
 This script compiles the FreeImage library and the FreeImagePlus C++
 wrapper.