From fedbebb26ce07664502175740d5d8dfd34725785 Mon Sep 17 00:00:00 2001 From: David Seifert Date: Wed, 11 May 2022 16:14:40 +0200 Subject: media-libs/devil: remove USE=nvtt Bug: https://bugs.gentoo.org/770760 Signed-off-by: David Seifert --- media-libs/devil/devil-1.7.8-r3.ebuild | 91 -------------------------------- media-libs/devil/devil-1.7.8-r4.ebuild | 95 ++++++++++++++++++++++++++++++++++ media-libs/devil/metadata.xml | 21 ++++---- 3 files changed, 105 insertions(+), 102 deletions(-) delete mode 100644 media-libs/devil/devil-1.7.8-r3.ebuild create mode 100644 media-libs/devil/devil-1.7.8-r4.ebuild (limited to 'media-libs/devil') diff --git a/media-libs/devil/devil-1.7.8-r3.ebuild b/media-libs/devil/devil-1.7.8-r3.ebuild deleted file mode 100644 index 113a199ada8a..000000000000 --- a/media-libs/devil/devil-1.7.8-r3.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -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 arm64 ~hppa ~mips ppc ppc64 ~riscv x86" -IUSE="allegro cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 gif glut jpeg mng nvtt opengl png sdl static-libs tiff X xpm" - -# OpenEXR support dropped b/c no support for OpenEXR 3 -# See bug #833833 -RDEPEND=" - allegro? ( media-libs/allegro:0 ) - gif? ( media-libs/giflib:= ) - glut? ( media-libs/freeglut ) - jpeg? ( virtual/jpeg:0 ) - mng? ( media-libs/libmng:= ) - nvtt? ( media-gfx/nvidia-texture-tools ) - opengl? ( virtual/opengl - virtual/glu ) - png? ( media-libs/libpng:0= ) - sdl? ( media-libs/libsdl ) - tiff? ( media-libs/tiff:0 ) - X? ( x11-libs/libXext - x11-libs/libX11 - x11-libs/libXrender ) - xpm? ( x11-libs/libXpm )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig - X? ( x11-base/xorg-proto )" - -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 - "${FILESDIR}/${P}"-jasper-remove-uchar.patch -) - -src_prepare() { - default - 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) \ - --disable-exr \ - $(use_enable gif) \ - $(use_enable jpeg) \ - --enable-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 - - # Package provides .pc files - find "${ED}" -name '*.la' -delete || die -} diff --git a/media-libs/devil/devil-1.7.8-r4.ebuild b/media-libs/devil/devil-1.7.8-r4.ebuild new file mode 100644 index 000000000000..4abab857c9b5 --- /dev/null +++ b/media-libs/devil/devil-1.7.8-r4.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +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 arm64 ~hppa ~mips ppc ppc64 ~riscv x86" +IUSE="allegro cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 gif glut jpeg mng opengl png sdl static-libs tiff X xpm" + +# OpenEXR support dropped b/c no support for OpenEXR 3 +# See bug #833833 +RDEPEND=" + allegro? ( media-libs/allegro:0 ) + gif? ( media-libs/giflib:= ) + glut? ( media-libs/freeglut ) + jpeg? ( media-libs/libjpeg-turbo:= ) + mng? ( media-libs/libmng:= ) + opengl? ( + virtual/opengl + virtual/glu + ) + png? ( media-libs/libpng:0= ) + sdl? ( media-libs/libsdl ) + tiff? ( media-libs/tiff:0 ) + X? ( + x11-libs/libXext + x11-libs/libX11 + x11-libs/libXrender + ) + xpm? ( x11-libs/libXpm )" +DEPEND=" + ${RDEPEND} + X? ( x11-base/xorg-proto )" +BDEPEND="virtual/pkgconfig" + +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 + "${FILESDIR}/${P}"-jasper-remove-uchar.patch +) + +src_prepare() { + default + 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) \ + --disable-exr \ + $(use_enable gif) \ + $(use_enable jpeg) \ + --enable-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) \ + --without-nvtt +} + +src_install() { + default + + # Package provides .pc files + find "${ED}" -name '*.la' -delete || die +} diff --git a/media-libs/devil/metadata.xml b/media-libs/devil/metadata.xml index 58783541108a..5b50790d86f4 100644 --- a/media-libs/devil/metadata.xml +++ b/media-libs/devil/metadata.xml @@ -1,15 +1,14 @@ - - games@gentoo.org - Gentoo Games Project - - - Add support for Allegro - Add support for media-gfx/nvidia-texture-tools - - - openil - + + games@gentoo.org + Gentoo Games Project + + + Add support for Allegro + + + openil + -- cgit v1.2.3-65-gdbad