diff options
Diffstat (limited to 'media-libs')
46 files changed, 948 insertions, 156 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz Binary files differindex 8d54abeca4b0..9c0f368c4c53 100644 --- a/media-libs/Manifest.gz +++ b/media-libs/Manifest.gz diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest index 6e20329ad4eb..1ee264cb87a1 100644 --- a/media-libs/freetype/Manifest +++ b/media-libs/freetype/Manifest @@ -9,6 +9,6 @@ DIST ft2demos-2.13.2.tar.xz 341140 BLAKE2B 5e2c3eb2fccb359d03e154b94d349baab27aa DIST ft2demos-2.13.3.tar.xz 342404 BLAKE2B 5f5a48e0ad839ece97ea2bd451bd819ccbf9347425dc323a368e5fed91cfddeffd61b1dfea2e7cc7d65e30e6ebb932dd142430998039eb4a8f91758a3690ddef SHA512 e662a20ad2ff80534e8ea0df2f299e8f61350f13d279f80f8257b18352e863dd2c266791b85d3410b0c83966cb12e3ff49cf398b83a651dc73772df9fcf5936c EBUILD freetype-2.13.0.ebuild 7471 BLAKE2B e34f9310f6e3be77fc2ba69325667a53c3c205b1a14858073853f7202b951b2f4d54b751ef72a5fbc9db6a6e304b70aac7e83df0717532f8e78e3fdf5cc7b1e3 SHA512 fb44300f7175c9f538d71c3beb77774103dd07602bf10856ebc9eb42087aa1e08bd6d549deaec9b46e958d2f2746e42739ce8dd7f126cad7cca2264963eef07f EBUILD freetype-2.13.2.ebuild 6979 BLAKE2B 7cea55108f71de28fc10ed3c87fb3e2e0816263f4c89338f4703ae93bd9c10a86ead5aee71bc1a234e99176a2e691d564a00e9340e041d2d21e71d0ec004e18d SHA512 b2b88ce39734f04e55ef7465ecb06c0db234aa9d0a6ed753b77afe2d8eef820a256aefdaa0f5f0686cd3ffce7b2b322e270840eae74a080b740296bfa91df539 -EBUILD freetype-2.13.3.ebuild 6987 BLAKE2B 1d55874bd6efcbe39fd90d6cf24870d3848521254a805d4b2ec4e9da412b7a9bf1a7e8f3cc25b91671b5103e78fb440d1f7ddfe1873f3d91e8eb40dad3fe9cc0 SHA512 f8bf0acf5fa6182944f20e3a8dd03facf61d53a8018a518aea6ead7f80c555c5c0904e276031403aefa489c8f95fef4e6cd7675c939d33f60a19238007fbb096 +EBUILD freetype-2.13.3.ebuild 6982 BLAKE2B 2e3075a94393521a087ff35a6761ac3d297535dce99635904876c3e34a11f85986e2d5f621cdf8b1522c2f162f1ecf50a442e0c9dbb1be4009fb595b0c5b87a7 SHA512 727d6ef20bdde392fca986140ddf48070807613de2dde895e254855a682b1052ad5e27109946d2231cc8cb146637526832903326d3c4514b490c920526e322c7 EBUILD freetype-9999.ebuild 6987 BLAKE2B 1d55874bd6efcbe39fd90d6cf24870d3848521254a805d4b2ec4e9da412b7a9bf1a7e8f3cc25b91671b5103e78fb440d1f7ddfe1873f3d91e8eb40dad3fe9cc0 SHA512 f8bf0acf5fa6182944f20e3a8dd03facf61d53a8018a518aea6ead7f80c555c5c0904e276031403aefa489c8f95fef4e6cd7675c939d33f60a19238007fbb096 MISC metadata.xml 1279 BLAKE2B f9693d5d9ba012da3835d832882d667e4940b5d65110357f0e2e1ee994db79f0c82abc955a2fafcae38fdcc605f4bdb832bc443cf41d320fce46fac277fecff5 SHA512 7cef4192a1e0133ace925460ce84e1ad64be996cab6e0f6febbda4337174a5d7847fa62c94826e59835c03a792f5b02d16b83e81d341c350ca6976a1e809c439 diff --git a/media-libs/freetype/freetype-2.13.3.ebuild b/media-libs/freetype/freetype-2.13.3.ebuild index e45b12ff7c84..889c45950a90 100644 --- a/media-libs/freetype/freetype-2.13.3.ebuild +++ b/media-libs/freetype/freetype-2.13.3.ebuild @@ -23,7 +23,7 @@ else mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz ) " - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="|| ( FTL GPL-2+ )" diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest index 9f849edef8bd..4dada26ea143 100644 --- a/media-libs/gmmlib/Manifest +++ b/media-libs/gmmlib/Manifest @@ -4,8 +4,10 @@ AUX gmmlib-22.1.1_custom_cflags.patch 2963 BLAKE2B af9979ee3c7977c93288b6afd0c0a DIST intel-gmmlib-22.5.2.tar.gz 867665 BLAKE2B 64559ec6489614df352ba58d25f8706c234f3cff008228a7056e29d92584fab27af311fdb3db8c2e4f6983598019c646df8761ed422a47bcdbff02e79896d613 SHA512 516e2cc0d678d8fd44d8d2b1bfdf61c05670c01c906bd7f55a807846cd6399d4b616f86e6a1d85e2a6a0480c4616a40e9d5b29a3f45fbf588cc4d725ada71d49 DIST intel-gmmlib-22.5.3.tar.gz 867696 BLAKE2B e7fe7394e0e4ee319a35a551908649e209c28f62fc566eab522f7182a78771b35a58ae067118f198eaca2d4f9cbbf58e4f54b9c838b87eed6ac82f2dce7158f1 SHA512 6649f241096b3b81a63c7d29b42494f5621dd9988f2570eaeb7164a4e5a71083180d4a8634782c4831ab8cd22e6b736a2e45e1a52cd5b70f62fe892411362444 DIST intel-gmmlib-22.5.4.tar.gz 868826 BLAKE2B 8a3d455a271d2e76e790e980e96ab0d9bd70854c039272b34eb605d8175749a9a561178ec022d197960bb4e9226217ed43c1a53f2598b1c6910931ca35d4c1c1 SHA512 08735c056a443f5f998b089e8a88bb61f1b0ceb2557971af3c9a0235aca3846888bd32ec42a9750e311d0575a84111c897a6417bcaf3ecf0eac60fa2549f5d93 +DIST intel-gmmlib-22.5.5.tar.gz 868894 BLAKE2B be17a0b1c16bf0ffcb37da3f63db20643803757ea42911f5666218e34bb3f59919bfa369749bef81598e8fb1855a8cad7347b6811791bc2c483b20a3e644e6dd SHA512 8603847f7d2daf0e7839973fea96fa552dbd8c25f29eb961a4f3c5918c70e61ed975a1f6f886547b605dd9f65a059e9decad6372a4269e2b61195259b049630e EBUILD gmmlib-22.5.2.ebuild 954 BLAKE2B e65b06b054ff521cc3ee3d2b95a6777a706fe03fa30cd7a369539d5ebc0b5aead789a8997d640f7a273f2ff9235b216cf1950c3d6f93f9349ac76348ed3de189 SHA512 c7bcd9d9ddd19d174d277a620a38b206d8e1796ad1dcde3ba61b34eaa92eb4d0ece070077e5cd744a38ed80317ea6715ce5d4a5a7cc8057672980d69060585cb EBUILD gmmlib-22.5.3.ebuild 955 BLAKE2B eba2f14d093a7b8b63a1cee0dff0fab805b9681bca014bd11cb2ff7682aec1b3adeaf41cac8b33a1d8a48c4c4420bfcc296a91429c3d55ab3e51581ee126adaa SHA512 f6f89934cf6bb49c453de13a599224d6415f494522f0ebc876cdecda9a061b9d41788ce3ae55d1c168c1f73d6d362403cb15b81067866e1554a4f57ff73c9494 EBUILD gmmlib-22.5.4.ebuild 955 BLAKE2B eba2f14d093a7b8b63a1cee0dff0fab805b9681bca014bd11cb2ff7682aec1b3adeaf41cac8b33a1d8a48c4c4420bfcc296a91429c3d55ab3e51581ee126adaa SHA512 f6f89934cf6bb49c453de13a599224d6415f494522f0ebc876cdecda9a061b9d41788ce3ae55d1c168c1f73d6d362403cb15b81067866e1554a4f57ff73c9494 +EBUILD gmmlib-22.5.5.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.5.5.ebuild b/media-libs/gmmlib/gmmlib-22.5.5.ebuild new file mode 100644 index 000000000000..2a09f24b8f3d --- /dev/null +++ b/media-libs/gmmlib/gmmlib-22.5.5.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/libplacebo/Manifest b/media-libs/libplacebo/Manifest index daf4bcfd7e97..0c168cea5982 100644 --- a/media-libs/libplacebo/Manifest +++ b/media-libs/libplacebo/Manifest @@ -4,6 +4,6 @@ AUX libplacebo-7.349.0-glslang-1.3.296.patch 506 BLAKE2B 42db4aa183b53599605840c DIST fast_float-5.2.0.tar.gz 84800 BLAKE2B 39133eda20acd5f1f049e8040815a67aee588ab93be4953bde3b9227fb691e099581ef79b12b740437b78a9b4c9007762b44d9726ca07505ad5cb51394d8e3fd SHA512 c703c7cba3c69775317c66a62ce145646fd7d3d063124501e3d6a7deebb8c62c14a2ccdffed18de2d73d9d3a8ba2061ef1d34cc780ee0b6d607935d5f1b1de81 DIST libplacebo-glad-2.0.4.tar.gz 599932 BLAKE2B 788d2b70222fd09eea02515bdf3cbc147540631bf35fe39f12aa21fdbabf3d229f4234a430217dfaf3363934b8be12dd6a19871049a7b117deb8260ec69f8c67 SHA512 328d0dbe33e69f846d1c54226c6675694404f41e53c4762e6013c7bfe76b0700f0b28f4117a2018a09c9c23ccb6ad94d7b20882fefc2513941a4515686c9b9e7 DIST libplacebo-v7.349.0.tar.bz2 701309 BLAKE2B 6d0b546776c0326ab8305e7e12341b13e560e1ef53600913ece82341c762cdd466fd2d172781c769e59a57058769d5c0e48ca408ba0c2c7f936459bba6fb4212 SHA512 2e8cec7928aaafaaf9825cbacfb4758024ff04e40b98061fc6f178225647c90344e5aad23b02d82483062dbccf966a7d0178075151cefc6abaef1890f2b0c128 -EBUILD libplacebo-7.349.0.ebuild 3424 BLAKE2B 0e0cf28a2456e9a683a7a7c38cc9e13c2d356329bd451002232537a7fb0a1085aa8ee705ef93bfc98385f4ca98e9f2ada75cda703f7ffd5a1d1d241c3f0077fb SHA512 5c3eb7a33ffa886f6e0a5ea223f97608cb77d38c1896150031037b3433d2a2dbf7dbf4501cd97a1bd1e7164382e4d8965f649f574183e99367b5c9d319a826e5 -EBUILD libplacebo-9999.ebuild 3429 BLAKE2B d7a45adc43bd739322387246ea39073bcf72c6dcf09f60baf98d835edde25bb4410dc39870f9deb229381e6ee236567e2ec6d863759cbcaf63e4fd02d3c9b1c5 SHA512 387f799df21128d0292fad12462fa29784525bceca2f40316590acc310da4cc9a4617fe6e75e2b1ef3abd98bc3af0fc2e56a94b5c5455632a00408c8b3081250 +EBUILD libplacebo-7.349.0.ebuild 3424 BLAKE2B ef1a035b831c08bc15b2453aa056bb14dad4fff6a7ff55b7febb9f1119a6dea22b8264130537d63546debb54124b6ffd2bf73dcab946b700dad52d9e68d254ff SHA512 e4e40382f237b13816bb5f02e8f5b7ffeda5a7ac0734a636853bf202cf7ae31a57dd52511f8476c30cf308ddb52e7e004b221730f9912aa3268e1eab1d4a4499 +EBUILD libplacebo-9999.ebuild 3429 BLAKE2B 7fd6f6eb3fc391280f07a30dfecf94ace7b6ff9a0ad0060e0e5d4323deb177b2856029b0814d1269f08b1da679ddac58402affa9553b8874c269fb7655833a47 SHA512 4b470c0f26f7ffa1d5f1ea6ad43bb665d387ce2722e2e448a092b08ec7a1d9d2f1545f4330f5553e7b185538312adfb60f5de90acb76e53cb80d589c9b361eb4 MISC metadata.xml 794 BLAKE2B 7611ec1c500c2aeff415b9bda5b7a8f64df1e005972902eacc6fe25f84c8c68089041c0015e6ee82062eab9ae0127f502068a116ac01b6f9bbf4269ff8bf1987 SHA512 a8173a71e13137f432bef3b490b05c2e2899a935ed33259b21c488976deb78a860d09a81c8778e23f0b5eb42d02bcfe8a1867da98f4f29713864c21d463c0667 diff --git a/media-libs/libplacebo/libplacebo-7.349.0.ebuild b/media-libs/libplacebo/libplacebo-7.349.0.ebuild index ee0a83ec2656..10102b7a31a0 100644 --- a/media-libs/libplacebo/libplacebo-7.349.0.ebuild +++ b/media-libs/libplacebo/libplacebo-7.349.0.ebuild @@ -52,7 +52,7 @@ RDEPEND=" shaderc? ( media-libs/shaderc[${MULTILIB_USEDEP}] ) !shaderc? ( glslang? ( dev-util/glslang:=[${MULTILIB_USEDEP}] ) ) unwind? ( - llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] ) + llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] ) !llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] ) ) vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] ) diff --git a/media-libs/libplacebo/libplacebo-9999.ebuild b/media-libs/libplacebo/libplacebo-9999.ebuild index fd9eb972c5a4..2055812a69ea 100644 --- a/media-libs/libplacebo/libplacebo-9999.ebuild +++ b/media-libs/libplacebo/libplacebo-9999.ebuild @@ -52,7 +52,7 @@ RDEPEND=" shaderc? ( media-libs/shaderc[${MULTILIB_USEDEP}] ) !shaderc? ( glslang? ( dev-util/glslang:=[${MULTILIB_USEDEP}] ) ) unwind? ( - llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] ) + llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] ) !llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] ) ) vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] ) diff --git a/media-libs/librtprocess/Manifest b/media-libs/librtprocess/Manifest index be3e0f28f209..11e17ff74230 100644 --- a/media-libs/librtprocess/Manifest +++ b/media-libs/librtprocess/Manifest @@ -1,3 +1,3 @@ DIST librtprocess-0.12.0.tar.gz 158244 BLAKE2B 0fa18416b25b760541fd01285b5cc0c3a38d8ddb4dd88b45237fa0cd3f43bdb7831c06282e2c63ddee240c59f6641fb9233e2370d460e3ccdd2d86a5a75e318b SHA512 2eaaff9d9365b97cfb76cef36c0ba53d9b556f45d49bdcc84947ef3bf513240cec13d763ae7fc78589c2b68a739ed23477f6953a7329d8177275f81e5e588ddf -EBUILD librtprocess-0.12.0-r1.ebuild 771 BLAKE2B 10d854af61a45a61b34c2ed4876dd51e2fae3ba0bee494e73c1db565dc744822481e8bf37f6b60c9c12cf55c2f295daf8150995f3afe8295e4839f97ded9dbdd SHA512 ee01adacdae7ee906604eff741fd4048914fa8fd601f1bc110f0e8161ade85cd3e6b7c67cc9600c32e2a2d51449f377dc347d06d11808c31ca2da4c4bacbc5fc +EBUILD librtprocess-0.12.0-r1.ebuild 771 BLAKE2B cbf9d60bd86a8bcf524a4ca908f1ff6f49b38a0b8c8ad1669cca7f87d80adb146b1b68d750166ca8d3981751ea4ae690205efbc7bcd53b01beede1abdc41e7a6 SHA512 46386edc966c17cdacfc236c6e0f194c954e144d8c7238659dde2ac3d0f1743b19b5fa179890925a7b8793e2398e360a8fb7b9080d0cc4b418cf484d744b7739 MISC metadata.xml 686 BLAKE2B bfde95b605e302d99e08b5be18dc694c4b7daca573e72927ada1dce430a9743f5b660ac9111cfdce37605f206eab8c94cf2997bc99de83ddc24f3f2ead670fcb SHA512 1a191e865353cf6256585746d9ec198a5c39da080060990a53a1bfcc024b2d782785c661e63d05cc4b08d61e0410cd6686bc2f45442b46d04c55c3a59b02744b diff --git a/media-libs/librtprocess/librtprocess-0.12.0-r1.ebuild b/media-libs/librtprocess/librtprocess-0.12.0-r1.ebuild index 3552a317c4a2..6eb0b12e8e1e 100644 --- a/media-libs/librtprocess/librtprocess-0.12.0-r1.ebuild +++ b/media-libs/librtprocess/librtprocess-0.12.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,7 +18,7 @@ BDEPEND=" openmp? ( || ( sys-devel/gcc[openmp] - sys-devel/clang-runtime[openmp] + llvm-core/clang-runtime[openmp] ) ) " diff --git a/media-libs/libv4l/Manifest b/media-libs/libv4l/Manifest index 38d272b090d5..666a66f545f3 100644 --- a/media-libs/libv4l/Manifest +++ b/media-libs/libv4l/Manifest @@ -1,3 +1,3 @@ DIST v4l-utils-1.28.1.tar.xz 1246516 BLAKE2B a68728ab6802754cd766453375e212624ee731a7fc9b0d0da6a4c62ce19e75968c5bdbefa33d2977d439a23f36f5c8ff83efc44dae65eed206a31ef19ea57363 SHA512 6493c97f59af5fe0ffa4bb815ebac4531f5ea2b0612c2035c7f00a888ce686ee0aeeaef982553ff9ad6441c39dac63e6c718b1bedb0541cb2ce2e3c2f91ab12f -EBUILD libv4l-1.28.1.ebuild 3598 BLAKE2B d38f1844f81f599eb41347f34cf38df98d143fa6b1311a5826625ab63e4fb05d61861efe2c0f23d2ddfa1db2c72039c024da1f9383b785740552dedf89299aae SHA512 6ce3214faa068901c3cf0572d130be59743ec7416f74974900062c678d42b14d83744f4d2282d1f58e9e91331a2f94de48cc9d473f5f95f07ef16086022fe7bc +EBUILD libv4l-1.28.1.ebuild 3598 BLAKE2B 405fc293ec24302ba65b3e419b273e63c56b83d625d739589fbd90733259d01abc395c3223a9cf8c4e5ef93e58f9972e62b79f51a3ab4b53fe578af64fdefad7 SHA512 c601ce8e075c1df7b5c8e5023ab0d2072481dd3ed075416a0e70a56a0ee458db1b6b58ce6c9b11e62df72af2b092dfcedf97b3831d2a6e8b6bb5bba7196ef984 MISC metadata.xml 1333 BLAKE2B 980117d95da191d35287e97e99c1add4231438d0e5f763cd576bd9bf79ce894297bd32252b8e73a1356d14be66dde09ef0ae3307a0e856554cb024569eee63ee SHA512 da28f9574865217098fb8602d7860131e58b7c16501bef840814a3ef7870a5565795151c8b574ecc895c9614400b5ac5b444430fd147dabea0f747174d6ae7a0 diff --git a/media-libs/libv4l/libv4l-1.28.1.ebuild b/media-libs/libv4l/libv4l-1.28.1.ebuild index 0baeeb18e021..c87900980f76 100644 --- a/media-libs/libv4l/libv4l-1.28.1.ebuild +++ b/media-libs/libv4l/libv4l-1.28.1.ebuild @@ -59,7 +59,7 @@ DEPEND=" BDEPEND=" sys-devel/gettext virtual/pkgconfig - bpf? ( sys-devel/clang:*[llvm_targets_BPF] ) + bpf? ( llvm-core/clang:*[llvm_targets_BPF] ) doc? ( app-text/doxygen ) utils? ( dev-lang/perl @@ -80,7 +80,7 @@ check_llvm() { } pkg_pretend() { - has_version -b sys-devel/clang && check_llvm + has_version -b llvm-core/clang && check_llvm } pkg_setup() { diff --git a/media-libs/libva-intel-media-driver/Manifest b/media-libs/libva-intel-media-driver/Manifest index c3a5698aa383..613329f774cd 100644 --- a/media-libs/libva-intel-media-driver/Manifest +++ b/media-libs/libva-intel-media-driver/Manifest @@ -3,8 +3,10 @@ AUX libva-intel-media-driver-23.3.4_testing_in_src_test.patch 2497 BLAKE2B 5db90 DIST intel-media-24.3.4.tar.gz 27623962 BLAKE2B 0f4eb4321db0b3f1ce05461d0321777918dbb7ac1e28dc916040ca252441c7682650c6af0224588c445ccb06cc1c28b8d5ff47b7a0b271e83b1a97cf3af6e67d SHA512 015915b4265fafa5cb619ac69e1cbd3f17ac22fc51dcb9455782cad097dd494c28cdcc9c4c184c739216b419a5b1ec5730ee19d9dedfc83e20761803a3e89d81 DIST intel-media-24.4.2.tar.gz 27670782 BLAKE2B a89df89b15cb800fd9e90e8ffaee6ee76cdaa3b97d49feacb0c40e2ff7ac44db38dd2ef4fd65b25bdc4450d95c20559b1a9cb3f87e9f7916568ef7fdea631685 SHA512 63f68c2fec1608082b5e1892b7f0cfadbd9e7c2ccacf681e2e596d020d15dbd8dd95bbff353cf7e987dc9a2638b498594b42c36b366ba9bc8cdf5795f38b23fe DIST intel-media-24.4.3.tar.gz 27695613 BLAKE2B 9f4201563d93a0bab5408161b5b418a163bca09f2c17734638817a4060444a321c06a95fbc81616140b55e46a2a1bf8267dba93e15c8f6a1368b8fd98497c4de SHA512 151416aa5e22c98a56d15a00cb8dd3a25cff4a8445b5106b77000d7cff4788736d0e0f4067121334bc3e7b4fba76e84a07b5ac318f12b0fa9a8f9c2317847ada +DIST intel-media-24.4.4.tar.gz 27696988 BLAKE2B cf13b3d0feb005b204892a62402d2a044661279b419bbc47ac414691a5238ada5dc2d59e848a9d53219163420e6b2d364a563f57e10488325587405e2add8ef3 SHA512 0a34a707082a3d7032b472667640d40761f1c9425e291002d2bd2af42d57d69ec3cf6e835430e731ff6c7eb24b22b1843c0b83812001f4ed203fd55097a2c6dc EBUILD libva-intel-media-driver-24.3.4.ebuild 1512 BLAKE2B fbcaa3d74924d108719352a39e427cf67ac308f16c2241b72075651beebfb1a6b121c96f9c4e3866a5ebd5cbdafeee42f1cfa2cb01f76516bf86326133c99e67 SHA512 c24ac146c9bbd37b715697adfba21a486f3887197dde0d5bbd5362acdeddf88a540492b1d60720c96b3461da03b56b9b7de372f515b48898291f69b371ebbff0 EBUILD libva-intel-media-driver-24.4.2.ebuild 1512 BLAKE2B f1b378ac51d69df8397517fe2d7429a93ff5e437748118686b9c2ad7c80d729093904569ae7ae1c2912c3a877525f21e59b6c3d518bf5effe431dc48dc4df9f8 SHA512 0f0eafab51e79227278db7286a8591c4e856f233336455299fdf4ef9542b69f3b32d50d4e0d260598d3a912a079aa8ed51b095c9e2c7683f2e0f5820c4937ece EBUILD libva-intel-media-driver-24.4.3.ebuild 1512 BLAKE2B f1b378ac51d69df8397517fe2d7429a93ff5e437748118686b9c2ad7c80d729093904569ae7ae1c2912c3a877525f21e59b6c3d518bf5effe431dc48dc4df9f8 SHA512 0f0eafab51e79227278db7286a8591c4e856f233336455299fdf4ef9542b69f3b32d50d4e0d260598d3a912a079aa8ed51b095c9e2c7683f2e0f5820c4937ece +EBUILD libva-intel-media-driver-24.4.4.ebuild 1512 BLAKE2B f1b378ac51d69df8397517fe2d7429a93ff5e437748118686b9c2ad7c80d729093904569ae7ae1c2912c3a877525f21e59b6c3d518bf5effe431dc48dc4df9f8 SHA512 0f0eafab51e79227278db7286a8591c4e856f233336455299fdf4ef9542b69f3b32d50d4e0d260598d3a912a079aa8ed51b095c9e2c7683f2e0f5820c4937ece EBUILD libva-intel-media-driver-9999.ebuild 1513 BLAKE2B 12f5e2300d3fc0560a6bdbf73d15c3fe54eb71973912c93b089ad6700741f5dd2e180751d75c9f487462d3dd8ded18565c9268f1ed01118d0a8ddae2d2d345db SHA512 51fe6b32460a5d35466aceea3cdee22438bb0d4d2ecb1ea292158c4bf03db0c0e65d5333b1b228a0a92c8660b4e948559c761d240bcd00f5cd8636413d969c1a MISC metadata.xml 565 BLAKE2B e630d474342839898d53aef1849b002ef651c9f4fe3bfcfe72e809012e6c65153b1a6c14db922a45440ffd5717b90dddd6973185f8a625906e9d5571e50728d9 SHA512 22227f8a9cc39fff74f0bf2cdc8953f110e94ce0ab107076269d604c3cf8ae46c8496c9bcf47598e351cb9714e427f213ade5e446a5e8c67acfc87db5530b370 diff --git a/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.4.4.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.4.4.ebuild new file mode 100644 index 000000000000..42f6583e9710 --- /dev/null +++ b/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.4.4.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib flag-o-matic + +if [[ ${PV} == *9999 ]] ; then + : ${EGIT_REPO_URI:="https://github.com/intel/media-driver"} + if [[ ${PV%9999} != "" ]] ; then + : ${EGIT_BRANCH:="release/${PV%.9999}"} + fi + inherit git-r3 +else + MY_PV="${PV%_pre}" + SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz" + S="${WORKDIR}/media-driver-intel-media-${MY_PV}" + if [[ ${PV} != *_pre* ]] ; then + KEYWORDS="~amd64" + fi +fi + +DESCRIPTION="Intel Media Driver for VA-API (iHD)" +HOMEPAGE="https://github.com/intel/media-driver" + +LICENSE="MIT BSD redistributable? ( no-source-code )" +SLOT="0" +IUSE="+redistributable test X" + +RESTRICT="!test? ( test )" + +DEPEND=">=media-libs/gmmlib-22.5.0:=[${MULTILIB_USEDEP}] + >=media-libs/libva-2.22.0[X?,${MULTILIB_USEDEP}] +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-23.3.4-Remove-unwanted-CFLAGS.patch + "${FILESDIR}"/${PN}-23.3.4_testing_in_src_test.patch +) + +multilib_src_configure() { + # https://github.com/intel/media-driver/issues/356 + append-cxxflags -D_FILE_OFFSET_BITS=64 + + local mycmakeargs=( + -DMEDIA_BUILD_FATAL_WARNINGS=OFF + -DMEDIA_RUN_TEST_SUITE=$(usex test) + -DBUILD_TYPE=Release + -DPLATFORM=linux + -DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex !X) + -DENABLE_NONFREE_KERNELS=$(usex redistributable) + -DLATEST_CPP_NEEDED=ON # Seems to be the best option for now + ) + local CMAKE_BUILD_TYPE="Release" + cmake_src_configure +} diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index 33aed2c21ee7..6afabbb02510 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -8,6 +8,7 @@ DIST mesa-24.2.7.tar.xz 29589968 BLAKE2B eb1b0285e14e77c3140275b322ff084fca74a10 DIST mesa-24.2.8.tar.xz 29622208 BLAKE2B f71a1663f9637883b4c442ba8c68f7960c48c4f8a02412738404386bfb962052923b40c1412198bd29f2ab6cf11654f8c63d4c14a400b89d99229680bc96eaae SHA512 3aa1051a72e1428e42f9537d8f6a26f2ebddc78894e0f71d2cdcc9ed555ea4d6489ad8e74d4c59b8cdf7ea1c629fa725ac2fe1e385db5d3a582d8fe8186392d6 DIST mesa-24.3.0-rc2.tar.xz 30490544 BLAKE2B 043ca1c90d87ec93788fea1c3911e8703cdd2aa8fbf14eafd3b56be1a8b5cdc25bc6c1fec5adeff10af937e2b2d584c1b44c7dda130c78654f390f4cdfc08db8 SHA512 6f47ad5a7d0d5d3cfb933275e566531c176078edffc582c638678ee5fab6cbece9e66ae92c099e8c494a79883b6728cb7deca9297c8d9b6095b7089401d64f1f DIST mesa-24.3.0.tar.xz 30566304 BLAKE2B 43977028609e1be35849e5b72d5cdfbe2052ce959ec43dd649fbf2f3d0f262fbbc3f5194a56a33463eb0b0de8f7f32e4fd2b0dc06cc2f83b27d01bca611f26ec SHA512 20168ae4c278776a60d5febf53b3367cf08bffffb40ef2054821e68d7a8c37a07871d097ab17555f41a4fe716f0de7df95ad7d452b1ed57db6527838eb839ba4 +DIST mesa-24.3.1.tar.xz 30611028 BLAKE2B d3efc322388e29f651b15b0396fef8a6acc0cf24881165900845e429dd6cb53d51511f174d6a4017f48962b764b9a42f069825196af9f4ca969a4b46e1108a0e SHA512 deecf58e2c31e35d7c1943bb21184b52133a83fa472925128d3a03a57b26c92a476a6d3f7140ef2b78475b66affdabf97436ee8b324be204ce5bb940f78119c8 DIST paste-1.0.14.crate 18157 BLAKE2B 35e8548611c51ee75f4d04926149e5e54870d7073d9b635d550a6fa0f85891f57f326bdbcff3dd8618cf40f8e08cf903ef87d9c034d5921d8b91e1db842cdd7c SHA512 3a793f0e5e773a7f7defc798a4c17ae9a40d715144632ea6cb0a8c785e14c4212046491df016bb9838281f8eaf327a79f01c1e2ac5f26785c028bc880faff9ee DIST proc-macro2-1.0.70.crate 44343 BLAKE2B fff0dec06b21e391783cc136790238acb783780eaedcf14875a350e7ceb46fdc100c8b9e3f09fb7f4c2196c25d4c6b61e574c0dad762d94533b628faab68cf5c SHA512 ae9366856853f7d96caf7a7581843d36bfc7843f8683897b19ffc666c03b0b1eff502ddb18ca4c1c1a239a368f03f6cc258b0e2795f64b61c6a31404462eec5f DIST proc-macro2-1.0.86.crate 48958 BLAKE2B 4b89e07f23af8328dbb34fe2b3f1b202f1e6a3885a6269740a23359b41bb4099ac2484565d3b2b0936261689ca525785ac620c766997234fd8d0f409e80e5ea3 SHA512 1cdb7e22a35ae231d880c9420784c9acf97bda2db258b3d34aae5061dc1858449defe19a49e12c6a4173906aa72a4115059ac2db0fc760205fd2ab8b5b414434 @@ -15,14 +16,15 @@ DIST quote-1.0.33.crate 28090 BLAKE2B 77c4b166f1200e1ee2ab94a5014acd334c1fe4b7d7 DIST syn-2.0.39.crate 244129 BLAKE2B 2cff6626624d03f70f1662af45a8644c28a9f92e2dfe38999bef3ba4a4c1ce825ae598277e9cb7abd5585eebfb17b239effc8d0bbf1c6ac196499f0d288e5e01 SHA512 96cc347cfdb0f9ca0b6c7289279a1cad8fc401625783742292564f7ceca8237ced8d9a3f62069696f6132ed06092dff2baaf4be09ef53b21260d93785b0e27c3 DIST syn-2.0.68.crate 265035 BLAKE2B 8bc6f68ed286bea617a2cfaf3949bb699d3a0466faeca735314a51596ce950e4ee57eda88154bd562c1728cfaff4cdb5bc1ba701b9d47a9c50d4c4f011bee975 SHA512 7b781f8ea2b0d01c06f47d165da99cd96e3b44a33de1d77c78a2cb37ebe3f8304f426ba3d0d1cf766241dcc0537908774504df7d455d63bf89ec22ac0499d372 DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920 -EBUILD mesa-24.1.7-r1.ebuild 13767 BLAKE2B f76b17d363c4844428b0f71f0c1e23119d2dee61782c5f4887e0670dfdb8937806e5e6396a56c575ad2a5274f0fc2a89ca18e8000dff7743372b8eda44760867 SHA512 ec6e2b506ee8b39b31720f097a589cc9c66509e5e812228490e5528d5372c3c4cd9db8638098e75db0d631c960ed74e54d2bc1c1fc1fbb467b81fe3f03d81f29 -EBUILD mesa-24.2.3-r1.ebuild 13700 BLAKE2B e6a3a22762ac8951b9ef1ea3f4eeba42aec616e5f0c26ea0f527ded7d925071f255486e372a5a4c685a4c2090a8e574683fd9fefaec927453735e7548a9430d0 SHA512 5b81996aaa5cc12b6926fc5a2cf90d21d7d8fc8715e0fa54b86d752e3322965c591fc254167a65d865ed203b35078475564af69f5369c42418b5067538a5c543 -EBUILD mesa-24.2.4-r1.ebuild 13700 BLAKE2B e6a3a22762ac8951b9ef1ea3f4eeba42aec616e5f0c26ea0f527ded7d925071f255486e372a5a4c685a4c2090a8e574683fd9fefaec927453735e7548a9430d0 SHA512 5b81996aaa5cc12b6926fc5a2cf90d21d7d8fc8715e0fa54b86d752e3322965c591fc254167a65d865ed203b35078475564af69f5369c42418b5067538a5c543 -EBUILD mesa-24.2.5-r1.ebuild 13700 BLAKE2B e6a3a22762ac8951b9ef1ea3f4eeba42aec616e5f0c26ea0f527ded7d925071f255486e372a5a4c685a4c2090a8e574683fd9fefaec927453735e7548a9430d0 SHA512 5b81996aaa5cc12b6926fc5a2cf90d21d7d8fc8715e0fa54b86d752e3322965c591fc254167a65d865ed203b35078475564af69f5369c42418b5067538a5c543 -EBUILD mesa-24.2.6-r2.ebuild 13784 BLAKE2B c1e94f18772d5ae0ba3c4d88ea078aeea8891be9319a3fe398a0e537d976fc1840925146e96261c689247b7b0cf5a3241ab78c1d99c8acb39c9f17b189fb0bcf SHA512 14b6e630fdee08e165f282562fefccbf004d1273c832b920032e6b8f70f3212b8384023b400b590afc6c06ace8e32163df701355a29e2409e2e53234c0058f6b -EBUILD mesa-24.2.7.ebuild 13700 BLAKE2B e6a3a22762ac8951b9ef1ea3f4eeba42aec616e5f0c26ea0f527ded7d925071f255486e372a5a4c685a4c2090a8e574683fd9fefaec927453735e7548a9430d0 SHA512 5b81996aaa5cc12b6926fc5a2cf90d21d7d8fc8715e0fa54b86d752e3322965c591fc254167a65d865ed203b35078475564af69f5369c42418b5067538a5c543 -EBUILD mesa-24.2.8.ebuild 13700 BLAKE2B e6a3a22762ac8951b9ef1ea3f4eeba42aec616e5f0c26ea0f527ded7d925071f255486e372a5a4c685a4c2090a8e574683fd9fefaec927453735e7548a9430d0 SHA512 5b81996aaa5cc12b6926fc5a2cf90d21d7d8fc8715e0fa54b86d752e3322965c591fc254167a65d865ed203b35078475564af69f5369c42418b5067538a5c543 -EBUILD mesa-24.3.0.ebuild 13528 BLAKE2B c4ba904ac93f0685f8521e16545efe4d5a236f6158fd3ae6a305ddc634e94baec25c4eb7ec5184a32ea20cf5ca2a499ae1629543e00517cc0b739d1ec456e346 SHA512 4766fe3eadfb07d935be8c60b1f53d2cb14b5d8fc12c01cff773d5e4e8c85f7c0fbcf23bccaedef9ea771227ba2b2db15ccc35184c65d45bf44e805fefae687b -EBUILD mesa-24.3.0_rc2.ebuild 13528 BLAKE2B c4ba904ac93f0685f8521e16545efe4d5a236f6158fd3ae6a305ddc634e94baec25c4eb7ec5184a32ea20cf5ca2a499ae1629543e00517cc0b739d1ec456e346 SHA512 4766fe3eadfb07d935be8c60b1f53d2cb14b5d8fc12c01cff773d5e4e8c85f7c0fbcf23bccaedef9ea771227ba2b2db15ccc35184c65d45bf44e805fefae687b -EBUILD mesa-9999.ebuild 13528 BLAKE2B c4ba904ac93f0685f8521e16545efe4d5a236f6158fd3ae6a305ddc634e94baec25c4eb7ec5184a32ea20cf5ca2a499ae1629543e00517cc0b739d1ec456e346 SHA512 4766fe3eadfb07d935be8c60b1f53d2cb14b5d8fc12c01cff773d5e4e8c85f7c0fbcf23bccaedef9ea771227ba2b2db15ccc35184c65d45bf44e805fefae687b +EBUILD mesa-24.1.7-r1.ebuild 13769 BLAKE2B cbdd0130cb55c039d1d81d67eeb2b0b8493fe25db50f938f08e2e437b3e0b0a9d50d2c6250bee66f081b7a3577da3ffab810ba636e8ebfe450a7e7c7b8dc8a7b SHA512 dd1de43ecd26536b96d753a479d509667382243ed536edd3c181207bd4b7fc1528d7ab53a3d491659a0866d4b9d4c90f06e5c5a61f4e3353a0f3fbb4ec81d90e +EBUILD mesa-24.2.3-r1.ebuild 13702 BLAKE2B 58bc8cbf7664b6e98f6596468ea890ce14e711974a4a22b5d8b54addd33e07b69879649e8fb6519e9ce26637058a573e6757fa5ea591e26ed6e843c68325c8d8 SHA512 60da25cb25ce0c816f9f4d1efda8f7e8278b977c9b97a83b7a12ad4bb61bce5627e053e34392d91c0370e559c219a80065d782884a333f676f383b4ab40c37e5 +EBUILD mesa-24.2.4-r1.ebuild 13702 BLAKE2B 58bc8cbf7664b6e98f6596468ea890ce14e711974a4a22b5d8b54addd33e07b69879649e8fb6519e9ce26637058a573e6757fa5ea591e26ed6e843c68325c8d8 SHA512 60da25cb25ce0c816f9f4d1efda8f7e8278b977c9b97a83b7a12ad4bb61bce5627e053e34392d91c0370e559c219a80065d782884a333f676f383b4ab40c37e5 +EBUILD mesa-24.2.5-r1.ebuild 13702 BLAKE2B 58bc8cbf7664b6e98f6596468ea890ce14e711974a4a22b5d8b54addd33e07b69879649e8fb6519e9ce26637058a573e6757fa5ea591e26ed6e843c68325c8d8 SHA512 60da25cb25ce0c816f9f4d1efda8f7e8278b977c9b97a83b7a12ad4bb61bce5627e053e34392d91c0370e559c219a80065d782884a333f676f383b4ab40c37e5 +EBUILD mesa-24.2.6-r2.ebuild 13786 BLAKE2B b3f7f042643724e6be4fcffbb7670629247b1bef83909d9c7dfbb614487b86a9c1ab9293c25c05dcdbf41831f1ca9c96c82fd29247aba7a0abb60048ed0a7cc5 SHA512 331bcbd9c9a9e8a7f0a05dda77acd7bb5fef47a159fcd7feba361c7e2d421b65c1d8a7aaf5dac5b38b557439528a67ea36412fee5bbb6935df1e373f66f1444b +EBUILD mesa-24.2.7.ebuild 13702 BLAKE2B 58bc8cbf7664b6e98f6596468ea890ce14e711974a4a22b5d8b54addd33e07b69879649e8fb6519e9ce26637058a573e6757fa5ea591e26ed6e843c68325c8d8 SHA512 60da25cb25ce0c816f9f4d1efda8f7e8278b977c9b97a83b7a12ad4bb61bce5627e053e34392d91c0370e559c219a80065d782884a333f676f383b4ab40c37e5 +EBUILD mesa-24.2.8.ebuild 13702 BLAKE2B 58bc8cbf7664b6e98f6596468ea890ce14e711974a4a22b5d8b54addd33e07b69879649e8fb6519e9ce26637058a573e6757fa5ea591e26ed6e843c68325c8d8 SHA512 60da25cb25ce0c816f9f4d1efda8f7e8278b977c9b97a83b7a12ad4bb61bce5627e053e34392d91c0370e559c219a80065d782884a333f676f383b4ab40c37e5 +EBUILD mesa-24.3.0.ebuild 13530 BLAKE2B b904449f3bfcec35b69fddff80d21700ae036de68a1aabe9ab4667bd5e6af770ae509695314b09aba889085f0245697cd44c5e6da6daf6093e1cd1b9a71ed11e SHA512 4a8a3dc06d41b5b12c4881dac86cc9f88aa0273bb9933410228fbd52e33e440082617865498b33d34b28d02a20ef6afa38d4dba1862db3c242f59ffcf33c764b +EBUILD mesa-24.3.0_rc2.ebuild 13530 BLAKE2B b904449f3bfcec35b69fddff80d21700ae036de68a1aabe9ab4667bd5e6af770ae509695314b09aba889085f0245697cd44c5e6da6daf6093e1cd1b9a71ed11e SHA512 4a8a3dc06d41b5b12c4881dac86cc9f88aa0273bb9933410228fbd52e33e440082617865498b33d34b28d02a20ef6afa38d4dba1862db3c242f59ffcf33c764b +EBUILD mesa-24.3.1.ebuild 13530 BLAKE2B b904449f3bfcec35b69fddff80d21700ae036de68a1aabe9ab4667bd5e6af770ae509695314b09aba889085f0245697cd44c5e6da6daf6093e1cd1b9a71ed11e SHA512 4a8a3dc06d41b5b12c4881dac86cc9f88aa0273bb9933410228fbd52e33e440082617865498b33d34b28d02a20ef6afa38d4dba1862db3c242f59ffcf33c764b +EBUILD mesa-9999.ebuild 13530 BLAKE2B b904449f3bfcec35b69fddff80d21700ae036de68a1aabe9ab4667bd5e6af770ae509695314b09aba889085f0245697cd44c5e6da6daf6093e1cd1b9a71ed11e SHA512 4a8a3dc06d41b5b12c4881dac86cc9f88aa0273bb9933410228fbd52e33e440082617865498b33d34b28d02a20ef6afa38d4dba1862db3c242f59ffcf33c764b MISC metadata.xml 1303 BLAKE2B 348e84a15156bd8ae4634c1866f83f1b283b77f8478e66e57dd3f047a6346d1cc67a7c808ce159b82d292dfab62e8b6c4d17cefcae7aea6fa38739667947258b SHA512 448c3d73ded90117f38cec7c80eead4bdac1599c563798c91c96bca8543b9db2e5c2a06f26f9b7496af085a964aff51ed8b0882aa88f18404b64447de2f65598 diff --git a/media-libs/mesa/mesa-24.1.7-r1.ebuild b/media-libs/mesa/mesa-24.1.7-r1.ebuild index ebfcea5d7aac..3bc7670467fe 100644 --- a/media-libs/mesa/mesa-24.1.7-r1.ebuild +++ b/media-libs/mesa/mesa-24.1.7-r1.ebuild @@ -96,10 +96,10 @@ RDEPEND=" unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) llvm? ( $(llvm_gen_dep " - sys-devel/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}] + llvm-core/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}] + llvm-core/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}] ) ") video_cards_r600? ( @@ -112,7 +112,7 @@ RDEPEND=" lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] ) opencl? ( >=virtual/opencl-3 - dev-libs/libclc[spirv(-)] + llvm-core/libclc[spirv(-)] >=dev-util/spirv-tools-1.3.231.0 virtual/libelf:0= ) @@ -170,7 +170,7 @@ BDEPEND=" ") video_cards_intel? ( ~dev-util/intel_clc-${PV} - dev-libs/libclc[spirv(-)] + llvm-core/libclc[spirv(-)] $(python_gen_any_dep "dev-python/ply[\${PYTHON_USEDEP}]") ) vulkan? ( @@ -273,8 +273,8 @@ python_check_deps() { 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" + if use llvm && has_version llvm-core/llvm[!debug=]; then + ewarn "Mismatch between debug USE flags in media-libs/mesa and llvm-core/llvm" ewarn "detected! This can cause problems. For details, see bug 459306." fi diff --git a/media-libs/mesa/mesa-24.2.3-r1.ebuild b/media-libs/mesa/mesa-24.2.3-r1.ebuild index 3dd7cb3ad57b..c3075d910f97 100644 --- a/media-libs/mesa/mesa-24.2.3-r1.ebuild +++ b/media-libs/mesa/mesa-24.2.3-r1.ebuild @@ -98,10 +98,10 @@ RDEPEND=" unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) llvm? ( $(llvm_gen_dep " - sys-devel/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}] + llvm-core/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}] + llvm-core/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}] ) ") video_cards_r600? ( @@ -114,7 +114,7 @@ RDEPEND=" lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] ) opencl? ( >=virtual/opencl-3 - dev-libs/libclc[spirv(-)] + llvm-core/libclc[spirv(-)] >=dev-util/spirv-tools-1.3.231.0 virtual/libelf:0= ) @@ -173,7 +173,7 @@ BDEPEND=" ") video_cards_intel? ( ~dev-util/intel_clc-${PV} - dev-libs/libclc[spirv(-)] + llvm-core/libclc[spirv(-)] $(python_gen_any_dep "dev-python/ply[\${PYTHON_USEDEP}]") ) vulkan? ( @@ -277,8 +277,8 @@ python_check_deps() { 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" + if use llvm && has_version llvm-core/llvm[!debug=]; then + ewarn "Mismatch between debug USE flags in media-libs/mesa and llvm-core/llvm" ewarn "detected! This can cause problems. For details, see bug 459306." fi diff --git a/media-libs/mesa/mesa-24.2.4-r1.ebuild b/media-libs/mesa/mesa-24.2.4-r1.ebuild index 3dd7cb3ad57b..c3075d910f97 100644 --- a/media-libs/mesa/mesa-24.2.4-r1.ebuild +++ b/media-libs/mesa/mesa-24.2.4-r1.ebuild @@ -98,10 +98,10 @@ RDEPEND=" unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) llvm? ( $(llvm_gen_dep " - sys-devel/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}] + llvm-core/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}] + llvm-core/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}] ) ") video_cards_r600? ( @@ -114,7 +114,7 @@ RDEPEND=" lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] ) opencl? ( >=virtual/opencl-3 - dev-libs/libclc[spirv(-)] + llvm-core/libclc[spirv(-)] >=dev-util/spirv-tools-1.3.231.0 virtual/libelf:0= ) @@ -173,7 +173,7 @@ BDEPEND=" ") video_cards_intel? ( ~dev-util/intel_clc-${PV} - dev-libs/libclc[spirv(-)] + llvm-core/libclc[spirv(-)] $(python_gen_any_dep "dev-python/ply[\${PYTHON_USEDEP}]") ) vulkan? ( @@ -277,8 +277,8 @@ python_check_deps() { 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" + if use llvm && has_version llvm-core/llvm[!debug=]; then + ewarn "Mismatch between debug USE flags in media-libs/mesa and llvm-core/llvm" ewarn "detected! This can cause problems. For details, see bug 459306." fi diff --git a/media-libs/mesa/mesa-24.2.5-r1.ebuild b/media-libs/mesa/mesa-24.2.5-r1.ebuild index 3dd7cb3ad57b..c3075d910f97 100644 --- a/media-libs/mesa/mesa-24.2.5-r1.ebuild +++ b/media-libs/mesa/mesa-24.2.5-r1.ebuild @@ -98,10 +98,10 @@ RDEPEND=" unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) llvm? ( $(llvm_gen_dep " - sys-devel/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}] + llvm-core/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}] + llvm-core/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}] ) ") video_cards_r600? ( @@ -114,7 +114,7 @@ RDEPEND=" lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] ) opencl? ( >=virtual/opencl-3 - dev-libs/libclc[spirv(-)] + llvm-core/libclc[spirv(-)] >=dev-util/spirv-tools-1.3.231.0 virtual/libelf:0= ) @@ -173,7 +173,7 @@ BDEPEND=" ") video_cards_intel? ( ~dev-util/intel_clc-${PV} - dev-libs/libclc[spirv(-)] + llvm-core/libclc[spirv(-)] $(python_gen_any_dep "dev-python/ply[\${PYTHON_USEDEP}]") ) vulkan? ( @@ -277,8 +277,8 @@ python_check_deps() { 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" + if use llvm && has_version llvm-core/llvm[!debug=]; then + ewarn "Mismatch between debug USE flags in media-libs/mesa and llvm-core/llvm" ewarn "detected! This can cause problems. For details, see bug 459306." fi diff --git a/media-libs/mesa/mesa-24.2.6-r2.ebuild b/media-libs/mesa/mesa-24.2.6-r2.ebuild index db88d34888ed..949cec8c6d99 100644 --- a/media-libs/mesa/mesa-24.2.6-r2.ebuild +++ b/media-libs/mesa/mesa-24.2.6-r2.ebuild @@ -98,10 +98,10 @@ RDEPEND=" unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) llvm? ( $(llvm_gen_dep " - sys-devel/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}] + llvm-core/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}] + llvm-core/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}] ) ") video_cards_r600? ( @@ -114,7 +114,7 @@ RDEPEND=" lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] ) opencl? ( >=virtual/opencl-3 - dev-libs/libclc[spirv(-)] + llvm-core/libclc[spirv(-)] >=dev-util/spirv-tools-1.3.231.0 virtual/libelf:0= ) @@ -173,7 +173,7 @@ BDEPEND=" ") video_cards_intel? ( ~dev-util/intel_clc-${PV} - dev-libs/libclc[spirv(-)] + llvm-core/libclc[spirv(-)] $(python_gen_any_dep "dev-python/ply[\${PYTHON_USEDEP}]") ) vulkan? ( @@ -281,8 +281,8 @@ python_check_deps() { 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" + if use llvm && has_version llvm-core/llvm[!debug=]; then + ewarn "Mismatch between debug USE flags in media-libs/mesa and llvm-core/llvm" ewarn "detected! This can cause problems. For details, see bug 459306." fi diff --git a/media-libs/mesa/mesa-24.2.7.ebuild b/media-libs/mesa/mesa-24.2.7.ebuild index 3dd7cb3ad57b..c3075d910f97 100644 --- a/media-libs/mesa/mesa-24.2.7.ebuild +++ b/media-libs/mesa/mesa-24.2.7.ebuild @@ -98,10 +98,10 @@ RDEPEND=" unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) llvm? ( $(llvm_gen_dep " - sys-devel/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}] + llvm-core/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}] + llvm-core/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}] ) ") video_cards_r600? ( @@ -114,7 +114,7 @@ RDEPEND=" lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] ) opencl? ( >=virtual/opencl-3 - dev-libs/libclc[spirv(-)] + llvm-core/libclc[spirv(-)] >=dev-util/spirv-tools-1.3.231.0 virtual/libelf:0= ) @@ -173,7 +173,7 @@ BDEPEND=" ") video_cards_intel? ( ~dev-util/intel_clc-${PV} - dev-libs/libclc[spirv(-)] + llvm-core/libclc[spirv(-)] $(python_gen_any_dep "dev-python/ply[\${PYTHON_USEDEP}]") ) vulkan? ( @@ -277,8 +277,8 @@ python_check_deps() { 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" + if use llvm && has_version llvm-core/llvm[!debug=]; then + ewarn "Mismatch between debug USE flags in media-libs/mesa and llvm-core/llvm" ewarn "detected! This can cause problems. For details, see bug 459306." fi diff --git a/media-libs/mesa/mesa-24.2.8.ebuild b/media-libs/mesa/mesa-24.2.8.ebuild index 3dd7cb3ad57b..c3075d910f97 100644 --- a/media-libs/mesa/mesa-24.2.8.ebuild +++ b/media-libs/mesa/mesa-24.2.8.ebuild @@ -98,10 +98,10 @@ RDEPEND=" unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) llvm? ( $(llvm_gen_dep " - sys-devel/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}] + llvm-core/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}] + llvm-core/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}] ) ") video_cards_r600? ( @@ -114,7 +114,7 @@ RDEPEND=" lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] ) opencl? ( >=virtual/opencl-3 - dev-libs/libclc[spirv(-)] + llvm-core/libclc[spirv(-)] >=dev-util/spirv-tools-1.3.231.0 virtual/libelf:0= ) @@ -173,7 +173,7 @@ BDEPEND=" ") video_cards_intel? ( ~dev-util/intel_clc-${PV} - dev-libs/libclc[spirv(-)] + llvm-core/libclc[spirv(-)] $(python_gen_any_dep "dev-python/ply[\${PYTHON_USEDEP}]") ) vulkan? ( @@ -277,8 +277,8 @@ python_check_deps() { 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" + if use llvm && has_version llvm-core/llvm[!debug=]; then + ewarn "Mismatch between debug USE flags in media-libs/mesa and llvm-core/llvm" ewarn "detected! This can cause problems. For details, see bug 459306." fi diff --git a/media-libs/mesa/mesa-24.3.0.ebuild b/media-libs/mesa/mesa-24.3.0.ebuild index 3c486c964f4c..23476336a9f6 100644 --- a/media-libs/mesa/mesa-24.3.0.ebuild +++ b/media-libs/mesa/mesa-24.3.0.ebuild @@ -97,10 +97,10 @@ RDEPEND=" unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) llvm? ( $(llvm_gen_dep " - sys-devel/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}] + llvm-core/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}] + llvm-core/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}] ) ") video_cards_r600? ( @@ -113,7 +113,7 @@ RDEPEND=" lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] ) opencl? ( >=virtual/opencl-3 - dev-libs/libclc[spirv(-)] + llvm-core/libclc[spirv(-)] >=dev-util/spirv-tools-1.3.231.0 virtual/libelf:0= ) @@ -172,7 +172,7 @@ BDEPEND=" ") video_cards_intel? ( ~dev-util/intel_clc-${PV} - dev-libs/libclc[spirv(-)] + llvm-core/libclc[spirv(-)] $(python_gen_any_dep "dev-python/ply[\${PYTHON_USEDEP}]") ) vulkan? ( @@ -276,8 +276,8 @@ python_check_deps() { 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" + if use llvm && has_version llvm-core/llvm[!debug=]; then + ewarn "Mismatch between debug USE flags in media-libs/mesa and llvm-core/llvm" ewarn "detected! This can cause problems. For details, see bug 459306." fi diff --git a/media-libs/mesa/mesa-24.3.0_rc2.ebuild b/media-libs/mesa/mesa-24.3.0_rc2.ebuild index 3c486c964f4c..23476336a9f6 100644 --- a/media-libs/mesa/mesa-24.3.0_rc2.ebuild +++ b/media-libs/mesa/mesa-24.3.0_rc2.ebuild @@ -97,10 +97,10 @@ RDEPEND=" unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) llvm? ( $(llvm_gen_dep " - sys-devel/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}] + llvm-core/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}] + llvm-core/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}] ) ") video_cards_r600? ( @@ -113,7 +113,7 @@ RDEPEND=" lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] ) opencl? ( >=virtual/opencl-3 - dev-libs/libclc[spirv(-)] + llvm-core/libclc[spirv(-)] >=dev-util/spirv-tools-1.3.231.0 virtual/libelf:0= ) @@ -172,7 +172,7 @@ BDEPEND=" ") video_cards_intel? ( ~dev-util/intel_clc-${PV} - dev-libs/libclc[spirv(-)] + llvm-core/libclc[spirv(-)] $(python_gen_any_dep "dev-python/ply[\${PYTHON_USEDEP}]") ) vulkan? ( @@ -276,8 +276,8 @@ python_check_deps() { 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" + if use llvm && has_version llvm-core/llvm[!debug=]; then + ewarn "Mismatch between debug USE flags in media-libs/mesa and llvm-core/llvm" ewarn "detected! This can cause problems. For details, see bug 459306." fi diff --git a/media-libs/mesa/mesa-24.3.1.ebuild b/media-libs/mesa/mesa-24.3.1.ebuild new file mode 100644 index 000000000000..23476336a9f6 --- /dev/null +++ b/media-libs/mesa/mesa-24.3.1.ebuild @@ -0,0 +1,492 @@ +# 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 +CARGO_OPTIONAL=1 +PYTHON_COMPAT=( python3_{10..13} ) + +inherit flag-o-matic llvm-r1 meson-multilib python-any-r1 linux-info rust-toolchain + +MY_P="${P/_/-}" + +CRATES=" + syn@2.0.68 + proc-macro2@1.0.86 + quote@1.0.33 + unicode-ident@1.0.12 + paste@1.0.14 +" + +RUST_MIN_VER="1.74.1" +RUST_OPTIONAL=1 + +inherit cargo + +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" + inherit git-r3 +else + SRC_URI=" + https://archive.mesa3d.org/${MY_P}.tar.xz + " + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris" +fi + +# This should be {CARGO_CRATE_URIS//.crate/.tar.gz} to correspond to the wrap files, +# but there are "stale" distfiles on the mirrors with the wrong names. +# export MESON_PACKAGE_CACHE_DIR="${DISTDIR}" +SRC_URI+=" + ${CARGO_CRATE_URIS} +" + +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 + 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} ) + 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.121" +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 " + llvm-core/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}] + opencl? ( + dev-util/spirv-llvm-translator:\${LLVM_SLOT} + llvm-core/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 + llvm-core/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.614.1[${MULTILIB_USEDEP}] ) + valgrind? ( dev-debug/valgrind ) + wayland? ( >=dev-libs/wayland-protocols-1.38 ) + X? ( + x11-libs/libXrandr[${MULTILIB_USEDEP}] + x11-base/xorg-proto + ) +" +BDEPEND=" + ${PYTHON_DEPS} + opencl? ( + ${RUST_DEPEND} + >=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}] + dev-python/pyyaml[\${PYTHON_USEDEP}] + ") + video_cards_intel? ( + ~dev-util/intel_clc-${PV} + llvm-core/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 + ${RUST_DEPEND} + ) + ) + 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() { + if [[ ${PV} == 9999 ]]; then + git-r3_src_unpack + else + unpack ${MY_P}.tar.xz + fi + + # We need this because we cannot tell meson to use DISTDIR yet + pushd "${DISTDIR}" >/dev/null || die + mkdir -p "${S}"/subprojects/packagecache || die + local i + for i in *.crate; do + ln -s "${PWD}/${i}" "${S}/subprojects/packagecache/${i/.crate/}.tar.gz" || die + done + popd >/dev/null || die +} + +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}]" && + python_has_version -b "dev-python/pyyaml[${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 llvm-core/llvm[!debug=]; then + ewarn "Mismatch between debug USE flags in media-libs/mesa and llvm-core/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 + + if use opencl || (use vulkan && use video_cards_nvk); then + rust_pkg_setup + fi +} + +src_prepare() { + default + sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \ + bin/symbols-check.py || die # bug #830728 +} + +multilib_src_configure() { + local emesonargs=() + + # bug #932591 and https://gitlab.freedesktop.org/mesa/mesa/-/issues/11140 + 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 || # svga + 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 + + gallium_enable !llvm softpipe + gallium_enable llvm llvmpipe + 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 + + emesonargs+=(-Dvulkan-layers=device-select,overlay) + fi + + driver_list() { + local drivers="$(sort -u <<< "${1// /$'\n'}")" + echo "${drivers//$'\n'/,}" + } + + 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 + -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 3c486c964f4c..23476336a9f6 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -97,10 +97,10 @@ RDEPEND=" unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) llvm? ( $(llvm_gen_dep " - sys-devel/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}] + llvm-core/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}] + llvm-core/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}] ) ") video_cards_r600? ( @@ -113,7 +113,7 @@ RDEPEND=" lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] ) opencl? ( >=virtual/opencl-3 - dev-libs/libclc[spirv(-)] + llvm-core/libclc[spirv(-)] >=dev-util/spirv-tools-1.3.231.0 virtual/libelf:0= ) @@ -172,7 +172,7 @@ BDEPEND=" ") video_cards_intel? ( ~dev-util/intel_clc-${PV} - dev-libs/libclc[spirv(-)] + llvm-core/libclc[spirv(-)] $(python_gen_any_dep "dev-python/ply[\${PYTHON_USEDEP}]") ) vulkan? ( @@ -276,8 +276,8 @@ python_check_deps() { 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" + if use llvm && has_version llvm-core/llvm[!debug=]; then + ewarn "Mismatch between debug USE flags in media-libs/mesa and llvm-core/llvm" ewarn "detected! This can cause problems. For details, see bug 459306." fi diff --git a/media-libs/oidn/Manifest b/media-libs/oidn/Manifest index 55b4ba6c22db..ea67ee70bf1d 100644 --- a/media-libs/oidn/Manifest +++ b/media-libs/oidn/Manifest @@ -8,6 +8,6 @@ DIST oidn-2.3.0.tar.gz 75300547 BLAKE2B 88a5922b4db63c48ab69047dca8d1077205a6d7a EBUILD oidn-1.4.2.ebuild 707 BLAKE2B c8c98d1a61c78ae0524100200c9eb02c5d700e6afe043084d30910f822b1e5fb06c41d915ad4c85d213807484199d1d89ae72e86bc723a807015f9a76268f5b7 SHA512 06b247c86ffab4c4bb7ca0e9c9ebb6a20057a3eff294995eb9062c086b7d7e41f3d9e39e1e89c69924a76d5aaea41c5a8e1319a18f77e1a53b6d9bd9e58ea874 EBUILD oidn-1.4.3.ebuild 709 BLAKE2B 83d6551d7c82d920a8339ff43a7ec966e4cd0179b5c0077624b889b600e9123de4cbb690003fffceed311928c333059c22e8f5e397c20763bdfeac47a2f32843 SHA512 90bcc6567182303fc1d15aee57784538e784c5eaae4c80abbc6d0d195162ffb9dd0b0dcfdd05bacea5895df060cd3946d34de2d01ae3f76dfdcc6cc80476d5f3 EBUILD oidn-2.1.0.ebuild 1745 BLAKE2B 623facc91063e88b56fdc80546e9b1b233a9b245f2441ba20277d11a11959d27a2d5277848530231b26b5b91cd583a43ac3c3a26bc9434678192510ece924ba5 SHA512 42ce153e58919b7addc88adacc11c30c8b7de2813b9f5d6a15dbdfa9b31b2ac39b097077a598bd2f7b2bc693892d64e8111e93e5de30cea39a712fdea1c87a17 -EBUILD oidn-2.2.2.ebuild 2277 BLAKE2B 65c09afb70aea9e6fbf01c57926c52f494570a776539a817c605fb7ce12482d577001e3e2359986c46b2eefe9e84dfc5b00ae9f4109737eced0d44473892840d SHA512 db75325d2f90943b91090e51bfbfa6e9e9441c8a805628a6054b077adc4038e4ca4964a92a17333f7b5d2e4f28e90d74f77e94d8898405db1a60916eef76754b -EBUILD oidn-2.3.0.ebuild 2278 BLAKE2B eda8c4f7280e2abdff673620a0a6603a45f42f0f680ab6138dffe8a33d8eff12ca6e8a311ff5c58bb096dbdd584b5cf00c2d06d5c69db4b9d72e5701fa678f4c SHA512 0bfe7ab156981f2d33f61774c8349dd77c40ae8040b3098963ee44ac518b41c156fbd57bd3d8d81c61077d899da8f47ca7c98c241d10ea21dffe53bf080b6805 +EBUILD oidn-2.2.2.ebuild 2277 BLAKE2B c9140389f08f3999910370bf7f9cd7565619d2700bfc85f057faa2c1cbe6d81c37c2344b9b8ec7ad52e342c3ff57e2d1e1e721fe75afc43918bdb2725e80254c SHA512 6f7262dcacdf3df56ce830a54d6e7b736bf4d92c2944c413fb60e09cd33bde52865d51ead411ce212eeb4e358b3b15b3d1e151c613a68c0070b4a91ae9cd57e6 +EBUILD oidn-2.3.0.ebuild 2278 BLAKE2B 3189679d919924ac6b97276a5743745b6873abce4e2e1ff9f96048eccfe03482c2fb6059e84010bcf95d3ec8743dfb9ef228c1e759d8279112c299bc3a97440a SHA512 722e022dfc52490e28b887daaaae797e0e5a1040464ffed12cc0bd2549a248cb03d3c1adb95a05c3149256ba22664782a53360a50b7efad6249a17e5775bbf35 MISC metadata.xml 995 BLAKE2B e4acf06e236b5d7497d7e19f20ccc961ea25da8dc3180d51ff76decd6f92cf4c927d6dbf96876ed47cb02e2ad7a42aa2571aa98d65e6b90afbe8a8142a3f090b SHA512 7f3b6cce23de7b0aade535b1fe1cb5af8bf622347731837e87cebcf28471a782825a599be79bf96bb69cd1ce5d36c9a9531d51cde1267cfc86453f94beb70d34 diff --git a/media-libs/oidn/oidn-2.2.2.ebuild b/media-libs/oidn/oidn-2.2.2.ebuild index 193b91c619d1..748ea3565f9e 100644 --- a/media-libs/oidn/oidn-2.2.2.ebuild +++ b/media-libs/oidn/oidn-2.2.2.ebuild @@ -40,8 +40,8 @@ RDEPEND=" " DEPEND="${RDEPEND} $(llvm_gen_dep ' - sys-devel/clang:${LLVM_SLOT}= - sys-devel/llvm:${LLVM_SLOT}= + llvm-core/clang:${LLVM_SLOT}= + llvm-core/llvm:${LLVM_SLOT}= ') " diff --git a/media-libs/oidn/oidn-2.3.0.ebuild b/media-libs/oidn/oidn-2.3.0.ebuild index 3ff4eb5cf3fc..ab3c94b0c162 100644 --- a/media-libs/oidn/oidn-2.3.0.ebuild +++ b/media-libs/oidn/oidn-2.3.0.ebuild @@ -38,8 +38,8 @@ RDEPEND=" " DEPEND="${RDEPEND} $(llvm_gen_dep ' - sys-devel/clang:${LLVM_SLOT}= - sys-devel/llvm:${LLVM_SLOT}= + llvm-core/clang:${LLVM_SLOT}= + llvm-core/llvm:${LLVM_SLOT}= ') " BDEPEND="${PYTHON_DEPS}" diff --git a/media-libs/opensubdiv/Manifest b/media-libs/opensubdiv/Manifest index be8bc9c56e23..347c852b32fc 100644 --- a/media-libs/opensubdiv/Manifest +++ b/media-libs/opensubdiv/Manifest @@ -11,6 +11,6 @@ DIST opensubdiv-3.6.0.tar.gz 40746688 BLAKE2B 23f92fa028ae32b430350998299dab3fbb EBUILD opensubdiv-3.4.4-r3.ebuild 2446 BLAKE2B 0f613fee98fa1feae0aa4dd2f29aec068147ff966d543af80cc5a6cad8c841d2a824f2d70708fdff7b27b3371085fdbcf95eced07d0069386ca521e65684079a SHA512 23e04d277443f66a777acebfed7ca85ac4da09ae53ef5a3eca1eaf4116209227550542a4175cc27c085ca5334033ea5980456ad66ac8c40f53f29b07451773e6 EBUILD opensubdiv-3.5.0.ebuild 2454 BLAKE2B 13a8f49887bd963e0be2f145b60827815381591f423ad662ae28cd296205bb473c3821682f3cda11f6b59b459348d55cdfc58ba95fd8e0d5f4dcceb6c33760d9 SHA512 1f98c1acfeeceb966f0ab653e4bff6df1e94791d1b0eb619a173252b5263593dee564f14f5ed61532372594caa223a8535fa3ae2a9b862bfcfec9caf065daf02 EBUILD opensubdiv-3.5.1.ebuild 2892 BLAKE2B 2314d783c73759592bdce53bacd0e2e50aa5aa1b518647c303cb19957983a8c70c5db33cdd418bd2882e9a4e7347a947b730cc8899aa2223a60466340aea52c3 SHA512 98e9fd19093a14cc4aea8f57148e9bb065b5fa1b6fd9c5e7b75fabd2c60d10902950cd206941088d62ba01ea29eb2225420570cb871d299057e519d262216962 -EBUILD opensubdiv-3.6.0-r1.ebuild 4807 BLAKE2B 103219675443dec7e9912e6ed7dff4c775abb08b5f0b86e9d3fcd3ab6d4c073bb76656772deb9f5a7bc134ddcf45d364f6c8440c0133c714560487aed5e5c976 SHA512 5d99f732fa318d9552ed55c644f477eaf7a97ff6c370775cc960d061dca709dd85e007c4175c9289493b7380989ac3c588b56d523e3c76140f5eaddea4a2de81 -EBUILD opensubdiv-3.6.0-r2.ebuild 4802 BLAKE2B acda12be1f067c26ad2f4fe28db60e3738f946e147f23280dc3b1cf3a347b8d6318009fe5e6085d2f3d222efa8c8c69c0f5c3907f14323cd3e7621e21e20f918 SHA512 6a1e2df17490a1e35167a98af90e8529af0e31b5c4596c69ef95ccc1cf6d939ca1f88af5713bb6f806f3b00365bc9956c53bde4e9dd86dd94c550b524442b7be +EBUILD opensubdiv-3.6.0-r1.ebuild 4812 BLAKE2B c3dc975f7dc0d79a57fdffb7a70ac6ec4ca43e1cd93f507f39bf3459ef98fdc410ca2bf72c74d72d6ec7c52a6360159b3107f221b834ab8139752ebc4d58a85c SHA512 748d05989acfc4e23fa4247ccbad18dec35a6794a9b6516033740f30819bca9a82a59454a58bda5d5ad575f00a50e2b2a69189d548a23d6dceda987ef1d176e7 +EBUILD opensubdiv-3.6.0-r2.ebuild 4807 BLAKE2B 79730a1dc049a9d35d03bd7aa3aee6a985acc3548e79a63ed3feac847b0dd148f418b07ab6838bdf123f313367b7f5cec816d4c349f24184736e568e16d6fff2 SHA512 e2f79edbf2191dd7ecd6cfcc0dc3b13a8b26ad7bc0ad83a83eebb4cb693faeae7201b8177f4816c60dd94c6fe4a3816242c565fda99e796673d64571b332fbc4 MISC metadata.xml 1153 BLAKE2B 8f7d43df25d8f5e31b37e2a48b539a1331afa5d79d31300b81431a2e93ee0a342a35a9480f37ae7133a45311854d2e561ea1e2a69478ebcf7d652081f2004545 SHA512 4ee257417d8dd6df875ea8a254d56d5a3134f4d335e118d058118db07c7ac18f753ca02aa814bc0c73d5b00a1ae3a7aa3819a4b2c99c988cc0b3706a00b6e66e diff --git a/media-libs/opensubdiv/opensubdiv-3.6.0-r1.ebuild b/media-libs/opensubdiv/opensubdiv-3.6.0-r1.ebuild index 118c43243cc4..849dfa35702b 100644 --- a/media-libs/opensubdiv/opensubdiv-3.6.0-r1.ebuild +++ b/media-libs/opensubdiv/opensubdiv-3.6.0-r1.ebuild @@ -56,7 +56,7 @@ RDEPEND=" opencl? ( virtual/opencl ) openmp? ( || ( sys-devel/gcc:*[openmp] - sys-libs/libomp + llvm-runtimes/openmp ) ) ptex? ( media-libs/ptex ) tbb? ( dev-cpp/tbb:= ) diff --git a/media-libs/opensubdiv/opensubdiv-3.6.0-r2.ebuild b/media-libs/opensubdiv/opensubdiv-3.6.0-r2.ebuild index 7c2bfcedf8c9..c3631332c524 100644 --- a/media-libs/opensubdiv/opensubdiv-3.6.0-r2.ebuild +++ b/media-libs/opensubdiv/opensubdiv-3.6.0-r2.ebuild @@ -53,7 +53,7 @@ RDEPEND=" opencl? ( virtual/opencl ) openmp? ( || ( sys-devel/gcc:*[openmp] - sys-libs/libomp + llvm-runtimes/openmp ) ) ptex? ( media-libs/ptex ) tbb? ( dev-cpp/tbb:= ) diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest index a355edc91538..2d2e12536e47 100644 --- a/media-libs/osl/Manifest +++ b/media-libs/osl/Manifest @@ -1,7 +1,7 @@ DIST osl-1.12.14.0.tar.gz 20555853 BLAKE2B 4f6bc2084e4c1b25e707a37830961f20926e6ab5cb915c763cbd8126127e70f6368832077729ab5e044f573e8c38c4afb413eff8adccee5ea1ae96cb9be43b6e SHA512 51641e58fb0bba042853e3976c104decc788f1b1d3ec2e33a3f5504b11b05950dc38766ffb066b0f76edc4e0a8829d6b7dd408d9288b74d69380395b1d991bd5 DIST osl-1.13.10.0.tar.gz 21776721 BLAKE2B 6b40adcf50403292003ae8216e60328d5af6d25bf22cd241aeb4f99b1d39c628c78fe1bc8372226c984ca38b6e08427525f12dc38e5b6d3355de02cbc71f1b7b SHA512 f005b8797a7bb882bcdf4fd644551d42c150956baa8dd9deff39ff1121321f33b8e144a9a96ac940ae6bf60985c6131457131baa87c73c2b498298aaa77c3c7d -EBUILD osl-1.12.14.0-r1.ebuild 9915 BLAKE2B 1066b5f8de5e64142f545025ee50eb7cfbc9bcb97ba3148363cf17c7962c997205df7341fb250b8b3acfcb10c19fe3259404aaa049e638fe8a12cd243b5a6049 SHA512 f56d81c78fb40713cbf5e1635275975d5801b6abbb876a2c67709a3c22ed5cbe521c153e8aa3865fc943675f5d15935244b18f99fed14d552db878877c620bde -EBUILD osl-1.12.14.0.ebuild 3906 BLAKE2B 99da9664c5a9ea78af28d4ce67cc44ba9b446bcf46efc7ce2f5f57fafe6e3a51ed89f16681b8cd2be5afaf3d1b0cee9e5f2a8156547fca4945d0d2432ecb9b92 SHA512 db06490cc6dea73fa9e4c0dec4a4f0c605689ad8ec10710a44a0da718b9aada9524ba40cad6d6df75049ac50abbae0ad0fca595b7dd69429a45f49943d0f9cb5 -EBUILD osl-1.13.10.0.ebuild 7681 BLAKE2B af39ddf672f0121c07efb623cca9260ecd0423bd885397ce7ca787b86c4f8fefabe5433259e69fa87b58f85d5905519e6835766b8e8e2fa813721a971a375aef SHA512 0073d65ff2063947aab3d8e1d05d4d043626392fb79d90ffb5b1f304695561494d4de9a460031f58bad9179e61191a08e67de7f5de284eabab8f8f86c3ea3efa -EBUILD osl-9999.ebuild 7682 BLAKE2B 2088ec50cc26da7374f29f5da59f302f04c626010f687d9365dac517894ef101d7e15730d96efe109deb5adf0a44e34f3d32748258f5525589c19ca71c9f9e39 SHA512 5f1a8c990888f4af09b2676fe131dacaf13855a0ac49fc1c614b1e849c1b1afbbc4029b6c7258e1530190edf4db02374fff1b2db74a61434dc2658e0b0ef229c -MISC metadata.xml 1162 BLAKE2B 56fc654915ef7d354844d8b9d99cbe1e2fa8ece1bf3ee2028847d8add16c663cab3110598ae78b7da05c6f3b06bc0926ff1797827c5b2750c03ec02d4c5effe2 SHA512 6e391782385aca530fb9526dd4675845aefd42d760555a7633b0daec2d2890e5d2ce93f39b4c297c1f1056e2c4607c228baba4a1875f05c47362abeb50455dba +EBUILD osl-1.12.14.0-r1.ebuild 9915 BLAKE2B c95259a1d5bac311f49ab0c4bbac05d913d7bd01431975f4c5e8b8bc1c41e58ddc0539a577c8712a178dfac00c2567b3c5e5d974d5fecde536ea35f1702cec30 SHA512 cf5216cbfd6a3d4f33f240f3c817612fbd47e1699ad49791aeae4f13071d99b255867cc366cc3a92330d5957a10e27c0ad9963fff9410056788c6343b0cfd89f +EBUILD osl-1.12.14.0.ebuild 3906 BLAKE2B 59228846da135c84663ff3d4a12f3370de16f281bf7f03dbd14668581c2b8fd010de16129f1e1957c51da5d83a0c1d9541ad1713ff5b938c22021ff9b84eb74b SHA512 e557e55accb7b1a5b5b07c1198fe92547d067d6687100f4ef54be38e20488bdda2cb7809e218aa7f207358ab6a1dc157d1bf5581a7db42180ed2fd4927f42c22 +EBUILD osl-1.13.10.0.ebuild 7681 BLAKE2B 52a7216fce0e543a85c07f40adc9777cc8e619d691ed50247db20d77976bd524bd194e4d33112faf125568e3bced119bd7a225f4e0bdf4174ceb365e34ca21b1 SHA512 9bcc7aea721f050971f327d04c0402478fa85d6d9ddad4e5437bcff6ab1c2c276f7f7fb264ef4c5ce3b3c932dcf0580d30df8d0d3f5f174157dd0d219012427a +EBUILD osl-9999.ebuild 7682 BLAKE2B 645b27d0eb9c87aff57dfcb41b36fa500e7d1e2c59cad3066d64d35f81f8c16f25586d2d80834db707c06d4cbf7ef25a20e38078f515c4a6b1b7fb57c3c98ad3 SHA512 0b43980802be12e478a0bec279c20ba50051f3228db6432abba6096c0ec95d5d678d9e34e3ef5b011c411b7337db6d40fa2b0c93b95528090c561cc3d7abe7b1 +MISC metadata.xml 1167 BLAKE2B c6931d08976c0bf03bfe8138f4babe2f04b61ab486868d31bd37ed20433c5199d5c5e06f63845bb734ad8be017098afdc5c4e94388d56acb5b87727aed4ded61 SHA512 f55dfc1e4e4d8a5b25a04e2bb45a60320f4d472b523a4d3bbce2c47df9974178081db2e7ce8756d5f7116d8e433b2e1ea24faf0d58e2d4ef75d2ae51c97333a6 diff --git a/media-libs/osl/metadata.xml b/media-libs/osl/metadata.xml index 4c2f57c8a0ed..a0f31940cbeb 100644 --- a/media-libs/osl/metadata.xml +++ b/media-libs/osl/metadata.xml @@ -16,7 +16,7 @@ </longdescription> <use> <flag name="gui">Build the osltoy binary (with Qt5)</flag> - <flag name="libcxx">Build against <pkg>sys-libs/libcxx</pkg> when using clang</flag> + <flag name="libcxx">Build against <pkg>llvm-runtimes/libcxx</pkg> when using clang</flag> <flag name="nofma">Do not use Fuse-Multiply-Add operations</flag> <flag name="optix">Add support for NVIDIA's OptiX Raytracing Engine</flag> <flag name="partio">Use <pkg>media-libs/partio</pkg></flag> diff --git a/media-libs/osl/osl-1.12.14.0-r1.ebuild b/media-libs/osl/osl-1.12.14.0-r1.ebuild index e450385f5016..a5bef473888b 100644 --- a/media-libs/osl/osl-1.12.14.0-r1.ebuild +++ b/media-libs/osl/osl-1.12.14.0-r1.ebuild @@ -42,8 +42,8 @@ RDEPEND=" >=media-libs/openexr-3:0= >=media-libs/openimageio-2.4:= $(llvm_gen_dep ' - sys-devel/clang:${LLVM_SLOT} - sys-devel/llvm:${LLVM_SLOT} + llvm-core/clang:${LLVM_SLOT} + llvm-core/llvm:${LLVM_SLOT} ') sys-libs/zlib:= python? ( diff --git a/media-libs/osl/osl-1.12.14.0.ebuild b/media-libs/osl/osl-1.12.14.0.ebuild index 459fa3084277..6bbe929b50c3 100644 --- a/media-libs/osl/osl-1.12.14.0.ebuild +++ b/media-libs/osl/osl-1.12.14.0.ebuild @@ -35,7 +35,7 @@ RDEPEND=" dev-libs/pugixml >=media-libs/openexr-3:0= >=media-libs/openimageio-2.3.12.0:= - <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):= + <llvm-core/clang-$((${LLVM_MAX_SLOT} + 1)):= sys-libs/zlib:= python? ( ${PYTHON_DEPS} @@ -64,7 +64,7 @@ BDEPEND=" " llvm_check_deps() { - has_version -r "sys-devel/clang:${LLVM_SLOT}" + has_version -r "llvm-core/clang:${LLVM_SLOT}" } pkg_setup() { diff --git a/media-libs/osl/osl-1.13.10.0.ebuild b/media-libs/osl/osl-1.13.10.0.ebuild index 2d149fe4a5f5..1ab9bcdd3d56 100644 --- a/media-libs/osl/osl-1.13.10.0.ebuild +++ b/media-libs/osl/osl-1.13.10.0.ebuild @@ -45,8 +45,8 @@ RDEPEND=" >=media-libs/openexr-3:0= >=media-libs/openimageio-2.4:= $(llvm_gen_dep ' - sys-devel/clang:${LLVM_SLOT} - sys-devel/llvm:${LLVM_SLOT} + llvm-core/clang:${LLVM_SLOT} + llvm-core/llvm:${LLVM_SLOT} ') sys-libs/zlib:= optix? ( dev-libs/optix[-headers-only] ) diff --git a/media-libs/osl/osl-9999.ebuild b/media-libs/osl/osl-9999.ebuild index 3df3ad89ba3b..40728570e380 100644 --- a/media-libs/osl/osl-9999.ebuild +++ b/media-libs/osl/osl-9999.ebuild @@ -45,8 +45,8 @@ RDEPEND=" >=media-libs/openexr-3:0= >=media-libs/openimageio-2.4:= $(llvm_gen_dep ' - sys-devel/clang:${LLVM_SLOT} - sys-devel/llvm:${LLVM_SLOT} + llvm-core/clang:${LLVM_SLOT} + llvm-core/llvm:${LLVM_SLOT} ') sys-libs/zlib:= optix? ( dev-libs/optix[-headers-only] ) diff --git a/media-libs/roc-toolkit/Manifest b/media-libs/roc-toolkit/Manifest index 8859ed1c6247..5b2485210e83 100644 --- a/media-libs/roc-toolkit/Manifest +++ b/media-libs/roc-toolkit/Manifest @@ -2,6 +2,6 @@ AUX roc-toolkit-0.2.5-dont-force-O3.patch 626 BLAKE2B d8365e9bc957b5cd6729768c66 AUX roc-toolkit-0.4.0-dont-force-O3.patch 630 BLAKE2B a4895648b0826e7b1de3cf083afa14f7d8d365c45088f9cb87e94c4d737ca51db038225efe42fe351f150f3cd0ec752cad1c0a7124dc7407c0fb1d8dcf299cae SHA512 03c46f69e53b373c0fa9eef2cf43e5a12c51eebe1158be7ba21083c8af90174d73c2da9142621a0b8991fc16432438f5617e0dc54969f51d249c74390b4d12ee DIST roc-toolkit-0.3.0.tar.gz 1679439 BLAKE2B 31775d330bdfb3c42278d1ecbbbb5e14f695ca82f22929e435b6c9bf10c2e25c3367d11cf2913a81e6469876c255193be11eb78b775fad3b17f57c5be9c4bb39 SHA512 447532862dc1714054ebd03ce7fd101525c213a87bc7198a55c8e6068c28db318d59389bafd83681a4e6b34a61e68ac305c66b84e417a3f791b02340a821e6ec DIST roc-toolkit-0.4.0.tar.gz 1895030 BLAKE2B 2ffcf6b1ca50fcae09c7aaa27939e23428feb21f330d578d731e494c62aa088c7e00de3b1a1b488d1bb13ffcc979fede1fc2726e2293a383a87174a4480e8aec SHA512 51763287ee825b6617273ededd9e77560f4223b8ba4a577855c3225908e848895a4f925163862cf6d19a8215245ec26f33d07d6cb80c51768d37eaa06ac02063 -EBUILD roc-toolkit-0.3.0.ebuild 1978 BLAKE2B fe5b0ecbb54ce0eaafe4abe9d63ac0dff29e7ac220a3227706c3a667ea566681f81decf51e1d0a3fbe415fadf7d38af881f9efcf70e7d458c1d2549c87dee87e SHA512 5d956260db827c0455f84ea714a24db7a8da0aa30b54f08fed25e6315b2d4b66c887b19624730eb27bff8c26ba31c6bcc2d398ebdce8570efac29a104ff0557c -EBUILD roc-toolkit-0.4.0.ebuild 2155 BLAKE2B 1ca54e0e8e19f6acae753eed2cf7ec36804c29cbd47be0be42799923b67aa15e687cb858e5e6dfd4b513ddca049089a14bc8d3b19348dff2de1184e65f4f245a SHA512 dba9a68ff90bc42118994a1504631dd61198590886868886df48be0d9b6c73bf364703b0ff66d1268b19c8f67236a7ed8dc0e23132fb99287d54aba6834dd815 +EBUILD roc-toolkit-0.3.0.ebuild 1983 BLAKE2B 874a3777ec2ffe851d5a61fd0c087a67370e8b1216601f217ecfc8b064e4f06c20b23c25635fbd9a8e3dfa48ac5b26c5f4571f7b4f2993c985f86cad62cfc0c7 SHA512 42f259ad5a8bb5cd310b0588ef3a778a290eb1a25b4377307339d4b82d472e3a5b387613305397d5b86a784424759e50ea94a4535c9be2b768483391a73ead1b +EBUILD roc-toolkit-0.4.0.ebuild 2155 BLAKE2B b2fa6e61566627d75561de6ef726f9cdf4a3666148e0e3e01b3c0047e678b1f484181f68fcf1ac87f648b042729889b61cea814489450230537901b505f2ffe7 SHA512 9920fb138abe710fe6a8996402f634273cc609dc680c2b8dde3b9fc25869b70bcd769641006392f1835bfc3d6e2ec3a3d005bbf13b7eb201895e9a5fc7e7a483 MISC metadata.xml 424 BLAKE2B 809444d92a63d99a23c18612cc9559138cdecad99b2af61370141f18e2d0acc0518f1bcee47cd435e26f096b49269b92a3c864e871ef7ae3e15de15f0bc09d6d SHA512 7dfdbb7a4be3022622e15bb263f493f0fdb17ea00c9f6b3711be4877993aaaabe05334dac14e290e602a663fd40dc3ac2f6697e979f0f4b8f9866befb7ac5ae3 diff --git a/media-libs/roc-toolkit/roc-toolkit-0.3.0.ebuild b/media-libs/roc-toolkit/roc-toolkit-0.3.0.ebuild index 7b8860050538..142e9016166b 100644 --- a/media-libs/roc-toolkit/roc-toolkit-0.3.0.ebuild +++ b/media-libs/roc-toolkit/roc-toolkit-0.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -25,7 +25,7 @@ DEPEND=" sox? ( media-sound/sox ) ssl? ( dev-libs/openssl:= ) unwind? ( - llvm-libunwind? ( sys-libs/llvm-libunwind:= ) + llvm-libunwind? ( llvm-runtimes/libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) ) " diff --git a/media-libs/roc-toolkit/roc-toolkit-0.4.0.ebuild b/media-libs/roc-toolkit/roc-toolkit-0.4.0.ebuild index b5355e5f2b18..e2635d28b20c 100644 --- a/media-libs/roc-toolkit/roc-toolkit-0.4.0.ebuild +++ b/media-libs/roc-toolkit/roc-toolkit-0.4.0.ebuild @@ -26,7 +26,7 @@ DEPEND=" sndfile? ( >=media-libs/libsndfile-1.0.28 ) ssl? ( >=dev-libs/openssl-3.0.8:= ) unwind? ( - llvm-libunwind? ( sys-libs/llvm-libunwind:= ) + llvm-libunwind? ( llvm-runtimes/libunwind:= ) !llvm-libunwind? ( >=sys-libs/libunwind-1.2.1:= ) ) " diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest index 2516f9e7adb2..33f917af62fd 100644 --- a/media-libs/vigra/Manifest +++ b/media-libs/vigra/Manifest @@ -1,6 +1,10 @@ AUX vigra-1.11.1-cmake-module-dir.patch 673 BLAKE2B 9dcd11f5754c59bee64d4a4ead62da0e0cb5cde74923871a377ca06a0f639be3a63d6b1769258d09da474e4110ad499a5402660912d8bb07ac0d5bbe199bc36c SHA512 9ab597ea7413d276b22d3cc46ac4179748b98bbaaa44234f71145d69e987b5162d38f87c3317d9bb863cabbcef7c1f3d77f727d19576df7892b2df7272055ce4 AUX vigra-1.11.1-lib_suffix.patch 1032 BLAKE2B ce1b73b89c4d10c3b2ef3185a3c9a7ca791f58efe85eb205bb5f4e638ddc18d171bb7f4a9487670bb1a276c998f0e5096e2efa4fee0f167907d3d02df01bcb42 SHA512 c1cb242eb2ebdf398c81e16acc5a493312b310836caa7f25717dd20d23e885800beeef9ca0589c75ec3a0bd1ba2d879b1e999094cfef3956134e0d6d13f25d0f +AUX vigra-1.12.1-clang19.patch 945 BLAKE2B 030ba9775971812013b735394c2d3cc6dddf2e99c4c84826251c5b969fc1ae800326a16b3eb5572a326f5aa9726512359fa3cc1c6a9cffb7ee20b4b9a80ebcf1 SHA512 2e6ee5cbd21abfc2d1450b008ceb2ec461902c08a51a4f881c5fc223583eb776ff2a6effa753c0fd005d168b4f0083ba73f1c1f92f35f6cdaa70d1239f43e4ce +AUX vigra-1.12.1-python311.patch 1158 BLAKE2B 10d89e4f4b999d555b815b7c50c5e3c68a08eba56f246264ae99c233f0c7ed9315477d25cabd9ba6c6c1cd82c6cc4ba07712921d847a4f1d4196f25584618123 SHA512 d36e4e561b74e54c159db849487e8c44c8879c827c2e3c600373e0ed94b2eced98b33dfe3d8f5aa24660cb330fab8f585ca83abf0b00024d36916b5519752170 DIST vigra-1.11.2_p20240505.tar.gz 34219390 BLAKE2B ad92dc6d21acb52c1aa587a4fbe051fb8416ab8f0b5a7560a6d720f38e73d467c9cebb3940cede83827e7657e30438e4d0d52207cffaf208be76f4ff8cdebca9 SHA512 fa51fc456046989e8bf1225d8ae4bac9ef77b24b9343e657c327f817f3a1b622c645ef22772a6c14c30f7e86ec5ab08df8592ec7b21727146d0f775c010cc9d5 +DIST vigra-1.12.1.tar.gz 34211133 BLAKE2B 177239a42e2052b93d414214a8119712354a939e01c2e8eeaac7ab63135eed44b4e66855a86c9e26565ca53c2e1686852ca44d6fe3924d92fe352756ccaad699 SHA512 745995f71cd32173f937083976d7894a37189c005d1a870c76f25be58aabf163ad10d1b562f65de4eb4adb1addc7c2951823c96e0391ba02f0c5ddcf569f2ee4 EBUILD vigra-1.11.2_p20240505.ebuild 2907 BLAKE2B 60b6fd7c1741508a88a9487b3c76b6c4730f9510908eafa52a58d74b32aa407381f46bd0920d60b54b296db2c86fecbd6330aa7edf2f1599b8b34068735b96d9 SHA512 cbf6736b795e61e850d678ef0cbff4e549a70ebd7cfff79a587ec8bc00ea78ae8d1b13b19ea69140700eecb75d7786fb78109f3f31ea7ad268487f1efec91ef1 -EBUILD vigra-9999.ebuild 2910 BLAKE2B 170448e8f5fcfa9f22a6835482f1914c9a540253ffc928d0c04a88a45709654b6104a6daa5eab9533d2d0faa83521de7ae7f3132893dda00f1d94817c19be196 SHA512 1259a6730057cd09eaa1bd4b415f15785b207fb48bfcca32a738221b42f7c266967cb065c6861d79f5eb8725216bce938c5559ded5d7f952f09292526eae373b +EBUILD vigra-1.12.1.ebuild 2909 BLAKE2B c20772d6e38e4fe3176e72f3e42605bc6e5311b7b56824054f5a03101343df318cea3257857cc1e4e9721c49b57ae7ca3abc12ae0da7e5f0704ecfbeec1da643 SHA512 b7e705a4d9a8cd9bdce5b1d1853e5d766710ce4b7801c4b5db81a2fd58ab8eedcd004d07ca6a2d29ded7241a79c6608e9a6946d9a394498aea7193509b2094fc +EBUILD vigra-9999.ebuild 2909 BLAKE2B c20772d6e38e4fe3176e72f3e42605bc6e5311b7b56824054f5a03101343df318cea3257857cc1e4e9721c49b57ae7ca3abc12ae0da7e5f0704ecfbeec1da643 SHA512 b7e705a4d9a8cd9bdce5b1d1853e5d766710ce4b7801c4b5db81a2fd58ab8eedcd004d07ca6a2d29ded7241a79c6608e9a6946d9a394498aea7193509b2094fc MISC metadata.xml 338 BLAKE2B ce8cddf2fde724bf72d4e61054b4cbe18f40a34e02b34326d227a184d9eac1133bffc48a373f8d2bcc5c5d13de30263c3029a566db9fd6d4442f779be8e97ef7 SHA512 e4242661592f929fdba417b1fa4c176db354d82c7eeb9324a3a6102d3fb405267411e27313666fd9201af1da49de9c1319179c42017273932365113ddcd5a4a5 diff --git a/media-libs/vigra/files/vigra-1.12.1-clang19.patch b/media-libs/vigra/files/vigra-1.12.1-clang19.patch new file mode 100644 index 000000000000..aae20e93be83 --- /dev/null +++ b/media-libs/vigra/files/vigra-1.12.1-clang19.patch @@ -0,0 +1,27 @@ +https://github.com/ukoethe/vigra/issues/591 +https://github.com/msys2/MINGW-packages/commit/bd697fd68cd657cfc3c746a290335b1faaf5371b + +--- a/include/vigra/multi_iterator_coupled.hxx ++++ b/include/vigra/multi_iterator_coupled.hxx +@@ -490,7 +490,7 @@ + CoupledScanOrderIterator operator--(int) + { + CoupledScanOrderIterator res(*this); +- --this; ++ --(*this); + return res; + } + +--- a/include/vigra/random_access_set.hxx ++++ b/include/vigra/random_access_set.hxx +@@ -400,8 +400,8 @@ + const typename RandomAccessSet<Key,Compare,Alloc>::value_type& value + ) + { +- if((position == begin() || this->operator()(*(position-1),value)) +- && (position == end() || this->operator()(value, *position))) { ++ if((position == begin() || key_comp()(*(position-1),value)) ++ && (position == end() || key_comp()(value, *position))) { + return vector_.insert(position, value); + } + return insert(value).first; diff --git a/media-libs/vigra/files/vigra-1.12.1-python311.patch b/media-libs/vigra/files/vigra-1.12.1-python311.patch new file mode 100644 index 000000000000..e3da95c94ea0 --- /dev/null +++ b/media-libs/vigra/files/vigra-1.12.1-python311.patch @@ -0,0 +1,37 @@ +https://github.com/ukoethe/vigra/issues/529 +https://github.com/ukoethe/vigra/pull/594 + +From 5c2c21f7075836cdab84457632480a1cfabcec0f Mon Sep 17 00:00:00 2001 +From: Alfred Wingate <parona@protonmail.com> +Date: Wed, 4 Dec 2024 23:36:44 +0200 +Subject: [PATCH] Move away from inline global regex flag + +Fixes: https://github.com/ukoethe/vigra/issues/529 +Signed-off-by: Alfred Wingate <parona@protonmail.com> +--- a/docsrc/post.py ++++ b/docsrc/post.py +@@ -85,18 +85,18 @@ headingSummary = re.compile(r'''(<!-- Generated by Doxygen .+ --> + </div> + <div class="header">) + <div class="summary"> +-(?s).*?</div>''') ++(?s:.)*?</div>''') + + # tested with doxygen 1.8.2 + headingSummary2 = re.compile(r'''(<!-- Generated by Doxygen .+ --> + </div><!-- top --> + <div class="header">) + <div class="summary"> +-(?s).*?</div>''') ++(?s:.)*?</div>''') + + # tested with doxygen 1.7.5.1 + headingNavpath = re.compile(r'''(<!-- Generated by Doxygen .+ -->) +- <div id="nav-path" class="navpath">(?s).*?</div>''') ++ <div id="nav-path" class="navpath">(?s:.)*?</div>''') + + # tested with doxygen 1.8.2 + headingNavpath2 = re.compile(r'''(<!-- Generated by Doxygen .+ -->) +-- +2.47.1 + diff --git a/media-libs/vigra/vigra-1.12.1.ebuild b/media-libs/vigra/vigra-1.12.1.ebuild new file mode 100644 index 000000000000..490176b71a09 --- /dev/null +++ b/media-libs/vigra/vigra-1.12.1.ebuild @@ -0,0 +1,124 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) +PYTHON_REQ_USE="threads(+),xml(+)" + +inherit cmake flag-o-matic python-single-r1 + +DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures" +HOMEPAGE="https://ukoethe.github.io/vigra/" + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/ukoethe/vigra.git" + inherit git-r3 +else + if [[ ${PV} == *_p* ]] ; then + VIGRA_COMMIT="4db795574a471bf1d94d258361f1ef536dd87ac1" + SRC_URI=" + https://github.com/ukoethe/vigra/archive/${VIGRA_COMMIT}.tar.gz + -> ${P}.tar.gz + " + S="${WORKDIR}"/${PN}-${VIGRA_COMMIT} + else + SRC_URI=" + https://github.com/ukoethe/vigra/archive/refs/tags/Version-$(ver_rs 1- -).tar.gz + -> ${P}.tar.gz + " + S="${WORKDIR}/${PN}-Version-$(ver_rs 1- -)" + fi + + KEYWORDS="~amd64 ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png test +tiff +zlib" + +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + test? ( hdf5 fftw ) +" +RESTRICT="!test? ( test )" + +DEPEND=" + fftw? ( sci-libs/fftw:3.0= ) + hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi=] ) + jpeg? ( media-libs/libjpeg-turbo:= ) + openexr? ( + >=dev-libs/imath-3.1.4-r2:= + >=media-libs/openexr-3:0= + ) + png? ( media-libs/libpng:0= ) + tiff? ( media-libs/tiff:= ) + zlib? ( sys-libs/zlib ) +" +# Python is needed as a runtime dep of installed vigra-config +RDEPEND=" + ${PYTHON_DEPS} + ${DEPEND} +" +BDEPEND=" + doc? ( + app-text/doxygen + dev-texlive/texlive-latex + ) +" + +PATCHES=( + # TODO: upstream + "${FILESDIR}/${PN}-1.11.1-lib_suffix.patch" + "${FILESDIR}/${PN}-1.11.1-cmake-module-dir.patch" + + "${FILESDIR}/${PN}-1.12.1-clang19.patch" + "${FILESDIR}/${PN}-1.12.1-python311.patch" +) + +src_prepare() { + cmake_src_prepare + + sed -i -e '/ADD_DEPENDENCIES(PACKAGE_SRC_TAR/d' CMakeLists.txt || die + + sed -i -e 's|@DOCDIR@|@CMAKE_INSTALL_PREFIX@/@DOCINSTALL@|' config/vigra-config.in || die +} + +src_configure() { + # Floating point error increases with -mfma leading to test failures + append-flags -ffp-contract=off + + local mycmakeargs=( + -DAUTOEXEC_TESTS=OFF + -DAUTOBUILD_TESTS=$(usex test) + -DDOCINSTALL="share/doc/${PF}/html" + -DWITH_HDF5=$(usex hdf5) + -DWITH_OPENEXR=$(usex openexr) + -DWITH_VALGRIND=OFF # only used for tests + -DWITH_VIGRANUMPY=OFF + -DBUILD_TESTS=$(usex test) + -DBUILD_DOCS=$(usex doc) + $(cmake_use_find_package fftw FFTW3) + $(cmake_use_find_package fftw FFTW3F) + $(cmake_use_find_package jpeg JPEG) + $(cmake_use_find_package png PNG) + $(cmake_use_find_package tiff TIFF) + $(cmake_use_find_package zlib ZLIB) + ) + + use doc && mycmakeargs+=( -DPython_EXECUTABLE=${PYTHON} ) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + use doc && cmake_build doc_cpp +} + +src_install() { + cmake_src_install + einstalldocs + + python_fix_shebang "${ED}"/usr/bin/vigra-config +} diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild index 09cc7b4ffdc8..490176b71a09 100644 --- a/media-libs/vigra/vigra-9999.ebuild +++ b/media-libs/vigra/vigra-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) PYTHON_REQ_USE="threads(+),xml(+)" inherit cmake flag-o-matic python-single-r1 @@ -12,15 +12,22 @@ DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and HOMEPAGE="https://ukoethe.github.io/vigra/" if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/ukoethe/${PN}.git" + EGIT_REPO_URI="https://github.com/ukoethe/vigra.git" inherit git-r3 else if [[ ${PV} == *_p* ]] ; then VIGRA_COMMIT="4db795574a471bf1d94d258361f1ef536dd87ac1" - SRC_URI="https://github.com/ukoethe/vigra/archive/${VIGRA_COMMIT}.tar.gz -> ${P}.tar.gz" + SRC_URI=" + https://github.com/ukoethe/vigra/archive/${VIGRA_COMMIT}.tar.gz + -> ${P}.tar.gz + " S="${WORKDIR}"/${PN}-${VIGRA_COMMIT} else - SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${PV//\./-}/${P}-src.tar.gz" + SRC_URI=" + https://github.com/ukoethe/vigra/archive/refs/tags/Version-$(ver_rs 1- -).tar.gz + -> ${P}.tar.gz + " + S="${WORKDIR}/${PN}-Version-$(ver_rs 1- -)" fi KEYWORDS="~amd64 ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris" @@ -28,19 +35,14 @@ fi LICENSE="MIT" SLOT="0" -IUSE="+fftw +hdf5 +jpeg mpi openexr +png test +tiff +zlib" +IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png test +tiff +zlib" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} test? ( hdf5 fftw ) " -BDEPEND=" - test? ( - $(python_gen_cond_dep ' - dev-python/pytest[${PYTHON_USEDEP}] - ') - ) -" +RESTRICT="!test? ( test )" + DEPEND=" fftw? ( sci-libs/fftw:3.0= ) hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi=] ) @@ -58,63 +60,65 @@ RDEPEND=" ${PYTHON_DEPS} ${DEPEND} " - -# Severely broken, also disabled in Fedora, bugs #390447, #653442 -RESTRICT="test" +BDEPEND=" + doc? ( + app-text/doxygen + dev-texlive/texlive-latex + ) +" PATCHES=( # TODO: upstream "${FILESDIR}/${PN}-1.11.1-lib_suffix.patch" "${FILESDIR}/${PN}-1.11.1-cmake-module-dir.patch" + + "${FILESDIR}/${PN}-1.12.1-clang19.patch" + "${FILESDIR}/${PN}-1.12.1-python311.patch" ) src_prepare() { - vigra_disable() { - if ! use ${1}; then - sed -e "/^VIGRA_FIND_PACKAGE.*${2:-$1}/Is/^/#disabled by USE=${1}: /" \ - -i CMakeLists.txt || die "failed to disable ${1}" - fi - } - cmake_src_prepare - vigra_disable fftw fftw3 - vigra_disable fftw fftw3f - vigra_disable jpeg - vigra_disable png - vigra_disable tiff - vigra_disable zlib - - # Don't use python_fix_shebang because we can't put this behind USE="python" - sed -i -e '/env/s:python:python3:' config/vigra-config.in || die - - sed -i -e '/ADD_DEPENDENCIES(PACKAGE_SRC_TAR doc_cpp)/d' CMakeLists.txt || die + sed -i -e '/ADD_DEPENDENCIES(PACKAGE_SRC_TAR/d' CMakeLists.txt || die - cmake_comment_add_subdirectory docsrc - - if ! use test; then - cmake_comment_add_subdirectory test - cmake_run_in vigranumpy cmake_comment_add_subdirectory test - fi + sed -i -e 's|@DOCDIR@|@CMAKE_INSTALL_PREFIX@/@DOCINSTALL@|' config/vigra-config.in || die } src_configure() { - # Needed for now ("fix" compatibility with >=sci-libs/hdf5-1.12) - # bug #808731 - use hdf5 && append-cppflags -DH5_USE_110_API + # Floating point error increases with -mfma leading to test failures + append-flags -ffp-contract=off local mycmakeargs=( -DAUTOEXEC_TESTS=OFF + -DAUTOBUILD_TESTS=$(usex test) -DDOCINSTALL="share/doc/${PF}/html" -DWITH_HDF5=$(usex hdf5) -DWITH_OPENEXR=$(usex openexr) -DWITH_VALGRIND=OFF # only used for tests -DWITH_VIGRANUMPY=OFF + -DBUILD_TESTS=$(usex test) + -DBUILD_DOCS=$(usex doc) + $(cmake_use_find_package fftw FFTW3) + $(cmake_use_find_package fftw FFTW3F) + $(cmake_use_find_package jpeg JPEG) + $(cmake_use_find_package png PNG) + $(cmake_use_find_package tiff TIFF) + $(cmake_use_find_package zlib ZLIB) ) + use doc && mycmakeargs+=( -DPython_EXECUTABLE=${PYTHON} ) + cmake_src_configure } -src_test() { - PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake_src_test +src_compile() { + cmake_src_compile + use doc && cmake_build doc_cpp +} + +src_install() { + cmake_src_install + einstalldocs + + python_fix_shebang "${ED}"/usr/bin/vigra-config } |