commit: 9f4a47a732c6042380d133ec1825d6187666bcf6
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 6 21:57:38 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Dec 6 21:59:00 2016 +0000
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 compiled" warning for nvtt
---- m4/ax_check_glut.m4
-+++ m4/ax_check_glut.m4
+--- a/m4/ax_check_glut.m4
++++ b/m4/ax_check_glut.m4
@@ -114,4 +114,11 @@
AC_SUBST([GLUT_CFLAGS])
@@ -19,8 +19,8 @@ fix "header present but cannot be compiled" warning for nvtt
+ [enable_glut="yes"])
+
])dnl
---- m4/devil-api_checks.m4
-+++ m4/devil-api_checks.m4
+--- a/m4/devil-api_checks.m4
++++ b/m4/devil-api_checks.m4
@@ -31,8 +31,8 @@
AS_IF([test "x$no_gl" != "xyes" -a "x$no_glu" != "xyes"],
[use_ogl="yes"
@@ -32,8 +32,8 @@ fix "header present but cannot be compiled" warning for nvtt
ILUT_LIBS="$GLUT_LIBS $ILUT_LIBS"])
AC_DEFINE([ILUT_USE_OPENGL],
[1],
---- configure.ac
-+++ configure.ac
+--- a/configure.ac
++++ b/configure.ac
@@ -343,8 +343,10 @@
[Do you want to use the Nvidia texture tools if
possible? (enables GPU accelerated image manipulation, default="yes")]) ],
[],
@@ -65,8 +65,8 @@ fix "header present but cannot be compiled" warning for nvtt
[EXAMPLES_TO_BUILD="$EXAMPLES_TO_BUILD ILUT_gl ILUT_volume"])
dnl Win32
---- bin/Makefile.am
-+++ bin/Makefile.am
+--- a/bin/Makefile.am
++++ b/bin/Makefile.am
@@ -45,11 +45,11 @@
examples_PROGRAMS += ILUT_animation
endif #USE_W32
