From 221e4723c96dfa8b8de2612e2f2821a6de5b948d Mon Sep 17 00:00:00 2001 From: Peter Asplund Date: Tue, 3 Nov 2020 23:24:14 +0100 Subject: media-libs/devil: Version bump to 1.8.0 and port ebuild to cmake. Add 9999 version for git HEAD. Signed-off-by: Peter Asplund Package-Manager: Portage-3.0.8, Repoman-3.0.2 --- media-libs/devil/ChangeLog | 7 +++ media-libs/devil/Manifest | 9 ++-- media-libs/devil/devil-1.8.0-r1.ebuild | 90 ---------------------------------- media-libs/devil/devil-1.8.0.ebuild | 80 ++++++++++++++++-------------- media-libs/devil/devil-9999.ebuild | 78 +++++++++++++++++++++++++++++ 5 files changed, 130 insertions(+), 134 deletions(-) delete mode 100644 media-libs/devil/devil-1.8.0-r1.ebuild create mode 100644 media-libs/devil/devil-9999.ebuild diff --git a/media-libs/devil/ChangeLog b/media-libs/devil/ChangeLog index 846e0e3..57b1cde 100644 --- a/media-libs/devil/ChangeLog +++ b/media-libs/devil/ChangeLog @@ -1,3 +1,10 @@ +*devil-9999 (03 Nov 2020) + + 03 Nov 2020; AzP +devil-9999.ebuild, + -devil-1.8.0-r1.ebuild, devil-1.8.0.ebuild: + media-libs/devil: Version bump to 1.8.0 and port ebuild to cmake. Add 9999 + version for git HEAD. Signed-off-by: Peter Asplund + 18 Feb 2018; AzP devil-1.7.8-r3.ebuild: Clean up all complaints by repoman diff --git a/media-libs/devil/Manifest b/media-libs/devil/Manifest index 9863971..d5832b9 100644 --- a/media-libs/devil/Manifest +++ b/media-libs/devil/Manifest @@ -5,11 +5,8 @@ AUX devil-1.7.8-libpng14.patch 1221 SHA256 bd1da681157678fcffcaba5ec2f7f2d33ad99 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 -DIST DevIL-1.8.0.tar.gz 3084833 SHA256 0075973ee7dd89f0507873e2580ac78336452d29d34a07134b208f44e2feb709 SHA512 103fa51f4094af0fe988bf9520e1b9178900f980b72226e64ede60b6b0938a646c670a37372214edb557e492947cd5af5012a3ac906734a5ea83e072f81db583 WHIRLPOOL 24b56ac990ddcc258b12949e4398163ea582af2cb701fb77788750eacecad8a6f72c89d6250a43303bfafdfb16521083293c9d1c1a30c30732af79abae23bebc DIST v1.8.0.tar.gz 2949100 SHA256 52129f247b26fcb5554643c9e6bbee75c4b9717735fdbf3c6ebff08cee38ad37 SHA512 4aed5e50a730ece8b1eb6b2f6204374c6fb6f5334cf7c880d84c0f79645ea7c6b5118f57a7868a487510fc59c452f51472b272215d4c852f265f58b5857e17c7 WHIRLPOOL ba326cba2841cb4b11679fcb745701861130eb41628fee64323142f5f199dd3cc5f3de9dabc3dc01834f6419256102cde8d80fab78df2c7c544c895f336dd511 -EBUILD devil-1.7.8-r3.ebuild 1929 SHA256 850618b8c417c83c77a0a3306193e5d400a4fd1c13cf3a71755146023bdb2afd SHA512 3c3eaf75af9fbf07b59692a59f6e76b5b29e52aa7acb903c3493735ffe5252d388d11d9755a4f6bc83f45201f019a252d810cc9f6eb5eed57671ea5d274730f0 WHIRLPOOL f11ae73dab8afbeadebdef9a16ec35826d9ef5939725942eb3225eedc61526fff74874a2fc3bc3c7f2dd34a8ce2529829b0c36802225bb103c28a63b4e9f7a5f -EBUILD devil-1.8.0-r1.ebuild 2127 SHA256 1fa39b6746fd152e5e9c112787dea6917d2f1fc06ee3fa17b7d50c9b4646eab3 SHA512 e98887fbb86ee933bba86c1b3538e34a3ebb0b6361b4e49b554a85a69feeb1dd652233565c13043c5763781a6a63330c12f0d3b15ff91951b23b7a46fab9778f WHIRLPOOL c8329f08fe01fa499a4a3d3e1e85628c7e1c64d63b00de9611436ae79b1591d1756bd343252264cd84efae50405b6ac418036ddc17f055d34ebbed76dcffc28f -EBUILD devil-1.8.0.ebuild 2097 SHA256 c37021f8ba3926a1cd5ef64adc68b8c7182e0c1bb5a7805694589ca2221107eb SHA512 3501a0704f8e12f46d4542e175c653c86e5c7f23ee1949e53509996dfde92a3bede399eb3c329348c9f7b42f7f93dab284413d68c6ff2404525987a8ec63638d WHIRLPOOL 6e0382de1e1ed64208750baf9bac61025dd8d2cbc62dd231d3688d417e0f12a7b674f1a13a167d1b6873a5339b52804dce06ef254efd82b78bc7388b35e7a8a1 -MISC ChangeLog 505 SHA256 c23e6c06f1e9e40af3a8eb6a42ce7c47439a6ab3cafa05b08ceb79e6f5da0435 SHA512 7d841b71be87387762a98f1fbd938c13b2207db59b25e0e72699f073ab12e92f5cd09960dba31d30d07fbc72ea8ea5ed2990d1d2cc52f2c3beba0408655cbd1d WHIRLPOOL 4173675a4b280d445c738f3481cb9db3478bceecc24cdf73277924f92ff0107cb1445af85af843b9ef8d9e27ba884e235ef29d9280aa9dc9a010eb9d7a63b56b +EBUILD devil-1.8.0.ebuild 1992 SHA256 e54221a0cda6e0e985fdf05b864bbbc6f07369332ccd4e2dae238cafd4d7c92d SHA512 5339cd51ebb9f47c9ef412c672835374f09d064648249faed5fbc7eb7d24f144264279e9e17000b07af39647118816e411ea4bcc934917e0122cffe7e0daf430 WHIRLPOOL 7b2c9bb4559a4553b548e3c896e7e0e3c533399011155cf433d5393bb7d95c80ec4fda27d65c9a5fec11a4681a9e567882b318d0f64c8084a11854881bcc8fc6 +EBUILD devil-9999.ebuild 1998 SHA256 648060ecf1dff921950692bbe16522b5b8975fec6029f2db44cda8881be85f49 SHA512 7ab3f5431cdecdac60c2ec7a818c5334b21fa50add066643892969488a8300663052cbf7a8c474511e73fff0feaedcb4127dd572b5e74851d346c1c5151d4a41 WHIRLPOOL 73be6e502aafa097d56fdebf826d28bafcb0f1caf1c6e9ecf34bfe10b4b0a305d1f89c9a4ff2b4f4ad868e3a679982a16952f667aa1ac889851c409672c983ff +MISC ChangeLog 798 SHA256 9d886f3729638a4977fc605a5493ac8c4cea03f94169c208151d0267cdb91b3a SHA512 1d19010a0fbbc1f04fb416ce10b82ef1ce5a9150fc613c23877f702eb12fb9cbefda82ffcfed4c18d99f0aa90b837cd00952278e5b26c7d9349d97c3e6076d03 WHIRLPOOL fe1775d6640c005c181a2a9684382ef8536fe305631eb798bc3372f0f352b89bc2efffff95439abdccbbba3d0b59b14f72bbe503d20ff0a5d1a9fd479f3bd8a9 MISC metadata.xml 499 SHA256 d4cf93176bedb75d01c37dcd8d29a49fbfebfa7fd49f2dfcdf6cadb7365a7c39 SHA512 68440791a1c641a6983d297e924bee78038905b1ee383592b220f0ef51980d8f9eb237a6d70b0d848781d08e72fe02f4b4f36691d37a72b4003ea59fe3764cfc WHIRLPOOL f83bbbadaf75bb031417c47910870f8529d60ef1bb06f2b7aa431d7878ca54486befcbc9020cc5ab2cba6d2512b883d3798e1425df445cdb794335e4d2a5096e diff --git a/media-libs/devil/devil-1.8.0-r1.ebuild b/media-libs/devil/devil-1.8.0-r1.ebuild deleted file mode 100644 index fad8f81..0000000 --- a/media-libs/devil/devil-1.8.0-r1.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -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 x86" -IUSE="allegro cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 gif glut jpeg mng nvtt openexr opengl png sdl static-libs tiff X xpm" - -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 ) - openexr? ( media-libs/openexr:= ) - 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} - 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) \ - $(use_enable openexr 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 "${D}" -name '*.la' -delete || die -} diff --git a/media-libs/devil/devil-1.8.0.ebuild b/media-libs/devil/devil-1.8.0.ebuild index 3531ba8..d87703d 100644 --- a/media-libs/devil/devil-1.8.0.ebuild +++ b/media-libs/devil/devil-1.8.0.ebuild @@ -1,73 +1,77 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils cmake-utils #autotools +EAPI=7 + +inherit eutils cmake + +S=${WORKDIR}/DevIL-${PV}/DevIL/ DESCRIPTION="DevIL image library" HOMEPAGE="http://openil.sourceforge.net/" SRC_URI="https://github.com/DentonW/DevIL/archive/v${PV}.tar.gz" -MY_P=DevIL-${PV} -S=${WORKDIR}/${MY_P}/DevIL/ - 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" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86" +IUSE="allegro cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 gif glut jpeg mng nvtt openexr opengl png sdl static-libs tiff X xpm" -RDEPEND="allegro? ( media-libs/allegro:0 ) +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 ) + 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 )" + x11-libs/libX11 + x11-libs/libXrender ) + xpm? ( x11-libs/libXpm )" DEPEND="${RDEPEND} - virtual/pkgconfig" + virtual/pkgconfig + X? ( x11-base/xorg-proto )" src_configure() { local mycmakeargs=( - $(cmake-utils_use_enable static-libs static) + -DENABLE_static="$(usex static-libs)" --disable-lcms --enable-ILU --enable-ILUT - $(cmake-utils_use_enable cpu_flags_x86_sse sse) - $(cmake-utils_use_enable cpu_flags_x86_sse2 sse2) - $(cmake-utils_use_enable cpu_flags_x86_sse3 sse3) - $(cmake-utils_use_enable openexr exr) - $(cmake-utils_use_enable gif) - $(cmake-utils_use_enable jpeg) - $(cmake-utils_use_enable jpeg2k jp2) - $(cmake-utils_use_enable mng) - $(cmake-utils_use_enable png) - $(cmake-utils_use_enable tiff) - $(cmake-utils_use_enable xpm) - $(cmake-utils_use_enable allegro) + -DENABLE_sse="$(usex cpu_flags_x86_sse)" + -DENABLE_sse2="$(usex cpu_flags_x86_sse2)" + -DENABLE_sse3="$(usex cpu_flags_x86_sse3)" + -DENABLE_exr="$(usex openexr)" + -DENABLE_gif="$(usex gif)" + -DENABLE_jpeg="$(usex jpeg)" + --enable-jp2 + -DENABLE_mng="$(usex mng)" + -DENABLE_png="$(usex png)" + -DENABLE_tiff="$(usex tiff)" + -DENABLE_xpm="$(usex xpm)" + -DENABLE_allegro="$(usex allegro)" --disable-directx8 --disable-directx9 - $(cmake-utils_use_enable opengl) - $(cmake-utils_use_enable sdl) - $(cmake-utils_use_enable X x11) - $(cmake-utils_use_enable X shm) - $(cmake-utils_use_enable X render) - $(cmake-utils_use_enable glut) - $(cmake-utils_use_with X x) - $(cmake-utils_use_with nvtt) + -DENABLE_opengl="$(usex opengl)" + -DENABLE_sdl="$(usex sdl)" + -DENABLE_x11="$(usex X)" + -DENABLE_shm="$(usex X)" + -DENABLE_render="$(usex X)" + -DENABLE_glut="$(usex glut)" + -DWITH_x="$(usex X)" + -DWITH_nvtt="$(usex nvtt)" ) - cmake-utils_src_configure + cmake_src_configure } src_install() { default - use static-libs || prune_libtool_files + + # package provides .pc files + find "${D}" -name '*.la' -delete || die } diff --git a/media-libs/devil/devil-9999.ebuild b/media-libs/devil/devil-9999.ebuild new file mode 100644 index 0000000..dc2f678 --- /dev/null +++ b/media-libs/devil/devil-9999.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit git-r3 eutils cmake + +S=${WORKDIR}/devil-${PV}/DevIL/ + +DESCRIPTION="DevIL image library" +HOMEPAGE="http://openil.sourceforge.net/" +EGIT_REPO_URI="https://github.com/DentonW/DevIL.git" +SRC_URI="" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86" +IUSE="allegro cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 gif glut jpeg mng nvtt openexr opengl png sdl static-libs tiff X xpm" + +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 ) + openexr? ( media-libs/openexr:= ) + 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} + virtual/pkgconfig + X? ( x11-base/xorg-proto )" + +src_configure() { + local mycmakeargs=( + -DENABLE_static="$(usex static-libs)" + --disable-lcms + --enable-ILU + --enable-ILUT + -DENABLE_sse="$(usex cpu_flags_x86_sse)" + -DENABLE_sse2="$(usex cpu_flags_x86_sse2)" + -DENABLE_sse3="$(usex cpu_flags_x86_sse3)" + -DENABLE_exr="$(usex openexr)" + -DENABLE_gif="$(usex gif)" + -DENABLE_jpeg="$(usex jpeg)" + --enable-jp2 + -DENABLE_mng="$(usex mng)" + -DENABLE_png="$(usex png)" + -DENABLE_tiff="$(usex tiff)" + -DENABLE_xpm="$(usex xpm)" + -DENABLE_allegro="$(usex allegro)" + --disable-directx8 + --disable-directx9 + -DENABLE_opengl="$(usex opengl)" + -DENABLE_sdl="$(usex sdl)" + -DENABLE_x11="$(usex X)" + -DENABLE_shm="$(usex X)" + -DENABLE_render="$(usex X)" + -DENABLE_glut="$(usex glut)" + -DWITH_x="$(usex X)" + -DWITH_nvtt="$(usex nvtt)" + ) + cmake_src_configure +} + +src_install() { + default + + # package provides .pc files + find "${D}" -name '*.la' -delete || die +} -- cgit v1.2.3-65-gdbad