diff options
| author | Dugan Chen <thedoogster [at] gmail [dot] com> | 2015-11-26 23:33:32 +0700 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2015-11-28 07:25:59 +0700 |
| commit | b7ef55005eac21267b39a9c112df3e307960d1bb (patch) | |
| tree | ff7e068c84723b71ecf7b0665e7bf79e3e9e6f07 | |
| parent | b6c74f9319f9cd05a73b39508886fab3e3497a6f (diff) | |
libraries/DevIL: Add patch for gcc 5.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | libraries/DevIL/DevIL.SlackBuild | 7 | ||||
| -rw-r--r-- | libraries/DevIL/patch-include_IL_il.h | 13 |
2 files changed, 18 insertions, 2 deletions
diff --git a/libraries/DevIL/DevIL.SlackBuild b/libraries/DevIL/DevIL.SlackBuild index cef895bbdab1b..3cf47dc1eab59 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 0000000000000..e265db2fe439b --- /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 |