summaryrefslogtreecommitdiff
path: root/libraries/DevIL
diff options
context:
space:
mode:
Diffstat (limited to 'libraries/DevIL')
-rw-r--r--libraries/DevIL/DevIL.SlackBuild7
-rw-r--r--libraries/DevIL/patch-include_IL_il.h13
2 files changed, 18 insertions, 2 deletions
diff --git a/libraries/DevIL/DevIL.SlackBuild b/libraries/DevIL/DevIL.SlackBuild
index cef895bbda..3cf47dc1ea 100644
--- a/libraries/DevIL/DevIL.SlackBuild
+++ b/libraries/DevIL/DevIL.SlackBuild
@@ -8,7 +8,7 @@
PRGNAM=DevIL
SRCNAM=devil
VERSION=${VERSION:-1.7.8}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -51,7 +51,10 @@ 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 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Fix build with gcc5
+patch -p0 < $CWD/patch-include_IL_il.h
# Build against libpng14, not libpng12.
sed -i 's/png12/png14/g' configure
diff --git a/libraries/DevIL/patch-include_IL_il.h b/libraries/DevIL/patch-include_IL_il.h
new file mode 100644
index 0000000000..e265db2fe4
--- /dev/null
+++ b/libraries/DevIL/patch-include_IL_il.h
@@ -0,0 +1,13 @@
+$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