Add new devil version

Package-Manager: Portage-2.3.5, Repoman-2.3.2

11 files changed, 315 insertions, 0 deletions

diff --git a/media-libs/devil/ChangeLog b/media-libs/devil/ChangeLog
new file mode 100644
index 0000000..07d20c5
--- /dev/null
+++ b/media-libs/devil/ChangeLog
@@ -0,0 +1,8 @@
+*devil-1.7.8-r3 (18 Mar 2017)
+
+  18 Mar 2017; Peter Asplund <peterasplund@gentoo.se> +devil-1.7.8-r3.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,
+  +files/devil-1.7.8-uchar.patch, +metadata.xml:
+  Add new devil version
diff --git a/media-libs/devil/Manifest b/media-libs/devil/Manifest
new file mode 100644
index 0000000..8dc6eca
--- /dev/null
+++ b/media-libs/devil/Manifest
@@ -0,0 +1,11 @@
+AUX devil-1.7.8-CVE-2009-3994.patch 443 SHA256 856c0f3f5b24b4474acaf84277441a390d13fcdd86e9ed19623de07a6261ef90 SHA512 b5e720e24f2e97e19c694224281a41466296de9e3bc3a4dddf7a5a0881c8f49af864625f1b46e37cd9d113d0b7e7f95b1720e5b49be679e2c7ad6169cd52729f WHIRLPOOL 179af1739cfa54cc4206c454a5632adff123be2c98c12cfb6ce668f6f17fe4238b747a77f9972cd9533c4de425b3acced180a9a1559f85163e406fc51623412e
+AUX devil-1.7.8-ILUT.patch 667 SHA256 a100cda1db97f7e90cc864589b89294f18aee05f2ef4907dde0c8cf03845160d SHA512 e36d441a2f7e56a7affc858de7447a558a9b73037bec3d0544126c5fdc2d3d580acb314f666db2a9cdaa8f78586ecafd8bb211ed0a921b32d23e49f3780145a2 WHIRLPOOL 5d241a7f1a3bc95652217903fce8abc578c02200b40ffd665d2f0207a65ee32318064f9416da17d0141e106ec9c1d526ad4acaf5cc5aa617eda972a3779b70d5
+AUX devil-1.7.8-fix-test.patch 238 SHA256 ca0154a8c5fad3aed4dbdc8816d63765458814f7d44ff55984dd048603495090 SHA512 964e5dbf741a2f2891949fe314a3fe52166f07cd78ccb690cb7bd37a9bd342818ca49f9a233e1a91e11a06931e1af9810a6d255c4f0f08ff0f32d1a7c9613688 WHIRLPOOL 69a7199639403629222ca5c93d90ee1de2d51698ad57a8eecbcd1aea892b653bb7adf1db18ffa2196b37da599ee39888fcbca77b542b6a23d26e2772ffe811cc
+AUX devil-1.7.8-libpng14.patch 1221 SHA256 bd1da681157678fcffcaba5ec2f7f2d33ad9971816ea33dedcf2721ad0ab4536 SHA512 cca76f7f6702ee8341ef68f36f36ade358662a38294e6e2badf7944e2c5b194d1098eb24e9c57e4101b3b110548d106cf8e3ed7ac55281d96428c07cbf6396d0 WHIRLPOOL 06178a97bfa6a67ef50bc26887f6ec4067c0db21c97a518032d75005b18658500262ad22c74e7df0cbe6a66e09eedbb3e57fac25eb06590a2be2e3828af748e9
+AUX devil-1.7.8-nvtt-glut.patch 2477 SHA256 7660558de9615d617027f501f93e7472647696fb5cd7c02dee31cb2a42969383 SHA512 08fc08f2ef37a19eb0d5f0d904814d659ff6133f479a323420d8cc1922b2c836e5f7d23cc52bddd723fe51a747cc40646df75c16fdb3c2a1a08a1967f0d842e0 WHIRLPOOL 96a17dff33a6c0daa7833b223078bb3df7a95b965bee0ec1b05aa2caa2a15e46a2a8b4e5bedd4c504f070102cf8e2cc99a41042291b55803c76b4ee61b050070
+AUX devil-1.7.8-restrict.patch 587 SHA256 f30f4f95a208963af7fcf5de68c2a94db55911b34b9feef2c4324673388784c3 SHA512 9370a94406e98979266d027857d7dd04069eefb6e2ccfb52d254b9eb658d932e5e7e9bd3a38aad57099b870c54aaa0a2d8b337f9bad42d06f6521c10d0a6f8db WHIRLPOOL d7633320ba62b81f80aa91a42228c70afe647f466f63ecc68e55afcfd3875ff05f00669a08db7bbcfa2e3c26e29d12fc02c0947dc46116ee3ca4460c8f4e3b9f
+AUX devil-1.7.8-uchar.patch 739 SHA256 8c24e84fb82a1c939d7cf05c55c9ebf903eef59dc5730fc78568e9a117d216b4 SHA512 cf611410bb61877a416ecb573c42c78f94eae78f9a2c6105cf82d095ca68fb25d995cbfefb0f5bac942eb03f13278305a2e43106f976aff4608cad0307a1e657 WHIRLPOOL d32a269583d5d2e6804a2e10d60c2f0e9b934472dcf667da27dfd46a147b8ac5bcfb2a4818e6c096a859af343423772c1b6ef1a4b355d8e7851c7134a526c404
+DIST DevIL-1.7.8.tar.gz 2051993 SHA256 682ffa3fc894686156337b8ce473c954bf3f4fb0f3ecac159c73db632d28a8fd SHA512 a67e1488d6cb366431d9fcb460b8fe5b8a1dd79426ac77f8abd0db4a5aad7512697f72ef0c49ddb0e806469cc37ba1319e10ccd2ebd73942332df2c3c507458e WHIRLPOOL 749bf0ce73786709414d6f2c3bf29b20c56397cb6f9f92b4158902a98a4f4d0ef66d78096ce8daea3d65b1718c5255421055cd223e9269f6c773ca310c2df146
+EBUILD devil-1.7.8-r3.ebuild 1970 SHA256 73d19d88e53219ea97bc4abd18d9dfc0657f67513d781b2cf534000652532c4a SHA512 4a808fa72c8cb4491ab5849ded5e6c586008c585d01863e30a8b228851508b3dc5969bdebde6997165b28fb8e5e568e8852581e5a9edeccef53fcfea70d28084 WHIRLPOOL 1b72ad7d4f80791897767e9fc53fa692751360c88e1fbb49c921925adbda4ebfdf16fc991e23e6774f4f58433a07752e561139a858fcd78f7f720408142dda78
+MISC ChangeLog 400 SHA256 75b7487ee7fbc4c5ac6d40a7e0df5607b8f2eb603a0211ac53057c8b3137bb10 SHA512 0328e939e93d9139c44747578abf54751f9a93f219109310c29eababb119ad2889388a279aeb6668f680a495afb9de90c18a4787c3176e9e639792c33c7b9b25 WHIRLPOOL 68ad6cab96368d5cb416581ebd7a09efbb42b350e95c626582f855fa9dfcfed8b2c0c9541c76974799e111935b675cd666477cfed1840c24db1adf651f13c00c
+MISC metadata.xml 499 SHA256 d4cf93176bedb75d01c37dcd8d29a49fbfebfa7fd49f2dfcdf6cadb7365a7c39 SHA512 68440791a1c641a6983d297e924bee78038905b1ee383592b220f0ef51980d8f9eb237a6d70b0d848781d08e72fe02f4b4f36691d37a72b4003ea59fe3764cfc WHIRLPOOL f83bbbadaf75bb031417c47910870f8529d60ef1bb06f2b7aa431d7878ca54486befcbc9020cc5ab2cba6d2512b883d3798e1425df445cdb794335e4d2a5096e
diff --git a/media-libs/devil/devil-1.7.8-r3.ebuild b/media-libs/devil/devil-1.7.8-r3.ebuild
new file mode 100644
index 0000000..13ebfe0
--- /dev/null
+++ b/media-libs/devil/devil-1.7.8-r3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2017 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,uchar}.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
new file mode 100644
index 0000000..6c9f2db
--- /dev/null
+++ b/media-libs/devil/files/devil-1.7.8-CVE-2009-3994.patch
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 0000000..7807d0e
--- /dev/null
+++ b/media-libs/devil/files/devil-1.7.8-ILUT.patch
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 0000000..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)
diff --git a/media-libs/devil/files/devil-1.7.8-libpng14.patch b/media-libs/devil/files/devil-1.7.8-libpng14.patch
new file mode 100644
index 0000000..b843469
--- /dev/null
+++ b/media-libs/devil/files/devil-1.7.8-libpng14.patch
@@ -0,0 +1,33 @@
+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
new file mode 100644
index 0000000..8e2ccd7
--- /dev/null
+++ b/media-libs/devil/files/devil-1.7.8-nvtt-glut.patch
@@ -0,0 +1,83 @@
+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
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>
+ 
diff --git a/media-libs/devil/files/devil-1.7.8-uchar.patch b/media-libs/devil/files/devil-1.7.8-uchar.patch
new file mode 100644
index 0000000..45c1810
--- /dev/null
+++ b/media-libs/devil/files/devil-1.7.8-uchar.patch
@@ -0,0 +1,20 @@
+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/metadata.xml b/media-libs/devil/metadata.xml
new file mode 100644
index 0000000..e44a24d
--- /dev/null
+++ b/media-libs/devil/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
+  <use>
+    <flag name="allegro">Add support for Allegro</flag>
+    <flag name="nvtt">Add support for <pkg>media-gfx/nvidia-texture-tools</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">openil</remote-id>
+  </upstream>
+</pkgmetadata>