diff options
Diffstat (limited to 'media-libs')
38 files changed, 1375 insertions, 1991 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz Binary files differindex 7bbb75e9e618..9ec08533ab88 100644 --- a/media-libs/Manifest.gz +++ b/media-libs/Manifest.gz diff --git a/media-libs/exempi/Manifest b/media-libs/exempi/Manifest index b5791857d0ec..865ff3ce4bc9 100644 --- a/media-libs/exempi/Manifest +++ b/media-libs/exempi/Manifest @@ -1,13 +1,6 @@ AUX exempi-2.4.2-iconv.patch 1440 BLAKE2B a3fccd3c268c28f1fe0b9e13544ba7b33d433a9a92ad9319301996c162766dac9d3fc14f97c3a3c795d787d0b7b9048dec830e1ce5d809b1a14ffa82097e2ff5 SHA512 09cc5ba46c8e0a0b0c1c3b0c86d9c49c21e64a64ca35a90053bf98ed81652b8d1c91bc29a321b5b3bf032b65af220129860f7d3f8c6e12ce608db19c01841736 -AUX exempi-2.6.2-arm-static-build.patch 1785 BLAKE2B 2624ac36cdcbf8230af643f99250c9c755c5650d38a4d427125b60245dbfb79cf4d94ad135f043ddde956d3241c091f901d7243b99d26c70c88af44414a7b674 SHA512 49004cea850f2e51a4266a574e7453e21afe1a7032e7a925717c7b0df3bbe187c5c0b79dddabbd002ce662fe4055171cc72ddff6985f611cc4b8c3280dda1fc9 -AUX exempi-2.6.3-clang16-binary_function.patch 1083 BLAKE2B 8b2ff17c17d2b695e56d200fe2f372e5e8fc731d2b28d70d7105ff56c282577e1167f4de27fc883c42bf205af9794c407cf2050216aff6b04a9a6fbdc3039091 SHA512 2fd6fed8206138246b721ff081861f589dd1b62ca595290b868292306e88fb34a76d9ec8e3366b47bd69b53db8e7f21e0c2a8f164aff5ab02a6154d8a49074dc -DIST exempi-2.6.2.tar.bz2 3709476 BLAKE2B 3b65db1f9e7c2bf050af6e273b8327d70e23d3321d3c280ddf8b36b467e2822b12f93cb14d8d342e2a2974a9b745f13fd98c79d9b67e634da5bc9b5ae71e4918 SHA512 c81c7a5bad1a294ce253d1471c00740679b7fb489658ead68a6892b701cc02a031a5dc69d70045a8276e1e19c716df88e92014df4c2809266a71ff05de9ad57a DIST exempi-2.6.3.tar.xz 2842408 BLAKE2B a3deb86a12161f4a1b7c0bacc4e6b59a5e54df4e5c158b48c8d66dc968e5fb1e210a9fac73e85720b43e9090c38a7023e771054e63a57c618385bb02a525d89e SHA512 517dba7534ac6978083338d3c3bf184c9b0a56e625e714703da71b064b68a8872bdd66673be27a192e7e6a22b9acd8eb1ad447c2a807f564547e765c63fbd2b4 -DIST exempi-2.6.4.tar.xz 2843304 BLAKE2B 35ae01db243825eea05fe946a958be78ee75c3e6bc3cd02bf5596bd0c9543ccecb285c93e2533c7ceba1e42b25266834bddfd6eda4fef351b384298cc638cfb2 SHA512 86e41e24e34150f398dffe3219f1530fbf14606feeee9953395bfedb335316ec90ac88e2843f2c037a564909fc3cc82a5cce53edb18219663a1b454cda6bef72 DIST exempi-2.6.5.tar.xz 2843132 BLAKE2B bc8c347af4c9c7bf085311ce055bd1c7cd5c2b845c723dd74bbcdf104be018885a82180333dbdda3cf9a64a4125dfe0fa0904fbd05663c3a6c32e6a60a8ca2d3 SHA512 71a0830c7a547bd7304e38f307a17a5ca70d6d22bb94db93f7e6c0903d1a1a1e211487cd530ec81fb058d0b45224018d23aab9a9394b6cfa025c50f0d77b5002 -EBUILD exempi-2.6.2.ebuild 1367 BLAKE2B 8738f7f492a553b0f830914f22f05c00c1ebd3c478fdd7118ce8f1a689ce23c24e5c02f1ed34c3d8f6e6a6fd67fb8c0da5332e75e1fd86150074bacf86509451 SHA512 e8472f8f50666d5efbf666a2c3745f5167cb16dbfa00e7c73a3c6744c4cd17079afb5b81f8e8b1dadf119f9a41a4cbfd62fcbc913d484e489e7a60322882b208 -EBUILD exempi-2.6.3-r1.ebuild 1376 BLAKE2B dd331b2e1b6f3366def0392e106173958c3ede11af169f228dff4c2c7e2bac2c4b21cf6eb3e84f5d86769a15c8fe1dbbd4df60b92b40a3e3fe276447a526bce0 SHA512 6c11e732158df93e9b7771c61d2ccf471d98c1a8885bc243141f6da68c8bb3de9aa2da7b5987950bf31ef1808aeed977b901c51a6c7b871eebd47ee59bc61fb3 -EBUILD exempi-2.6.3.ebuild 1311 BLAKE2B c42857488f654fcc01378e0796752d9b2291b3d80be06161f30c639c128ec5cac55b5801be9ada1afbd5da75cd4a937d497d2777207b61a61f5278cbea96c49a SHA512 ee7967090af3b175de3d0eb5429cd7b35b576fba48c95b45d170a1874d0a2b5e9f72ab0f2841e70ae28216d0abf5acb79b4e3a8611686ac53b9287cea813a151 -EBUILD exempi-2.6.4.ebuild 1376 BLAKE2B dd331b2e1b6f3366def0392e106173958c3ede11af169f228dff4c2c7e2bac2c4b21cf6eb3e84f5d86769a15c8fe1dbbd4df60b92b40a3e3fe276447a526bce0 SHA512 6c11e732158df93e9b7771c61d2ccf471d98c1a8885bc243141f6da68c8bb3de9aa2da7b5987950bf31ef1808aeed977b901c51a6c7b871eebd47ee59bc61fb3 -EBUILD exempi-2.6.5.ebuild 1403 BLAKE2B 580460466a847bc21ba981768079304e1ce17183f7d59c9d91295b7353de994fa3e946e90563967d442aefbae4971b1e5a3c3565f89ce8c0990e5c9f784b77f2 SHA512 9d1d24c54f2d356c4333f2644e6bcc1cad42b632991b5e1d11c7b0e539a45df791bf92a8f447488eca66f6d9250cbb338d38c5ca46a998a28ec5931c26e0a072 +EBUILD exempi-2.6.3.ebuild 1290 BLAKE2B 5562b5a25b721c3de9eb78a17a21ab1680fc38fcd786ba097c78455391c57d8ad0a89dc9a5b76b3d051172c4f06b5bb69c209c3720c4bf84acbfb5fb3421d358 SHA512 272c500ef6e5061e6b0999a607748e2ef62257ccfefa816e171250fd5f4fe6a2b9b3017535b4aa85910daef1e262c291fa120c388be7a5385d15d9e4cdd34fb6 +EBUILD exempi-2.6.5.ebuild 1379 BLAKE2B 5ab399afb39d03f59f1f97a5470321c119699d28cc9ecc1e0bd6f2974c1f868ec62346715b2b0a920d005fd1b663042d85937bb920b741a9c0ed3c7eaccf1bf9 SHA512 6b4e9d7fb2d3b5e4ccec8128102612136af3104689d9201c556801f05f3e051fdac4411187ec018fae6db0a8c37cd6a0dda5062d5b11aa3af94837595c26ad83 MISC metadata.xml 323 BLAKE2B 5f01fafc347bc3dd68f29e05eeda1b335498b1ee928ab266c2f4bfe11f2833158c000a077fc1e11ee0f6be4cb1395773090687a109274e0abbb9ec8cb2e241a9 SHA512 c1c19755073fed175f6637fe6b1680867dc12c95b8c5ac4874f4a66781921fe755c8d0748d2824442289fde3cb72040ae32731e3e6a06d22e5dacc9d39924392 diff --git a/media-libs/exempi/exempi-2.6.2.ebuild b/media-libs/exempi/exempi-2.6.2.ebuild deleted file mode 100644 index 7cd19f245d41..000000000000 --- a/media-libs/exempi/exempi-2.6.2.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="Port of the Adobe XMP SDK to work on UNIX" -HOMEPAGE="https://libopenraw.freedesktop.org/wiki/Exempi" -# TODO: switch to xz for 2.6.3 -SRC_URI="https://libopenraw.freedesktop.org/download/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="2/8" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="examples test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/expat-2:= - sys-libs/zlib - virtual/libiconv -" -DEPEND=" - ${RDEPEND} - test? ( dev-libs/boost ) -" -BDEPEND=" - dev-build/autoconf-archive - sys-devel/gettext -" - -PATCHES=( - "${FILESDIR}"/${PN}-2.4.2-iconv.patch - "${FILESDIR}"/${PN}-2.6.2-arm-static-build.patch -) - -src_prepare() { - default - - config_rpath_update . - eautoreconf -} - -src_configure() { - # - --enable-static as --disable-static breaks build - # - Valgrind detection is "disabled" due to bug #295875 - econf \ - --enable-static \ - $(use_enable test unittest) \ - VALGRIND="" -} - -src_install() { - default - - if use examples; then - emake -C samples/source distclean - rm samples/{,source,testfiles}/Makefile* || die - docinto examples - dodoc -r samples/. - fi - - # --disable-static breaks tests - rm -rf "${ED}/usr/$(get_libdir)/libexempi.a" || die - - find "${ED}" -name '*.la' -delete || die -} diff --git a/media-libs/exempi/exempi-2.6.3-r1.ebuild b/media-libs/exempi/exempi-2.6.3-r1.ebuild deleted file mode 100644 index 3b477d996d29..000000000000 --- a/media-libs/exempi/exempi-2.6.3-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="Port of the Adobe XMP SDK to work on UNIX" -HOMEPAGE="https://libopenraw.freedesktop.org/wiki/Exempi" -SRC_URI="https://libopenraw.freedesktop.org/download/${P}.tar.xz" - -LICENSE="BSD" -SLOT="2/8" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="examples test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/expat-2:= - sys-libs/zlib - virtual/libiconv -" -DEPEND=" - ${RDEPEND} - test? ( dev-libs/boost ) -" -BDEPEND=" - dev-build/autoconf-archive - sys-devel/gettext -" - -PATCHES=( - "${FILESDIR}"/${PN}-2.4.2-iconv.patch - "${FILESDIR}"/${PN}-2.6.3-clang16-binary_function.patch -) - -src_prepare() { - default - - # Needed for autoconf 2.71 - config_rpath_update . - eautoreconf -} - -src_configure() { - # - --enable-static as --disable-static breaks build - # - Valgrind detection is "disabled" due to bug #295875 - econf \ - --enable-static \ - $(use_enable test unittest) \ - VALGRIND="" -} - -src_install() { - default - - if use examples; then - emake -C samples/source distclean - rm samples/{,source,testfiles}/Makefile* || die - docinto examples - dodoc -r samples/. - fi - - # --disable-static breaks tests - rm -rf "${ED}/usr/$(get_libdir)/libexempi.a" || die - - find "${ED}" -name '*.la' -delete || die -} diff --git a/media-libs/exempi/exempi-2.6.3.ebuild b/media-libs/exempi/exempi-2.6.3.ebuild index 7409cc411371..3dc108953c8a 100644 --- a/media-libs/exempi/exempi-2.6.3.ebuild +++ b/media-libs/exempi/exempi-2.6.3.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://libopenraw.freedesktop.org/download/${P}.tar.xz" LICENSE="BSD" SLOT="2/8" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc64 ~riscv x86" IUSE="examples test" RESTRICT="!test? ( test )" diff --git a/media-libs/exempi/exempi-2.6.4.ebuild b/media-libs/exempi/exempi-2.6.4.ebuild deleted file mode 100644 index 3b477d996d29..000000000000 --- a/media-libs/exempi/exempi-2.6.4.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="Port of the Adobe XMP SDK to work on UNIX" -HOMEPAGE="https://libopenraw.freedesktop.org/wiki/Exempi" -SRC_URI="https://libopenraw.freedesktop.org/download/${P}.tar.xz" - -LICENSE="BSD" -SLOT="2/8" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="examples test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/expat-2:= - sys-libs/zlib - virtual/libiconv -" -DEPEND=" - ${RDEPEND} - test? ( dev-libs/boost ) -" -BDEPEND=" - dev-build/autoconf-archive - sys-devel/gettext -" - -PATCHES=( - "${FILESDIR}"/${PN}-2.4.2-iconv.patch - "${FILESDIR}"/${PN}-2.6.3-clang16-binary_function.patch -) - -src_prepare() { - default - - # Needed for autoconf 2.71 - config_rpath_update . - eautoreconf -} - -src_configure() { - # - --enable-static as --disable-static breaks build - # - Valgrind detection is "disabled" due to bug #295875 - econf \ - --enable-static \ - $(use_enable test unittest) \ - VALGRIND="" -} - -src_install() { - default - - if use examples; then - emake -C samples/source distclean - rm samples/{,source,testfiles}/Makefile* || die - docinto examples - dodoc -r samples/. - fi - - # --disable-static breaks tests - rm -rf "${ED}/usr/$(get_libdir)/libexempi.a" || die - - find "${ED}" -name '*.la' -delete || die -} diff --git a/media-libs/exempi/exempi-2.6.5.ebuild b/media-libs/exempi/exempi-2.6.5.ebuild index d11c41d688fd..6edceb5bc710 100644 --- a/media-libs/exempi/exempi-2.6.5.ebuild +++ b/media-libs/exempi/exempi-2.6.5.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://libopenraw.freedesktop.org/download/${P}.tar.xz" LICENSE="BSD" SLOT="2/8" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv ~x86" IUSE="examples test" RESTRICT="!test? ( test )" diff --git a/media-libs/exempi/files/exempi-2.6.2-arm-static-build.patch b/media-libs/exempi/files/exempi-2.6.2-arm-static-build.patch deleted file mode 100644 index 7abd23a5a405..000000000000 --- a/media-libs/exempi/files/exempi-2.6.2-arm-static-build.patch +++ /dev/null @@ -1,35 +0,0 @@ -https://gitlab.freedesktop.org/libopenraw/exempi/-/issues/28 - -From 269b68aaaaaa9af0caf50678e820181c0694ebf7 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine <fontaine.fabrice@gmail.com> -Date: Thu, 17 Mar 2022 17:27:28 +0100 -Subject: [PATCH] XMPFiles/source/XMPFiles_Impl.cpp: fix arm build with gcc 10 - -Fix the following build failure with exempi on arm with gcc 10 raised -since version 2.6.0 and -https://gitlab.freedesktop.org/libopenraw/exempi/-/commit/0872e35a30457d2ecf746a1bebdb7d94636d0e2f -https://github.com/adobe/XMP-Toolkit-SDK/commit/0872e35a30457d2ecf746a1bebdb7d94636d0e2f: - -/home/giuliobenetti/autobuild/run/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: ../../XMPFiles/source/.libs/libXMPFiles.a(XMPFiles_Impl.o):(.rodata+0x5c): multiple definition of `typeinfo name for TXMPMeta<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >'; XMPFilesCoverage.o:(.rodata+0x0): first defined here - -More information can be found on a similar issue here: -https://github.com/OpenKinect/libfreenect2/issues/157 - -Fixes: - - http://autobuild.buildroot.org/results/c440719de02a154c6bdae11bda06ea30c131c71d - -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> ---- a/XMPFiles/source/XMPFiles_Impl.cpp -+++ b/XMPFiles/source/XMPFiles_Impl.cpp -@@ -47,7 +47,9 @@ using namespace std; - /// This file ... - /// - // ================================================================================================= --#include "public/include/XMP.incl_cpp" -+#if ! XMP_StaticBuild -+ #include "public/include/XMP.incl_cpp" -+#endif - - #if XMP_WinBuild - #pragma warning ( disable : 4290 ) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow) - diff --git a/media-libs/exempi/files/exempi-2.6.3-clang16-binary_function.patch b/media-libs/exempi/files/exempi-2.6.3-clang16-binary_function.patch deleted file mode 100644 index bbe535ed1380..000000000000 --- a/media-libs/exempi/files/exempi-2.6.3-clang16-binary_function.patch +++ /dev/null @@ -1,33 +0,0 @@ -Bug: https://bugs.gentoo.org/910494 ---- a/XMPFiles/source/PluginHandler/XMPAtoms.h -+++ b/XMPFiles/source/PluginHandler/XMPAtoms.h -@@ -83,8 +83,12 @@ enum - - #define XMPAtomNull emptyStr_K - --struct StringCompare : std::binary_function<const std::string &, const std::string &, bool> -+struct StringCompare - { -+ public: -+ using first_argument_type = const std::string &; -+ using second_argument_type = const std::string &; -+ using result_type = bool; - bool operator() (const std::string & a, const std::string & b) const - { - return ( a.compare(b) < 0 ); ---- a/XMPFilesPlugins/api/source/PluginRegistry.h -+++ b/XMPFilesPlugins/api/source/PluginRegistry.h -@@ -68,8 +68,12 @@ public: - - private: - -- struct StringCompare : std::binary_function< const std::string &, const std::string &, bool > -+ struct StringCompare - { -+ public: -+ using first_argument_type = const std::string &; -+ using second_argument_type = const std::string &; -+ using result_type = bool; - bool operator()( const std::string & a, const std::string & b ) const - { - return ( a.compare(b) < 0 ); diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest index 3abcd0cb0657..1bb586c2be36 100644 --- a/media-libs/gmmlib/Manifest +++ b/media-libs/gmmlib/Manifest @@ -3,7 +3,9 @@ AUX gmmlib-20.3.2_cmake_project.patch 145 BLAKE2B f42306b41a0c62ea9d3d5bfe3d1e1f AUX gmmlib-22.1.1_custom_cflags.patch 2963 BLAKE2B af9979ee3c7977c93288b6afd0c0a65451f6f06cffbb00d32d53541410beded1feb6212bb0a5b7820e4ba8c4ee03656f274b94a26e0688e90e0ad140b37ee4a2 SHA512 933a9234f178ec566ca88fd3b48d746ac869936acfd5541d8b6b3cac3125c029054fe385101d734e5e35eeb9393f1609be96c9bcc2f1e0bb79a7295ccdd6c292 DIST intel-gmmlib-22.3.18.tar.gz 846277 BLAKE2B 79485dfe33537053b9986f2f97771c551757da0f9ba721f82f5ff057bf230aa7ad79818d6915fb26cd354cb49d4da27c770c5adb61e530bdd39b51469fc4f9af SHA512 6dab0522a4d15bd5147cb72899a48170f441d5160dc11224809477380b3762ade845e7498a54df7de6673c0ad44bd037db754713697794e26106837f69eb0636 DIST intel-gmmlib-22.3.19.tar.gz 846342 BLAKE2B ce3c25740d9c3f556db31f880b47fba8358dd7d7d53d80bc9923bec8c67fdeee3ae4efa5465390c229bfdc2f6c64fa0a7963516f83d12061d34bf51102cb3a64 SHA512 804e4995983884832dbb6d08a4e3c8ca8d60e7ef2c5a0de12d0facfac1fdce619ad229ad1a6b62fdf0ba74a968caf3bb884e283af8cf38babacff350fc9728b9 +DIST intel-gmmlib-22.3.20.tar.gz 846257 BLAKE2B 04e17f6735cd2081d672c29de986331fb5ddc7d89d142bcc470ee48567762676d562620d0d1f9e2ab061ba96b299bc4b0f6416c17542a8d7f9288cdfb1d0a42f SHA512 d5a6da43f4bdcb2a138c249e197b2e441d0999e89867aa66dfa68cbfc6982e631a7df29fd213a72a57b31cb29366f654343cb6b77a46f22e54bfa5432310e053 EBUILD gmmlib-22.3.18.ebuild 954 BLAKE2B e65b06b054ff521cc3ee3d2b95a6777a706fe03fa30cd7a369539d5ebc0b5aead789a8997d640f7a273f2ff9235b216cf1950c3d6f93f9349ac76348ed3de189 SHA512 c7bcd9d9ddd19d174d277a620a38b206d8e1796ad1dcde3ba61b34eaa92eb4d0ece070077e5cd744a38ed80317ea6715ce5d4a5a7cc8057672980d69060585cb EBUILD gmmlib-22.3.19.ebuild 955 BLAKE2B eba2f14d093a7b8b63a1cee0dff0fab805b9681bca014bd11cb2ff7682aec1b3adeaf41cac8b33a1d8a48c4c4420bfcc296a91429c3d55ab3e51581ee126adaa SHA512 f6f89934cf6bb49c453de13a599224d6415f494522f0ebc876cdecda9a061b9d41788ce3ae55d1c168c1f73d6d362403cb15b81067866e1554a4f57ff73c9494 +EBUILD gmmlib-22.3.20.ebuild 955 BLAKE2B eba2f14d093a7b8b63a1cee0dff0fab805b9681bca014bd11cb2ff7682aec1b3adeaf41cac8b33a1d8a48c4c4420bfcc296a91429c3d55ab3e51581ee126adaa SHA512 f6f89934cf6bb49c453de13a599224d6415f494522f0ebc876cdecda9a061b9d41788ce3ae55d1c168c1f73d6d362403cb15b81067866e1554a4f57ff73c9494 EBUILD gmmlib-9999.ebuild 955 BLAKE2B eba2f14d093a7b8b63a1cee0dff0fab805b9681bca014bd11cb2ff7682aec1b3adeaf41cac8b33a1d8a48c4c4420bfcc296a91429c3d55ab3e51581ee126adaa SHA512 f6f89934cf6bb49c453de13a599224d6415f494522f0ebc876cdecda9a061b9d41788ce3ae55d1c168c1f73d6d362403cb15b81067866e1554a4f57ff73c9494 MISC metadata.xml 478 BLAKE2B 22fa7744f1f6ae793034225645314ed7f0a5499cc33b570a00aa2c076cb3fdc9c2663654df4998a30fc76f7d833ed4f2022fd8b2869539e25c47f64e6b0f438a SHA512 0c46a6af2f254ee9c314f08654739003f58283e3ec00a8a3e628225e14065d359d0816a05aba1754379dea826d1bf2d501fb35ba58c5020f036917771ea035d9 diff --git a/media-libs/gmmlib/gmmlib-22.3.20.ebuild b/media-libs/gmmlib/gmmlib-22.3.20.ebuild new file mode 100644 index 000000000000..2a09f24b8f3d --- /dev/null +++ b/media-libs/gmmlib/gmmlib-22.3.20.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib + +if [[ ${PV} == *9999 ]] ; then + : ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"} + if [[ ${PV%9999} != "" ]] ; then + : ${EGIT_BRANCH:="release/${PV%.9999}"} + fi + inherit git-r3 +else + KEYWORDS="~amd64" + SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz" + S="${WORKDIR}/${PN}-intel-${P}" +fi + +DESCRIPTION="Intel Graphics Memory Management Library" +HOMEPAGE="https://github.com/intel/gmmlib" + +LICENSE="MIT" +SLOT="0/12.3" +IUSE="+custom-cflags test" +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch + "${FILESDIR}"/${PN}-20.3.2_cmake_project.patch + "${FILESDIR}"/${PN}-22.1.1_custom_cflags.patch +) + +multilib_src_configure() { + local mycmakeargs=( + -DBUILD_TESTING="$(usex test)" + -DOVERRIDE_COMPILER_FLAGS="$(usex !custom-cflags)" + ) + + cmake_src_configure +} diff --git a/media-libs/libjxl/Manifest b/media-libs/libjxl/Manifest index 20adcc5184ee..205fd1f119cd 100644 --- a/media-libs/libjxl/Manifest +++ b/media-libs/libjxl/Manifest @@ -6,8 +6,11 @@ DIST libjxl-0.8.2.tar.gz 1612062 BLAKE2B 2b5e65cde6c85881c5f26f676afec825c974f69 DIST libjxl-0.9.2.tar.gz 1873156 BLAKE2B 558d82dfaa2e5e4fdb07542b2daf4b80f661dec46986d412bdc2b1af0ac4b501f9e533eefd73e923b94a54f82695c4aed5cc531abc9e818ab4faf0aab0267b94 SHA512 97bc0ccd249fe0fa6d0f52c470a0d0bd181e3f00cd9820dda5ca437dff260e6c9e2c95dceec4bd9354c3adc4fc6724228cb027c537af6df7d3f90ab8ee61653f DIST libjxl-testdata-d6168ffb9e1cc24007e64b65dd84d822ad1fc759.tar.gz 67553075 BLAKE2B 779fee87386e617edd93bca7a523fa1ab223ae88114c3cc5484987a7c92cca2d0bb3d668fa3c8064b2a0255c17a06447c009f4fbf9ef379692ddfa37dee1be97 SHA512 a48d74a1ccff404eb7675225b59965e056dc3fc09930572785d83bae03fa1c38e105336dbf5ecfc3f0995e8b8bfb1097b451ae661f2933590b2b152192c8aa2f DIST libjxl-testdata-ff8d743aaba05b3014f17e5475e576242fa979fc.tar.gz 69105882 BLAKE2B a80fce437b810e7b99b4c7bd106ec7eba01a1eeddc90e1b82cb8d75f3ca194c357ef8e7b7e1e9da65aa39dc2cd11d32cb6de8558188c5258c7446d58787603ff SHA512 0d237e706fd8d001a9cb245b685e8e39085416daedec019c348ccc64cf15a34cecdb0c245f94f57507f5934e487ee5157f51f59bb6a000f5899862c582336384 +EBUILD libjxl-0.10.2-r1.ebuild 2945 BLAKE2B 00773bbe7fe462c425558fc9456f5871ab70a9083a52746e5fd8f0a0bf939654d4528213a85aa0cff31ee9722891b2306e14b962c58953ed65ceaa4585c778e2 SHA512 1b3470cb66f1bad55f76c4bb1b24f01a85973be5199e9cddba758e40714dce21b90a28eaeb5693c9906784448492e049ab337ddb6f07e5cb8651d57b9b52fe86 EBUILD libjxl-0.10.2.ebuild 2722 BLAKE2B 628d35e59657616b49b5ab54308c3d8600bc18c135cf9c464055ba739239cc67e079693251f5da9c0f0f509f4d88bcd95b47c1472549fb8ed0bc6964424336aa SHA512 9b78395438c0116b286b8f56996cfce92845186f23d644621008de619fe9c87c6554a9749b5b121a2e226ae68b087c05dcb1a0ffc663131cf5ee151696bc222d EBUILD libjxl-0.8.2-r1.ebuild 2339 BLAKE2B 5e919bdd10fe20de0b45122a7ed2f037ef3e54c4c17a385bdc930288c8b9ccbabf0de82bedfe8510999ea8085d37981764243662fccd872f29ba19ac14d9c407 SHA512 f9227486972af086b08140bd81bd02cb3f303792f168fb05ef9dc5c743c6ad576da3f2a5616b31aeefdaa77d1c7fef6a04da0fdd36648ad7361aaaee2ce7f603 +EBUILD libjxl-0.8.2-r2.ebuild 2571 BLAKE2B 3d66e80efb11dd03ab12446eba565a26b136cd75644c8d5dd976fb2bc47bb0129e9afdd091b2200b9e62076ec0586b72cdcb4eb3c919aebfde91b02b6acc78a9 SHA512 f1ba0c1652f21bcba6bf8825d925cc97e2c9340711afeade8d7aa76ca2588bb81f7949e84139fe44aebb150e560a11f301e580a1f5564073f789d91d35c261ff +EBUILD libjxl-0.9.2-r1.ebuild 3007 BLAKE2B 6ded330ffaf6eb2daf3a402c91b4abd16769ff3e41b86d08f7717d27b76806a4e95a27a5f5a5b824b6068038616d863145e75458d1716ab0bcf9720acb38c6ea SHA512 1fcf2d77d03f317f07569d2124771abda3827043738e98c105961ae9ed1d9099aafa7972d7c57d154465fd7ae9f400390c3764287f7758663cf4f860cf25910a EBUILD libjxl-0.9.2.ebuild 2784 BLAKE2B bb08ef63e10bcc07381fac168baa3b596f93e91c3d648b89f2a7ec0296b1bb4713fa91459faab76a08f89fe77cb23051131f19b3dcf1d6be3843b41ad6f8f271 SHA512 aeeca7ebde32c21a18e07d0b8e3c54fbdaa13b53d1c9eb642f53d34a56fd7b206d519c8f617d78fc691ffcd69745282577c589df3bef8af0692e9ef3346c2c06 -EBUILD libjxl-9999.ebuild 2417 BLAKE2B 65ce5cf9c5b1f2834b4fe15af97040309f50059fb06ee3ae7a7123a0c84069a9a2a03b5c9c215333b78b5dd73e79e2c01ff0ee52c1cf1ea6053b359e53948c4a SHA512 8265b56e188587d2d6eb0114de4c08979168fa57125e27acb50febdf907e8d1c3956d01b1e58c732369725665418e0e2ae3152538f5c78b35b02d0644a9e33d3 -MISC metadata.xml 864 BLAKE2B 04139ce686fbc36068182d03fc23f0a0d49262f8c6b21a690705411330c3b5ec4f969d0ed27fc712fc184736bb20e9bfa3a6fe2fe6d5db98527334151dc0a8d6 SHA512 73e89d636908712608a41f8c4b7f29fc9d551030cebcd83e8db722869aaff0bc96c1ad6c05c5dbe3a2b2b29b8c639c95d02a8d4ed7094a9200af7f008c9b20de +EBUILD libjxl-9999.ebuild 2608 BLAKE2B e4247be931c67d10fa9e200bc113731a940678547be3743a282087dc09b1afe1bee0063ec0d090f60c3860d4542d210f50fdc762263f2609f6fedcb10df058f3 SHA512 63b91932054fd351b091daa652b0f000ad7675e48cb489e4b52da4d99991066dc501d8814b02c2b005e5211f032fe7f6dee1b53944fc239b7bbadd46ee143339 +MISC metadata.xml 1029 BLAKE2B 4c5ef3d7aca316b497d964b1afcee9f71b165545691182c3818ef4f9a8bc7f10fdbed36a8bd58b0051b1f9851018a11efa3e9f7b57c5ec935435e16bd26b6036 SHA512 a3129f77efc640e78a2f1fa481fb6363249be74e74aabccb51970ec101808db95a326deeecfa557b669cfb2bf26622fc7dbcbe7624a0315d770e697bc3734296 diff --git a/media-libs/libjxl/libjxl-0.10.2-r1.ebuild b/media-libs/libjxl/libjxl-0.10.2-r1.ebuild new file mode 100644 index 000000000000..3430ddbc8d00 --- /dev/null +++ b/media-libs/libjxl/libjxl-0.10.2-r1.ebuild @@ -0,0 +1,115 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib gnome2-utils + +# This changes frequently. Please check the testdata submodule when bumping. +TESTDATA_COMMIT="ff8d743aaba05b3014f17e5475e576242fa979fc" +DESCRIPTION="JPEG XL image format reference implementation" +HOMEPAGE="https://github.com/libjxl/libjxl/" +SRC_URI=" + https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz + test? ( + https://github.com/libjxl/testdata/archive/${TESTDATA_COMMIT}.tar.gz + -> ${PN}-testdata-${TESTDATA_COMMIT}.tar.gz + ) +" + +LICENSE="BSD" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc64 ~riscv ~sparc ~x86" +IUSE="+gdk-pixbuf gif jpeg openexr +png test" +REQUIRED_USE="test? ( png )" +RESTRICT="!test? ( test )" + +DEPEND=" + app-arch/brotli:=[${MULTILIB_USEDEP}] + >=dev-cpp/highway-1.0.7[${MULTILIB_USEDEP}] + >=media-libs/lcms-2.13:2[${MULTILIB_USEDEP}] + gdk-pixbuf? ( + dev-libs/glib:2 + x11-libs/gdk-pixbuf:2 + ) + gif? ( media-libs/giflib:=[${MULTILIB_USEDEP}] ) + jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) + openexr? ( media-libs/openexr:= ) + png? ( media-libs/libpng:=[${MULTILIB_USEDEP}] ) +" +RDEPEND=" + ${DEPEND} + >=x11-misc/shared-mime-info-2.2 +" +DEPEND+=" + test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] ) +" + +multilib_src_configure() { + local mycmakeargs=( + -DJPEGXL_ENABLE_BENCHMARK=OFF + -DJPEGXL_ENABLE_COVERAGE=OFF + -DJPEGXL_ENABLE_FUZZERS=OFF + -DJPEGXL_ENABLE_SJPEG=OFF + -DJPEGXL_WARNINGS_AS_ERRORS=OFF + + -DCMAKE_DISABLE_FIND_PACKAGE_GIF=$(usex !gif) + -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex !jpeg) + -DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(usex !png) + + -DJPEGXL_ENABLE_SKCMS=OFF + -DJPEGXL_ENABLE_VIEWERS=OFF + -DJPEGXL_FORCE_SYSTEM_BROTLI=ON + -DJPEGXL_FORCE_SYSTEM_GTEST=ON + -DJPEGXL_FORCE_SYSTEM_HWY=ON + -DJPEGXL_FORCE_SYSTEM_LCMS2=ON + -DJPEGXL_ENABLE_DOXYGEN=OFF + -DJPEGXL_ENABLE_MANPAGES=OFF + -DJPEGXL_ENABLE_JNI=OFF + -DJPEGXL_ENABLE_JPEGLI=OFF + -DJPEGXL_ENABLE_JPEGLI_LIBJPEG=OFF + -DJPEGXL_ENABLE_TCMALLOC=OFF + -DJPEGXL_ENABLE_EXAMPLES=OFF + -DBUILD_TESTING=$(usex test ON OFF) + ) + + if use test; then + mycmakeargs+=( + -DJPEGXL_TEST_DATA_PATH="${WORKDIR}/testdata-${TESTDATA_COMMIT}" + ) + fi + + if multilib_is_native_abi; then + mycmakeargs+=( + -DJPEGXL_ENABLE_TOOLS=ON + -DJPEGXL_ENABLE_OPENEXR=$(usex openexr) + -DJPEGXL_ENABLE_PLUGINS=ON + -DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=$(usex gdk-pixbuf) + -DJPEGXL_ENABLE_PLUGIN_GIMP210=OFF + -DJPEGXL_ENABLE_PLUGIN_MIME=OFF + ) + else + mycmakeargs+=( + -DJPEGXL_ENABLE_TOOLS=OFF + -DJPEGXL_ENABLE_OPENEXR=OFF + -DJPEGXL_ENABLE_PLUGINS=OFF + ) + fi + + cmake_src_configure +} + +multilib_src_install() { + cmake_src_install + + find "${ED}" -name '*.a' -delete || die +} + +pkg_postinst() { + use gdk-pixbuf && multilib_foreach_abi gnome2_gdk_pixbuf_update +} + +pkg_postrm() { + use gdk-pixbuf && multilib_foreach_abi gnome2_gdk_pixbuf_update +} diff --git a/media-libs/libjxl/libjxl-0.8.2-r2.ebuild b/media-libs/libjxl/libjxl-0.8.2-r2.ebuild new file mode 100644 index 000000000000..ff3f34b606fb --- /dev/null +++ b/media-libs/libjxl/libjxl-0.8.2-r2.ebuild @@ -0,0 +1,94 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib + +# This changes frequently. Please check the testdata submodule when bumping. +TESTDATA_COMMIT="d6168ffb9e1cc24007e64b65dd84d822ad1fc759" +DESCRIPTION="JPEG XL image format reference implementation" +HOMEPAGE="https://github.com/libjxl/libjxl" +SRC_URI="https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + test? ( https://github.com/libjxl/testdata/archive/${TESTDATA_COMMIT}.tar.gz + -> ${PN}-testdata-${TESTDATA_COMMIT}.tar.gz )" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc64 ~riscv ~sparc ~x86" +IUSE="gif jpeg openexr +png test" +RESTRICT="!test? ( test )" + +DEPEND=" + app-arch/brotli:=[${MULTILIB_USEDEP}] + >=dev-cpp/highway-1.0.0[${MULTILIB_USEDEP}] + >=media-libs/lcms-2.13:2[${MULTILIB_USEDEP}] + gif? ( media-libs/giflib:=[${MULTILIB_USEDEP}] ) + jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) + openexr? ( media-libs/openexr:= ) + png? ( media-libs/libpng:=[${MULTILIB_USEDEP}] ) +" +RDEPEND=" + ${DEPEND} + >=x11-misc/shared-mime-info-2.2 +" +DEPEND+=" + test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] ) +" + +PATCHES=( + "${FILESDIR}/${PN}-0.8.2-backport-pr2596.patch" + "${FILESDIR}/${PN}-0.8.2-backport-pr2617.patch" +) + +multilib_src_configure() { + local mycmakeargs=( + -DJPEGXL_ENABLE_BENCHMARK=OFF + -DJPEGXL_ENABLE_COVERAGE=OFF + -DJPEGXL_ENABLE_FUZZERS=OFF + -DJPEGXL_ENABLE_SJPEG=OFF + -DJPEGXL_WARNINGS_AS_ERRORS=OFF + + -DCMAKE_DISABLE_FIND_PACKAGE_GIF=$(usex !gif) + -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex !jpeg) + -DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(usex !png) + + -DJPEGXL_ENABLE_SKCMS=OFF + -DJPEGXL_ENABLE_VIEWERS=OFF + -DJPEGXL_ENABLE_PLUGINS=OFF + -DJPEGXL_FORCE_SYSTEM_BROTLI=ON + -DJPEGXL_FORCE_SYSTEM_GTEST=ON + -DJPEGXL_FORCE_SYSTEM_HWY=ON + -DJPEGXL_FORCE_SYSTEM_LCMS2=ON + -DJPEGXL_ENABLE_DOXYGEN=OFF + -DJPEGXL_ENABLE_MANPAGES=OFF + -DJPEGXL_ENABLE_JNI=OFF + -DJPEGXL_ENABLE_JPEGLI_LIBJPEG=OFF + -DJPEGXL_ENABLE_TCMALLOC=OFF + -DJPEGXL_ENABLE_EXAMPLES=OFF + ) + + if multilib_is_native_abi; then + mycmakeargs+=( + -DJPEGXL_ENABLE_TOOLS=ON + -DJPEGXL_ENABLE_OPENEXR=$(usex openexr) + -DBUILD_TESTING=$(usex test ON OFF) + ) + use test && + mycmakeargs+=( -DJPEGXL_TEST_DATA_PATH="${WORKDIR}/testdata-${TESTDATA_COMMIT}" ) + else + mycmakeargs+=( + -DJPEGXL_ENABLE_TOOLS=OFF + -DJPEGXL_ENABLE_OPENEXR=OFF + -DBUILD_TESTING=OFF + ) + fi + + cmake_src_configure +} + +multilib_src_install() { + cmake_src_install + + find "${ED}" -name '*.a' -delete || die +} diff --git a/media-libs/libjxl/libjxl-0.9.2-r1.ebuild b/media-libs/libjxl/libjxl-0.9.2-r1.ebuild new file mode 100644 index 000000000000..00adab4f5232 --- /dev/null +++ b/media-libs/libjxl/libjxl-0.9.2-r1.ebuild @@ -0,0 +1,119 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib gnome2-utils + +# This changes frequently. Please check the testdata submodule when bumping. +TESTDATA_COMMIT="ff8d743aaba05b3014f17e5475e576242fa979fc" +DESCRIPTION="JPEG XL image format reference implementation" +HOMEPAGE="https://github.com/libjxl/libjxl/" +SRC_URI=" + https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz + test? ( + https://github.com/libjxl/testdata/archive/${TESTDATA_COMMIT}.tar.gz + -> ${PN}-testdata-${TESTDATA_COMMIT}.tar.gz + ) +" + +LICENSE="BSD" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc64 ~riscv ~sparc ~x86" +IUSE="+gdk-pixbuf gif jpeg openexr +png test" +REQUIRED_USE="test? ( png )" +RESTRICT="!test? ( test )" + +DEPEND=" + app-arch/brotli:=[${MULTILIB_USEDEP}] + >=dev-cpp/highway-1.0.7[${MULTILIB_USEDEP}] + >=media-libs/lcms-2.13:2[${MULTILIB_USEDEP}] + gdk-pixbuf? ( + dev-libs/glib:2 + x11-libs/gdk-pixbuf:2 + ) + gif? ( media-libs/giflib:=[${MULTILIB_USEDEP}] ) + jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) + openexr? ( media-libs/openexr:= ) + png? ( media-libs/libpng:=[${MULTILIB_USEDEP}] ) +" +RDEPEND=" + ${DEPEND} + >=x11-misc/shared-mime-info-2.2 +" +DEPEND+=" + test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] ) +" + +PATCHES=( + "${FILESDIR}/${PN}-0.9.1-backport-pr3143.patch" +) + +multilib_src_configure() { + local mycmakeargs=( + -DJPEGXL_ENABLE_BENCHMARK=OFF + -DJPEGXL_ENABLE_COVERAGE=OFF + -DJPEGXL_ENABLE_FUZZERS=OFF + -DJPEGXL_ENABLE_SJPEG=OFF + -DJPEGXL_WARNINGS_AS_ERRORS=OFF + + -DCMAKE_DISABLE_FIND_PACKAGE_GIF=$(usex !gif) + -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex !jpeg) + -DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(usex !png) + + -DJPEGXL_ENABLE_SKCMS=OFF + -DJPEGXL_ENABLE_VIEWERS=OFF + -DJPEGXL_FORCE_SYSTEM_BROTLI=ON + -DJPEGXL_FORCE_SYSTEM_GTEST=ON + -DJPEGXL_FORCE_SYSTEM_HWY=ON + -DJPEGXL_FORCE_SYSTEM_LCMS2=ON + -DJPEGXL_ENABLE_DOXYGEN=OFF + -DJPEGXL_ENABLE_MANPAGES=OFF + -DJPEGXL_ENABLE_JNI=OFF + -DJPEGXL_ENABLE_JPEGLI=OFF + -DJPEGXL_ENABLE_JPEGLI_LIBJPEG=OFF + -DJPEGXL_ENABLE_TCMALLOC=OFF + -DJPEGXL_ENABLE_EXAMPLES=OFF + -DBUILD_TESTING=$(usex test ON OFF) + ) + + if use test; then + mycmakeargs+=( + -DJPEGXL_TEST_DATA_PATH="${WORKDIR}/testdata-${TESTDATA_COMMIT}" + ) + fi + + if multilib_is_native_abi; then + mycmakeargs+=( + -DJPEGXL_ENABLE_TOOLS=ON + -DJPEGXL_ENABLE_OPENEXR=$(usex openexr) + -DJPEGXL_ENABLE_PLUGINS=ON + -DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=$(usex gdk-pixbuf) + -DJPEGXL_ENABLE_PLUGIN_GIMP210=OFF + -DJPEGXL_ENABLE_PLUGIN_MIME=OFF + ) + else + mycmakeargs+=( + -DJPEGXL_ENABLE_TOOLS=OFF + -DJPEGXL_ENABLE_OPENEXR=OFF + -DJPEGXL_ENABLE_PLUGINS=OFF + ) + fi + + cmake_src_configure +} + +multilib_src_install() { + cmake_src_install + + find "${ED}" -name '*.a' -delete || die +} + +pkg_postinst() { + use gdk-pixbuf && multilib_foreach_abi gnome2_gdk_pixbuf_update +} + +pkg_postrm() { + use gdk-pixbuf && multilib_foreach_abi gnome2_gdk_pixbuf_update +} diff --git a/media-libs/libjxl/libjxl-9999.ebuild b/media-libs/libjxl/libjxl-9999.ebuild index aef3acb16445..5841fd207bc5 100644 --- a/media-libs/libjxl/libjxl-9999.ebuild +++ b/media-libs/libjxl/libjxl-9999.ebuild @@ -10,28 +10,28 @@ HOMEPAGE="https://github.com/libjxl/libjxl/" EGIT_REPO_URI="https://github.com/libjxl/libjxl.git" EGIT_SUBMODULES=( - third_party/libjpeg-turbo third_party/skcms third_party/testdata ) LICENSE="BSD" SLOT="0" -IUSE="+gdk-pixbuf openexr test" +IUSE="+gdk-pixbuf gif jpeg openexr +png test" +REQUIRED_USE="test? ( png )" RESTRICT="!test? ( test )" DEPEND=" app-arch/brotli:=[${MULTILIB_USEDEP}] >=dev-cpp/highway-1.0.7[${MULTILIB_USEDEP}] - media-libs/giflib:=[${MULTILIB_USEDEP}] >=media-libs/lcms-2.13:2[${MULTILIB_USEDEP}] - media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] - media-libs/libpng:=[${MULTILIB_USEDEP}] gdk-pixbuf? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 ) + gif? ( media-libs/giflib:=[${MULTILIB_USEDEP}] ) + jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) openexr? ( media-libs/openexr:= ) + png? ( media-libs/libpng:=[${MULTILIB_USEDEP}] ) " RDEPEND=" ${DEPEND} @@ -49,6 +49,10 @@ multilib_src_configure() { -DJPEGXL_ENABLE_SJPEG=OFF -DJPEGXL_WARNINGS_AS_ERRORS=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_GIF=$(usex !gif) + -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex !jpeg) + -DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(usex !png) + -DJPEGXL_ENABLE_SKCMS=OFF -DJPEGXL_ENABLE_VIEWERS=OFF -DJPEGXL_FORCE_SYSTEM_BROTLI=ON diff --git a/media-libs/libjxl/metadata.xml b/media-libs/libjxl/metadata.xml index 1f058f4c648f..faffa19f3221 100644 --- a/media-libs/libjxl/metadata.xml +++ b/media-libs/libjxl/metadata.xml @@ -19,7 +19,11 @@ Contains command line utilities: cjxl, djxl, jxlinfo. </longdescription> <use> - <flag name="gdk-pixbuf">Build a gdk-pixbuf loader</flag> + <flag name="jpeg"> + Enable full support for JPEG images. When disabled, only + lossless conversion between JPEG and JPEG-XL is supported. + </flag> + <flag name="gdk-pixbuf">Build a gdk-pixbuf loader.</flag> </use> <upstream> <remote-id type="github">libjxl/libjxl</remote-id> diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index 03e5be4a8049..f70266110f03 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -2,15 +2,17 @@ AUX 24.0.4-dzn-Include-vulkan_core.h-instead-of-vulkan.h-in-the.patch 1088 BLAKE DIST mesa-24.0.7.tar.xz 20144724 BLAKE2B d9438e533b471445b2403e01e1fd593d83c0013b0991585f718122f1cadc6ac6bb1fb913f0fb257354ae21ddd9fe1f970ad9ac46f05d756c223ed56a11b9c9ce SHA512 77b0fae80ab0a07e2e528c113eadef0e3004b8df3e6e98fffe6fc2d8ac39f5ce7fa38ebe5c2ae32bfbac993dd7cbe288ace18ebb03cf2fb445fe7114f74dd45c DIST mesa-24.0.8.tar.xz 20170168 BLAKE2B 1919e99e6ccbd51c8e74e55985ea9a3f47bf49c7e4260a195a609ce175eeded9fc5a56970ae35d21bc650e4bb802df484d2088b29ef3861d13942bd495891a9a SHA512 1e1be9b50c2a404a96960db87d2ba4cd1c602445f9ab8acfb6a8a023410063620c2ef891fe516afec3d830756e0b0f4309ef50c6caeefa44e164b414c4708b10 DIST mesa-24.1.0.tar.xz 28994008 BLAKE2B 1558d20d426162bfe8cccf96107ddbf1373c8322f87f48daec73e23b283e00f95d6efd073cad9b92065928af4b9b4a339ff2d204412070eca903f77ca366e619 SHA512 4b7ed1940fc812ef4efb55978d3ffe3d0e2ae53d5b57a3baca10a52db2ba5852c5ee7e75c3739bd8d384c80bf1cba970a384250050f01f03bba98f255e12cec5 +DIST mesa-24.1.1.tar.xz 29019256 BLAKE2B 152ce5f4847a321689bf4aa88529963278f7dd24097c4c3de2b3a9164d06cd23d7cccd96bd31fea88311ded576c834a73e2d669e6d290404283f33f92b9bf262 SHA512 a23fc2fe479f21027095a7791042148586b23da848474209ca4fecfe5c4d499e66fff0ebfa06d07ed9f16b5d6a2ef755b362cb6079141aff5fdc47cc571e3b1d DIST paste-1.0.14.tar.gz 18429 BLAKE2B 88f533fd336bbbe24872b100777703832ff46b52970b94981fea202726de35ac0d3466f96370fa89c966b33e0f13c75cbf7f5f88bba290dc490a63c9e08a0b16 SHA512 0ec40c228afe645cb027a99c8bd8f7c65158aab48655018a45736727906b05f7354df114405f2eae88c4eba73dec62e8228f8be9834afa0f22b5f31c18006d34 DIST proc-macro2-1.0.70.tar.gz 46747 BLAKE2B 808e3a30c89fd979663899124853d386cc53862621f4d872bba87fe91baccddbc6612bd658b4c18b44f8420fcb10700b2906cde9c9512a616ab800ebbfb0867d SHA512 cd5c41ef6a410e310e90828a33fee42c1e2bf30dfc2b0a0cf429fcc60fa1262393c977b2cab5f8a50a35fd1394fd6cc7e7a482581f88dcde20d9ad030c7414a5 DIST quote-1.0.33.tar.gz 32169 BLAKE2B 2438915aebe30b79929ddc6ed8bad5282537b081c763a3d6b2b9483b63e7b5e99b9bba6f1f7deb725031b23384410b60c7cc4aef0b00bb1d94541cde54408ee3 SHA512 3c000577d0e9f82bc379570a4fa63283d73cfc6dee0475475ba201994491dece0110cdefc26fcf9a3b9d0bf50a3649ca5b68c8a0f6f2e620946b624ff8b8f38b DIST syn-2.0.39.tar.gz 286899 BLAKE2B 8bf5e89cb961195b48896294dc876d4e5e81fe7ac1df5330b972e6fdcfa2cf89fd1467f315081f84c1f447d402850e0ab4c7dc2bd20271c5e2bc9a2e3008f70b SHA512 2ee6bb196bef427a9b9aada38fb3a3a11e893c4e9e8808063f544f5c05cda58d554dfea24488dd60b4c299457852b52bf17e5de8595333ff4f2358441964c672 DIST unicode-ident-1.0.12.tar.gz 50118 BLAKE2B 04e2651e14251d68f4e7e70e1e7a6d5eded21aa4f684c6162a91608189f6dcabaca4aa22204c40e08c82d76773c679ff965f21836264885a3b4cb62d7aa762db SHA512 0d0228bfd8eb6a94d8ae4a003511dd5ad52a58b08d98a8f0a8c5e3dc8b3e6b987ea5009255dc1e9c411f91aec16edc4aaff26ed7a9c48430272f970cd2a9510d -EBUILD mesa-24.0.7.ebuild 11623 BLAKE2B c4a62576ed60ec76eb4c8e8ec9088caf83e2e122dd858c0dce64aca4d00b099b02d6106da02420889e9852843451a65aea8d66542dcf933cf46d33ac5cc3a2ea SHA512 5b41a2eee65e406369d358a16a2356bb4a6d56cccc57aec2aec3046dbc5e51946cd3d26686715f0c4fec7752294a5fa1d380e7aecf3500939ab36ce3257d9623 -EBUILD mesa-24.0.8-r1.ebuild 11797 BLAKE2B b71065c8f66ae5e8f838029022f958d077429cad7238183082856009096c58796949faee327cae6d4b4bd797ff4485a100d980193b0667f66e6f7208cd9625cd SHA512 df8e99dfb89387e2ddac792f8c57fc1ef1498207617b8a88268a1fb2dc2ff6e2b7113d0e9fa68783d4e5d56eb549fd0e69a1fd9e3f976e5fb5994d9fee97cc29 -EBUILD mesa-24.0.8.ebuild 11630 BLAKE2B 4c0b8bee298f59954db6759e92464530c0fd7684425ebbbd4985e0d7f87e004f1c0990ec5468266ee9773833fc00f6287ef162d9abaca1ebeb553fe0d26bc19f SHA512 0854e76a64cc3bb2bcd873805a1c92a46bb82cbba2a107cfd43af676da0eab5b755646155164182dedd8a3dc26a6b73a11e8c366ba8067e142b49ac6d48ec4f4 -EBUILD mesa-24.1.0-r1.ebuild 13686 BLAKE2B d3ee390ca6773f5a99a683b703c524df54922743849e3690655c9cd0938e1678c0909aa368dacd2fcdeb4a82f2bf1be145402ea2c0678793c6a52163307930d1 SHA512 a0f7d546432438340d3f7d74ffd3d168addcdf81ba7c68315e9960d6922fd11fcf75ea1190ef8341035429b54158481c8b16df5085625d3cf6cdf13a6712ab14 -EBUILD mesa-24.1.0.ebuild 13477 BLAKE2B 8ba955abf455044183db4601302c7473228c47b79318b837bfdf51aec8671f901744cc9bef54782bccee230d72a2a4c4e94c53279e8991292a9875fba98af444 SHA512 ecfd3177d7edd5d1ae5c56f7d19c7ceb2e42aa0d88df67a90db14609c7959f54c37244dab369c8c35d1e5e72e846957229f92250591fbd3e6c033005018506ee -EBUILD mesa-9999.ebuild 13686 BLAKE2B d3ee390ca6773f5a99a683b703c524df54922743849e3690655c9cd0938e1678c0909aa368dacd2fcdeb4a82f2bf1be145402ea2c0678793c6a52163307930d1 SHA512 a0f7d546432438340d3f7d74ffd3d168addcdf81ba7c68315e9960d6922fd11fcf75ea1190ef8341035429b54158481c8b16df5085625d3cf6cdf13a6712ab14 +EBUILD mesa-24.0.7.ebuild 11737 BLAKE2B c63e9edb6075b0af71fbcbc60eb6917468cad89ab245b8b0ef66dde87b85851966b98fd1b9730ce8e7f0e0423de7a44ee08807f2aa3842d44d4e2119b786d910 SHA512 dc68bed1f727ad15d1ab0a211b2fd377e554d2a11b3a7739f3ae7b2c2789a1981c46323464aeac5321bb65f5aa77d7639e0723f5f1374f8c8d4f6c1b92d04e60 +EBUILD mesa-24.0.8-r1.ebuild 11911 BLAKE2B ccbb733ee83f0f7869eaf08cfd48041adc3a49a27dd16169e7cf358f75fafb7088d3318313c279979df2e46d704f919cc4cb74ebe73cabdd88eeeba30023cea8 SHA512 fdcf5d16e88691846e38eb688889abdb559dba5e2c4545d5e4957ad66c1fd5836f37300940f74968cadb3f988a56642960c65dda268558b561901ebd66e39b6d +EBUILD mesa-24.0.8.ebuild 11744 BLAKE2B fd8bd36715e2445ea0293040a7ee58aa0750506a775caaed4784c1ada06af600c50327631a6354403c056409cc677a5f07542f9b7c8674645e5a7e3a532efc58 SHA512 aca57c57340534506fc49ac0313d97017e53891d35bd4460908164056cdf441e7be3fbbfdbb5e9a216dde36b14d4728aa2b591593910ec5ad12d5f4f8269bcc5 +EBUILD mesa-24.1.0-r1.ebuild 14471 BLAKE2B f3bd8b5deb02aceacc0769de3e027fe56ad44cd7b8e0d88760b676d71ceae2c95e8773a284df54338204fb204d198f6ec648b0eabf30516d017ece9b385ecd33 SHA512 8a9dcd0566799621d95c9b1063096cc67a65c9e896ab4e3bb6d59711c4c39b633cfc692bc4f2702e474bd9633a3e446451b462bba164f235cc9d7b64a27065ca +EBUILD mesa-24.1.0.ebuild 13591 BLAKE2B 25e06dfe37d5cad418b2caaadc7f3f22cb1842bd65d712d8e65bb348d26e51ed454755ae8dab6f6aeb803d0bb3df31113766eb0e60abb7493f339efee7cb4746 SHA512 b3d46efea43238b22eff219ef54af8a803e86b52e75e9cf9ccadc3e63fed3aa203721fa5aeeb2e7bcfdd4860baf66f41a0b1e672f5423c7f4e4b04620822bd9e +EBUILD mesa-24.1.1.ebuild 14310 BLAKE2B 21c697eb3bcd4dddeec9877fcee16f819ca89f9eacbfbe6c7ca4868da32925a103f3051a87219d8e93440c669a435be388ed4206aead86e46119117fcd2e155f SHA512 1f12d36112aa3ddbf8e26e00899f662f40301c7bf60e86cec53f74e1f0c199c6d33f1f095691d0d20ef9de52411a84dcd90f7f8e45056950eea5f8730306f0c2 +EBUILD mesa-9999.ebuild 14310 BLAKE2B 21c697eb3bcd4dddeec9877fcee16f819ca89f9eacbfbe6c7ca4868da32925a103f3051a87219d8e93440c669a435be388ed4206aead86e46119117fcd2e155f SHA512 1f12d36112aa3ddbf8e26e00899f662f40301c7bf60e86cec53f74e1f0c199c6d33f1f095691d0d20ef9de52411a84dcd90f7f8e45056950eea5f8730306f0c2 MISC metadata.xml 1435 BLAKE2B 53690878512b86ce0b8dce38b083684c85ad5c1a655d5a69cb3265e156869845263eb16f271691b66c9f0cd76e97b56908acf7a1792d6abac0ec99447826cbb5 SHA512 842106e5d6eb60ff33c8cae7f0d52983c4f7e104152718b50fc790cbcb2506551a6fc7841fe8e3c7963850c238f77505b0e49b10a3a936baf459e1acaf73e07f diff --git a/media-libs/mesa/mesa-24.0.7.ebuild b/media-libs/mesa/mesa-24.0.7.ebuild index 6728b6089ac8..079bc478b34e 100644 --- a/media-libs/mesa/mesa-24.0.7.ebuild +++ b/media-libs/mesa/mesa-24.0.7.ebuild @@ -137,7 +137,10 @@ BDEPEND=" app-alternatives/yacc app-alternatives/lex virtual/pkgconfig - $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]") + $(python_gen_any_dep " + >=dev-python/mako-0.8.0[\${PYTHON_USEDEP}] + dev-python/packaging[\${PYTHON_USEDEP}] + ") vulkan? ( dev-util/glslang llvm? ( @@ -212,7 +215,8 @@ pkg_pretend() { } python_check_deps() { - python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" || return 1 + python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" || return 1 if use llvm && use vulkan && use video_cards_intel && use amd64; then python_has_version -b "dev-python/ply[${PYTHON_USEDEP}]" || return 1 fi diff --git a/media-libs/mesa/mesa-24.0.8-r1.ebuild b/media-libs/mesa/mesa-24.0.8-r1.ebuild index b676b84c8534..41c743d15fe6 100644 --- a/media-libs/mesa/mesa-24.0.8-r1.ebuild +++ b/media-libs/mesa/mesa-24.0.8-r1.ebuild @@ -137,7 +137,10 @@ BDEPEND=" app-alternatives/yacc app-alternatives/lex virtual/pkgconfig - $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]") + $(python_gen_any_dep " + >=dev-python/mako-0.8.0[\${PYTHON_USEDEP}] + dev-python/packaging[\${PYTHON_USEDEP}] + ") vulkan? ( dev-util/glslang llvm? ( @@ -212,7 +215,8 @@ pkg_pretend() { } python_check_deps() { - python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" || return 1 + python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" || return 1 if use llvm && use vulkan && use video_cards_intel && use amd64; then python_has_version -b "dev-python/ply[${PYTHON_USEDEP}]" || return 1 fi diff --git a/media-libs/mesa/mesa-24.0.8.ebuild b/media-libs/mesa/mesa-24.0.8.ebuild index 53d40957a9fc..53ea99b9ba47 100644 --- a/media-libs/mesa/mesa-24.0.8.ebuild +++ b/media-libs/mesa/mesa-24.0.8.ebuild @@ -137,7 +137,10 @@ BDEPEND=" app-alternatives/yacc app-alternatives/lex virtual/pkgconfig - $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]") + $(python_gen_any_dep " + >=dev-python/mako-0.8.0[\${PYTHON_USEDEP}] + dev-python/packaging[\${PYTHON_USEDEP}] + ") vulkan? ( dev-util/glslang llvm? ( @@ -212,7 +215,8 @@ pkg_pretend() { } python_check_deps() { - python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" || return 1 + python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" || return 1 if use llvm && use vulkan && use video_cards_intel && use amd64; then python_has_version -b "dev-python/ply[${PYTHON_USEDEP}]" || return 1 fi diff --git a/media-libs/mesa/mesa-24.1.0-r1.ebuild b/media-libs/mesa/mesa-24.1.0-r1.ebuild index 9979d5a20b5d..3e505dc7f31e 100644 --- a/media-libs/mesa/mesa-24.1.0-r1.ebuild +++ b/media-libs/mesa/mesa-24.1.0-r1.ebuild @@ -46,7 +46,7 @@ LICENSE="MIT SGI-B-2.0" SLOT="0" RADEON_CARDS="r300 r600 radeon radeonsi" -VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel lavapipe lima nouveau nvk panfrost v3d vc4 virgl vivante vmware" +VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel lavapipe lima nouveau nvk panfrost v3d vc4 virgl vivante vmware zink" for card in ${VIDEO_CARDS}; do IUSE_VIDEO_CARDS+=" video_cards_${card}" done @@ -55,17 +55,20 @@ IUSE="${IUSE_VIDEO_CARDS} cpu_flags_x86_sse2 d3d9 debug +llvm lm-sensors opencl +opengl osmesa +proprietary-codecs selinux test unwind vaapi valgrind vdpau vulkan - vulkan-overlay wayland +X xa zink +zstd" + vulkan-overlay wayland +X xa +zstd" RESTRICT="!test? ( test )" REQUIRED_USE=" d3d9? ( || ( + video_cards_freedreno video_cards_intel + video_cards_nouveau + video_cards_panfrost video_cards_r300 video_cards_r600 video_cards_radeonsi - video_cards_nouveau video_cards_vmware + video_cards_zink ) ) llvm? ( ${LLVM_REQUIRED_USE} ) @@ -73,10 +76,10 @@ REQUIRED_USE=" video_cards_lavapipe? ( llvm vulkan ) video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) + video_cards_zink? ( vulkan opengl ) video_cards_nvk? ( vulkan video_cards_nouveau ) vdpau? ( X ) xa? ( X ) - zink? ( opengl vulkan ) " LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.119" @@ -112,6 +115,7 @@ RDEPEND=" ) vdpau? ( >=x11-libs/libvdpau-1.5:=[${MULTILIB_USEDEP}] ) video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] ) + video_cards_zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] ) selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] ) wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] ) ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}] @@ -124,7 +128,6 @@ RDEPEND=" x11-libs/libXfixes[${MULTILIB_USEDEP}] x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}] ) - zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] ) zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) " for card in ${RADEON_CARDS}; do @@ -157,7 +160,10 @@ BDEPEND=" app-alternatives/yacc app-alternatives/lex virtual/pkgconfig - $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]") + $(python_gen_any_dep " + >=dev-python/mako-0.8.0[\${PYTHON_USEDEP}] + dev-python/packaging[\${PYTHON_USEDEP}] + ") video_cards_intel? ( ~dev-util/intel_clc-${PV} dev-libs/libclc[spirv(-)] @@ -192,37 +198,44 @@ pkg_pretend() { if ! use video_cards_d3d12 && ! use video_cards_freedreno && ! use video_cards_intel && + ! use video_cards_lavapipe && + ! use video_cards_nouveau && + ! use video_cards_nvk && + ! use video_cards_panfrost && ! use video_cards_radeonsi && ! use video_cards_v3d && - ! use video_cards_nvk; then - ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain d3d12, freedreno, intel, radeonsi, v3d, or nvk" + ! use video_cards_virgl; then + ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain d3d12, freedreno, intel, lavapipe, nouveau, nvk, panfrost, radeonsi, v3d, or virgl" fi fi + # VA if use vaapi; then if ! use video_cards_d3d12 && + ! use video_cards_nouveau && ! use video_cards_r600 && ! use video_cards_radeonsi && - ! use video_cards_nouveau; then - ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain d3d12, r600, radeonsi, or nouveau" + ! use video_cards_virgl; then + ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl" fi fi if use vdpau; then if ! use video_cards_d3d12 && - ! use video_cards_r300 && + ! use video_cards_nouveau && ! use video_cards_r600 && ! use video_cards_radeonsi && - ! use video_cards_nouveau; then - ewarn "Ignoring USE=vdpau since VIDEO_CARDS does not contain d3d12, r300, r600, radeonsi, or nouveau" + ! use video_cards_virgl; then + ewarn "Ignoring USE=vdpau since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl" fi fi if use xa; then if ! use video_cards_freedreno && + ! use video_cards_intel && ! use video_cards_nouveau && ! use video_cards_vmware; then - ewarn "Ignoring USE=xa since VIDEO_CARDS does not contain freedreno, nouveau, or vmware" + ewarn "Ignoring USE=xa since VIDEO_CARDS does not contain freedreno, intel, nouveau, or vmware" fi fi @@ -236,7 +249,8 @@ pkg_pretend() { } python_check_deps() { - python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" || return 1 + python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" || return 1 if use llvm && use vulkan && use video_cards_intel && use amd64; then python_has_version -b "dev-python/ply[${PYTHON_USEDEP}]" || return 1 fi @@ -298,21 +312,25 @@ multilib_src_configure() { use wayland && platforms+=",wayland" emesonargs+=(-Dplatforms=${platforms#,}) - if use video_cards_intel || + if use video_cards_freedreno || + use video_cards_intel || # crocus i915 iris + use video_cards_nouveau || + use video_cards_panfrost || use video_cards_r300 || use video_cards_r600 || use video_cards_radeonsi || - use video_cards_nouveau || - use video_cards_vmware; then + use video_cards_vmware || # swrast + use video_cards_zink; then emesonargs+=($(meson_use d3d9 gallium-nine)) else emesonargs+=(-Dgallium-nine=false) fi if use video_cards_d3d12 || + use video_cards_nouveau || use video_cards_r600 || use video_cards_radeonsi || - use video_cards_nouveau; then + use video_cards_virgl; then emesonargs+=($(meson_feature vaapi gallium-va)) use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers ) else @@ -324,16 +342,17 @@ multilib_src_configure() { fi if use video_cards_d3d12 || - use video_cards_r300 || + use video_cards_nouveau || use video_cards_r600 || use video_cards_radeonsi || - use video_cards_nouveau; then + use video_cards_virgl; then emesonargs+=($(meson_feature vdpau gallium-vdpau)) else emesonargs+=(-Dgallium-vdpau=disabled) fi if use video_cards_freedreno || + use video_cards_intel || use video_cards_nouveau || use video_cards_vmware; then emesonargs+=($(meson_feature xa gallium-xa)) @@ -351,10 +370,10 @@ multilib_src_configure() { fi gallium_enable -- swrast + gallium_enable video_cards_d3d12 d3d12 gallium_enable video_cards_freedreno freedreno gallium_enable video_cards_intel crocus i915 iris gallium_enable video_cards_lima lima - gallium_enable video_cards_d3d12 d3d12 gallium_enable video_cards_nouveau nouveau gallium_enable video_cards_panfrost panfrost gallium_enable video_cards_v3d v3d @@ -362,13 +381,13 @@ multilib_src_configure() { gallium_enable video_cards_virgl virgl gallium_enable video_cards_vivante etnaviv gallium_enable video_cards_vmware svga - gallium_enable zink zink + gallium_enable video_cards_zink zink gallium_enable video_cards_r300 r300 gallium_enable video_cards_r600 r600 gallium_enable video_cards_radeonsi radeonsi - if ! use video_cards_r300 && \ - ! use video_cards_r600; then + if ! use video_cards_r300 && + ! use video_cards_r600; then gallium_enable video_cards_radeon r300 r600 fi @@ -382,12 +401,15 @@ multilib_src_configure() { fi if use vulkan; then - vulkan_enable video_cards_lavapipe swrast + vulkan_enable video_cards_d3d12 microsoft-experimental vulkan_enable video_cards_freedreno freedreno vulkan_enable video_cards_intel intel intel_hasvk - vulkan_enable video_cards_d3d12 microsoft-experimental + vulkan_enable video_cards_lavapipe swrast + vulkan_enable video_cards_panfrost panfrost vulkan_enable video_cards_radeonsi amd vulkan_enable video_cards_v3d broadcom + vulkan_enable video_cards_vc4 broadcom + vulkan_enable video_cards_virgl virtio if use video_cards_nvk; then vulkan_enable video_cards_nvk nouveau if ! multilib_is_native_abi; then diff --git a/media-libs/mesa/mesa-24.1.0.ebuild b/media-libs/mesa/mesa-24.1.0.ebuild index f9c4e1acfcbb..74f5ca28a2f6 100644 --- a/media-libs/mesa/mesa-24.1.0.ebuild +++ b/media-libs/mesa/mesa-24.1.0.ebuild @@ -157,7 +157,10 @@ BDEPEND=" app-alternatives/yacc app-alternatives/lex virtual/pkgconfig - $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]") + $(python_gen_any_dep " + >=dev-python/mako-0.8.0[\${PYTHON_USEDEP}] + dev-python/packaging[\${PYTHON_USEDEP}] + ") video_cards_intel? ( ~dev-util/intel_clc-${PV} dev-libs/libclc[spirv(-)] @@ -236,7 +239,8 @@ pkg_pretend() { } python_check_deps() { - python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" || return 1 + python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" || return 1 if use llvm && use vulkan && use video_cards_intel && use amd64; then python_has_version -b "dev-python/ply[${PYTHON_USEDEP}]" || return 1 fi diff --git a/media-libs/mesa/mesa-24.1.1.ebuild b/media-libs/mesa/mesa-24.1.1.ebuild new file mode 100644 index 000000000000..c184d9ab1e76 --- /dev/null +++ b/media-libs/mesa/mesa-24.1.1.ebuild @@ -0,0 +1,493 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LLVM_COMPAT=( {15..18} ) +LLVM_OPTIONAL=1 +PYTHON_COMPAT=( python3_{10..12} ) + +inherit flag-o-matic llvm-r1 meson-multilib python-any-r1 linux-info rust-toolchain toolchain-funcs + +MY_P="${P/_/-}" + +SYN_PV=2.0.39 +PROC_MACRO2_PV=1.0.70 +QUOTE_PV=1.0.33 +UNICODE_IDENT_PV=1.0.12 +PASTE_PV=1.0.14 + +NAK_URI=" + https://github.com/dtolnay/syn/archive/refs/tags/${SYN_PV}.tar.gz -> syn-${SYN_PV}.tar.gz + https://github.com/dtolnay/proc-macro2/archive/refs/tags/${PROC_MACRO2_PV}.tar.gz -> proc-macro2-${PROC_MACRO2_PV}.tar.gz + https://github.com/dtolnay/quote/archive/refs/tags/${QUOTE_PV}.tar.gz -> quote-${QUOTE_PV}.tar.gz + https://github.com/dtolnay/unicode-ident/archive/refs/tags/${UNICODE_IDENT_PV}.tar.gz -> unicode-ident-${UNICODE_IDENT_PV}.tar.gz + https://github.com/dtolnay/paste/archive/refs/tags/${PASTE_PV}.tar.gz -> paste-${PASTE_PV}.tar.gz +" + +DESCRIPTION="OpenGL-like graphic library for Linux" +HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git" + SRC_URI="${NAK_URI}" + inherit git-r3 +else + SRC_URI=" + https://archive.mesa3d.org/${MY_P}.tar.xz + ${NAK_URI} + " + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris" +fi +S="${WORKDIR}/${MY_P}" +EGIT_CHECKOUT_DIR=${S} + +LICENSE="MIT SGI-B-2.0" +SLOT="0" + +RADEON_CARDS="r300 r600 radeon radeonsi" +VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel lavapipe lima nouveau nvk panfrost v3d vc4 virgl vivante vmware zink" +for card in ${VIDEO_CARDS}; do + IUSE_VIDEO_CARDS+=" video_cards_${card}" +done + +IUSE="${IUSE_VIDEO_CARDS} + cpu_flags_x86_sse2 d3d9 debug +llvm + lm-sensors opencl +opengl osmesa +proprietary-codecs selinux + test unwind vaapi valgrind vdpau vulkan + vulkan-overlay wayland +X xa +zstd" +RESTRICT="!test? ( test )" +REQUIRED_USE=" + d3d9? ( + || ( + video_cards_freedreno + video_cards_intel + video_cards_nouveau + video_cards_panfrost + video_cards_r300 + video_cards_r600 + video_cards_radeonsi + video_cards_vmware + video_cards_zink + ) + ) + llvm? ( ${LLVM_REQUIRED_USE} ) + vulkan-overlay? ( vulkan ) + video_cards_lavapipe? ( llvm vulkan ) + video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) + video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) + video_cards_zink? ( vulkan opengl ) + video_cards_nvk? ( vulkan video_cards_nouveau ) + vdpau? ( X ) + xa? ( X ) +" + +LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.119" +RDEPEND=" + >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] + >=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.9[${MULTILIB_USEDEP}] + unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) + llvm? ( + $(llvm_gen_dep " + sys-devel/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}] + opencl? ( + dev-util/spirv-llvm-translator:\${LLVM_SLOT} + sys-devel/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}] + ) + ") + video_cards_r600? ( + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + video_cards_radeon? ( + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + ) + lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] ) + opencl? ( + >=virtual/opencl-3 + dev-libs/libclc[spirv(-)] + >=dev-util/spirv-tools-1.3.231.0 + virtual/libelf:0= + ) + vaapi? ( + >=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}] + ) + vdpau? ( >=x11-libs/libvdpau-1.5:=[${MULTILIB_USEDEP}] ) + video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] ) + video_cards_zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] ) + selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] ) + wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] ) + ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}] + X? ( + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] + >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}] + >=x11-libs/libxcb-1.17:=[${MULTILIB_USEDEP}] + x11-libs/libXfixes[${MULTILIB_USEDEP}] + x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}] + ) + zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) +" +for card in ${RADEON_CARDS}; do + RDEPEND="${RDEPEND} + video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] ) + " +done +RDEPEND="${RDEPEND} + video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] ) +" + +DEPEND="${RDEPEND} + video_cards_d3d12? ( >=dev-util/directx-headers-1.613.0[${MULTILIB_USEDEP}] ) + valgrind? ( dev-debug/valgrind ) + wayland? ( >=dev-libs/wayland-protocols-1.34 ) + X? ( + x11-libs/libXrandr[${MULTILIB_USEDEP}] + x11-base/xorg-proto + ) +" +BDEPEND=" + ${PYTHON_DEPS} + opencl? ( + >=virtual/rust-1.62.0 + >=dev-util/bindgen-0.58.0 + ) + >=dev-build/meson-1.4.1 + app-alternatives/yacc + app-alternatives/lex + virtual/pkgconfig + $(python_gen_any_dep " + >=dev-python/mako-0.8.0[\${PYTHON_USEDEP}] + dev-python/packaging[\${PYTHON_USEDEP}] + ") + video_cards_intel? ( + ~dev-util/intel_clc-${PV} + dev-libs/libclc[spirv(-)] + $(python_gen_any_dep "dev-python/ply[\${PYTHON_USEDEP}]") + ) + vulkan? ( + dev-util/glslang + video_cards_nvk? ( + >=dev-util/bindgen-0.68.1 + >=dev-util/cbindgen-0.26.0 + >=virtual/rust-1.74.1 + ) + ) + wayland? ( dev-util/wayland-scanner ) +" + +QA_WX_LOAD=" +x86? ( + usr/lib/libglapi.so.0.0.0 + usr/lib/libOSMesa.so.8.0.0 + usr/lib/libGLX_mesa.so.0.0.0 +)" + +src_unpack() { + [[ ${PV} == 9999 ]] && git-r3_src_unpack + unpack ${A} +} + +pkg_pretend() { + if use vulkan; then + if ! use video_cards_d3d12 && + ! use video_cards_freedreno && + ! use video_cards_intel && + ! use video_cards_lavapipe && + ! use video_cards_nouveau && + ! use video_cards_nvk && + ! use video_cards_panfrost && + ! use video_cards_radeonsi && + ! use video_cards_v3d && + ! use video_cards_virgl; then + ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain d3d12, freedreno, intel, lavapipe, nouveau, nvk, panfrost, radeonsi, v3d, or virgl" + fi + fi + + # VA + if use vaapi; then + if ! use video_cards_d3d12 && + ! use video_cards_nouveau && + ! use video_cards_r600 && + ! use video_cards_radeonsi && + ! use video_cards_virgl; then + ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl" + fi + fi + + if use vdpau; then + if ! use video_cards_d3d12 && + ! use video_cards_nouveau && + ! use video_cards_r600 && + ! use video_cards_radeonsi && + ! use video_cards_virgl; then + ewarn "Ignoring USE=vdpau since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl" + fi + fi + + if use xa; then + if ! use video_cards_freedreno && + ! use video_cards_intel && + ! use video_cards_nouveau && + ! use video_cards_vmware; then + ewarn "Ignoring USE=xa since VIDEO_CARDS does not contain freedreno, intel, nouveau, or vmware" + fi + fi + + if ! use llvm; then + use opencl && ewarn "Ignoring USE=opencl since USE does not contain llvm" + fi + + if use osmesa && ! use llvm; then + ewarn "OSMesa will be slow without enabling USE=llvm" + fi +} + +python_check_deps() { + python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" || return 1 + if use llvm && use vulkan && use video_cards_intel && use amd64; then + python_has_version -b "dev-python/ply[${PYTHON_USEDEP}]" || return 1 + fi +} + +pkg_setup() { + # warning message for bug 459306 + if use llvm && has_version sys-devel/llvm[!debug=]; then + ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm" + ewarn "detected! This can cause problems. For details, see bug 459306." + fi + + if use video_cards_intel || + use video_cards_radeonsi; then + if kernel_is -ge 5 11 3; then + CONFIG_CHECK="~KCMP" + elif kernel_is -ge 5 11; then + CONFIG_CHECK="~CHECKPOINT_RESTORE" + elif kernel_is -ge 5 10 20; then + CONFIG_CHECK="~KCMP" + else + CONFIG_CHECK="~CHECKPOINT_RESTORE" + fi + linux-info_pkg_setup + fi + + use llvm && llvm-r1_pkg_setup + python-any-r1_pkg_setup +} + +src_prepare() { + default + sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \ + bin/symbols-check.py || die # bug #830728 + + if use video_cards_nvk; then + # NVK Subproject Handling + pushd "${S}" >/dev/null || die + for subpkg in proc-macro2-${PROC_MACRO2_PV} syn-${SYN_PV} quote-${QUOTE_PV} unicode-ident-${UNICODE_IDENT_PV} paste-${PASTE_PV}; do + # copy subprojects folder + cp -r ../${subpkg} subprojects || die + # copy meson.build + cp subprojects/packagefiles/${subpkg%-*}/meson.build subprojects/${subpkg} || die + # ovewrite subpkg version when needed + sed -i -e "s/directory = \S\+/directory = ${subpkg}/" subprojects/${subpkg%-*}.wrap || die + done + popd >/dev/null || die + fi +} + +multilib_src_configure() { + local emesonargs=() + + # bug #932591 and https://gitlab.freedesktop.org/mesa/mesa/-/issues/11140 + tc-is-gcc && [[ $(gcc-major-version) -ge 14 ]] && filter-lto + + local platforms + use X && platforms+="x11" + use wayland && platforms+=",wayland" + emesonargs+=(-Dplatforms=${platforms#,}) + + if use video_cards_freedreno || + use video_cards_intel || # crocus i915 iris + use video_cards_nouveau || + use video_cards_panfrost || + use video_cards_r300 || + use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_vmware || # swrast + use video_cards_zink; then + emesonargs+=($(meson_use d3d9 gallium-nine)) + else + emesonargs+=(-Dgallium-nine=false) + fi + + if use video_cards_d3d12 || + use video_cards_nouveau || + use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_virgl; then + emesonargs+=($(meson_feature vaapi gallium-va)) + use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers ) + else + emesonargs+=(-Dgallium-va=disabled) + fi + + if use video_cards_d3d12; then + emesonargs+=($(meson_feature vaapi gallium-d3d12-video)) + fi + + if use video_cards_d3d12 || + use video_cards_nouveau || + use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_virgl; then + emesonargs+=($(meson_feature vdpau gallium-vdpau)) + else + emesonargs+=(-Dgallium-vdpau=disabled) + fi + + if use video_cards_freedreno || + use video_cards_intel || + use video_cards_nouveau || + use video_cards_vmware; then + emesonargs+=($(meson_feature xa gallium-xa)) + else + emesonargs+=(-Dgallium-xa=disabled) + fi + + if use video_cards_freedreno || + use video_cards_lima || + use video_cards_panfrost || + use video_cards_v3d || + use video_cards_vc4 || + use video_cards_vivante; then + gallium_enable -- kmsro + fi + + gallium_enable -- swrast + gallium_enable video_cards_d3d12 d3d12 + gallium_enable video_cards_freedreno freedreno + gallium_enable video_cards_intel crocus i915 iris + gallium_enable video_cards_lima lima + gallium_enable video_cards_nouveau nouveau + gallium_enable video_cards_panfrost panfrost + gallium_enable video_cards_v3d v3d + gallium_enable video_cards_vc4 vc4 + gallium_enable video_cards_virgl virgl + gallium_enable video_cards_vivante etnaviv + gallium_enable video_cards_vmware svga + gallium_enable video_cards_zink zink + + gallium_enable video_cards_r300 r300 + gallium_enable video_cards_r600 r600 + gallium_enable video_cards_radeonsi radeonsi + if ! use video_cards_r300 && + ! use video_cards_r600; then + gallium_enable video_cards_radeon r300 r600 + fi + + if use llvm && use opencl; then + PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig" + # See https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/docs/rusticl.rst + emesonargs+=( + $(meson_native_true gallium-rusticl) + -Drust_std=2021 + ) + fi + + if use vulkan; then + vulkan_enable video_cards_d3d12 microsoft-experimental + vulkan_enable video_cards_freedreno freedreno + vulkan_enable video_cards_intel intel intel_hasvk + vulkan_enable video_cards_lavapipe swrast + vulkan_enable video_cards_panfrost panfrost + vulkan_enable video_cards_radeonsi amd + vulkan_enable video_cards_v3d broadcom + vulkan_enable video_cards_vc4 broadcom + vulkan_enable video_cards_virgl virtio + if use video_cards_nvk; then + vulkan_enable video_cards_nvk nouveau + if ! multilib_is_native_abi; then + echo -e "[binaries]\nrust = ['rustc', '--target=$(rust_abi $CBUILD)']" > "${T}/rust_fix.ini" + emesonargs+=( + --native-file "${T}"/rust_fix.ini + ) + fi + fi + fi + + driver_list() { + local drivers="$(sort -u <<< "${1// /$'\n'}")" + echo "${drivers//$'\n'/,}" + } + + local vulkan_layers + use vulkan && vulkan_layers+="device-select" + use vulkan-overlay && vulkan_layers+=",overlay" + emesonargs+=(-Dvulkan-layers=${vulkan_layers#,}) + + if use opengl && use X; then + emesonargs+=(-Dglx=dri) + else + emesonargs+=(-Dglx=disabled) + fi + + if [[ "${ABI}" == amd64 ]]; then + emesonargs+=($(meson_feature video_cards_intel intel-rt)) + fi + + use debug && EMESON_BUILDTYPE=debug + + emesonargs+=( + $(meson_use test build-tests) + -Dshared-glapi=enabled + -Ddri3=enabled + -Dexpat=enabled + $(meson_use opengl) + $(meson_feature opengl gbm) + $(meson_feature opengl gles1) + $(meson_feature opengl gles2) + $(meson_feature opengl glvnd) + $(meson_feature opengl egl) + $(meson_feature llvm) + $(meson_feature lm-sensors lmsensors) + $(meson_use osmesa) + $(meson_use selinux) + $(meson_feature unwind libunwind) + $(meson_feature zstd) + $(meson_use cpu_flags_x86_sse2 sse2) + -Dintel-clc=$(usex video_cards_intel system auto) + -Dvalgrind=$(usex valgrind auto disabled) + -Dvideo-codecs=$(usex proprietary-codecs "all" "all_free") + -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}") + -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}") + -Db_ndebug=$(usex debug false true) + ) + meson_src_configure + + if ! multilib_is_native_abi && use video_cards_nvk; then + sed -i -E '{N; s/(rule rust_COMPILER_FOR_BUILD\n command = rustc) --target=[a-zA-Z0-9=:-]+ (.*) -C link-arg=-m[[:digit:]]+/\1 \2/g}' build.ninja || die + fi +} + +multilib_src_test() { + meson_src_test -t 100 +} + +# $1 - VIDEO_CARDS flag (check skipped for "--") +# other args - names of DRI drivers to enable +gallium_enable() { + if [[ $1 == -- ]] || use $1; then + shift + GALLIUM_DRIVERS+=("$@") + fi +} + +vulkan_enable() { + if [[ $1 == -- ]] || use $1; then + shift + VULKAN_DRIVERS+=("$@") + fi +} diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index 9979d5a20b5d..c184d9ab1e76 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -46,7 +46,7 @@ LICENSE="MIT SGI-B-2.0" SLOT="0" RADEON_CARDS="r300 r600 radeon radeonsi" -VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel lavapipe lima nouveau nvk panfrost v3d vc4 virgl vivante vmware" +VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel lavapipe lima nouveau nvk panfrost v3d vc4 virgl vivante vmware zink" for card in ${VIDEO_CARDS}; do IUSE_VIDEO_CARDS+=" video_cards_${card}" done @@ -55,17 +55,20 @@ IUSE="${IUSE_VIDEO_CARDS} cpu_flags_x86_sse2 d3d9 debug +llvm lm-sensors opencl +opengl osmesa +proprietary-codecs selinux test unwind vaapi valgrind vdpau vulkan - vulkan-overlay wayland +X xa zink +zstd" + vulkan-overlay wayland +X xa +zstd" RESTRICT="!test? ( test )" REQUIRED_USE=" d3d9? ( || ( + video_cards_freedreno video_cards_intel + video_cards_nouveau + video_cards_panfrost video_cards_r300 video_cards_r600 video_cards_radeonsi - video_cards_nouveau video_cards_vmware + video_cards_zink ) ) llvm? ( ${LLVM_REQUIRED_USE} ) @@ -73,10 +76,10 @@ REQUIRED_USE=" video_cards_lavapipe? ( llvm vulkan ) video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) + video_cards_zink? ( vulkan opengl ) video_cards_nvk? ( vulkan video_cards_nouveau ) vdpau? ( X ) xa? ( X ) - zink? ( opengl vulkan ) " LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.119" @@ -112,6 +115,7 @@ RDEPEND=" ) vdpau? ( >=x11-libs/libvdpau-1.5:=[${MULTILIB_USEDEP}] ) video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] ) + video_cards_zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] ) selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] ) wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] ) ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}] @@ -124,7 +128,6 @@ RDEPEND=" x11-libs/libXfixes[${MULTILIB_USEDEP}] x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}] ) - zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] ) zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) " for card in ${RADEON_CARDS}; do @@ -145,19 +148,20 @@ DEPEND="${RDEPEND} x11-base/xorg-proto ) " -# meson-1.4.0 contains a regression, so it fails to compile nouveau/NVK -# see https://gitlab.freedesktop.org/mesa/mesa/-/issues/10855 BDEPEND=" ${PYTHON_DEPS} opencl? ( >=virtual/rust-1.62.0 >=dev-util/bindgen-0.58.0 - >=dev-build/meson-1.3.1 ) + >=dev-build/meson-1.4.1 app-alternatives/yacc app-alternatives/lex virtual/pkgconfig - $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]") + $(python_gen_any_dep " + >=dev-python/mako-0.8.0[\${PYTHON_USEDEP}] + dev-python/packaging[\${PYTHON_USEDEP}] + ") video_cards_intel? ( ~dev-util/intel_clc-${PV} dev-libs/libclc[spirv(-)] @@ -169,7 +173,6 @@ BDEPEND=" >=dev-util/bindgen-0.68.1 >=dev-util/cbindgen-0.26.0 >=virtual/rust-1.74.1 - <dev-build/meson-1.4.0 ) ) wayland? ( dev-util/wayland-scanner ) @@ -192,37 +195,44 @@ pkg_pretend() { if ! use video_cards_d3d12 && ! use video_cards_freedreno && ! use video_cards_intel && + ! use video_cards_lavapipe && + ! use video_cards_nouveau && + ! use video_cards_nvk && + ! use video_cards_panfrost && ! use video_cards_radeonsi && ! use video_cards_v3d && - ! use video_cards_nvk; then - ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain d3d12, freedreno, intel, radeonsi, v3d, or nvk" + ! use video_cards_virgl; then + ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain d3d12, freedreno, intel, lavapipe, nouveau, nvk, panfrost, radeonsi, v3d, or virgl" fi fi + # VA if use vaapi; then if ! use video_cards_d3d12 && + ! use video_cards_nouveau && ! use video_cards_r600 && ! use video_cards_radeonsi && - ! use video_cards_nouveau; then - ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain d3d12, r600, radeonsi, or nouveau" + ! use video_cards_virgl; then + ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl" fi fi if use vdpau; then if ! use video_cards_d3d12 && - ! use video_cards_r300 && + ! use video_cards_nouveau && ! use video_cards_r600 && ! use video_cards_radeonsi && - ! use video_cards_nouveau; then - ewarn "Ignoring USE=vdpau since VIDEO_CARDS does not contain d3d12, r300, r600, radeonsi, or nouveau" + ! use video_cards_virgl; then + ewarn "Ignoring USE=vdpau since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl" fi fi if use xa; then if ! use video_cards_freedreno && + ! use video_cards_intel && ! use video_cards_nouveau && ! use video_cards_vmware; then - ewarn "Ignoring USE=xa since VIDEO_CARDS does not contain freedreno, nouveau, or vmware" + ewarn "Ignoring USE=xa since VIDEO_CARDS does not contain freedreno, intel, nouveau, or vmware" fi fi @@ -236,7 +246,8 @@ pkg_pretend() { } python_check_deps() { - python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" || return 1 + python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" || return 1 if use llvm && use vulkan && use video_cards_intel && use amd64; then python_has_version -b "dev-python/ply[${PYTHON_USEDEP}]" || return 1 fi @@ -298,21 +309,25 @@ multilib_src_configure() { use wayland && platforms+=",wayland" emesonargs+=(-Dplatforms=${platforms#,}) - if use video_cards_intel || + if use video_cards_freedreno || + use video_cards_intel || # crocus i915 iris + use video_cards_nouveau || + use video_cards_panfrost || use video_cards_r300 || use video_cards_r600 || use video_cards_radeonsi || - use video_cards_nouveau || - use video_cards_vmware; then + use video_cards_vmware || # swrast + use video_cards_zink; then emesonargs+=($(meson_use d3d9 gallium-nine)) else emesonargs+=(-Dgallium-nine=false) fi if use video_cards_d3d12 || + use video_cards_nouveau || use video_cards_r600 || use video_cards_radeonsi || - use video_cards_nouveau; then + use video_cards_virgl; then emesonargs+=($(meson_feature vaapi gallium-va)) use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers ) else @@ -324,16 +339,17 @@ multilib_src_configure() { fi if use video_cards_d3d12 || - use video_cards_r300 || + use video_cards_nouveau || use video_cards_r600 || use video_cards_radeonsi || - use video_cards_nouveau; then + use video_cards_virgl; then emesonargs+=($(meson_feature vdpau gallium-vdpau)) else emesonargs+=(-Dgallium-vdpau=disabled) fi if use video_cards_freedreno || + use video_cards_intel || use video_cards_nouveau || use video_cards_vmware; then emesonargs+=($(meson_feature xa gallium-xa)) @@ -351,10 +367,10 @@ multilib_src_configure() { fi gallium_enable -- swrast + gallium_enable video_cards_d3d12 d3d12 gallium_enable video_cards_freedreno freedreno gallium_enable video_cards_intel crocus i915 iris gallium_enable video_cards_lima lima - gallium_enable video_cards_d3d12 d3d12 gallium_enable video_cards_nouveau nouveau gallium_enable video_cards_panfrost panfrost gallium_enable video_cards_v3d v3d @@ -362,13 +378,13 @@ multilib_src_configure() { gallium_enable video_cards_virgl virgl gallium_enable video_cards_vivante etnaviv gallium_enable video_cards_vmware svga - gallium_enable zink zink + gallium_enable video_cards_zink zink gallium_enable video_cards_r300 r300 gallium_enable video_cards_r600 r600 gallium_enable video_cards_radeonsi radeonsi - if ! use video_cards_r300 && \ - ! use video_cards_r600; then + if ! use video_cards_r300 && + ! use video_cards_r600; then gallium_enable video_cards_radeon r300 r600 fi @@ -382,12 +398,15 @@ multilib_src_configure() { fi if use vulkan; then - vulkan_enable video_cards_lavapipe swrast + vulkan_enable video_cards_d3d12 microsoft-experimental vulkan_enable video_cards_freedreno freedreno vulkan_enable video_cards_intel intel intel_hasvk - vulkan_enable video_cards_d3d12 microsoft-experimental + vulkan_enable video_cards_lavapipe swrast + vulkan_enable video_cards_panfrost panfrost vulkan_enable video_cards_radeonsi amd vulkan_enable video_cards_v3d broadcom + vulkan_enable video_cards_vc4 broadcom + vulkan_enable video_cards_virgl virtio if use video_cards_nvk; then vulkan_enable video_cards_nvk nouveau if ! multilib_is_native_abi; then diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest index 1ab2190ead23..a17af42a7e45 100644 --- a/media-libs/openimageio/Manifest +++ b/media-libs/openimageio/Manifest @@ -1,3 +1,5 @@ +AUX openimageio-2.5.12.0-tests-optional.patch 1310 BLAKE2B 563d3ede3ea10439e130d96647918387455ae8fb1fbb75220a064ce98322f8d87f113c04b6e215db6d6e95bf1e96f9c922f144a46af1674726f5b87918a4ae3a SHA512 95b6921b4dadc6535d978178141b62916121e27540f8e578d93347bfab59506f49ded7584b03b8dac04af44e14a74701437fa0f6faacca9d12657352fc0d3f06 +AUX openimageio-2.5.12.0_heif_test.patch 839 BLAKE2B e7309fde786053afc3c373bfd5d6affa8d86d7524ff44b52a61b3c4cf3bb18cd2a987699e788eb7d6a910a1bd8b813deb2497475799593a6c780442d6cc31963 SHA512 f32a5b46bc4fb678322b0f9d930e1bdaae370087084ffce4dcf61de6a3d56059a384924fd718ed5cfbaff0ab76c6a1f8bdaf8c4e3961b9defaadb04e1d402b90 AUX openimageio-2.5.8.0-fits.patch 672 BLAKE2B 3bc6252c246698ef29dd74fdf1e1dde59658c717ed078cd5b9e251dc59f57395bc761325664d07ccae90df32e3600ab9c68732d3610ba9c99fbc236eb28840d6 SHA512 bdcca17073be2d8d2fdfb770f117f429fa4c8db26e7366d1ab9e211837fe07622054cd71ff9206fa7c449974faba865c6412d7a5cbd3042ca1a0b8e8a944efc5 AUX openimageio-2.5.8.0-fix-tests.patch 10084 BLAKE2B d6cc1e35cb31df4d42a4a4b14283c81fb4b9157be480688102f912052a51ad5d56d22573a3b9c4c9fc80465c12b3c085b07cf8745ac86b1c83985af30942f4c8 SHA512 39e55ad64fc644420a2305abb616f6ca409fc345bc363557c176c2e88b32fd96d52fbacaf2c002d159341bf6401d19407c50781af2b39c638e738047d86d3903 AUX openimageio-2.5.8.0-fix-unit_simd.patch 1028 BLAKE2B 2d9c9a61f44a8e1cf11429d9f32ffd047368ee9d42c5ab25bfafc3bdd3d856afb49aef8c46c850f9739de8db634dcadccdf83cc86fc9d7c078d5b96b7f300a6b SHA512 a96074ee5db257f0317677f8e67e1b634504fa0a608dddd089f1683fe6f77ca586bd6ebf54c35017eaf51c9025fb7c48697a340c74fd4c29976287009a805729 @@ -7,18 +9,10 @@ DIST file002.fits 11520 BLAKE2B e1983941ca932f9db088f2d1856ca3b1fd268cf8d30e1885 DIST file003.fits 581760 BLAKE2B 35d77c64ff9e25f34593ea41839a4f7712dc344d12ab2c041a1e1ef7ad9846a711fafb71ba71b191a7dc44cd94ae7172640210a5c48e2910d34efea4c20989e1 SHA512 dc143b27f8850e2a55ad95a9a7a76a348f0b9b0af5a223d1ae11157eb358acf74e482957faaa0cdbaf260b9cbe14b10e6b504068c7b312f059119c022279611f DIST file009.fits 25920 BLAKE2B 594061eba4d48da8cbfee58ab592a0adb5a22d681228330e84f60304e5146a8856e9c65b763d6d8e2136217ebe85d92128318cccfcf6358c7bc767232c6382c9 SHA512 57d53622854399aed96efbeff78e700990b2fc63c4dbd1bc9ac58c7670af98d528db2f1a3e9de4e74b977f8318109b465b46423bbac36bf2bf34a1e33e7dcdb8 DIST file012.fits 1019520 BLAKE2B e86d9e0004ca159d9a5ae0585776db65c7dd49162cb5dbd8b511686244950e33746d8a41f60b5ba8fcea220194fa87e16235adb7ccc0b4fb4b0a61e6c5c376a8 SHA512 45439544da478b24ccbcf14dc9a651aa8ecbce29b9992204d85c1eee42bc88b68802ec57bc148510da1e062de95ee53dd5c64c9bfa2e0b6cdfd945a78d1fc76a -DIST openimageio-2.4.12.0.tar.gz 32157951 BLAKE2B dd7dd7b641266a7c575eafbc258ffc4b298236043960ae6ef878f46cd3ec3342f3be5b9a14459724578abc6390318666e43e8835ef6b2f25bc05a52002c7096f SHA512 5a0b9e6b634326be051dac46d2145149e9ff3e33d60d05728420d156431d6aa85186706b5f5b66ab820f4cd97f68d049a76e2da13f99e457135360f56fb5a257 -DIST openimageio-2.4.13.0.tar.gz 32162857 BLAKE2B 43d6c16fb9dfba2e01ea6a7b68e8c72ec0c11be0d42d96e476a79b7972bcf61f2ac377009493e8fa9367001cc788a1453f8c0f1cf061a204f9da4b9f713d5554 SHA512 9e887c7039995ce7c41556e09a7eed940863260a522ecf7d9bec300189026ed507da560620dfa4a619deeb679be7adf42fe3a7020ff3094df777c7934c771227 -DIST openimageio-2.4.14.0.tar.gz 47890469 BLAKE2B 53865ab493a586a1e4fdc6f81a90f7ae3847556a09a9c19ade48cbe5d8e3f807d864a2409a468613b1a55c128d5f5e119f1f2a70fc44b1a5293c99c3431cc69f SHA512 6b87c805907a2f7c98f40e987fb6ebf769f8519f5d8a8b7393bed62a41cee1118bb32d2bc4d23fd464973e237077d08771ff85f72073caa57799d71bd098038f -DIST openimageio-2.4.15.0.tar.gz 47894262 BLAKE2B 82afc48b3d9affb987d94c57d91fe93b27c78350d02fc7605ce3995e5f37724495bbc0d2f85fa8efb86113ef48d0aec15cfdb9bad8547315542ed125e5f71349 SHA512 dc1f805d6dc85170784d2b2860bfd488fdebb92cb12254d5c0d4df9483e55f298f6fbf74aca0c52162583300327de99bd92f73c2a2b7f5611f61bbfef5ca22a5 -DIST openimageio-2.4.16.0.tar.gz 47894563 BLAKE2B 02788bb7ccc9bbcb84a44df0c86252545f89cf8dcd1b84443f185f43e60c9eb701e9c5e781c946dec797ec888c5ebdd5efb3f1d95b684c71cbb7271bf6f0da9e SHA512 f9835d6b5e938bdba462a64eb9cc3b89f27ea36b6b59f7143a9c0b2794f095ca68fbd26bdd7322b2b260e9ded5cc6a91f86ad11f292ad8163a1dfe55b9a3446c -DIST openimageio-2.4.6.0.tar.gz 31951691 BLAKE2B c21caf6784f366200127ba17a296e2134fa0d494e2cbf9cf592d020fdb820f62db0269545ac37c3969d64ddd8352d06a4f002fa9a7b3f05503ca9ec7d4a15415 SHA512 6e4e5294209c533eb9cf7c8df89b531bc77547df28af0d7964e255ce78142c201d5aa92a1f5f3b17348fdfc7d2a7aa9f2121acdf22fa98a6a872f0d31936bdf5 -DIST openimageio-2.5.4.0.tar.gz 48107518 BLAKE2B 38ba0f01976cfbe0f81c04fe8e64ff9c5ab530204d45a7b566882a7ec31c378c61a9b6bc62d6453c51e7ed33cd514a758b5d8224a646e568c9abd6274ebc6b0c SHA512 db9576bbc0b77da19db957710e86d8979e9987e91ff6246b513197fa98545904a7d34873cc2ba3ee60deed0a00a757dafb8dfa604f1e52097a1848aef43427cd -DIST openimageio-2.5.5.0.tar.gz 52025462 BLAKE2B d8d88d5e89815525fe7e75983b8d373058901614dcea9743a3851e242aa5f076b81ef3cc18764063e456ed9b79758d146c5d862be3a45d3671c59c7195acfa51 SHA512 d8ac989a6c7007089e3a29723889c9b9644d23ca9da1606da9f8c6bd7c0b301cf6a03f57c8eaaaca2a2fb2f3e79291f9dfa46ed31240a15d4650b83bf93ce96d +DIST openimageio-2.5.12.0.tar.gz 52535046 BLAKE2B d60e823b8834c68098e771929475b7321363aad044b244a5c2a284e1c67a1a3145d22ed259eccbc4f6fbfcd6d2768414e4f22bdfa17f6516205d7749dcc6c6c8 SHA512 c6e53b5484702c66f01490d23f272e597e016b984d54f81e400605bf2a2e1dd7843ce25a7ef51ffbc7ee7089b42e8d73a91699b93cb655b5ca9ef869c9a950f4 DIST openimageio-2.5.9.0.tar.gz 52051925 BLAKE2B 7d499d80af6cdecfdea9a422030c095357b67a7d8dd281638e2e687df47b5c7b57c909c8682f1c6185251df13d6f9c7ddf1f9d5fc7fef26351fe0d4b8cc7d8c6 SHA512 554f61e19e3f81c8495f48386494a1aeee3a2a759b3022b4fb5cf1dba1dbc813cd0956b60d08a2c1feca69d97141e5836651fcbbeadab1e050eb2d103eb1c41f DIST openimageio-oexr-test-image-df16e765fee28a947244657cae3251959ae63c00.tar.gz 252131865 BLAKE2B f5f2477897f84148574cdd02b673c7bdff49d8f45026375095bb6f184230466e2e60020be7583e5a5aa0aa9c971e7251979d3eeb2ee620d47342b1e4435427e0 SHA512 e89c2935496c5fec2ebe1175e9b9bd3aecb23374ec3947057195ee6d31a883c1a67c4dc754bf0a5b68859093b5e169b70ffabd4736cf67f9e3dc09f3299fc54f -DIST openimageio-oexr-test-image-f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz 252226183 BLAKE2B b94fb08515e18821e5b88c10031ca53675c56f96397e00b4e186d8dfb9f8557bc935ff102d61835590dca6deeef90dba03b81fd76a7958ab4d0592c042c2130a SHA512 26b9b2cda9d48554b8a53f06bc20301f8ff77dc5e1d7caf9ec45aaaefd8578d3d4d4b2e0a1d1b0f697805fdc0c5d4bae4948cea21821df3006ac0f8b9020f85f -DIST openimageio-oiio-test-image-245e50edede2792205080eadc1dedce33ff5c1e4.tar.gz 137900826 BLAKE2B e89fd990b5e3ef23a853fc554066804c2a092b74a7ee54e3f1654bf419904ca094fef2703cd2f29d90c6d2bc5b8c8808cf9e66eb858c6d8495fdb7941f5029d7 SHA512 6568d4171c7dbd12d86099fd3dc35bfe2cbd46af84e58884900c5cea6ccea0139eabdb6d2194217ab3cffac56a81d37db4fbae57eb2a05f7916c27fe75a51ee6 +DIST openimageio-oiio-test-image-7d821f02c848022b2ee703d6bee48ca2acbfae70.tar.gz 141224552 BLAKE2B e185f6b2bd345ca0740d1ac7bc48e5a283a80db0d2fa88566367e1179e96d048ac371708db29a6591d0c4eb7f9c171af22bac30fd68bc223e2c373db3b99077d SHA512 a3c9e4151c946b79e2eb37cd53fd2865d6117431ad06e4e35d42c10d9ff8415224e2f20e14af8dd869ec2a6c6faf4f9d8ef28e5b6556c88a54398de4a8843b59 DIST openimageio-oiio-test-image-aae37a54e31c0e719edcec852994d052ecf6541e.tar.gz 137910473 BLAKE2B 4fb43e1dc0a726fc64085884494b8fef23a824d38e79c5ec33ab4bd9338f5efbb91a6b534b89f37f868838984e22530e8f938436674b0972537fb6b25f3b9d57 SHA512 d7e49efd1ce07364f226318b6572ceb46d654f22d94baa031dea05c6529b51a23a81ae6940136c3f7dd749f65f105c2efcdb5609b21b291110b92419233b2521 DIST tst0001.fits 43200 BLAKE2B 7d9d82fde64c3b21f8f86be6feaf9187d48c2c504c9afc0e652015512fb3d9e04c0f78596cdc9d7cc54815175549bfdf01d2d80f894cd36f4e6284aaf065dcc8 SHA512 b401accd51b56a493e2ec52fe4441e05cbefa3d03fe0e1c6834327094ab9f8e0c69a0f2cff26007ed7c7f8686a78a3a7e043d945f3a93c1b68e03668b8cbdc5c DIST tst0003.fits 152640 BLAKE2B 74c38c9f6cd65a46eff865589bd319111187d123c90bedc80f934caf6625f20120ecb30e8f5210c7d5d6609964e63fc2c2fc59f60bf609a07f2440421f44356e SHA512 4cd9c9a96fd3a5b8daae7d6b34af4c68c965abc4cc825aaaf9f3587a43328f468595ff1cd210e9fbca365bd52bf31a70abf39b2b3966d3087dd3af40ba0781a4 @@ -27,13 +21,6 @@ DIST tst0006.fits 112320 BLAKE2B 1e3df92d994c1d0cfbf18956b124cc85510ae2dbbdbc528 DIST tst0007.fits 8640 BLAKE2B cf6eaff174e88bbd27f642964e6b3e5502cb08742d465a7cabb7aeaf284838f44660b5fa98c17df3c28f5986ecf657d8ec011579e3d9d62e63ce2171c157fd91 SHA512 ee8359132031678fa5e37f3b44642f41a7f64b251c3e788fbb756ad761327c1e1243df2b718cfe246449198d4e642b36fd43c61308ac434121ad4eadb3b2aaa3 DIST tst0008.fits 8640 BLAKE2B 7b4213cef2106cf0e298fce1ba3b28e74ba6ed26a2441650af297384b46c22910af8a36c2693c1c0e5aed6196561a8e4b4c75cde54541ea7a1a9d684a41f2f40 SHA512 c2dc77eb54cfc48bc97228a06e25cc5b4b2a8f32f417d5a34bb6794b020b277e144b1d5c71f09a44c94e05797c99f318de3f8705eabd22b44ac1b47fe601f918 DIST tst0013.fits 72000 BLAKE2B 6ca11cd033782adc8f359217e30752b47623c317aa155dc1bae43a0a019f7d5f9d4ba9c7349e99ee14f2d6498d5d166597606721b251b1b2dc039fbe400d00a3 SHA512 c816642e89e3bfdce38a4f755e84a12af35c9da48916abb66bcabf2f899201dfba3c988f929395092921a53a6d94922d84d325334e9bd8d348cdb305878ccb6a -EBUILD openimageio-2.4.12.0.ebuild 6052 BLAKE2B 42a713dfedb558a15becb7704412b3b4c2fa2b311894860becf1b74503f23719b82dbeb2434524a6fa6b45ee270d667b5b3d03640dc84a6fcdc263509c45cd98 SHA512 34e56ed35732fa46fc24e27b9b10014788edfe42cf6c41990a455bf093ffb18f7367aad878fe7e4e9ca2990e993814ad8e77c88c9d0fe93916313a9e93d4a1b2 -EBUILD openimageio-2.4.13.0.ebuild 6336 BLAKE2B c8694836ba140ba60de04b3468a0884a69a515bb34c0c1a4ce0c2bf8eb055601a8b73ee5ad3559b8368e5bb19e23e74bcba526bc4110450182552e1dbe1803f7 SHA512 14e02cfaede8883ff1aafc23760de610dfd407528a32f126615a9f36154a57a4f0318e4cdb735b0dd762f12bae443406e2841718d7b577b4a297c6707f658349 -EBUILD openimageio-2.4.14.0.ebuild 6279 BLAKE2B 82ad95094099201dbeedfd58a198e9b715aaa551bb80bb92c6a74883e63a91a55561734c98eb79566815df7fcd8a73287d9b79ba2d0f9e13a893637d7dbbf387 SHA512 70847532d5fc11c8d88067c1b0c82269d35509aa7d36eefec129276b8bc9772626c69ce6d1a65246ba1ccfd972c7bc7694227cc87f0551dd3ad7d8f49f829795 -EBUILD openimageio-2.4.15.0.ebuild 6279 BLAKE2B 82ad95094099201dbeedfd58a198e9b715aaa551bb80bb92c6a74883e63a91a55561734c98eb79566815df7fcd8a73287d9b79ba2d0f9e13a893637d7dbbf387 SHA512 70847532d5fc11c8d88067c1b0c82269d35509aa7d36eefec129276b8bc9772626c69ce6d1a65246ba1ccfd972c7bc7694227cc87f0551dd3ad7d8f49f829795 -EBUILD openimageio-2.4.16.0.ebuild 6279 BLAKE2B 82ad95094099201dbeedfd58a198e9b715aaa551bb80bb92c6a74883e63a91a55561734c98eb79566815df7fcd8a73287d9b79ba2d0f9e13a893637d7dbbf387 SHA512 70847532d5fc11c8d88067c1b0c82269d35509aa7d36eefec129276b8bc9772626c69ce6d1a65246ba1ccfd972c7bc7694227cc87f0551dd3ad7d8f49f829795 -EBUILD openimageio-2.4.6.0-r1.ebuild 5655 BLAKE2B 1347ac2ce140d8e0bbbb090735d503b301ec77ce5e889f84a924a0420a193c03f16016f9b86230a90b051a18234d4af75a00da14fc1da3caa58d7120d134066a SHA512 e980fc817a226973f7f362d9b22c0ba2d3390ab1b5a672b3bd06c6de446dc7a8c2015ee6d1d720fdcfeae6191b233d1fb48dc31ddd9ed3fac427bfbae9e44505 -EBUILD openimageio-2.5.4.0.ebuild 6241 BLAKE2B 247558a823639e6b7a1b75320c6997404a1c68f6edde9796fec05344edfcc485e11dff9d0d27fcd948283df7ecf0d453d7df2adaf26658ba6ebea11e89f4c901 SHA512 7ff883324ec33247e25e53e457fbb4601978bc5409b37dfbf7b3aa2c20eb7065b8b81665f732e4b03c384e7ce79617b3c2e63bbd249eed5f67b0d8d7baea4692 -EBUILD openimageio-2.5.5.0.ebuild 6308 BLAKE2B 51fe9d0fd9456ece2dc7eca8c98ca45a84ddb50eb509dbe70e8942360a10dcd15669c9c4413f86a42662fc25955d60de47665eff223736cc889af643d3fd4629 SHA512 471a0bdee8f84182a6404b9fa1f57ebd5335c3e7933e3f28c79ea69c8697fd9f2e65adecae3355c5c99d74d2f34f6c88d431fc558afce0c62b95029e37270e69 +EBUILD openimageio-2.5.12.0.ebuild 8123 BLAKE2B 8c7123b99c4d42023d676c6b642aedd56797d72b6a556f083692f8ed11c42d5089e8588b92788bafe39e28ac2c6af15e1340c7b5a14d9d234f36970d8c7b5da2 SHA512 83b59b19b80419964ac16a1288996dda79f67a5e13adc3a06e411a3a60953c69f598719ad5c9b0721dfdb1f3ee5d11480ceef2465f04cb09090b404a38d7e027 EBUILD openimageio-2.5.9.0.ebuild 7112 BLAKE2B b7f47974a996bc81e5439f4a7ab84496c06dffe01ee96a33a85415f6b4341d2281b853123b7a4b116d83715ddf21481dd592ca4689426ae84f332e95d3ebac41 SHA512 c0119d58d7a34f0511c3fd7e4a941acd98b271719460b12c6ccbefa9f49ea10b18003f005553a6cc86e6425b57399452cd1b6e52c113c37bb0c63d22ae583885 -MISC metadata.xml 1025 BLAKE2B 0fb315d25d5627709d9fe41c2e1d87320a42d9db3093ddfff742ccc32a37efb965536bf9fe64c5ce5be00bf3960cdd08d676bd2a47efe6d4739aa22e29efbc48 SHA512 68797e28b75e8334924ae96b1872e8ab61b59de9f5220e54656a41f6b4401a385fc1de4028285c2bb292b35e8a059c856ef67eedb3957f1cb9eda6ac7720ac21 +MISC metadata.xml 981 BLAKE2B 3497976625638ed812c74f4cceef74a752ab81f035674352d5b30f533c8b3f819a7cb44395d7e8456c78d92103ebe9c89bbf71aa292a2c72255674676e379318 SHA512 a349edcb5a9fcf5c7abe77d37260126b4866ba9bff06e7bc11279d91ac193ffe8df13dfcb373306fea417a28d0a6b8b2028c660adaf83d9a6f1a698cd48dd4e5 diff --git a/media-libs/openimageio/files/openimageio-2.5.12.0-tests-optional.patch b/media-libs/openimageio/files/openimageio-2.5.12.0-tests-optional.patch new file mode 100644 index 000000000000..5b284baa281b --- /dev/null +++ b/media-libs/openimageio/files/openimageio-2.5.12.0-tests-optional.patch @@ -0,0 +1,31 @@ +From: Paul Zander <negril.nx+gentoo@gmail.com> +Make fits test images download optional +Make j2k test images download optional + +diff --git a/src/cmake/testing.cmake b/src/cmake/testing.cmake +index b671def..ff84b7d 100644 +--- a/src/cmake/testing.cmake ++++ b/src/cmake/testing.cmake +@@ -271,9 +271,11 @@ macro (oiio_add_all_tests) + IMAGEDIR oiio-images URL "Recent checkout of oiio-images") + oiio_add_tests (jpeg2000 + FOUNDVAR OPENJPEG_FOUND ++ ENABLEVAR ENABLE_OPENJPEG + IMAGEDIR oiio-images URL "Recent checkout of oiio-images") + oiio_add_tests (jpeg2000-j2kp4files + FOUNDVAR OPENJPEG_FOUND ++ ENABLEVAR ENABLE_OPENJPEG + IMAGEDIR j2kp4files_v1_5 + URL http://www.itu.int/net/ITU-T/sigdb/speimage/ImageForm-s.aspx?val=10100803) + set (all_openexr_tests +@@ -410,6 +410,10 @@ function (oiio_setup_test_data) + oiio_get_test_data (openexr-images + REPO https://github.com/AcademySoftwareFoundation/openexr-images.git + BRANCH main) ++ if(ENABLE_FITS) + oiio_get_test_data (fits-images) ++ endif() ++ if(ENABLE_OPENJPEG) + oiio_get_test_data (j2kp4files_v1_5) ++ endif() + endfunction () diff --git a/media-libs/openimageio/files/openimageio-2.5.12.0_heif_test.patch b/media-libs/openimageio/files/openimageio-2.5.12.0_heif_test.patch new file mode 100644 index 000000000000..b7543e1e9562 --- /dev/null +++ b/media-libs/openimageio/files/openimageio-2.5.12.0_heif_test.patch @@ -0,0 +1,18 @@ +From: Paul Zander <negril.nx+gentoo@gmail.com> +Date: 2024-06-03 +Subject: [PATCH] create a ref output for libheif1.15 + +--- a/testsuite/heif/ref/out-libheif1.15-orient.txt 2024-06-01 21:59:05.000000000 +0200 ++++ b/testsuite/heif/ref/out-libheif1.15-orient.txt 2024-06-02 17:36:18.069440905 +0200 +@@ -39,6 +39,11 @@ + Exif:SubsecTimeOriginal: "006" + Exif:WhiteBalance: 0 (auto) + oiio:ColorSpace: "sRGB" ++Reading ref/Chimera-AV1-8bit-162.avif ++ref/Chimera-AV1-8bit-162.avif : 480 x 270, 3 channel, uint8 heif ++ SHA-1: F8FDAF1BD56A21E3AF99CF8EE7FA45434D2826C7 ++ channel list: R, G, B ++ oiio:ColorSpace: "sRGB" + Reading ../oiio-images/heif/greyhounds-looking-for-a-table.heic + ../oiio-images/heif/greyhounds-looking-for-a-table.heic : 3024 x 4032, 3 channel, uint8 heif + SHA-1: 8211F56BBABDC7615CCAF67CBF49741D1A292D2E diff --git a/media-libs/openimageio/metadata.xml b/media-libs/openimageio/metadata.xml index 626c08235ddd..ebe3fe1f3f72 100644 --- a/media-libs/openimageio/metadata.xml +++ b/media-libs/openimageio/metadata.xml @@ -12,7 +12,6 @@ <flag name="opencv">Enable OpenCV support via <pkg>media-libs/opencv</pkg></flag> <flag name="openvdb">Enable OpenVDB support via <pkg>media-gfx/openvdb</pkg></flag> <flag name="ptex">Enable Ptex texture mapping system file support via <pkg>media-libs/ptex</pkg></flag> - <flag name="qt5">Build iv with Qt5</flag> <flag name="qt6">Build iv with Qt6</flag> <flag name="tools">Build the command-line tools</flag> </use> diff --git a/media-libs/openimageio/openimageio-2.4.12.0.ebuild b/media-libs/openimageio/openimageio-2.4.12.0.ebuild deleted file mode 100644 index af89cc4292f7..000000000000 --- a/media-libs/openimageio/openimageio-2.4.12.0.ebuild +++ /dev/null @@ -1,197 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -FONT_PN=OpenImageIO -PYTHON_COMPAT=( python3_{9..11} ) - -TEST_OIIO_IMAGE_COMMIT="aae37a54e31c0e719edcec852994d052ecf6541e" -TEST_OEXR_IMAGE_COMMIT="df16e765fee28a947244657cae3251959ae63c00" -inherit cmake font python-single-r1 - -DESCRIPTION="A library for reading and writing images" -HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO" -SRC_URI="https://github.com/OpenImageIO/oiio/archive/v${PV}.tar.gz -> ${P}.tar.gz" -SRC_URI+=" test? ( - https://github.com/OpenImageIO/oiio-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz - https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz -)" -S="${WORKDIR}/OpenImageIO-${PV}" - -LICENSE="BSD" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv" - -X86_CPU_FEATURES=( - aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 - avx:avx avx2:avx2 avx512f:avx512f f16c:f16c -) -CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} ) - -IUSE="dicom doc ffmpeg gif jpeg2k opencv openvdb ptex python qt5 qt6 raw test +tools +truetype ${CPU_FEATURES[@]%:*}" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) qt5? ( tools ) qt6? ( tools )" - -# Not quite working yet -RESTRICT="!test? ( test )" # test" - -BDEPEND=" - doc? ( - app-text/doxygen - dev-texlive/texlive-bibtexextra - dev-texlive/texlive-fontsextra - dev-texlive/texlive-fontutils - dev-texlive/texlive-latex - dev-texlive/texlive-latexextra - ) -" -RDEPEND=" - dev-libs/boost:= - dev-cpp/robin-map - dev-libs/libfmt:= - dev-libs/pugixml:= - >=media-libs/libheif-1.7.0:= - media-libs/libjpeg-turbo:= - media-libs/libpng:0= - >=media-libs/libwebp-0.2.1:= - >=dev-libs/imath-3.1.2-r4:= - >=media-libs/opencolorio-2.1.1-r4:= - >=media-libs/openexr-3:0= - media-libs/tiff:= - sys-libs/zlib:= - dicom? ( sci-libs/dcmtk ) - ffmpeg? ( media-video/ffmpeg:= ) - gif? ( media-libs/giflib:0= ) - jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) - opencv? ( media-libs/opencv:= ) - openvdb? ( - dev-cpp/tbb:= - media-gfx/openvdb:= - ) - ptex? ( media-libs/ptex:= ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-libs/boost:=[python,${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - ') - ) - qt5? ( - media-libs/libglvnd - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtwidgets:5 - ) - qt6? ( - media-libs/libglvnd - dev-qt/qtbase:6[gui,widgets,opengl] - ) - raw? ( media-libs/libraw:= ) - truetype? ( media-libs/freetype:2= ) -" -DEPEND="${RDEPEND}" - -DOCS=( CHANGES.md CREDITS.md README.md ) - -pkg_pretend() { - use qt5 && use qt6 && einfo "The \"qt5\" USE flag has no effect when the \"qt6\" USE flag is also enabled." -} - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - use dicom || rm -r "${S}/src/dicom.imageio/" || die - cmake_src_prepare - cmake_comment_add_subdirectory src/fonts - - if use test ; then - mkdir -p "${BUILD_DIR}"/testsuite || die - mv "${WORKDIR}"/oiio-images-${TEST_OIIO_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/oiio-images || die - mv "${WORKDIR}"/openexr-images-${TEST_OEXR_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/openexr-images || die - fi -} - -src_configure() { - # Build with SIMD support - local cpufeature - local mysimd=() - for cpufeature in "${CPU_FEATURES[@]}"; do - use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}") - done - - # If no CPU SIMDs were used, completely disable them - [[ -z ${mysimd} ]] && mysimd=("0") - - local mycmakeargs=( - -DVERBOSE=ON - -DOIIO_BUILD_TOOLS=$(usex tools) - -DBUILD_TESTING=$(usex test) - -DOIIO_BUILD_TESTS=$(usex test) - -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF - -DINSTALL_FONTS=OFF - -DBUILD_DOCS=$(usex doc) - -DINSTALL_DOCS=$(usex doc) - -DSTOP_ON_WARNING=OFF - -DUSE_CCACHE=OFF - -DUSE_DCMTK=$(usex dicom) - -DUSE_EXTERNAL_PUGIXML=ON - -DUSE_JPEGTURBO=ON - -DUSE_NUKE=OFF # not in Gentoo - -DUSE_FFMPEG=$(usex ffmpeg) - -DUSE_GIF=$(usex gif) - -DUSE_OPENJPEG=$(usex jpeg2k) - -DUSE_OPENCV=$(usex opencv) - -DUSE_OPENVDB=$(usex openvdb) - -DUSE_PTEX=$(usex ptex) - -DUSE_PYTHON=$(usex python) - -DUSE_LIBRAW=$(usex raw) - -DUSE_FREETYPE=$(usex truetype) - -DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}") - ) - - if use qt5 || use qt6; then - mycmakeargs+=( -DENABLE_IV=ON -DUSE_OPENGL=ON -DUSE_QT=ON ) - if ! use qt6; then - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON ) - fi - else - mycmakeargs+=( -DENABLE_IV=OFF -DUSE_QT=OFF ) - fi - - if use python; then - mycmakeargs+=( - -DPYTHON_VERSION=${EPYTHON#python} - -DPYTHON_SITE_DIR=$(python_get_sitedir) - ) - fi - - cmake_src_configure -} - -src_test() { - # TODO: investigate failures - local myctestargs=( - -E "(oiiotool|maketx|oiiotool-maketx|texture-crop|texture-crop.batch|texture-half|texture-half.batch|texture-uint16|texture-uint16.batch|texture-interp-bilinear|texture-interp-bilinear.batch|texture-interp-closest|texture-interp-closest.batch|texture-levels-stochaniso|texture-levels-stochaniso.batch|texture-levels-stochmip|texture-levels-stochmip.batch|texture-mip-onelevel|texture-mip-onelevel.batch|texture-mip-stochastictrilinear|texture-mip-stochastictrilinear.batch|texture-mip-stochasticaniso|texture-mip-stochasticaniso.batch|texture-uint8|texture-uint8.batch|texture-skinny|texture-skinny.batch|texture-icwrite|texture-icwrite.batch|jpeg2000-broken|openexr-damaged|openvdb-broken|texture-texture3d-broken|texture-texture3d-broken.batch|psd|ptex-broken|raw-broken|targa|tiff-depths|zfile|unit_simd|cineon|dds|openvdb.batch-broken|texture-texture3d.batch-broken|cmake-consumer|texture-udim|texture-udim2|texture-udim.batch|texture-udim2.batch)" - ) - - cmake_src_test -} - -src_install() { - cmake_src_install - # can't use font_src_install - # it does directory hierarchy recreation - FONT_S=( - "${S}/src/fonts/Droid_Sans" - "${S}/src/fonts/Droid_Sans_Mono" - "${S}/src/fonts/Droid_Serif" - ) - insinto ${FONTDIR} - for dir in "${FONT_S[@]}"; do - doins "${dir}"/*.ttf - done -} diff --git a/media-libs/openimageio/openimageio-2.4.13.0.ebuild b/media-libs/openimageio/openimageio-2.4.13.0.ebuild deleted file mode 100644 index 3ee64256656e..000000000000 --- a/media-libs/openimageio/openimageio-2.4.13.0.ebuild +++ /dev/null @@ -1,201 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -FONT_PN=OpenImageIO -PYTHON_COMPAT=( python3_{10..11} ) - -TEST_OIIO_IMAGE_COMMIT="aae37a54e31c0e719edcec852994d052ecf6541e" -TEST_OEXR_IMAGE_COMMIT="df16e765fee28a947244657cae3251959ae63c00" -inherit cmake flag-o-matic font python-single-r1 - -DESCRIPTION="A library for reading and writing images" -HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO" -SRC_URI="https://github.com/OpenImageIO/oiio/archive/v${PV}.tar.gz -> ${P}.tar.gz" -SRC_URI+=" test? ( - https://github.com/OpenImageIO/oiio-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz - https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz -)" -S="${WORKDIR}/OpenImageIO-${PV}" - -LICENSE="BSD" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv" - -X86_CPU_FEATURES=( - aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 - avx:avx avx2:avx2 avx512f:avx512f f16c:f16c -) -CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} ) - -IUSE="dicom doc ffmpeg gif jpeg2k opencv openvdb ptex python qt5 qt6 raw test +tools +truetype ${CPU_FEATURES[@]%:*}" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) qt5? ( tools ) qt6? ( tools )" - -# Not quite working yet -RESTRICT="!test? ( test )" # test" - -BDEPEND=" - doc? ( - app-text/doxygen - dev-texlive/texlive-bibtexextra - dev-texlive/texlive-fontsextra - dev-texlive/texlive-fontutils - dev-texlive/texlive-latex - dev-texlive/texlive-latexextra - ) -" -RDEPEND=" - dev-libs/boost:= - dev-cpp/robin-map - dev-libs/libfmt:= - dev-libs/pugixml:= - >=media-libs/libheif-1.13.0:= - media-libs/libjpeg-turbo:= - media-libs/libpng:0= - >=media-libs/libwebp-0.2.1:= - >=dev-libs/imath-3.1.2-r4:= - >=media-libs/opencolorio-2.1.1-r4:= - >=media-libs/openexr-3:0= - media-libs/tiff:= - sys-libs/zlib:= - dicom? ( sci-libs/dcmtk ) - ffmpeg? ( media-video/ffmpeg:= ) - gif? ( media-libs/giflib:0= ) - jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) - opencv? ( media-libs/opencv:= ) - openvdb? ( - dev-cpp/tbb:= - media-gfx/openvdb:= - ) - ptex? ( media-libs/ptex:= ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-libs/boost:=[python,${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - ') - ) - qt5? ( - media-libs/libglvnd - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtwidgets:5 - ) - qt6? ( - media-libs/libglvnd - dev-qt/qtbase:6[gui,widgets,opengl] - ) - raw? ( media-libs/libraw:= ) - truetype? ( media-libs/freetype:2= ) -" -DEPEND="${RDEPEND}" - -DOCS=( CHANGES.md CREDITS.md README.md ) - -pkg_pretend() { - use qt5 && use qt6 && einfo "The \"qt5\" USE flag has no effect when the \"qt6\" USE flag is also enabled." -} - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - use dicom || rm -r "${S}/src/dicom.imageio/" || die - cmake_src_prepare - cmake_comment_add_subdirectory src/fonts - - if use test ; then - mkdir -p "${BUILD_DIR}"/testsuite || die - mv "${WORKDIR}"/oiio-images-${TEST_OIIO_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/oiio-images || die - mv "${WORKDIR}"/openexr-images-${TEST_OEXR_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/openexr-images || die - fi -} - -src_configure() { - # Build with SIMD support - local cpufeature - local mysimd=() - for cpufeature in "${CPU_FEATURES[@]}"; do - use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}") - done - - # If no CPU SIMDs were used, completely disable them - [[ -z ${mysimd} ]] && mysimd=("0") - - # This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully - # Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available. - use arm64 && append-flags -flax-vector-conversions - - local mycmakeargs=( - -DVERBOSE=ON - -DOIIO_BUILD_TOOLS=$(usex tools) - -DBUILD_TESTING=$(usex test) - -DOIIO_BUILD_TESTS=$(usex test) - -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF - -DINSTALL_FONTS=OFF - -DBUILD_DOCS=$(usex doc) - -DINSTALL_DOCS=$(usex doc) - -DSTOP_ON_WARNING=OFF - -DUSE_CCACHE=OFF - -DUSE_DCMTK=$(usex dicom) - -DUSE_EXTERNAL_PUGIXML=ON - -DUSE_JPEGTURBO=ON - -DUSE_NUKE=OFF # not in Gentoo - -DUSE_FFMPEG=$(usex ffmpeg) - -DUSE_GIF=$(usex gif) - -DUSE_OPENJPEG=$(usex jpeg2k) - -DUSE_OPENCV=$(usex opencv) - -DUSE_OPENVDB=$(usex openvdb) - -DUSE_PTEX=$(usex ptex) - -DUSE_PYTHON=$(usex python) - -DUSE_LIBRAW=$(usex raw) - -DUSE_FREETYPE=$(usex truetype) - -DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}") - ) - - if use qt5 || use qt6; then - mycmakeargs+=( -DENABLE_IV=ON -DUSE_OPENGL=ON -DUSE_QT=ON ) - if ! use qt6; then - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON ) - fi - else - mycmakeargs+=( -DENABLE_IV=OFF -DUSE_QT=OFF ) - fi - - if use python; then - mycmakeargs+=( - -DPYTHON_VERSION=${EPYTHON#python} - -DPYTHON_SITE_DIR=$(python_get_sitedir) - ) - fi - - cmake_src_configure -} - -src_test() { - # TODO: investigate failures - local myctestargs=( - -E "(oiiotool|maketx|oiiotool-maketx|texture-crop|texture-crop.batch|texture-half|texture-half.batch|texture-uint16|texture-uint16.batch|texture-interp-bilinear|texture-interp-bilinear.batch|texture-interp-closest|texture-interp-closest.batch|texture-levels-stochaniso|texture-levels-stochaniso.batch|texture-levels-stochmip|texture-levels-stochmip.batch|texture-mip-onelevel|texture-mip-onelevel.batch|texture-mip-stochastictrilinear|texture-mip-stochastictrilinear.batch|texture-mip-stochasticaniso|texture-mip-stochasticaniso.batch|texture-uint8|texture-uint8.batch|texture-skinny|texture-skinny.batch|texture-icwrite|texture-icwrite.batch|jpeg2000-broken|openexr-damaged|openvdb-broken|texture-texture3d-broken|texture-texture3d-broken.batch|psd|ptex-broken|raw-broken|targa|tiff-depths|zfile|unit_simd|cineon|dds|openvdb.batch-broken|texture-texture3d.batch-broken|cmake-consumer|texture-udim|texture-udim2|texture-udim.batch|texture-udim2.batch)" - ) - - cmake_src_test -} - -src_install() { - cmake_src_install - # can't use font_src_install - # it does directory hierarchy recreation - FONT_S=( - "${S}/src/fonts/Droid_Sans" - "${S}/src/fonts/Droid_Sans_Mono" - "${S}/src/fonts/Droid_Serif" - ) - insinto ${FONTDIR} - for dir in "${FONT_S[@]}"; do - doins "${dir}"/*.ttf - done -} diff --git a/media-libs/openimageio/openimageio-2.4.14.0.ebuild b/media-libs/openimageio/openimageio-2.4.14.0.ebuild deleted file mode 100644 index 723468d6f284..000000000000 --- a/media-libs/openimageio/openimageio-2.4.14.0.ebuild +++ /dev/null @@ -1,205 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -TEST_OIIO_IMAGE_COMMIT="aae37a54e31c0e719edcec852994d052ecf6541e" -TEST_OEXR_IMAGE_COMMIT="df16e765fee28a947244657cae3251959ae63c00" -inherit cmake flag-o-matic font python-single-r1 - -DESCRIPTION="A library for reading and writing images" -HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO" -SRC_URI=" - https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/v${PV}.tar.gz -> ${P}.tar.gz - test? ( - https://github.com/AcademySoftwareFoundation/OpenImageIO-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz - https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz - ) -" -S="${WORKDIR}/OpenImageIO-${PV}" - -LICENSE="BSD" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv" - -X86_CPU_FEATURES=( - aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 - avx:avx avx2:avx2 avx512f:avx512f f16c:f16c -) -CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" ) - -IUSE="dicom doc ffmpeg gif gui jpeg jpeg2k opencv openvdb ptex python qt6 raw test +tools +truetype ${CPU_FEATURES[*]%:*}" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) gui? ( tools )" - -# Not quite working yet -RESTRICT="!test? ( test )" # test" - -BDEPEND=" - doc? ( - app-text/doxygen - dev-texlive/texlive-bibtexextra - dev-texlive/texlive-fontsextra - dev-texlive/texlive-fontutils - dev-texlive/texlive-latex - dev-texlive/texlive-latexextra - ) -" -RDEPEND=" - dev-libs/boost:= - dev-cpp/robin-map - dev-libs/libfmt:= - dev-libs/pugixml:= - >=media-libs/libheif-1.13.0:= - jpeg? ( media-libs/libjpeg-turbo:= ) - media-libs/libpng:0= - >=media-libs/libwebp-0.2.1:= - >=dev-libs/imath-3.1.2-r4:= - >=media-libs/opencolorio-2.1.1-r4:= - >=media-libs/openexr-3:0= - media-libs/tiff:= - sys-libs/zlib:= - dicom? ( sci-libs/dcmtk ) - ffmpeg? ( media-video/ffmpeg:= ) - gif? ( media-libs/giflib:0= ) - jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) - opencv? ( media-libs/opencv:= ) - openvdb? ( - dev-cpp/tbb:= - media-gfx/openvdb:= - ) - ptex? ( media-libs/ptex:= ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-libs/boost:=[python,${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - ') - ) - gui? ( - media-libs/libglvnd - !qt6? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtwidgets:5 - ) - qt6? ( - dev-qt/qtbase:6[gui,widgets,opengl] - ) - ) - raw? ( media-libs/libraw:= ) - truetype? ( media-libs/freetype:2= ) -" -DEPEND=" - ${RDEPEND} -" - -DOCS=( - CHANGES.md - CREDITS.md - README.md -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - use dicom || rm -r "${S}/src/dicom.imageio/" || die - cmake_src_prepare - cmake_comment_add_subdirectory src/fonts - - if use test ; then - mkdir -p "${BUILD_DIR}"/testsuite || die - mv "${WORKDIR}/${PN}-images-${TEST_OIIO_IMAGE_COMMIT}" "${BUILD_DIR}"/testsuite/oiio-images || die - mv "${WORKDIR}/openexr-images-${TEST_OEXR_IMAGE_COMMIT}" "${BUILD_DIR}"/testsuite/openexr-images || die - fi -} - -src_configure() { - # Build with SIMD support - local cpufeature - local mysimd=() - for cpufeature in "${CPU_FEATURES[@]}"; do - use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}") - done - - # If no CPU SIMDs were used, completely disable them - [[ -z ${mysimd[*]} ]] && mysimd=("0") - - # This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully - # Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available. - use arm64 && append-flags -flax-vector-conversions - - local mycmakeargs=( - "-DVERBOSE=ON" - "-DOIIO_BUILD_TOOLS=$(usex tools)" - "-DBUILD_TESTING=$(usex test)" - "-DOIIO_BUILD_TESTS=$(usex test)" - "-DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF" - "-DINSTALL_FONTS=OFF" - "-DBUILD_DOCS=$(usex doc)" - "-DINSTALL_DOCS=$(usex doc)" - "-DSTOP_ON_WARNING=OFF" - "-DUSE_CCACHE=OFF" - "-DUSE_DCMTK=$(usex dicom)" - "-DUSE_EXTERNAL_PUGIXML=ON" - "-DUSE_JPEGTURBO=ON" - "-DUSE_NUKE=OFF" # not in Gentoo - "-DUSE_FFMPEG=$(usex ffmpeg)" - "-DUSE_GIF=$(usex gif)" - "-DUSE_OPENJPEG=$(usex jpeg2k)" - "-DUSE_OPENCV=$(usex opencv)" - "-DUSE_OPENVDB=$(usex openvdb)" - "-DUSE_PTEX=$(usex ptex)" - "-DUSE_PYTHON=$(usex python)" - "-DUSE_LIBRAW=$(usex raw)" - "-DUSE_FREETYPE=$(usex truetype)" - "-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")" - ) - - if use gui; then - mycmakeargs+=( -DENABLE_IV=ON -DUSE_OPENGL=ON -DUSE_QT=ON ) - if ! use qt6; then - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON ) - fi - else - mycmakeargs+=( -DENABLE_IV=OFF -DUSE_QT=OFF ) - fi - - if use python; then - mycmakeargs+=( - "-DPYTHON_VERSION=${EPYTHON#python}" - "-DPYTHON_SITE_DIR=$(python_get_sitedir)" - ) - fi - - cmake_src_configure -} - -src_test() { - # TODO: investigate failures - local myctestargs=( - -E "(oiiotool|maketx|oiiotool-maketx|texture-crop|texture-crop.batch|texture-half|texture-half.batch|texture-uint16|texture-uint16.batch|texture-interp-bilinear|texture-interp-bilinear.batch|texture-interp-closest|texture-interp-closest.batch|texture-levels-stochaniso|texture-levels-stochaniso.batch|texture-levels-stochmip|texture-levels-stochmip.batch|texture-mip-onelevel|texture-mip-onelevel.batch|texture-mip-stochastictrilinear|texture-mip-stochastictrilinear.batch|texture-mip-stochasticaniso|texture-mip-stochasticaniso.batch|texture-uint8|texture-uint8.batch|texture-skinny|texture-skinny.batch|texture-icwrite|texture-icwrite.batch|jpeg2000-broken|openexr-damaged|openvdb-broken|texture-texture3d-broken|texture-texture3d-broken.batch|psd|ptex-broken|raw-broken|targa|tiff-depths|zfile|unit_simd|cineon|dds|openvdb.batch-broken|texture-texture3d.batch-broken|cmake-consumer|texture-udim|texture-udim2|texture-udim.batch|texture-udim2.batch)" - ) - - cmake_src_test -} - -src_install() { - cmake_src_install - # can't use font_src_install - # it does directory hierarchy recreation - FONT_S=( - "${S}/src/fonts/Droid_Sans" - "${S}/src/fonts/Droid_Sans_Mono" - "${S}/src/fonts/Droid_Serif" - ) - insinto "${FONTDIR}" - for dir in "${FONT_S[@]}"; do - doins "${dir}"/*.ttf - done -} diff --git a/media-libs/openimageio/openimageio-2.4.15.0.ebuild b/media-libs/openimageio/openimageio-2.4.15.0.ebuild deleted file mode 100644 index 723468d6f284..000000000000 --- a/media-libs/openimageio/openimageio-2.4.15.0.ebuild +++ /dev/null @@ -1,205 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -TEST_OIIO_IMAGE_COMMIT="aae37a54e31c0e719edcec852994d052ecf6541e" -TEST_OEXR_IMAGE_COMMIT="df16e765fee28a947244657cae3251959ae63c00" -inherit cmake flag-o-matic font python-single-r1 - -DESCRIPTION="A library for reading and writing images" -HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO" -SRC_URI=" - https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/v${PV}.tar.gz -> ${P}.tar.gz - test? ( - https://github.com/AcademySoftwareFoundation/OpenImageIO-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz - https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz - ) -" -S="${WORKDIR}/OpenImageIO-${PV}" - -LICENSE="BSD" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv" - -X86_CPU_FEATURES=( - aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 - avx:avx avx2:avx2 avx512f:avx512f f16c:f16c -) -CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" ) - -IUSE="dicom doc ffmpeg gif gui jpeg jpeg2k opencv openvdb ptex python qt6 raw test +tools +truetype ${CPU_FEATURES[*]%:*}" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) gui? ( tools )" - -# Not quite working yet -RESTRICT="!test? ( test )" # test" - -BDEPEND=" - doc? ( - app-text/doxygen - dev-texlive/texlive-bibtexextra - dev-texlive/texlive-fontsextra - dev-texlive/texlive-fontutils - dev-texlive/texlive-latex - dev-texlive/texlive-latexextra - ) -" -RDEPEND=" - dev-libs/boost:= - dev-cpp/robin-map - dev-libs/libfmt:= - dev-libs/pugixml:= - >=media-libs/libheif-1.13.0:= - jpeg? ( media-libs/libjpeg-turbo:= ) - media-libs/libpng:0= - >=media-libs/libwebp-0.2.1:= - >=dev-libs/imath-3.1.2-r4:= - >=media-libs/opencolorio-2.1.1-r4:= - >=media-libs/openexr-3:0= - media-libs/tiff:= - sys-libs/zlib:= - dicom? ( sci-libs/dcmtk ) - ffmpeg? ( media-video/ffmpeg:= ) - gif? ( media-libs/giflib:0= ) - jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) - opencv? ( media-libs/opencv:= ) - openvdb? ( - dev-cpp/tbb:= - media-gfx/openvdb:= - ) - ptex? ( media-libs/ptex:= ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-libs/boost:=[python,${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - ') - ) - gui? ( - media-libs/libglvnd - !qt6? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtwidgets:5 - ) - qt6? ( - dev-qt/qtbase:6[gui,widgets,opengl] - ) - ) - raw? ( media-libs/libraw:= ) - truetype? ( media-libs/freetype:2= ) -" -DEPEND=" - ${RDEPEND} -" - -DOCS=( - CHANGES.md - CREDITS.md - README.md -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - use dicom || rm -r "${S}/src/dicom.imageio/" || die - cmake_src_prepare - cmake_comment_add_subdirectory src/fonts - - if use test ; then - mkdir -p "${BUILD_DIR}"/testsuite || die - mv "${WORKDIR}/${PN}-images-${TEST_OIIO_IMAGE_COMMIT}" "${BUILD_DIR}"/testsuite/oiio-images || die - mv "${WORKDIR}/openexr-images-${TEST_OEXR_IMAGE_COMMIT}" "${BUILD_DIR}"/testsuite/openexr-images || die - fi -} - -src_configure() { - # Build with SIMD support - local cpufeature - local mysimd=() - for cpufeature in "${CPU_FEATURES[@]}"; do - use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}") - done - - # If no CPU SIMDs were used, completely disable them - [[ -z ${mysimd[*]} ]] && mysimd=("0") - - # This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully - # Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available. - use arm64 && append-flags -flax-vector-conversions - - local mycmakeargs=( - "-DVERBOSE=ON" - "-DOIIO_BUILD_TOOLS=$(usex tools)" - "-DBUILD_TESTING=$(usex test)" - "-DOIIO_BUILD_TESTS=$(usex test)" - "-DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF" - "-DINSTALL_FONTS=OFF" - "-DBUILD_DOCS=$(usex doc)" - "-DINSTALL_DOCS=$(usex doc)" - "-DSTOP_ON_WARNING=OFF" - "-DUSE_CCACHE=OFF" - "-DUSE_DCMTK=$(usex dicom)" - "-DUSE_EXTERNAL_PUGIXML=ON" - "-DUSE_JPEGTURBO=ON" - "-DUSE_NUKE=OFF" # not in Gentoo - "-DUSE_FFMPEG=$(usex ffmpeg)" - "-DUSE_GIF=$(usex gif)" - "-DUSE_OPENJPEG=$(usex jpeg2k)" - "-DUSE_OPENCV=$(usex opencv)" - "-DUSE_OPENVDB=$(usex openvdb)" - "-DUSE_PTEX=$(usex ptex)" - "-DUSE_PYTHON=$(usex python)" - "-DUSE_LIBRAW=$(usex raw)" - "-DUSE_FREETYPE=$(usex truetype)" - "-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")" - ) - - if use gui; then - mycmakeargs+=( -DENABLE_IV=ON -DUSE_OPENGL=ON -DUSE_QT=ON ) - if ! use qt6; then - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON ) - fi - else - mycmakeargs+=( -DENABLE_IV=OFF -DUSE_QT=OFF ) - fi - - if use python; then - mycmakeargs+=( - "-DPYTHON_VERSION=${EPYTHON#python}" - "-DPYTHON_SITE_DIR=$(python_get_sitedir)" - ) - fi - - cmake_src_configure -} - -src_test() { - # TODO: investigate failures - local myctestargs=( - -E "(oiiotool|maketx|oiiotool-maketx|texture-crop|texture-crop.batch|texture-half|texture-half.batch|texture-uint16|texture-uint16.batch|texture-interp-bilinear|texture-interp-bilinear.batch|texture-interp-closest|texture-interp-closest.batch|texture-levels-stochaniso|texture-levels-stochaniso.batch|texture-levels-stochmip|texture-levels-stochmip.batch|texture-mip-onelevel|texture-mip-onelevel.batch|texture-mip-stochastictrilinear|texture-mip-stochastictrilinear.batch|texture-mip-stochasticaniso|texture-mip-stochasticaniso.batch|texture-uint8|texture-uint8.batch|texture-skinny|texture-skinny.batch|texture-icwrite|texture-icwrite.batch|jpeg2000-broken|openexr-damaged|openvdb-broken|texture-texture3d-broken|texture-texture3d-broken.batch|psd|ptex-broken|raw-broken|targa|tiff-depths|zfile|unit_simd|cineon|dds|openvdb.batch-broken|texture-texture3d.batch-broken|cmake-consumer|texture-udim|texture-udim2|texture-udim.batch|texture-udim2.batch)" - ) - - cmake_src_test -} - -src_install() { - cmake_src_install - # can't use font_src_install - # it does directory hierarchy recreation - FONT_S=( - "${S}/src/fonts/Droid_Sans" - "${S}/src/fonts/Droid_Sans_Mono" - "${S}/src/fonts/Droid_Serif" - ) - insinto "${FONTDIR}" - for dir in "${FONT_S[@]}"; do - doins "${dir}"/*.ttf - done -} diff --git a/media-libs/openimageio/openimageio-2.4.16.0.ebuild b/media-libs/openimageio/openimageio-2.4.16.0.ebuild deleted file mode 100644 index 723468d6f284..000000000000 --- a/media-libs/openimageio/openimageio-2.4.16.0.ebuild +++ /dev/null @@ -1,205 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -TEST_OIIO_IMAGE_COMMIT="aae37a54e31c0e719edcec852994d052ecf6541e" -TEST_OEXR_IMAGE_COMMIT="df16e765fee28a947244657cae3251959ae63c00" -inherit cmake flag-o-matic font python-single-r1 - -DESCRIPTION="A library for reading and writing images" -HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO" -SRC_URI=" - https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/v${PV}.tar.gz -> ${P}.tar.gz - test? ( - https://github.com/AcademySoftwareFoundation/OpenImageIO-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz - https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz - ) -" -S="${WORKDIR}/OpenImageIO-${PV}" - -LICENSE="BSD" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv" - -X86_CPU_FEATURES=( - aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 - avx:avx avx2:avx2 avx512f:avx512f f16c:f16c -) -CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" ) - -IUSE="dicom doc ffmpeg gif gui jpeg jpeg2k opencv openvdb ptex python qt6 raw test +tools +truetype ${CPU_FEATURES[*]%:*}" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) gui? ( tools )" - -# Not quite working yet -RESTRICT="!test? ( test )" # test" - -BDEPEND=" - doc? ( - app-text/doxygen - dev-texlive/texlive-bibtexextra - dev-texlive/texlive-fontsextra - dev-texlive/texlive-fontutils - dev-texlive/texlive-latex - dev-texlive/texlive-latexextra - ) -" -RDEPEND=" - dev-libs/boost:= - dev-cpp/robin-map - dev-libs/libfmt:= - dev-libs/pugixml:= - >=media-libs/libheif-1.13.0:= - jpeg? ( media-libs/libjpeg-turbo:= ) - media-libs/libpng:0= - >=media-libs/libwebp-0.2.1:= - >=dev-libs/imath-3.1.2-r4:= - >=media-libs/opencolorio-2.1.1-r4:= - >=media-libs/openexr-3:0= - media-libs/tiff:= - sys-libs/zlib:= - dicom? ( sci-libs/dcmtk ) - ffmpeg? ( media-video/ffmpeg:= ) - gif? ( media-libs/giflib:0= ) - jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) - opencv? ( media-libs/opencv:= ) - openvdb? ( - dev-cpp/tbb:= - media-gfx/openvdb:= - ) - ptex? ( media-libs/ptex:= ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-libs/boost:=[python,${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - ') - ) - gui? ( - media-libs/libglvnd - !qt6? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtwidgets:5 - ) - qt6? ( - dev-qt/qtbase:6[gui,widgets,opengl] - ) - ) - raw? ( media-libs/libraw:= ) - truetype? ( media-libs/freetype:2= ) -" -DEPEND=" - ${RDEPEND} -" - -DOCS=( - CHANGES.md - CREDITS.md - README.md -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - use dicom || rm -r "${S}/src/dicom.imageio/" || die - cmake_src_prepare - cmake_comment_add_subdirectory src/fonts - - if use test ; then - mkdir -p "${BUILD_DIR}"/testsuite || die - mv "${WORKDIR}/${PN}-images-${TEST_OIIO_IMAGE_COMMIT}" "${BUILD_DIR}"/testsuite/oiio-images || die - mv "${WORKDIR}/openexr-images-${TEST_OEXR_IMAGE_COMMIT}" "${BUILD_DIR}"/testsuite/openexr-images || die - fi -} - -src_configure() { - # Build with SIMD support - local cpufeature - local mysimd=() - for cpufeature in "${CPU_FEATURES[@]}"; do - use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}") - done - - # If no CPU SIMDs were used, completely disable them - [[ -z ${mysimd[*]} ]] && mysimd=("0") - - # This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully - # Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available. - use arm64 && append-flags -flax-vector-conversions - - local mycmakeargs=( - "-DVERBOSE=ON" - "-DOIIO_BUILD_TOOLS=$(usex tools)" - "-DBUILD_TESTING=$(usex test)" - "-DOIIO_BUILD_TESTS=$(usex test)" - "-DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF" - "-DINSTALL_FONTS=OFF" - "-DBUILD_DOCS=$(usex doc)" - "-DINSTALL_DOCS=$(usex doc)" - "-DSTOP_ON_WARNING=OFF" - "-DUSE_CCACHE=OFF" - "-DUSE_DCMTK=$(usex dicom)" - "-DUSE_EXTERNAL_PUGIXML=ON" - "-DUSE_JPEGTURBO=ON" - "-DUSE_NUKE=OFF" # not in Gentoo - "-DUSE_FFMPEG=$(usex ffmpeg)" - "-DUSE_GIF=$(usex gif)" - "-DUSE_OPENJPEG=$(usex jpeg2k)" - "-DUSE_OPENCV=$(usex opencv)" - "-DUSE_OPENVDB=$(usex openvdb)" - "-DUSE_PTEX=$(usex ptex)" - "-DUSE_PYTHON=$(usex python)" - "-DUSE_LIBRAW=$(usex raw)" - "-DUSE_FREETYPE=$(usex truetype)" - "-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")" - ) - - if use gui; then - mycmakeargs+=( -DENABLE_IV=ON -DUSE_OPENGL=ON -DUSE_QT=ON ) - if ! use qt6; then - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON ) - fi - else - mycmakeargs+=( -DENABLE_IV=OFF -DUSE_QT=OFF ) - fi - - if use python; then - mycmakeargs+=( - "-DPYTHON_VERSION=${EPYTHON#python}" - "-DPYTHON_SITE_DIR=$(python_get_sitedir)" - ) - fi - - cmake_src_configure -} - -src_test() { - # TODO: investigate failures - local myctestargs=( - -E "(oiiotool|maketx|oiiotool-maketx|texture-crop|texture-crop.batch|texture-half|texture-half.batch|texture-uint16|texture-uint16.batch|texture-interp-bilinear|texture-interp-bilinear.batch|texture-interp-closest|texture-interp-closest.batch|texture-levels-stochaniso|texture-levels-stochaniso.batch|texture-levels-stochmip|texture-levels-stochmip.batch|texture-mip-onelevel|texture-mip-onelevel.batch|texture-mip-stochastictrilinear|texture-mip-stochastictrilinear.batch|texture-mip-stochasticaniso|texture-mip-stochasticaniso.batch|texture-uint8|texture-uint8.batch|texture-skinny|texture-skinny.batch|texture-icwrite|texture-icwrite.batch|jpeg2000-broken|openexr-damaged|openvdb-broken|texture-texture3d-broken|texture-texture3d-broken.batch|psd|ptex-broken|raw-broken|targa|tiff-depths|zfile|unit_simd|cineon|dds|openvdb.batch-broken|texture-texture3d.batch-broken|cmake-consumer|texture-udim|texture-udim2|texture-udim.batch|texture-udim2.batch)" - ) - - cmake_src_test -} - -src_install() { - cmake_src_install - # can't use font_src_install - # it does directory hierarchy recreation - FONT_S=( - "${S}/src/fonts/Droid_Sans" - "${S}/src/fonts/Droid_Sans_Mono" - "${S}/src/fonts/Droid_Serif" - ) - insinto "${FONTDIR}" - for dir in "${FONT_S[@]}"; do - doins "${dir}"/*.ttf - done -} diff --git a/media-libs/openimageio/openimageio-2.4.6.0-r1.ebuild b/media-libs/openimageio/openimageio-2.4.6.0-r1.ebuild deleted file mode 100644 index b0ad2973ca0f..000000000000 --- a/media-libs/openimageio/openimageio-2.4.6.0-r1.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -FONT_PN=OpenImageIO -PYTHON_COMPAT=( python3_{9..11} ) - -TEST_OIIO_IMAGE_COMMIT="245e50edede2792205080eadc1dedce33ff5c1e4" -TEST_OEXR_IMAGE_COMMIT="f17e353fbfcde3406fe02675f4d92aeae422a560" -inherit cmake font python-single-r1 - -DESCRIPTION="A library for reading and writing images" -HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO" -SRC_URI="https://github.com/OpenImageIO/oiio/archive/v${PV}.tar.gz -> ${P}.tar.gz" -SRC_URI+=" test? ( - https://github.com/OpenImageIO/oiio-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz - https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz - )" -S="${WORKDIR}/oiio-${PV}" - -LICENSE="BSD" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv" - -X86_CPU_FEATURES=( - aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 - avx:avx avx2:avx2 avx512f:avx512f f16c:f16c -) -CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} ) - -IUSE="dicom doc ffmpeg gif jpeg2k opencv opengl openvdb ptex python qt5 raw test +truetype ${CPU_FEATURES[@]%:*}" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -# Not quite working yet -RESTRICT="!test? ( test )" # test" - -BDEPEND=" - doc? ( - app-text/doxygen - dev-texlive/texlive-bibtexextra - dev-texlive/texlive-fontsextra - dev-texlive/texlive-fontutils - dev-texlive/texlive-latex - dev-texlive/texlive-latexextra - ) -" -RDEPEND=" - dev-libs/boost:= - dev-cpp/robin-map - dev-libs/libfmt:= - dev-libs/pugixml:= - >=media-libs/libheif-1.7.0:= - media-libs/libjpeg-turbo:= - media-libs/libpng:0= - >=media-libs/libwebp-0.2.1:= - >=dev-libs/imath-3.1.2-r4:= - >=media-libs/opencolorio-2.1.1-r4:= - >=media-libs/openexr-3:0= - media-libs/tiff:= - sys-libs/zlib:= - dicom? ( sci-libs/dcmtk ) - ffmpeg? ( media-video/ffmpeg:= ) - gif? ( media-libs/giflib:0= ) - jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) - opencv? ( media-libs/opencv:= ) - opengl? ( - media-libs/glew:= - virtual/glu - virtual/opengl - ) - openvdb? ( - dev-cpp/tbb:= - media-gfx/openvdb:= - ) - ptex? ( media-libs/ptex:= ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-libs/boost:=[python,${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - ') - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - opengl? ( dev-qt/qtopengl:5 ) - ) - raw? ( media-libs/libraw:= ) - truetype? ( media-libs/freetype:2= ) -" -DEPEND="${RDEPEND}" - -DOCS=( CHANGES.md CREDITS.md README.md ) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - use dicom || rm -r "${S}/src/dicom.imageio/" || die - cmake_src_prepare - cmake_comment_add_subdirectory src/fonts - - if use test ; then - mkdir -p "${BUILD_DIR}"/testsuite || die - mv "${WORKDIR}"/oiio-images-${TEST_OIIO_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/oiio-images || die - mv "${WORKDIR}"/openexr-images-${TEST_OEXR_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/openexr-images || die - fi -} - -src_configure() { - # Build with SIMD support - local cpufeature - local mysimd=() - for cpufeature in "${CPU_FEATURES[@]}"; do - use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}") - done - - # If no CPU SIMDs were used, completely disable them - [[ -z ${mysimd} ]] && mysimd=("0") - - local mycmakeargs=( - -DVERBOSE=ON - -DBUILD_TESTING=$(usex test) - -DOIIO_BUILD_TESTS=$(usex test) - -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF - -DINSTALL_FONTS=OFF - -DBUILD_DOCS=$(usex doc) - -DINSTALL_DOCS=$(usex doc) - -DSTOP_ON_WARNING=OFF - -DUSE_CCACHE=OFF - -DUSE_DCMTK=$(usex dicom) - -DUSE_EXTERNAL_PUGIXML=ON - -DUSE_JPEGTURBO=ON - -DUSE_NUKE=OFF # not in Gentoo - -DUSE_FFMPEG=$(usex ffmpeg) - -DUSE_GIF=$(usex gif) - -DUSE_OPENJPEG=$(usex jpeg2k) - -DUSE_OPENCV=$(usex opencv) - -DUSE_OPENGL=$(usex opengl) - -DUSE_OPENVDB=$(usex openvdb) - -DUSE_PTEX=$(usex ptex) - -DUSE_PYTHON=$(usex python) - -DUSE_QT=$(usex qt5) - -DUSE_LIBRAW=$(usex raw) - -DUSE_FREETYPE=$(usex truetype) - -DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}") - ) - - if use python; then - mycmakeargs+=( - -DPYTHON_VERSION=${EPYTHON#python} - -DPYTHON_SITE_DIR=$(python_get_sitedir) - ) - fi - - cmake_src_configure -} - -src_test() { - # TODO: investigate failures - local myctestargs=( - -E "(oiiotool|maketx|oiiotool-maketx|texture-crop|texture-crop.batch|texture-half|texture-half.batch|texture-uint16|texture-uint16.batch|texture-interp-bilinear|texture-interp-bilinear.batch|texture-interp-closest|texture-interp-closest.batch|texture-levels-stochaniso|texture-levels-stochaniso.batch|texture-levels-stochmip|texture-levels-stochmip.batch|texture-mip-onelevel|texture-mip-onelevel.batch|texture-mip-stochastictrilinear|texture-mip-stochastictrilinear.batch|texture-mip-stochasticaniso|texture-mip-stochasticaniso.batch|texture-uint8|texture-uint8.batch|texture-skinny|texture-skinny.batch|texture-icwrite|texture-icwrite.batch|jpeg2000-broken|openexr-damaged|openvdb-broken|texture-texture3d-broken|texture-texture3d-broken.batch|psd|ptex-broken|raw-broken|targa|tiff-depths|zfile|unit_simd|cineon|dds|openvdb.batch-broken|texture-texture3d.batch-broken|cmake-consumer|texture-udim|texture-udim2|texture-udim.batch|texture-udim2.batch)" - ) - - cmake_src_test -} - -src_install() { - cmake_src_install - # can't use font_src_install - # it does directory hierarchy recreation - FONT_S=( - "${S}/src/fonts/Droid_Sans" - "${S}/src/fonts/Droid_Sans_Mono" - "${S}/src/fonts/Droid_Serif" - ) - insinto ${FONTDIR} - for dir in "${FONT_S[@]}"; do - doins "${dir}"/*.ttf - done -} diff --git a/media-libs/openimageio/openimageio-2.5.12.0.ebuild b/media-libs/openimageio/openimageio-2.5.12.0.ebuild new file mode 100644 index 000000000000..c778a756041e --- /dev/null +++ b/media-libs/openimageio/openimageio-2.5.12.0.ebuild @@ -0,0 +1,302 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +TEST_OIIO_IMAGE_COMMIT="7d821f02c848022b2ee703d6bee48ca2acbfae70" +TEST_OEXR_IMAGE_COMMIT="df16e765fee28a947244657cae3251959ae63c00" +inherit cmake flag-o-matic python-single-r1 virtualx + +DESCRIPTION="A library for reading and writing images" +HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO" +SRC_URI=" + https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/v${PV}.tar.gz -> ${P}.tar.gz + test? ( + https://github.com/AcademySoftwareFoundation/OpenImageIO-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz + -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz + https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz + -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz + jpeg2k? ( https://www.itu.int/wftp3/Public/t/testsignal/SpeImage/T803/v2002_11/J2KP4files.zip ) + + fits? ( + https://www.cv.nrao.edu/fits/data/tests/ftt4b/file001.fits + https://www.cv.nrao.edu/fits/data/tests/ftt4b/file002.fits + https://www.cv.nrao.edu/fits/data/tests/ftt4b/file003.fits + https://www.cv.nrao.edu/fits/data/tests/ftt4b/file009.fits + https://www.cv.nrao.edu/fits/data/tests/ftt4b/file012.fits + https://www.cv.nrao.edu/fits/data/tests/pg93/tst0001.fits + https://www.cv.nrao.edu/fits/data/tests/pg93/tst0003.fits + https://www.cv.nrao.edu/fits/data/tests/pg93/tst0005.fits + https://www.cv.nrao.edu/fits/data/tests/pg93/tst0006.fits + https://www.cv.nrao.edu/fits/data/tests/pg93/tst0007.fits + https://www.cv.nrao.edu/fits/data/tests/pg93/tst0008.fits + https://www.cv.nrao.edu/fits/data/tests/pg93/tst0013.fits + ) + ) +" +S="${WORKDIR}/OpenImageIO-${PV}" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv" + +X86_CPU_FEATURES=( + aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 + avx:avx avx2:avx2 avx512f:avx512f f16c:f16c +) +CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" ) + +IUSE="dicom doc ffmpeg fits gif gui jpeg2k opencv openvdb ptex python qt6 raw test +tools +truetype ${CPU_FEATURES[*]%:*}" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) gui? ( tools ) test? ( tools truetype )" + +RESTRICT="!test? ( test )" + +BDEPEND=" + jpeg2k? ( app-arch/unzip ) + doc? ( + app-text/doxygen + dev-texlive/texlive-bibtexextra + dev-texlive/texlive-fontsextra + dev-texlive/texlive-fontutils + dev-texlive/texlive-latex + dev-texlive/texlive-latexextra + ) +" +RDEPEND=" + dev-libs/boost:= + dev-cpp/robin-map + dev-libs/libfmt:= + dev-libs/pugixml:= + >=media-libs/libheif-1.13.0:= + media-libs/libjpeg-turbo:= + media-libs/libpng:0= + >=media-libs/libwebp-0.2.1:= + >=dev-libs/imath-3.1.2-r4:= + >=media-libs/opencolorio-2.1.1-r4:= + >=media-libs/openexr-3:0= + media-libs/tiff:= + sys-libs/zlib:= + dicom? ( sci-libs/dcmtk ) + ffmpeg? ( media-video/ffmpeg:= ) + fits? ( sci-libs/cfitsio:= ) + gif? ( media-libs/giflib:0= ) + jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) + opencv? ( media-libs/opencv:= ) + openvdb? ( + dev-cpp/tbb:= + media-gfx/openvdb:= + ) + ptex? ( media-libs/ptex:= ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-libs/boost:=[python,${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/pybind11[${PYTHON_USEDEP}] + ') + ) + gui? ( + media-libs/libglvnd + !qt6? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtopengl:5 + dev-qt/qtwidgets:5 + ) + qt6? ( + dev-qt/qtbase:6[gui,widgets,opengl] + ) + ) + raw? ( media-libs/libraw:= ) + truetype? ( media-libs/freetype:2= ) +" +DEPEND=" + ${RDEPEND} +" + +DOCS=( + CHANGES.md + CREDITS.md + README.md +) + +PATCHES=( + "${FILESDIR}/${PN}-2.5.8.0-fix-unit_simd.patch" + "${FILESDIR}/${PN}-2.5.8.0-fix-tests.patch" + "${FILESDIR}/${PN}-2.5.12.0-tests-optional.patch" +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + if ! use dicom; then + rm "src/dicom.imageio" -r || die + fi + + if ! use gif; then + rm src/gif.imageio -r || die + fi + + if ! use jpeg2k; then + rm src/jpeg2000.imageio -r || die + fi + + if ! use raw; then + rm src/raw.imageio -r || die + fi + + cmake_src_prepare + cmake_comment_add_subdirectory src/fonts + + if use test ; then + mv -v "${WORKDIR}/OpenImageIO-images-${TEST_OIIO_IMAGE_COMMIT}" "${WORKDIR}/oiio-images" || die + mv -v "${WORKDIR}/openexr-images-${TEST_OEXR_IMAGE_COMMIT}" "${WORKDIR}/openexr-images" || die + + if use fits; then + mkdir -p "${WORKDIR}/fits-images/"{ftt4b,pg93} || die + for a in ${A}; do + if [[ "${a}" == file*.fits ]]; then + cp "${DISTDIR}/${a}" "${WORKDIR}/fits-images/ftt4b/" || die + fi + if [[ "${a}" == tst*.fits ]]; then + cp "${DISTDIR}/${a}" "${WORKDIR}/fits-images/pg93/" || die + fi + done + fi + + if use jpeg2k; then + mv -v "${WORKDIR}/J2KP4files" "${WORKDIR}/j2kp4files_v1_5" || die + fi + + cp testsuite/heif/ref/out-libheif1.1{2,5}-orient.txt || die + eapply "${FILESDIR}/${PN}-2.5.12.0_heif_test.patch" + fi +} + +src_configure() { + # Build with SIMD support + local cpufeature + local mysimd=() + for cpufeature in "${CPU_FEATURES[@]}"; do + use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}") + done + + # If no CPU SIMDs were used, completely disable them + [[ -z ${mysimd[*]} ]] && mysimd=("0") + + # This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully + # Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available. + use arm64 && append-flags -flax-vector-conversions + + local mycmakeargs=( + -DVERBOSE="yes" + -DINTERNALIZE_FMT="no" + # -DALWAYS_PREFER_CONFIG="yes" + # -DGLIBCXX_USE_CXX11_ABI="yes" + # -DTEX_BATCH_SIZE="8" # TODO AVX512 -> 16 + -DSTOP_ON_WARNING="OFF" + + -DCMAKE_CXX_STANDARD="17" + -DDOWNSTREAM_CXX_STANDARD="17" + + -DCMAKE_UNITY_BUILD_MODE="BATCH" + -DUNITY_SMALL_BATCH_SIZE="$(nproc)" + + -DBUILD_DOCS="$(usex doc)" + # -DBUILD_OIIOUTIL_ONLY="no" + -DBUILD_TESTING="$(usex test)" + + -DINSTALL_FONTS="OFF" + -DINSTALL_DOCS="$(usex doc)" + + -DENABLE_DCMTK="$(usex dicom)" + -DENABLE_FFmpeg="$(usex ffmpeg)" + -DENABLE_FITS="$(usex fits)" + -DENABLE_FREETYPE="$(usex truetype)" + -DENABLE_GIF="$(usex gif)" + -DENABLE_LibRaw="$(usex raw)" + -DENABLE_Nuke="no" # not in Gentoo + -DENABLE_OpenCV="$(usex opencv)" + -DENABLE_OpenJPEG="$(usex jpeg2k)" + -DENABLE_OpenVDB="$(usex openvdb)" + -DENABLE_TBB="$(usex openvdb)" + -DENABLE_Ptex="$(usex ptex)" + + -DENABLE_GIF="$(usex gif)" + -DENABLE_LIBRAW="$(usex raw)" + -DENABLE_PTEX="$(usex ptex)" + -DENABLE_OPENJPEG="$(usex jpeg2k)" + + -DOIIO_BUILD_TOOLS="$(usex tools)" + -DOIIO_BUILD_TESTS="$(usex test)" + -DOIIO_DOWNLOAD_MISSING_TESTDATA="no" + + -DUSE_CCACHE="no" + -DUSE_EXTERNAL_PUGIXML="yes" + # -DUSE_LIBCPLUSPLUS="yes" + -DUSE_R3DSDK="no" # not in Gentoo + -DUSE_PYTHON="$(usex python)" + -DUSE_SIMD="$(local IFS=','; echo "${mysimd[*]}")" +) + + if use gui; then + mycmakeargs+=( -DUSE_IV="yes" -DUSE_OPENGL="yes" -DUSE_QT="yes" ) + if ! use qt6; then + mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6="yes" ) + fi + else + mycmakeargs+=( + -DUSE_QT="no" + ) + fi + + if use python; then + mycmakeargs+=( + "-DPYTHON_VERSION=${EPYTHON#python}" + "-DPYTHON_SITE_DIR=$(python_get_sitedir)" + ) + fi + + cmake_src_configure +} + +src_test() { + # A lot of tests needs to have access to the installed data files. + # So install them into the image directory now. + DESTDIR="${T}" cmake_build install + + CMAKE_SKIP_TESTS=( + "-broken$" + ) + + sed -e "s#../../../testsuite#../../../OpenImageIO-${PV}/testsuite#g" \ + -i "${CMAKE_USE_DIR}/testsuite/python-imagebufalgo/ref/out.txt" || die + + local -x CI CMAKE_PREFIX_PATH LD_LIBRARY_PATH OPENIMAGEIO_FONTS PYTHONPATH + CI=true + CMAKE_PREFIX_PATH="${T}/usr" + LD_LIBRARY_PATH="${T}/usr/$(get_libdir)" + OPENIMAGEIO_FONTS="${CMAKE_USE_DIR}/src/fonts" + + if use python; then + PYTHONPATH="${T}$(python_get_sitedir)" + fi + + virtx cmake_src_test + + # Clean up the image directory for src_install + rm -fr "${T:?}"/usr || die +} + +src_install() { + cmake_src_install + + # remove Windows loader file + if use python; then + rm "${D}$(python_get_sitedir)/__init__.py" || die + fi +} diff --git a/media-libs/openimageio/openimageio-2.5.4.0.ebuild b/media-libs/openimageio/openimageio-2.5.4.0.ebuild deleted file mode 100644 index cc11c16d6f6c..000000000000 --- a/media-libs/openimageio/openimageio-2.5.4.0.ebuild +++ /dev/null @@ -1,204 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -TEST_OIIO_IMAGE_COMMIT="aae37a54e31c0e719edcec852994d052ecf6541e" -TEST_OEXR_IMAGE_COMMIT="df16e765fee28a947244657cae3251959ae63c00" -inherit cmake flag-o-matic font python-single-r1 - -DESCRIPTION="A library for reading and writing images" -HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO" -SRC_URI=" - https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/v${PV}.tar.gz -> ${P}.tar.gz - test? ( - https://github.com/AcademySoftwareFoundation/OpenImageIO-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz - https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz - ) -" -S="${WORKDIR}/OpenImageIO-${PV}" - -LICENSE="BSD" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv" - -X86_CPU_FEATURES=( - aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 - avx:avx avx2:avx2 avx512f:avx512f f16c:f16c -) -CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" ) - -IUSE="dicom doc ffmpeg gif gui jpeg2k opencv openvdb ptex python qt6 raw test +tools +truetype ${CPU_FEATURES[*]%:*}" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) gui? ( tools )" - -# Not quite working yet -RESTRICT="!test? ( test )" # test" - -BDEPEND=" - doc? ( - app-text/doxygen - dev-texlive/texlive-bibtexextra - dev-texlive/texlive-fontsextra - dev-texlive/texlive-fontutils - dev-texlive/texlive-latex - dev-texlive/texlive-latexextra - ) -" -RDEPEND=" - dev-libs/boost:= - dev-cpp/robin-map - dev-libs/libfmt:= - dev-libs/pugixml:= - >=media-libs/libheif-1.13.0:= - media-libs/libjpeg-turbo:= - media-libs/libpng:0= - >=media-libs/libwebp-0.2.1:= - >=dev-libs/imath-3.1.2-r4:= - >=media-libs/opencolorio-2.1.1-r4:= - >=media-libs/openexr-3:0= - media-libs/tiff:= - sys-libs/zlib:= - dicom? ( sci-libs/dcmtk ) - ffmpeg? ( media-video/ffmpeg:= ) - gif? ( media-libs/giflib:0= ) - jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) - opencv? ( media-libs/opencv:= ) - openvdb? ( - dev-cpp/tbb:= - media-gfx/openvdb:= - ) - ptex? ( media-libs/ptex:= ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-libs/boost:=[python,${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - ') - ) - gui? ( - media-libs/libglvnd - !qt6? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtwidgets:5 - ) - qt6? ( - dev-qt/qtbase:6[gui,widgets,opengl] - ) - ) - raw? ( media-libs/libraw:= ) - truetype? ( media-libs/freetype:2= ) -" -DEPEND=" - ${RDEPEND} -" - -DOCS=( - CHANGES.md - CREDITS.md - README.md -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - use dicom || rm -r "${S}/src/dicom.imageio/" || die - cmake_src_prepare - cmake_comment_add_subdirectory src/fonts - - if use test ; then - mkdir -p "${BUILD_DIR}"/testsuite || die - mv "${WORKDIR}/${PN}-images-${TEST_OIIO_IMAGE_COMMIT}" "${BUILD_DIR}"/testsuite/oiio-images || die - mv "${WORKDIR}/openexr-images-${TEST_OEXR_IMAGE_COMMIT}" "${BUILD_DIR}"/testsuite/openexr-images || die - fi -} - -src_configure() { - # Build with SIMD support - local cpufeature - local mysimd=() - for cpufeature in "${CPU_FEATURES[@]}"; do - use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}") - done - - # If no CPU SIMDs were used, completely disable them - [[ -z ${mysimd[*]} ]] && mysimd=("0") - - # This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully - # Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available. - use arm64 && append-flags -flax-vector-conversions - - local mycmakeargs=( - "-DVERBOSE=ON" - "-DOIIO_BUILD_TOOLS=$(usex tools)" - "-DBUILD_TESTING=$(usex test)" - "-DOIIO_BUILD_TESTS=$(usex test)" - "-DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF" - "-DINSTALL_FONTS=OFF" - "-DBUILD_DOCS=$(usex doc)" - "-DINSTALL_DOCS=$(usex doc)" - "-DSTOP_ON_WARNING=OFF" - "-DUSE_CCACHE=OFF" - "-DUSE_DCMTK=$(usex dicom)" - "-DUSE_EXTERNAL_PUGIXML=ON" - "-DUSE_NUKE=OFF" # not in Gentoo - "-DUSE_FFMPEG=$(usex ffmpeg)" - "-DUSE_GIF=$(usex gif)" - "-DUSE_OPENJPEG=$(usex jpeg2k)" - "-DUSE_OPENCV=$(usex opencv)" - "-DUSE_OPENVDB=$(usex openvdb)" - "-DUSE_PTEX=$(usex ptex)" - "-DUSE_PYTHON=$(usex python)" - "-DUSE_LIBRAW=$(usex raw)" - "-DUSE_FREETYPE=$(usex truetype)" - "-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")" - ) - - if use gui; then - mycmakeargs+=( -DENABLE_IV=ON -DUSE_OPENGL=ON -DUSE_QT=ON ) - if ! use qt6; then - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON ) - fi - else - mycmakeargs+=( -DENABLE_IV=OFF -DUSE_QT=OFF ) - fi - - if use python; then - mycmakeargs+=( - "-DPYTHON_VERSION=${EPYTHON#python}" - "-DPYTHON_SITE_DIR=$(python_get_sitedir)" - ) - fi - - cmake_src_configure -} - -src_test() { - # TODO: investigate failures - local myctestargs=( - -E "(oiiotool|maketx|oiiotool-maketx|texture-crop|texture-crop.batch|texture-half|texture-half.batch|texture-uint16|texture-uint16.batch|texture-interp-bilinear|texture-interp-bilinear.batch|texture-interp-closest|texture-interp-closest.batch|texture-levels-stochaniso|texture-levels-stochaniso.batch|texture-levels-stochmip|texture-levels-stochmip.batch|texture-mip-onelevel|texture-mip-onelevel.batch|texture-mip-stochastictrilinear|texture-mip-stochastictrilinear.batch|texture-mip-stochasticaniso|texture-mip-stochasticaniso.batch|texture-uint8|texture-uint8.batch|texture-skinny|texture-skinny.batch|texture-icwrite|texture-icwrite.batch|jpeg2000-broken|openexr-damaged|openvdb-broken|texture-texture3d-broken|texture-texture3d-broken.batch|psd|ptex-broken|raw-broken|targa|tiff-depths|zfile|unit_simd|cineon|dds|openvdb.batch-broken|texture-texture3d.batch-broken|cmake-consumer|texture-udim|texture-udim2|texture-udim.batch|texture-udim2.batch)" - ) - - cmake_src_test -} - -src_install() { - cmake_src_install - # can't use font_src_install - # it does directory hierarchy recreation - FONT_S=( - "${S}/src/fonts/Droid_Sans" - "${S}/src/fonts/Droid_Sans_Mono" - "${S}/src/fonts/Droid_Serif" - ) - insinto "${FONTDIR}" - for dir in "${FONT_S[@]}"; do - doins "${dir}"/*.ttf - done -} diff --git a/media-libs/openimageio/openimageio-2.5.5.0.ebuild b/media-libs/openimageio/openimageio-2.5.5.0.ebuild deleted file mode 100644 index 28e7f281307b..000000000000 --- a/media-libs/openimageio/openimageio-2.5.5.0.ebuild +++ /dev/null @@ -1,206 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -TEST_OIIO_IMAGE_COMMIT="aae37a54e31c0e719edcec852994d052ecf6541e" -TEST_OEXR_IMAGE_COMMIT="df16e765fee28a947244657cae3251959ae63c00" -inherit cmake flag-o-matic font python-single-r1 - -DESCRIPTION="A library for reading and writing images" -HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO" -SRC_URI=" - https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/v${PV}.tar.gz -> ${P}.tar.gz - test? ( - https://github.com/AcademySoftwareFoundation/OpenImageIO-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz - https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz - ) -" -S="${WORKDIR}/OpenImageIO-${PV}" - -LICENSE="BSD" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv" - -X86_CPU_FEATURES=( - aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 - avx:avx avx2:avx2 avx512f:avx512f f16c:f16c -) -CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" ) - -IUSE="dicom doc ffmpeg gif gui jpeg2k opencv openvdb ptex python qt6 raw test +tools +truetype ${CPU_FEATURES[*]%:*}" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) gui? ( tools )" - -# Not quite working yet -RESTRICT="!test? ( test )" # test" - -BDEPEND=" - doc? ( - app-text/doxygen - dev-texlive/texlive-bibtexextra - dev-texlive/texlive-fontsextra - dev-texlive/texlive-fontutils - dev-texlive/texlive-latex - dev-texlive/texlive-latexextra - ) -" -RDEPEND=" - dev-libs/boost:= - dev-cpp/robin-map - dev-libs/libfmt:= - dev-libs/pugixml:= - >=media-libs/libheif-1.13.0:= - media-libs/libjpeg-turbo:= - media-libs/libpng:0= - >=media-libs/libwebp-0.2.1:= - >=dev-libs/imath-3.1.2-r4:= - >=media-libs/opencolorio-2.1.1-r4:= - >=media-libs/openexr-3:0= - media-libs/tiff:= - sys-libs/zlib:= - dicom? ( sci-libs/dcmtk ) - ffmpeg? ( media-video/ffmpeg:= ) - gif? ( media-libs/giflib:0= ) - jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) - opencv? ( media-libs/opencv:= ) - openvdb? ( - dev-cpp/tbb:= - media-gfx/openvdb:= - ) - ptex? ( media-libs/ptex:= ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-libs/boost:=[python,${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - ') - ) - gui? ( - media-libs/libglvnd - !qt6? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtwidgets:5 - ) - qt6? ( - dev-qt/qtbase:6[gui,widgets,opengl] - ) - ) - raw? ( media-libs/libraw:= ) - truetype? ( media-libs/freetype:2= ) -" -DEPEND=" - ${RDEPEND} -" - -DOCS=( - CHANGES.md - CREDITS.md - README.md -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - use dicom || rm -r "${S}/src/dicom.imageio/" || die - cmake_src_prepare - cmake_comment_add_subdirectory src/fonts - - if use test ; then - mkdir -p "${BUILD_DIR}"/testsuite || die - mv "${WORKDIR}/OpenImageIO-images-${TEST_OIIO_IMAGE_COMMIT}" "${BUILD_DIR}"/testsuite/oiio-images || die - mv "${WORKDIR}/openexr-images-${TEST_OEXR_IMAGE_COMMIT}" "${BUILD_DIR}"/testsuite/openexr-images || die - fi -} - -src_configure() { - # Build with SIMD support - local cpufeature - local mysimd=() - for cpufeature in "${CPU_FEATURES[@]}"; do - use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}") - done - - # If no CPU SIMDs were used, completely disable them - [[ -z ${mysimd[*]} ]] && mysimd=("0") - - # This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully - # Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available. - use arm64 && append-flags -flax-vector-conversions - - local mycmakeargs=( - -DCMAKE_CXX_STANDARD="17" - -DDOWNSTREAM_CXX_STANDARD="17" - "-DVERBOSE=ON" - "-DOIIO_BUILD_TOOLS=$(usex tools)" - "-DBUILD_TESTING=$(usex test)" - "-DOIIO_BUILD_TESTS=$(usex test)" - "-DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF" - "-DINSTALL_FONTS=OFF" - "-DBUILD_DOCS=$(usex doc)" - "-DINSTALL_DOCS=$(usex doc)" - "-DSTOP_ON_WARNING=OFF" - "-DUSE_CCACHE=OFF" - "-DUSE_DCMTK=$(usex dicom)" - "-DUSE_EXTERNAL_PUGIXML=ON" - "-DUSE_NUKE=OFF" # not in Gentoo - "-DUSE_FFMPEG=$(usex ffmpeg)" - "-DUSE_GIF=$(usex gif)" - "-DUSE_OPENJPEG=$(usex jpeg2k)" - "-DUSE_OPENCV=$(usex opencv)" - "-DUSE_OPENVDB=$(usex openvdb)" - "-DUSE_PTEX=$(usex ptex)" - "-DUSE_PYTHON=$(usex python)" - "-DUSE_LIBRAW=$(usex raw)" - "-DUSE_FREETYPE=$(usex truetype)" - "-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")" - ) - - if use gui; then - mycmakeargs+=( -DENABLE_IV=ON -DUSE_OPENGL=ON -DUSE_QT=ON ) - if ! use qt6; then - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON ) - fi - else - mycmakeargs+=( -DENABLE_IV=OFF -DUSE_QT=OFF ) - fi - - if use python; then - mycmakeargs+=( - "-DPYTHON_VERSION=${EPYTHON#python}" - "-DPYTHON_SITE_DIR=$(python_get_sitedir)" - ) - fi - - cmake_src_configure -} - -src_test() { - # TODO: investigate failures - local myctestargs=( - -E "(oiiotool|maketx|oiiotool-maketx|texture-crop|texture-crop.batch|texture-half|texture-half.batch|texture-uint16|texture-uint16.batch|texture-interp-bilinear|texture-interp-bilinear.batch|texture-interp-closest|texture-interp-closest.batch|texture-levels-stochaniso|texture-levels-stochaniso.batch|texture-levels-stochmip|texture-levels-stochmip.batch|texture-mip-onelevel|texture-mip-onelevel.batch|texture-mip-stochastictrilinear|texture-mip-stochastictrilinear.batch|texture-mip-stochasticaniso|texture-mip-stochasticaniso.batch|texture-uint8|texture-uint8.batch|texture-skinny|texture-skinny.batch|texture-icwrite|texture-icwrite.batch|jpeg2000-broken|openexr-damaged|openvdb-broken|texture-texture3d-broken|texture-texture3d-broken.batch|psd|ptex-broken|raw-broken|targa|tiff-depths|zfile|unit_simd|cineon|dds|openvdb.batch-broken|texture-texture3d.batch-broken|cmake-consumer|texture-udim|texture-udim2|texture-udim.batch|texture-udim2.batch)" - ) - - cmake_src_test -} - -src_install() { - cmake_src_install - # can't use font_src_install - # it does directory hierarchy recreation - FONT_S=( - "${S}/src/fonts/Droid_Sans" - "${S}/src/fonts/Droid_Sans_Mono" - "${S}/src/fonts/Droid_Serif" - ) - insinto "${FONTDIR}" - for dir in "${FONT_S[@]}"; do - doins "${dir}"/*.ttf - done -} |