aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libraries/DevIL/DevIL.SlackBuild5
-rw-r--r--libraries/DevIL/patches/devil-1.6.8-libpng14.patch11
2 files changed, 15 insertions, 1 deletions
diff --git a/libraries/DevIL/DevIL.SlackBuild b/libraries/DevIL/DevIL.SlackBuild
index 5123622278956..bcd254b1ce16d 100644
--- a/libraries/DevIL/DevIL.SlackBuild
+++ b/libraries/DevIL/DevIL.SlackBuild
@@ -7,7 +7,7 @@
PRGNAM=DevIL
VERSION=${VERSION:-1.6.8}
PKG_VERSION=${VERSION}_rc2
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
# Automatically determine the architecture we're building on:
@@ -54,6 +54,9 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# Fixes a libpng 1.4 problem.
+patch -p1 < $CWD/patches/devil-1.6.8-libpng14.patch
+
# Fix the typo that prevents building with Allegro
# Also patch files to change (ILvoid) to (void) in order to
# fix issues with gcc 4.2.
diff --git a/libraries/DevIL/patches/devil-1.6.8-libpng14.patch b/libraries/DevIL/patches/devil-1.6.8-libpng14.patch
new file mode 100644
index 0000000000000..886ce42239cea
--- /dev/null
+++ b/libraries/DevIL/patches/devil-1.6.8-libpng14.patch
@@ -0,0 +1,11 @@
+--- devil-1.6.8.orig/src-IL/src/il_png.c 2010-09-18 22:02:51.000000000 -0400
++++ devil-1.6.8/src-IL/src/il_png.c 2010-09-18 22:07:53.066090769 -0400
+@@ -277,7 +277,7 @@
+
+ // Expand low-bit-depth grayscale images to 8 bits
+ if (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