diff options
| -rw-r--r-- | media-libs/devil/ChangeLog | 237 | ||||
| -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 | ||||
| -rw-r--r-- | media-libs/devil/metadata.xml | 11 |
10 files changed, 510 insertions, 0 deletions
diff --git a/media-libs/devil/ChangeLog b/media-libs/devil/ChangeLog new file mode 100644 index 0000000..ba79ccb --- /dev/null +++ b/media-libs/devil/ChangeLog @@ -0,0 +1,237 @@ +# ChangeLog for media-libs/devil +# Copyright 1999-2015 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 $ + + 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, + +files/devil-1.7.8-nvtt-glut.patch, +files/devil-1.7.8-restrict.patch, + +metadata.xml: + Fix test execution with automake:1.15. + + 01 Jun 2015; Michael Sterrett <mr_bones_@gentoo.org> devil-1.7.8-r2.ebuild: + add slot dep for repoman + + 29 Jan 2015; Michał Górny <mgorny@gentoo.org> devil-1.7.8-r2.ebuild: + Switch to CPU_FLAGS_X86. + + 22 Jan 2015; Michael Sterrett <mr_bones_@gentoo.org> -devil-1.7.8-r1.ebuild: + old + + 02 Jan 2015; Mikle Kolyada <zlogene@gentoo.org> devil-1.7.8-r2.ebuild: + amd64/ppc/x86 stable wrt bug #526836 + +*devil-1.7.8-r2 (27 Oct 2014) + + 27 Oct 2014; Michael Sterrett <mr_bones_@gentoo.org> +devil-1.7.8-r2.ebuild: + drop lcms:0 support (bug #526836) + + 02 Feb 2014; Sergey Popov <pinkbyte@gentoo.org> devil-1.7.8-r1.ebuild: + Add ~mips, wrt bug #499866 + + 30 Jul 2013; Sergey Popov <pinkbyte@gentoo.org> devil-1.7.8-r1.ebuild: + Add ~arm keyword + + 09 Feb 2013; Julian Ospald <hasufell@gentoo.org> devil-1.7.8-r1.ebuild: + add jpeg2k useflag wrt #455438 + + 22 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org> -devil-1.7.8.ebuild: + old + + 17 Dec 2012; Agostino Sarubbo <ago@gentoo.org> devil-1.7.8-r1.ebuild: + Add ~ppc64, wrt bug #419621 + + 04 Jul 2012; Jeff Horelick <jdhore@gentoo.org> devil-1.7.8-r1.ebuild: + marked x86 per bug 419809 + + 11 Jun 2012; Agostino Sarubbo <ago@gentoo.org> devil-1.7.8-r1.ebuild: + Stable for amd64, wrt bug #419809 + + 07 Jun 2012; Brent Baude <ranger@gentoo.org> devil-1.7.8-r1.ebuild: + Marking devil-1.7.8-r1 ppc for bug 419809 + + 05 Jun 2012; Michael Sterrett <mr_bones_@gentoo.org> devil-1.7.8-r1.ebuild: + tidy + + 05 May 2012; Jeff Horelick <jdhore@gentoo.org> devil-1.7.8-r1.ebuild: + dev-util/pkgconfig -> virtual/pkgconfig + + 04 May 2012; Julian Ospald <hasufell@gentoo.org> devil-1.7.8.ebuild: + fix broken useflag X wrt #375841, disable nvtt by default wrt #411565 + +*devil-1.7.8-r1 (04 May 2012) + + 04 May 2012; Julian Ospald <hasufell@gentoo.org> +devil-1.7.8-r1.ebuild, + +files/devil-1.7.8-ILUT.patch, +files/devil-1.7.8-nvtt-glut.patch: + revbump, nvtt and glut flags added, wrt #411565 and #375841 + + 22 Apr 2012; Michael Sterrett <mr_bones_@gentoo.org> devil-1.7.8.ebuild: + add sse-related use flags (bug #412791) + + 26 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> devil-1.7.8.ebuild: + Pin media-libs/allegro to old version. + + 08 Nov 2010; Samuli Suominen <ssuominen@gentoo.org> devil-1.7.8.ebuild: + Use virtual/jpeg wrt #327487. + + 16 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org> devil-1.7.8.ebuild: + virtual/glu -> virtual/opengl + + 19 Jul 2010; Joseph Jezak <josejx@gentoo.org> devil-1.7.8.ebuild: + Marked ppc stable for bug #322843. + + 29 Jun 2010; Michael Sterrett <mr_bones_@gentoo.org> devil-1.7.8.ebuild: + add static-libs support + + 25 Jun 2010; Raúl Porcel <armin76@gentoo.org> devil-1.7.7.ebuild, + devil-1.7.8.ebuild: + Drop ia64/sparc keywords + + 21 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> devil-1.7.8.ebuild: + Restrict media-libs/lcms depend to old version. + + 19 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> devil-1.7.8.ebuild: + amd64/x86 stable wrt #322843, thanks to Thomas Kahle for testing. + +*devil-1.7.8 (10 May 2010) + + 10 May 2010; Samuli Suominen <ssuominen@gentoo.org> +devil-1.7.8.ebuild, + +files/devil-1.7.8-CVE-2009-3994.patch, +files/devil-1.7.8-libpng14.patch: + Version bump wrt #297760 (Karl-Robert Ernst) with CVE-2009-3994 patch + (Christopher Harvey) and libpng14 compability (Marcin Baczyński) + + 21 Dec 2009; Michael Sterrett <mr_bones_@gentoo.org> devil-1.7.7.ebuild: + update USE=X deps (bug #297608) + + 07 Apr 2009; Michael Sterrett <mr_bones_@gentoo.org> devil-1.7.7.ebuild: + correct parameters passed to configure (bug #265228) + + 06 Mar 2009; Michael Sterrett <mr_bones_@gentoo.org> devil-1.7.7.ebuild: + Avoid user-installed NVIDIA TEXTOOLS install (bug #261474) + + 25 Feb 2009; Michael Sterrett <mr_bones_@gentoo.org> + -files/devil-1.6.7-png-types.patch, -files/devil-1.6.7-sdl-checks.patch, + -devil-1.6.7-r2.ebuild: + clean out old, vulnerable ebuild (bug #255217) + + 25 Feb 2009; Tobias Scherbaum <dertobi123@gentoo.org> devil-1.7.7.ebuild: + ppc stable, bug #255217 + + 16 Feb 2009; Raúl Porcel <armin76@gentoo.org> devil-1.7.7.ebuild: + ia64/sparc stable wrt #255217 + + 14 Feb 2009; Markus Meier <maekke@gentoo.org> devil-1.7.7.ebuild: + amd64/x86 stable, bug #255217 + + 11 Feb 2009; Michael Sterrett <mr_bones_@gentoo.org> devil-1.7.7.ebuild: + add a couple more knobs + +*devil-1.7.7 (11 Feb 2009) + + 11 Feb 2009; Michael Sterrett <mr_bones_@gentoo.org> +devil-1.7.7.ebuild: + version bump + + 28 Nov 2008; Tupone Alfredo <tupone@gentoo.org> + -files/devil-1.6.7-gcc42.patch, devil-1.6.7-r2.ebuild: + Removed big file in files. Bug #248987 by <flameeyes@gentoo.org> + +*devil-1.6.7-r2 (14 Aug 2007) + + 14 Aug 2007; Tristan Heaven <nyhm@gentoo.org> +devil-1.6.7-r2.ebuild: + Revision bump for gcc-4.2 patch + + 06 Jun 2007; Michael Sterrett <mr_bones_@gentoo.org> + +files/devil-1.6.7-gcc42.patch, devil-1.6.7-r1.ebuild: + patch to make g++ 4.2 happy from Philipp via bug #179843 + + 31 Dec 2006; Michael Sterrett <mr_bones_@gentoo.org> + devil-1.6.7-r1.ebuild: + fix il_wrap.h for bug #159507 + + 02 Nov 2006; Tristan Heaven <nyhm@gentoo.org> devil-1.6.7-r1.ebuild: + Use autotools eclass + + 28 Aug 2006; Luis Medinas <metalgod@gentoo.org> devil-1.6.7-r1.ebuild: + Stable on amd64. Bug #145148. + + 27 Aug 2006; Jason Wever <weeve@gentoo.org> devil-1.6.7-r1.ebuild: + Stable on SPARC wrt bug #145148. + + 25 Jul 2006; Michael Sterrett <mr_bones_@gentoo.org> + devil-1.6.7-r1.ebuild: + install the static library as well (bug #117992) + + 13 Jul 2006; Aron Griffis <agriffis@gentoo.org> devil-1.6.7-r1.ebuild: + Mark 1.6.7-r1 stable on ia64 + + 01 Apr 2006; Aron Griffis <agriffis@gentoo.org> devil-1.6.7-r1.ebuild: + Mark 1.6.7-r1 ~ia64 + + 25 Jan 2006; Donnie Berkholz <spyderous@gentoo.org>; + devil-1.6.7-r1.ebuild: + (#118758) Add modular X deps. + + 02 Jan 2006; Michael Hanselmann <hansmi@gentoo.org> devil-1.6.7-r1.ebuild: + Stable on ppc. + + 30 Dec 2005; Michael Sterrett <mr_bones_@gentoo.org> + devil-1.6.7-r1.ebuild: + stable for x86 + + 25 Nov 2005; Mike Frysinger <vapier@gentoo.org> + +files/devil-1.6.7-sdl-checks.patch, devil-1.6.7-r1.ebuild: + Fix by Henrik Dohlmann to make sure sdl libs/cflags arent used when sdl is + disabled #113441. + + 30 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> devil-1.6.6-r2.ebuild, + devil-1.6.7.ebuild, devil-1.6.7-r1.ebuild: + Removed INSTALL. + +*devil-1.6.7-r1 (30 Sep 2005) + + 30 Sep 2005; Mike Frysinger <vapier@gentoo.org> devil-1.6.7.ebuild: + Add optional support for xpm/allegro/mng #91610 by James Le Cuirot. + + 21 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> devil-1.6.7.ebuild: + Stable on ppc. + +*devil-1.6.7 (11 Oct 2004) + + 11 Oct 2004; Mike Frysinger <vapier@gentoo.org> +devil-1.6.7.ebuild: + Version bump. + +*devil-1.6.6-r2 (30 May 2004) + + 30 May 2004; Mike Frysinger <vapier@gentoo.org> + files/1.6.6-configure.in.patch, -devil-1.6.1.ebuild, -devil-1.6.6-r1.ebuild, + +devil-1.6.6-r2.ebuild, -devil-1.6.6.ebuild: + Update the configure.in patch to fix libpng linking #51972 by Marc De Falco, + CFLAG hard coding, and a sdl-config typo. + + 03 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; devil-1.6.1.ebuild, + devil-1.6.6-r1.ebuild, devil-1.6.6.ebuild: + Change x11-base/xfree dependency to virtual/x11. + + 23 Mar 2004; Martin Holzer <mholzer@gentoo.org> devil-1.6.1.ebuild: + fixing depend qa issue. see 45343. + +*devil-1.6.6-r1 (18 Mar 2004) + + 18 Mar 2004; Mike Frysinger <vapier@gentoo.org> : + Add configure.in patch by Shaun Cloherty to fix configure logic #40972. + +*devil-1.6.6 (01 Oct 2003) + + 01 Oct 2003; Michael Sterrett <mr_bones_@gentoo.org> devil-1.6.6.ebuild: + version bump; converted to use use_with and use_enable for USE flags + +*devil-1.6.5 (31 Dec 2002) + + 31 Dec 2002; Martin Holzer <mholzer@gentoo.org> devil-1.6.5.ebuild files/digest-devil-1.6.5 ChangeLog : + Version bumped. Closes #12960. + +*devil-1.6.1 (12 Jul 2002) + + 12 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> devil-1.6.1.ebuild files/digest-devil-1.6.1 ChangeLog : + Initial import. + ebuild submitted by Scott A. Friedman <friedman@ucla.edu> diff --git a/media-libs/devil/Manifest b/media-libs/devil/Manifest new file mode 100644 index 0000000..8a251b7 --- /dev/null +++ b/media-libs/devil/Manifest @@ -0,0 +1 @@ +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 new file mode 100644 index 0000000..7ed1289 --- /dev/null +++ b/media-libs/devil/devil-1.7.8-r2.ebuild @@ -0,0 +1,78 @@ +# 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 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/metadata.xml b/media-libs/devil/metadata.xml new file mode 100644 index 0000000..870c44c --- /dev/null +++ b/media-libs/devil/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <use> + <flag name="allegro">Add support for Allegro</flag> + <flag name="nvtt">Add support for <pkg>dev-util/nvidia-texture-tools</pkg></flag> + </use> + <upstream> + <remote-id type="sourceforge">openil</remote-id> + </upstream> +</pkgmetadata> |