diff options
| -rw-r--r-- | media-libs/devil/ChangeLog | 8 | ||||
| -rw-r--r-- | media-libs/devil/Manifest | 1 | ||||
| -rw-r--r-- | media-libs/devil/devil-1.7.8-r2.ebuild | 78 | ||||
| -rw-r--r-- | media-libs/devil/files/devil-1.7.8-CVE-2009-3994.patch | 17 | ||||
| -rw-r--r-- | media-libs/devil/files/devil-1.7.8-ILUT.patch | 17 | ||||
| -rw-r--r-- | media-libs/devil/files/devil-1.7.8-fix-test.patch | 10 | ||||
| -rw-r--r-- | media-libs/devil/files/devil-1.7.8-libpng14.patch | 33 | ||||
| -rw-r--r-- | media-libs/devil/files/devil-1.7.8-nvtt-glut.patch | 83 | ||||
| -rw-r--r-- | media-libs/devil/files/devil-1.7.8-restrict.patch | 23 |
9 files changed, 7 insertions, 263 deletions
diff --git a/media-libs/devil/ChangeLog b/media-libs/devil/ChangeLog index ba79ccb..31bf682 100644 --- a/media-libs/devil/ChangeLog +++ b/media-libs/devil/ChangeLog @@ -1,7 +1,13 @@ # ChangeLog for media-libs/devil -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/media-libs/devil/ChangeLog,v 1.66 2015/06/01 22:43:24 mr_bones_ Exp $ + 05 Apr 2017; Dustin Polke <DuPol@gmx.de> -devil-1.7.8-r2.ebuild, + -files/devil-1.7.8-CVE-2009-3994.patch, -files/devil-1.7.8-ILUT.patch, + -files/devil-1.7.8-fix-test.patch, -files/devil-1.7.8-libpng14.patch, + -files/devil-1.7.8-nvtt-glut.patch, -files/devil-1.7.8-restrict.patch: + Drop version which does not compile anymore. Tests are now fixed in portage. + 03 Oct 2015; Dustin Polke <DuPol@gmx.de> +devil-1.7.8-r2.ebuild, +files/devil-1.7.8-CVE-2009-3994.patch, +files/devil-1.7.8-ILUT.patch, +files/devil-1.7.8-fix-test.patch, +files/devil-1.7.8-libpng14.patch, diff --git a/media-libs/devil/Manifest b/media-libs/devil/Manifest deleted file mode 100644 index 8a251b7..0000000 --- a/media-libs/devil/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST DevIL-1.7.8.tar.gz 2051993 SHA256 682ffa3fc894686156337b8ce473c954bf3f4fb0f3ecac159c73db632d28a8fd SHA512 a67e1488d6cb366431d9fcb460b8fe5b8a1dd79426ac77f8abd0db4a5aad7512697f72ef0c49ddb0e806469cc37ba1319e10ccd2ebd73942332df2c3c507458e WHIRLPOOL 749bf0ce73786709414d6f2c3bf29b20c56397cb6f9f92b4158902a98a4f4d0ef66d78096ce8daea3d65b1718c5255421055cd223e9269f6c773ca310c2df146 diff --git a/media-libs/devil/devil-1.7.8-r2.ebuild b/media-libs/devil/devil-1.7.8-r2.ebuild deleted file mode 100644 index 7ed1289..0000000 --- a/media-libs/devil/devil-1.7.8-r2.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit autotools eutils - -MY_P=DevIL-${PV} - -DESCRIPTION="DevIL image library" -HOMEPAGE="http://openil.sourceforge.net/" -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" - -RDEPEND="allegro? ( media-libs/allegro:0 ) - gif? ( media-libs/giflib ) - glut? ( media-libs/freeglut ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( media-libs/jasper ) - mng? ( media-libs/libmng ) - nvtt? ( media-gfx/nvidia-texture-tools ) - openexr? ( media-libs/openexr ) - opengl? ( virtual/opengl - virtual/glu ) - 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 )" -DEPEND="${RDEPEND} - virtual/pkgconfig - X? ( x11-proto/xextproto )" - -src_prepare() { - epatch "${FILESDIR}"/${P}-{CVE-2009-3994,libpng14,nvtt-glut,ILUT,restrict,fix-test}.patch - eautoreconf -} - -src_configure() { - econf \ - $(use_enable static-libs static) \ - --disable-lcms \ - --enable-ILU \ - --enable-ILUT \ - $(use_enable cpu_flags_x86_sse sse) \ - $(use_enable cpu_flags_x86_sse2 sse2) \ - $(use_enable cpu_flags_x86_sse3 sse3) \ - $(use_enable openexr exr) \ - $(use_enable gif) \ - $(use_enable jpeg) \ - $(use_enable jpeg2k jp2) \ - $(use_enable mng) \ - $(use_enable png) \ - $(use_enable tiff) \ - $(use_enable xpm) \ - $(use_enable allegro) \ - --disable-directx8 \ - --disable-directx9 \ - $(use_enable opengl) \ - $(use_enable sdl) \ - $(use_enable X x11) \ - $(use_enable X shm) \ - $(use_enable X render) \ - $(use_enable glut) \ - $(use_with X x) \ - $(use_with nvtt) -} - -src_install() { - default - use static-libs || prune_libtool_files -} 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 deleted file mode 100644 index 6c9f2db..0000000 --- a/media-libs/devil/files/devil-1.7.8-CVE-2009-3994.patch +++ /dev/null @@ -1,17 +0,0 @@ -http://bugs.gentoo.org/297760 - ---- src-IL/src/il_dicom.c -+++ src-IL/src/il_dicom.c -@@ -427,9 +427,11 @@ ILboolean GetUID(ILubyte *UID) - return IL_FALSE; - - ValLen = GetLittleUShort(); -+ if (ValLen > 64) -+ return IL_FALSE; - if (iread(UID, ValLen, 1) != 1) - return IL_FALSE; -- UID[64] = 0; // Just to make sure that our string is terminated. -+ UID[ValLen] = 0; // Just to make sure that our string is terminated. - - return IL_TRUE; - } diff --git a/media-libs/devil/files/devil-1.7.8-ILUT.patch b/media-libs/devil/files/devil-1.7.8-ILUT.patch deleted file mode 100644 index 7807d0e..0000000 --- a/media-libs/devil/files/devil-1.7.8-ILUT.patch +++ /dev/null @@ -1,17 +0,0 @@ -From: hasufell <hasufell@gentoo.org> -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 -@@ -137,7 +137,8 @@ - [main], - [dnl The use_x11 var is either "yes" already, or we don't want "no" to be overwritten - ILUT_LIBS="-lX11 $ILUT_LIBS"], -- [use_x11="no"]) ]) -+ [use_x11="no"]) ], -+ [use_x11="no"]) - TEST_API([shm]) - AS_IF([test "x$enable_shm" = "xyes"], - [AC_CHECK_HEADER([X11/extensions/XShm.h], 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 deleted file mode 100644 index 44af2fc..0000000 --- a/media-libs/devil/files/devil-1.7.8-fix-test.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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) diff --git a/media-libs/devil/files/devil-1.7.8-libpng14.patch b/media-libs/devil/files/devil-1.7.8-libpng14.patch deleted file mode 100644 index b843469..0000000 --- a/media-libs/devil/files/devil-1.7.8-libpng14.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -Nur devil-1.7.8.orig/src-IL/src/il_icon.c devil-1.7.8/src-IL/src/il_icon.c ---- devil-1.7.8.orig/src-IL/src/il_icon.c 2009-03-08 09:10:09.000000000 +0200 -+++ devil-1.7.8/src-IL/src/il_icon.c 2010-01-17 00:54:09.000000000 +0200 -@@ -525,7 +525,7 @@ - - // Expand low-bit-depth grayscale images to 8 bits - if (ico_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { -- png_set_gray_1_2_4_to_8(ico_png_ptr); -+ png_set_expand_gray_1_2_4_to_8(ico_png_ptr); - } - - // Expand RGB images with transparency to full alpha channels -diff -Nur devil-1.7.8.orig/src-IL/src/il_png.c devil-1.7.8/src-IL/src/il_png.c ---- devil-1.7.8.orig/src-IL/src/il_png.c 2009-03-08 09:10:09.000000000 +0200 -+++ devil-1.7.8/src-IL/src/il_png.c 2010-01-17 00:55:26.000000000 +0200 -@@ -105,7 +105,7 @@ - Read = iread(Signature, 1, 8); - iseek(-Read, IL_SEEK_CUR); - -- return png_check_sig(Signature, 8); -+ return png_sig_cmp(Signature, 0, 8) == 0; - } - - -@@ -278,7 +278,7 @@ - - // Expand low-bit-depth grayscale images to 8 bits - if (png_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { -- png_set_gray_1_2_4_to_8(png_ptr); -+ png_set_expand_gray_1_2_4_to_8(png_ptr); - } - - // Expand RGB images with transparency to full alpha channels 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 deleted file mode 100644 index 8e2ccd7..0000000 --- a/media-libs/devil/files/devil-1.7.8-nvtt-glut.patch +++ /dev/null @@ -1,83 +0,0 @@ -From: Julian Ospald <hasufell@gentoo.org> -Date: Tue May 1 20:00:44 UTC 2012 -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 -@@ -114,4 +114,11 @@ - - AC_SUBST([GLUT_CFLAGS]) - AC_SUBST([GLUT_LIBS]) -+ -+AC_ARG_ENABLE([glut], -+ [AS_HELP_STRING([--enable-glut], -+ [Enable support for glut (default=yes)]) ], -+ [enable_glut=$enableval], -+ [enable_glut="yes"]) -+ - ])dnl ---- m4/devil-api_checks.m4 -+++ m4/devil-api_checks.m4 -@@ -31,8 +31,8 @@ - AS_IF([test "x$no_gl" != "xyes" -a "x$no_glu" != "xyes"], - [use_ogl="yes" - ILUT_LIBS="$GLU_LIBS $GL_LIBS $ILUT_LIBS" -- AS_IF([test "x$no_glut" != "xyes"], -- [have_glut="yes" -+ AS_IF([test "x$no_glut" != "xyes" -a "x$enable_glut" = "xyes"], -+ [use_glut="yes" - ILUT_LIBS="$GLUT_LIBS $ILUT_LIBS"]) - AC_DEFINE([ILUT_USE_OPENGL], - [1], ---- configure.ac -+++ configure.ac -@@ -343,8 +343,10 @@ - [Do you want to use the Nvidia texture tools if possible? (enables GPU accelerated image manipulation, default="yes")]) ], - [], - [with_nvtt="yes"]) -+AC_LANG_PUSH([C++]) - AS_IF([test "x$with_nvtt" = "xyes"], - [DEVIL_CHECK_NVIDIA_TEXTOOLS]) -+AC_LANG_POP - - dnl - dnl ILUT APIs library checking -@@ -392,8 +394,8 @@ - AM_CONDITIONAL([USE_OPENGL], - [test "x$use_ogl" = "xyes"]) - --AM_CONDITIONAL([HAVE_GLUT], -- [test "x$have_glut" = "xyes"]) -+AM_CONDITIONAL([USE_GLUT], -+ [test "x$use_glut" = "xyes"]) - - AM_CONDITIONAL([USE_SDL], - [test "x$use_sdl" = "xyes"]) -@@ -410,7 +412,7 @@ - AM_CONDITIONAL([USE_X11], - [test "x$use_x11" = "xyes"]) - #this is instedad AM_COND_IF([USE_OPENGL && USE_X11]) --AS_IF([test "x$have_glut" = "xyes" -a "x$use_x11" = "xyes"], -+AS_IF([test "x$use_glut" = "xyes" -a "x$use_x11" = "xyes"], - [EXAMPLES_TO_BUILD="$EXAMPLES_TO_BUILD ILUT_gl ILUT_volume"]) - - dnl Win32 ---- bin/Makefile.am -+++ bin/Makefile.am -@@ -45,11 +45,11 @@ - examples_PROGRAMS += ILUT_animation - endif #USE_W32 - --if HAVE_GLUT -+if USE_GLUT - if USE_X11 - examples_PROGRAMS += ILUT_gl ILUT_volume - endif #USE_X11 --endif #HAVE_GLUT -+endif #USE_GLUT - - endif #BUILD_ILUT - diff --git a/media-libs/devil/files/devil-1.7.8-restrict.patch b/media-libs/devil/files/devil-1.7.8-restrict.patch deleted file mode 100644 index d99ccb3..0000000 --- a/media-libs/devil/files/devil-1.7.8-restrict.patch +++ /dev/null @@ -1,23 +0,0 @@ -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> - |