[gentoo-commits] repo/gentoo:master commit in: media-libs/devil/, media-libs/devil/files/
commit: d4ca5662e87e32fd71d326e225bc3ca65c6fdabf
Author: David Seifert gentoo org>
AuthorDate: Tue Dec 6 23:46:48 2016 +
Commit: David Seifert gentoo org>
CommitDate: Tue Dec 6 23:46:48 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4ca5662
media-libs/devil: Remove use of 'uchar' from jasper
Gentoo-bug: 600188
Package-Manager: portage-2.3.3
media-libs/devil/devil-1.7.8-r2.ebuild | 1 +
.../files/devil-1.7.8-jasper-remove-uchar.patch| 96 ++
2 files changed, 97 insertions(+)
diff --git a/media-libs/devil/devil-1.7.8-r2.ebuild
b/media-libs/devil/devil-1.7.8-r2.ebuild
index d999b88..9372d9c 100644
--- a/media-libs/devil/devil-1.7.8-r2.ebuild
+++ b/media-libs/devil/devil-1.7.8-r2.ebuild
@@ -46,6 +46,7 @@ PATCHES=(
"${FILESDIR}/${P}"-ILUT.patch
"${FILESDIR}/${P}"-restrict.patch
"${FILESDIR}/${P}"-fix-test.patch
+ "${FILESDIR}/${P}"-jasper-remove-uchar.patch
)
src_prepare() {
diff --git a/media-libs/devil/files/devil-1.7.8-jasper-remove-uchar.patch
b/media-libs/devil/files/devil-1.7.8-jasper-remove-uchar.patch
new file mode 100644
index ..79fb188
--- /dev/null
+++ b/media-libs/devil/files/devil-1.7.8-jasper-remove-uchar.patch
@@ -0,0 +1,96 @@
+From 8b5e3cb38f46afd063a5258af0da1eb6a942dec5 Mon Sep 17 00:00:00 2001
+From: Ben Campbell
+Date: Wed, 16 Nov 2016 14:41:05 +1300
+Subject: [PATCH] jp2: remove use of uchar define from older jasPer
+
+fixes #41
+jasPer now defines jas_uchar instead of uchar, but it's a moot
+point since the offending code in DevIL was never executed and could
+be removed.
+---
+ DevIL/src-IL/src/il_jp2.c | 42 ++
+ 1 file changed, 14 insertions(+), 28 deletions(-)
+
+diff --git a/src-IL/src/il_jp2.c b/src-IL/src/il_jp2.c
+index acc5787..3fd397b 100644
+--- a/src-IL/src/il_jp2.c
b/src-IL/src/il_jp2.c
+@@ -358,7 +358,7 @@ static jas_stream_ops_t jas_stream_devilops = {
+
+ static jas_stream_t *jas_stream_create(void);
+ static void jas_stream_destroy(jas_stream_t *stream);
+-static void jas_stream_initbuf(jas_stream_t *stream, int bufmode, char *buf,
int bufsize);
++static void jas_stream_initbuf(jas_stream_t *stream, int bufmode );
+
+
+ // Modified version of jas_stream_fopen and jas_stream_memopen from
jas_stream.c of JasPer
+@@ -377,7 +377,7 @@ jas_stream_t *iJp2ReadStream()
+ stream->openmode_ = JAS_STREAM_READ | JAS_STREAM_BINARY;
+
+ /* We use buffering whether it is from memory or a file. */
+- jas_stream_initbuf(stream, JAS_STREAM_FULLBUF, 0, 0);
++ jas_stream_initbuf(stream, JAS_STREAM_FULLBUF);
+
+ /* Select the operations for a memory stream. */
+ stream->ops_ = &jas_stream_devilops;
+@@ -432,8 +432,7 @@ jas_stream_t *iJp2ReadStream()
+ // The following functions are taken directly from jas_stream.c of JasPer,
+ // since they are designed to be used within JasPer only.
+
+-static void jas_stream_initbuf(jas_stream_t *stream, int bufmode, char *buf,
+- int bufsize)
++static void jas_stream_initbuf(jas_stream_t *stream, int bufmode )
+ {
+ /* If this function is being called, the buffer should not have been
+ initialized yet. */
+@@ -441,31 +440,18 @@ static void jas_stream_initbuf(jas_stream_t *stream, int
bufmode, char *buf,
+
+ if (bufmode != JAS_STREAM_UNBUF) {
+ /* The full- or line-buffered mode is being employed. */
+- if (!buf) {
+- /* The caller has not specified a buffer to employ, so
allocate
+-one. */
+- if ((stream->bufbase_ = jas_malloc(JAS_STREAM_BUFSIZE +
+-JAS_STREAM_MAXPUTBACK))) {
+- stream->bufmode_ |= JAS_STREAM_FREEBUF;
+- stream->bufsize_ = JAS_STREAM_BUFSIZE;
+- } else {
+- /* The buffer allocation has failed. Resort to
unbuffered
+-operation. */
+- stream->bufbase_ = stream->tinybuf_;
+- stream->bufsize_ = 1;
+- }
+- } else {
+- /* The caller has specified a buffer to employ. */
+- /* The buffer must be large enough to accommodate
maximum
+-putback. */
+- assert(bufsize > JAS_STREAM_MAXPUTBACK);
+- stream->bufbase_ = JAS_CAST(uchar *, buf);
+- stream->bufsize_ = bufsize - JAS_STREAM_MAXPUTBACK;
+- }
++if ((stream->bufbase_ = jas_malloc(JAS_STREAM_BUFSIZE +
++ JAS_STREAM_MAXPUTBACK))) {
++stream->bufmode_ |= JAS_STREAM_FREEBUF;
++stream->bufsize_ = JAS_STREAM_BUFSIZE;
++} else {
++/* The buffer allocation has failed. Resort to unbuffered
++ operation. *
[gentoo-commits] repo/gentoo:master commit in: media-libs/devil/, media-libs/devil/files/
commit: 9f4a47a732c6042380d133ec1825d6187666bcf6
Author: David Seifert gentoo org>
AuthorDate: Tue Dec 6 21:57:38 2016 +
Commit: David Seifert gentoo org>
CommitDate: Tue Dec 6 21:59:00 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f4a47a7
media-libs/devil: Port to EAPI 6
Gentoo-bug: 600188
* Make PATCHES -p1 compliant
* Delete .la files unconditionally
Package-Manager: portage-2.3.3
media-libs/devil/devil-1.7.8-r2.ebuild | 29 --
.../devil/files/devil-1.7.8-CVE-2009-3994.patch| 4 +--
media-libs/devil/files/devil-1.7.8-ILUT.patch | 4 +--
media-libs/devil/files/devil-1.7.8-fix-test.patch | 4 +--
media-libs/devil/files/devil-1.7.8-nvtt-glut.patch | 16 ++--
5 files changed, 35 insertions(+), 22 deletions(-)
diff --git a/media-libs/devil/devil-1.7.8-r2.ebuild
b/media-libs/devil/devil-1.7.8-r2.ebuild
index 8da20b4..d999b88 100644
--- a/media-libs/devil/devil-1.7.8-r2.ebuild
+++ b/media-libs/devil/devil-1.7.8-r2.ebuild
@@ -2,8 +2,9 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
-inherit autotools eutils
+EAPI=6
+
+inherit autotools
MY_P=DevIL-${PV}
@@ -14,9 +15,10 @@ SRC_URI="mirror://sourceforge/openil/${MY_P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="amd64 ~arm ~mips ppc ppc64 x86"
-IUSE="allegro gif glut jpeg jpeg2k mng nvtt openexr opengl png sdl
cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 static-libs tiff xpm X"
+IUSE="allegro cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 gif glut
jpeg jpeg2k mng nvtt openexr opengl png sdl static-libs tiff X xpm"
-RDEPEND="allegro? ( media-libs/allegro:0 )
+RDEPEND="
+ allegro? ( media-libs/allegro:0 )
gif? ( media-libs/giflib:= )
glut? ( media-libs/freeglut )
jpeg? ( virtual/jpeg:0 )
@@ -29,16 +31,25 @@ RDEPEND="allegro? ( media-libs/allegro:0 )
png? ( media-libs/libpng:0= )
sdl? ( media-libs/libsdl )
tiff? ( media-libs/tiff:0 )
- xpm? ( x11-libs/libXpm )
X? ( x11-libs/libXext
x11-libs/libX11
-x11-libs/libXrender )"
+x11-libs/libXrender )
+ xpm? ( x11-libs/libXpm )"
DEPEND="${RDEPEND}
virtual/pkgconfig
X? ( x11-proto/xextproto )"
+PATCHES=(
+ "${FILESDIR}/${P}"-CVE-2009-3994.patch
+ "${FILESDIR}/${P}"-libpng14.patch
+ "${FILESDIR}/${P}"-nvtt-glut.patch
+ "${FILESDIR}/${P}"-ILUT.patch
+ "${FILESDIR}/${P}"-restrict.patch
+ "${FILESDIR}/${P}"-fix-test.patch
+)
+
src_prepare() {
- epatch
"${FILESDIR}"/${P}-{CVE-2009-3994,libpng14,nvtt-glut,ILUT,restrict,fix-test}.patch
+ default
eautoreconf
}
@@ -74,5 +85,7 @@ src_configure() {
src_install() {
default
- use static-libs || prune_libtool_files
+
+ # package provides .pc files
+ find "${D}" -name '*.la' -delete || die
}
diff --git a/media-libs/devil/files/devil-1.7.8-CVE-2009-3994.patch
b/media-libs/devil/files/devil-1.7.8-CVE-2009-3994.patch
index 6c9f2db..77e684a 100644
--- a/media-libs/devil/files/devil-1.7.8-CVE-2009-3994.patch
+++ b/media-libs/devil/files/devil-1.7.8-CVE-2009-3994.patch
@@ -1,7 +1,7 @@
http://bugs.gentoo.org/297760
src-IL/src/il_dicom.c
-+++ src-IL/src/il_dicom.c
+--- a/src-IL/src/il_dicom.c
b/src-IL/src/il_dicom.c
@@ -427,9 +427,11 @@ ILboolean GetUID(ILubyte *UID)
return IL_FALSE;
diff --git a/media-libs/devil/files/devil-1.7.8-ILUT.patch
b/media-libs/devil/files/devil-1.7.8-ILUT.patch
index 7807d0e..f14d43b 100644
--- a/media-libs/devil/files/devil-1.7.8-ILUT.patch
+++ b/media-libs/devil/files/devil-1.7.8-ILUT.patch
@@ -3,8 +3,8 @@ Date: Thu May 3 22:23:21 UTC 2012
use_x11=no was not set when --disable-x11 was
m4/devil-api_checks.m4
-+++ m4/devil-api_checks.m4
+--- a/m4/devil-api_checks.m4
b/m4/devil-api_checks.m4
@@ -137,7 +137,8 @@
[main],
[dnl The use_x11 var is either "yes" already,
or we don't want "no" to be overwritten
diff --git a/media-libs/devil/files/devil-1.7.8-fix-test.patch
b/media-libs/devil/files/devil-1.7.8-fix-test.patch
index 44af2fc..eda05e7 100644
--- a/media-libs/devil/files/devil-1.7.8-fix-test.patch
+++ b/media-libs/devil/files/devil-1.7.8-fix-test.patch
@@ -1,5 +1,5 @@
a/devil-1.7.8/test/Makefile.am
-+++ b/devil-1.7.8/test/Makefile.am
+--- a/test/Makefile.am
b/test/Makefile.am
@@ -12,5 +12,6 @@ else
testil_LDADD += ../lib/libIL.la
endif
diff --git a/media-libs/devil/files/devil-1.7.8-nvtt-glut.patch
b/media-libs/devil/files/devil-1.7.8-nvtt-glut.patch
index 8e2ccd7..571d76b 100644
--- a/media-libs/devil/files/devil-1.7.8-nvtt-glut.patch
+++ b/media-libs/devil/files/devil-1.7.8-nvtt-glut.patch
@@ -5,8 +5,8 @@ Subject: build system
remove automagic handling of glut and add configure option
fix "header present but cannot be
[gentoo-commits] repo/gentoo:master commit in: media-libs/devil/, media-libs/devil/files/
commit: fab1531be3c5fb51d0058c3b382000d13c3fc985
Author: Michael Sterrett gentoo org>
AuthorDate: Tue Oct 6 18:47:54 2015 +
Commit: Michael Sterrett gentoo org>
CommitDate: Tue Oct 6 18:48:08 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fab1531b
fix tests with patch from Dustin Polke (bug #527270)
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-fix-test.patch | 10 ++
2 files changed, 11 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 c20974c..43a592e 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,restrict}.patch
+ epatch
"${FILESDIR}"/${P}-{CVE-2009-3994,libpng14,nvtt-glut,ILUT,restrict,fix-test}.patch
eautoreconf
}
diff --git a/media-libs/devil/files/devil-1.7.8-fix-test.patch
b/media-libs/devil/files/devil-1.7.8-fix-test.patch
new file mode 100644
index 000..44af2fc
--- /dev/null
+++ b/media-libs/devil/files/devil-1.7.8-fix-test.patch
@@ -0,0 +1,10 @@
+--- a/devil-1.7.8/test/Makefile.am
b/devil-1.7.8/test/Makefile.am
+@@ -12,5 +12,6 @@ else
+ testil_LDADD += ../lib/libIL.la
+ endif
+
+-TESTS_ENVIRONMENT = /bin/bash
++TESTS_ENVIRONMENT =
+ TESTS = $(check_SCRIPTS)
++LOG_COMPILER = $(SHELL)
[gentoo-commits] repo/gentoo:master commit in: media-libs/devil/, media-libs/devil/files/
commit: bbec455c85cfdd85ae529cc407ede34277127c91
Author: Michael Sterrett gentoo org>
AuthorDate: Thu Sep 3 15:01:03 2015 +
Commit: Michael Sterrett gentoo org>
CommitDate: Thu Sep 3 15:06:05 2015 +
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 000..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.0 +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
+
