libraries/DevIL: Updated for version 1.6.8_rc2

5 files changed, 16 insertions, 7 deletions

diff --git a/libraries/DevIL/DevIL.SlackBuild b/libraries/DevIL/DevIL.SlackBuild
index 8edd6781a927..f0ee54055e97 100644
--- a/libraries/DevIL/DevIL.SlackBuild
+++ b/libraries/DevIL/DevIL.SlackBuild
@@ -18,10 +18,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -43,25 +46,29 @@ find . \
 # Also patch files to change (ILvoid) to (void) in order to
 # fix issues with gcc 4.2.
 # Thanks to David Somero for the heads up on this.
-patch -p1 < $CWD/ILvoid_fix_1.diff
-patch -p1 < $CWD/ILvoid_fix_2.diff
+patch -p1 < $CWD/patches/ILvoid_fix_1.diff
+patch -p1 < $CWD/patches/ILvoid_fix_2.diff
 # There is a space in the filename's path, so we have to cd into 
 # the offending directory before patching.
 ( cd cpp\ wrapper
-  patch < $CWD/ILvoid_fix_3.diff
+  patch < $CWD/patches/ILvoid_fix_3.diff
 )
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
-  --prefix=/usr
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --build=$ARCH-slackware-linux
 
 force_arch="$ARCH" make
 make install DESTDIR=$PKG
 
 ( cd $PKG
-  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
+  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
@@ -73,4 +80,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKG_VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKG_VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/DevIL/DevIL.info b/libraries/DevIL/DevIL.info
index dd9ada95950c..8398b201c187 100644
--- a/libraries/DevIL/DevIL.info
+++ b/libraries/DevIL/DevIL.info
@@ -3,6 +3,8 @@ VERSION="1.6.8_rc2"
 HOMEPAGE="http://openil.sourceforge.net/"
 DOWNLOAD="http://downloads.sourceforge.net/openil/DevIL-1.6.8-rc2.tar.gz"
 MD5SUM="9d815c8637adb6fb6c25c38dc178aca2"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Phil Warner"
 EMAIL="pc_warner@yahoo.com"
 APPROVED="David Somero"
diff --git a/libraries/DevIL/ILvoid_fix_1.diff b/libraries/DevIL/patches/ILvoid_fix_1.diff
index 119372d65214..119372d65214 100644
--- a/libraries/DevIL/ILvoid_fix_1.diff
+++ b/libraries/DevIL/patches/ILvoid_fix_1.diff
diff --git a/libraries/DevIL/ILvoid_fix_2.diff b/libraries/DevIL/patches/ILvoid_fix_2.diff
index b443bb06eeaa..b443bb06eeaa 100644
--- a/libraries/DevIL/ILvoid_fix_2.diff
+++ b/libraries/DevIL/patches/ILvoid_fix_2.diff
diff --git a/libraries/DevIL/ILvoid_fix_3.diff b/libraries/DevIL/patches/ILvoid_fix_3.diff
index 77bfb6ae5239..77bfb6ae5239 100644
--- a/libraries/DevIL/ILvoid_fix_3.diff
+++ b/libraries/DevIL/patches/ILvoid_fix_3.diff