commit: bbec455c85cfdd85ae529cc407ede34277127c91
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 3 15:01:03 2015 +0000
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Thu Sep 3 15:06:05 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbec455c
fix building with gcc-5.2 with patch from Sven Eden via bug 552370
Package-Manager: portage-2.2.20.1
media-libs/devil/devil-1.7.8-r2.ebuild | 2 +-
media-libs/devil/files/devil-1.7.8-restrict.patch | 23 +++++++++++++++++++++++
2 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/media-libs/devil/devil-1.7.8-r2.ebuild
b/media-libs/devil/devil-1.7.8-r2.ebuild
index 1f03c57..8be0281 100644
--- a/media-libs/devil/devil-1.7.8-r2.ebuild
+++ b/media-libs/devil/devil-1.7.8-r2.ebuild
@@ -38,7 +38,7 @@ DEPEND="${RDEPEND}
X? ( x11-proto/xextproto )"
src_prepare() {
- epatch "${FILESDIR}"/${P}-{CVE-2009-3994,libpng14,nvtt-glut,ILUT}.patch
+ epatch
"${FILESDIR}"/${P}-{CVE-2009-3994,libpng14,nvtt-glut,ILUT,restrict}.patch
eautoreconf
}
diff --git a/media-libs/devil/files/devil-1.7.8-restrict.patch
b/media-libs/devil/files/devil-1.7.8-restrict.patch
new file mode 100644
index 0000000..d99ccb3
--- /dev/null
+++ b/media-libs/devil/files/devil-1.7.8-restrict.patch
@@ -0,0 +1,23 @@
+Patch from Sven Eden via bug 552370
+https://bugs.gentoo.org/show_bug.cgi?id=552370
+
+--- a/include/IL/il.h 2009-03-08 08:10:08.000000000 +0100
++++ b/include/IL/il.h 2015-09-03 16:22:04.056637044 +0200
+@@ -63,13 +63,13 @@
+ #endif
+ #endif
+
+-#ifdef RESTRICT_KEYWORD
+-#define RESTRICT restrict
+-#define CONST_RESTRICT const restrict
++#if defined(RESTRICT_KEYWORD) && !defined(__cplusplus)
++#define RESTRICT __restrict__
++#define CONST_RESTRICT const __restrict__
+ #else
+ #define RESTRICT
+ #define CONST_RESTRICT const
+-#endif
++#endif // RESTRICT keyword and not C++
+
+ #include <stdio.h>
+
