diff options
Diffstat (limited to 'libraries/FreeImage')
| -rw-r--r-- | libraries/FreeImage/010_avoid-raw-literal.diff | 44 | ||||
| -rw-r--r-- | libraries/FreeImage/FreeImage.SlackBuild | 6 | ||||
| -rw-r--r-- | libraries/FreeImage/FreeImage.info | 6 |
3 files changed, 4 insertions, 52 deletions
diff --git a/libraries/FreeImage/010_avoid-raw-literal.diff b/libraries/FreeImage/010_avoid-raw-literal.diff deleted file mode 100644 index a22d3f58a8..0000000000 --- a/libraries/FreeImage/010_avoid-raw-literal.diff +++ /dev/null @@ -1,44 +0,0 @@ -# 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 9787e0772a..200292024e 100644 --- a/libraries/FreeImage/FreeImage.SlackBuild +++ b/libraries/FreeImage/FreeImage.SlackBuild @@ -5,7 +5,7 @@ # Taken over in 2011 by Alan Alberghini <414N@slacky.it> PRGNAM=FreeImage -VERSION=${VERSION:-3.17.0} +VERSION=${VERSION:-3.18.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -53,10 +53,6 @@ find -L . \ \( -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" \ make INSTALLDIR=$PKG/usr/lib${LIBDIRSUFFIX} DESTDIR=$PKG diff --git a/libraries/FreeImage/FreeImage.info b/libraries/FreeImage/FreeImage.info index 10a5f841cb..639d2753d1 100644 --- a/libraries/FreeImage/FreeImage.info +++ b/libraries/FreeImage/FreeImage.info @@ -1,8 +1,8 @@ PRGNAM="FreeImage" -VERSION="3.17.0" +VERSION="3.18.0" HOMEPAGE="http://freeimage.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/freeimage/FreeImage3170.zip" -MD5SUM="459e15f0ec75d6efa3c7bd63277ead86" +DOWNLOAD="http://downloads.sourceforge.net/freeimage/FreeImage3180.zip" +MD5SUM="f8ba138a3be233a3eed9c456e42e2578" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |