media-libs/devil:

Remove duplicate patch files

Signed-off-by: Peter Asplund <peter.azp@gmail.com>

11 files changed, 2 insertions, 288 deletions

diff --git a/media-libs/devil/devil-1.8.0.ebuild b/media-libs/devil/devil-1.8.0.ebuild
index 9a4b036..ea991cd 100644
--- a/media-libs/devil/devil-1.8.0.ebuild
+++ b/media-libs/devil/devil-1.8.0.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
 IUSE="lcms jpeg mng openexr opengl png sdl test tiff X xpm"
 
 PATCHES=(
-	"${FILESDIR}/${P}-cmake-install-paths.patch"
+	"${FILESDIR}/${PN}-cmake-install-paths.patch"
 )
 
 RESTRICT="!test? ( test )"
diff --git a/media-libs/devil/devil-9999.ebuild b/media-libs/devil/devil-9999.ebuild
index 2ff2fb0..e0f00a4 100644
--- a/media-libs/devil/devil-9999.ebuild
+++ b/media-libs/devil/devil-9999.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 IUSE="lcms jpeg mng openexr opengl png sdl test tiff X xpm"
 
 PATCHES=(
-	"${FILESDIR}/${P}-cmake-install-paths.patch"
+	"${FILESDIR}/${PN}-cmake-install-paths.patch"
 )
 
 RESTRICT="!test? ( test )"
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>
- 
diff --git a/media-libs/devil/files/devil-1.7.8-uchar.patch b/media-libs/devil/files/devil-1.7.8-uchar.patch
deleted file mode 100644
index 45c1810..0000000
--- a/media-libs/devil/files/devil-1.7.8-uchar.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ru devil-1.7.8.orig/src-IL/src/il_jp2.c devil-1.7.8/src-IL/src/il_jp2.c
---- devil-1.7.8.orig/src-IL/src/il_jp2.c	2009-03-07 23:10:09.000000000 -0800
-+++ devil-1.7.8/src-IL/src/il_jp2.c	2016-11-20 11:11:15.798150421 -0800
-@@ -14,6 +14,7 @@
- #include "il_internal.h"
- #ifndef IL_NO_JP2
- #include <jasper/jasper.h>
-+#include <jasper/jas_types.h>
- #include "il_jp2.h"
- 
- #if defined(_WIN32) && defined(IL_USE_PRAGMA_LIBS)
-@@ -459,7 +460,7 @@
- 			/* The buffer must be large enough to accommodate maximum
- 			  putback. */
- 			assert(bufsize > JAS_STREAM_MAXPUTBACK);
--			stream->bufbase_ = JAS_CAST(uchar *, buf);
-+			stream->bufbase_ = JAS_CAST(jas_uchar *, buf);
- 			stream->bufsize_ = bufsize - JAS_STREAM_MAXPUTBACK;
- 		}
- 	} else {
diff --git a/media-libs/devil/files/devil-9999-cmake-install-paths.patch b/media-libs/devil/files/devil-9999-cmake-install-paths.patch
deleted file mode 100644
index 103565f..0000000
--- a/media-libs/devil/files/devil-9999-cmake-install-paths.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff -r --unified a/DevIL/src-IL/CMakeLists.txt b/DevIL/src-IL/CMakeLists.txt
---- a/src-IL/CMakeLists.txt	2023-02-26 22:14:14.468289653 +0100
-+++ b/src-IL/CMakeLists.txt	2023-02-26 22:39:57.848451049 +0100
-@@ -2,6 +2,7 @@
- project(DevIL)
- 
- include (TestBigEndian)
-+include (GNUInstallDirs)
- 
- option(BUILD_SHARED_LIBS "Build with shared (.DLL .SO) libraries." ON)
- 
-@@ -311,11 +312,11 @@
- 
- # Installation
- install (TARGETS IL
--    ARCHIVE DESTINATION lib
--    LIBRARY DESTINATION lib
--    RUNTIME DESTINATION bin
-+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+    RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
- )
--install (FILES ../include/IL/il.h DESTINATION include/IL)
-+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/../include/IL/il.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/IL)
- 
- install(FILES
-     ${CMAKE_CURRENT_BINARY_DIR}/IL.pc
-diff -r --unified a/DevIL/src-ILU/CMakeLists.txt b/DevIL/src-ILU/CMakeLists.txt
---- a/src-ILU/CMakeLists.txt	2023-02-26 22:40:01.657478195 +0100
-+++ b/src-ILU/CMakeLists.txt	2023-02-26 22:42:30.253560617 +0100
-@@ -2,6 +2,8 @@
- 
- project(ILU)
- 
-+include (GNUInstallDirs)
-+
- file(GLOB ILU_SRCS src/*.cpp)
- file(GLOB ILU_INC include/*.h ../include/IL/devil_internal_exports.h ../include/IL/ilu.h)
- file(GLOB ILU_RSRC)
-@@ -75,11 +77,11 @@
- 
- # Installation
- install (TARGETS ILU
--    ARCHIVE DESTINATION lib
--    LIBRARY DESTINATION lib
--    RUNTIME DESTINATION bin
-+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+    RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
- )
--install (FILES ../include/IL/ilu.h DESTINATION include/IL)
-+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/../include/IL/ilu.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/IL)
- 
- install(FILES
-     ${CMAKE_CURRENT_BINARY_DIR}/ILU.pc
-diff -r --unified a/DevIL/src-ILUT/CMakeLists.txt b/DevIL/src-ILUT/CMakeLists.txt
---- a/src-ILUT/CMakeLists.txt	2023-02-26 22:40:01.657478195 +0100
-+++ b/src-ILUT/CMakeLists.txt	2023-02-26 22:43:27.677989601 +0100
-@@ -2,6 +2,8 @@
- 
- project(ILUT)
- 
-+include (GNUInstallDirs)
-+
- file(GLOB ILUT_SRCS src/*.cpp)
- file(GLOB ILUT_INC include/*.h ../include/IL/devil_internal_exports.h ../include/IL/ilut.h)
- file(GLOB ILUT_RSRC)
-@@ -95,11 +97,11 @@
- 
- # Installation
- install (TARGETS ILUT
--    ARCHIVE DESTINATION lib
--    LIBRARY DESTINATION lib
--    RUNTIME DESTINATION bin
-+	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+	RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
- )
--install (FILES ../include/IL/ilut.h DESTINATION include/IL)
-+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/../include/IL/ilut.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/IL)
- 
- install(FILES
-     ${CMAKE_CURRENT_BINARY_DIR}/ILUT.pc
diff --git a/media-libs/devil/files/devil-1.8.0-cmake-install-paths.patch b/media-libs/devil/files/devil-cmake-install-paths.patch
index 103565f..103565f 100644
--- a/media-libs/devil/files/devil-1.8.0-cmake-install-paths.patch
+++ b/media-libs/devil/files/devil-cmake-install-paths.patch