libraries/DevIL: Updated for version 1.8.0.DevIL

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

4 files changed, 23 insertions, 75 deletions

diff --git a/libraries/DevIL/04_png_set_expand_gray.diff b/libraries/DevIL/04_png_set_expand_gray.diff
deleted file mode 100644
index 78fe892881..0000000000
--- a/libraries/DevIL/04_png_set_expand_gray.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: devil-1.7.8/src-IL/src/il_icon.c
-===================================================================
---- devil-1.7.8.orig/src-IL/src/il_icon.c	2013-05-21 00:08:36.847356129 +0200
-+++ devil-1.7.8/src-IL/src/il_icon.c	2013-05-21 00:10:29.317942183 +0200
-@@ -525,7 +525,7 @@
- 
- 	// Expand low-bit-depth grayscale images to 8 bits
- 	if (ico_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
--		png_set_gray_1_2_4_to_8(ico_png_ptr);
-+		png_set_expand_gray_1_2_4_to_8(ico_png_ptr);
- 	}
- 
- 	// Expand RGB images with transparency to full alpha channels
-Index: devil-1.7.8/src-IL/src/il_png.c
-===================================================================
---- devil-1.7.8.orig/src-IL/src/il_png.c	2009-03-08 08:10:09.000000000 +0100
-+++ devil-1.7.8/src-IL/src/il_png.c	2013-05-21 00:10:18.554077504 +0200
-@@ -278,7 +278,7 @@
- 
- 	// Expand low-bit-depth grayscale images to 8 bits
- 	if (png_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
--		png_set_gray_1_2_4_to_8(png_ptr);
-+		png_set_expand_gray_1_2_4_to_8(png_ptr);
- 	}
- 
- 	// Expand RGB images with transparency to full alpha channels
diff --git a/libraries/DevIL/DevIL.SlackBuild b/libraries/DevIL/DevIL.SlackBuild
index 3cf47dc1ea..445923e146 100644
--- a/libraries/DevIL/DevIL.SlackBuild
+++ b/libraries/DevIL/DevIL.SlackBuild
@@ -6,14 +6,13 @@
 # Currently maintained by Dugan Chen
 
 PRGNAM=DevIL
-SRCNAM=devil
-VERSION=${VERSION:-1.7.8}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-1.8.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 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 +23,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"
@@ -43,9 +42,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM-$VERSION
+rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -53,39 +52,27 @@ 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 {} \;
 
-# Fix build with gcc5
-patch -p0 < $CWD/patch-include_IL_il.h
+cd $PRGNAM
 
-# Build against libpng14, not libpng12.
-sed -i 's/png12/png14/g' configure
+sed -i "s|DESTINATION\ lib|DESTINATION lib$LIBDIRSUFFIX|" */CMakeLists.txt
 
-# Fix further linking issues with libpng. This patch is taken
-# from Ubuntu. Without this patch, DevIL will compile, but attempts
-# to link against it will break.
-patch -p1 < $CWD/04_png_set_expand_gray.diff
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --datarootdir=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --enable-static=no \
-  --enable-ILU=yes \
-  --enable-ILUT=yes \
-  --build=$ARCH-slackware-linux
-make
-make install DESTDIR=$PKG
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
 
 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
 
-rm -f $PKG/usr/info/dir
-gzip -9 $PKG/usr/info/*.info*
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING CREDITS ChangeLog INSTALL Libraries.txt \
-  NEWS README README.unix TODO examples/ $PKG/usr/doc/$PRGNAM-$VERSION
+  NEWS README.md TODO examples/ ../LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/DevIL/DevIL.info b/libraries/DevIL/DevIL.info
index 073e932c59..77a515fb60 100644
--- a/libraries/DevIL/DevIL.info
+++ b/libraries/DevIL/DevIL.info
@@ -1,8 +1,8 @@
 PRGNAM="DevIL"
-VERSION="1.7.8"
+VERSION="1.8.0"
 HOMEPAGE="http://openil.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/openil/DevIL/1.7.8/DevIL-1.7.8.tar.gz"
-MD5SUM="7918f215524589435e5ec2e8736d5e1d"
+DOWNLOAD="https://github.com/DentonW/DevIL/archive/v1.8.0/DevIL-1.8.0.tar.gz"
+MD5SUM="59d5b69f2fc09d153845f2c6fe287edb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/DevIL/patch-include_IL_il.h b/libraries/DevIL/patch-include_IL_il.h
deleted file mode 100644
index e265db2fe4..0000000000
--- a/libraries/DevIL/patch-include_IL_il.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-include_IL_il.h,v 1.1 2012/07/09 19:16:33 joerg Exp $
-
---- include/IL/il.h.orig	2012-07-06 12:31:13.000000000 +0000
-+++ include/IL/il.h
-@@ -63,7 +63,7 @@ extern "C" {
- 	#endif
- #endif
- 
--#ifdef RESTRICT_KEYWORD
-+#if defined(RESTRICT_KEYWORD) && !defined(__cplusplus)
- #define RESTRICT restrict
- #define CONST_RESTRICT const restrict
- #else