diff options
Diffstat (limited to 'media-libs')
68 files changed, 820 insertions, 993 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz Binary files differindex f988fe0ae8e4..320d580e5c31 100644 --- a/media-libs/Manifest.gz +++ b/media-libs/Manifest.gz diff --git a/media-libs/aalib/Manifest b/media-libs/aalib/Manifest index 595a69fdbd48..fd8646aa7211 100644 --- a/media-libs/aalib/Manifest +++ b/media-libs/aalib/Manifest @@ -8,4 +8,4 @@ AUX aalib-1.4_rc5-more-protos.patch 1499 BLAKE2B abf425195f87f83dc019ded382c365f AUX aalib-1.4_rc5-tinfo.patch 709 BLAKE2B fb7dd0eb1e39046c66de0466b0411f97fa948d9da03719fcd759a7331c7da0a6cfcba92353ef5363cf651501d73ce4fd29a5baf94897f10f0518284ebb4db10c SHA512 2abab613af549f4c24f7d617cf65de773e7850ec8485dfa23de2405ed59cf14f7cb70c2f1b701e27ae541e5f75302f4d28c3f866303bfc901a96074c9d9d534b DIST aalib-1.4rc5.tar.gz 391028 BLAKE2B fd527716c0484d45fa3b75712a24301bd485fab8191ac1d5c6d35f8af093a00e11f0f8d2797ddcc32f4d87a39649fd50145dcc557e5ba98e67336cff2bb79002 SHA512 3e4506eccce3b81ccbbb79a4a1b90abd39e2259e6043fde90f70b9ca279bd4c37758a047167267b97c4ec92f64fb17c7c8f548114f0d0c6e78ddb9463b5f1299 EBUILD aalib-1.4_rc5-r10.ebuild 1996 BLAKE2B 86b6da78471851cc9d7573d75a3fe59437e6e525bb4f550fd28a1c58d7e38e5962105f2e29250f509a15c28d0f46262db8e31ab8dd896696dfd8a24d31b57faf SHA512 4ebb97ccb589b7a5b485e82409a658c523c7a9d87184aca0b3f763d5471a27ad09ab6a79a3666bb296a41825c9f79821ca22fcfde8ef8a2a65cb8134cfa28fb6 -MISC metadata.xml 410 BLAKE2B 2f08a7a6bcc149aafd7d9493ea4f87945b3c38fae8e79a80991fb8b23506b7c503d7a0f4c3acd815537a823b0f2f6f49d727d0d34d1476b988811acfa6e89905 SHA512 b35f23f666eb8225269db37aeadf96af19d464b3835933d8fbae839c574cff6ff71bc9553260e383a2a77ca798063eb2529452c99057c4fbd0a0c028ccf86cdd +MISC metadata.xml 304 BLAKE2B b65e1f76bcfc32ca5437f1b0d3125851047adcd4e3f0703c61b3d7fcf069349263dadb428a6bad946cd3e58ab9168340721f8b728b0204dddf6985aa8311f385 SHA512 c81ea7d8442a925944c7c1c84d2c04e3af7b068565140577e21725f058fae8e048971b017b989479a9b5e97378e489108483e16f6e9f6701ad7514a94ae02c7f diff --git a/media-libs/aalib/metadata.xml b/media-libs/aalib/metadata.xml index cc413d659809..2c0ad0577842 100644 --- a/media-libs/aalib/metadata.xml +++ b/media-libs/aalib/metadata.xml @@ -4,10 +4,6 @@ <maintainer type="project"> <email>media-video@gentoo.org</email> </maintainer> - <maintainer type="person"> - <email>marecki@gentoo.org</email> - <name>Marek Szuba</name> - </maintainer> <upstream> <remote-id type="sourceforge">aa-project</remote-id> </upstream> diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest index 9e023b724444..7734d75ac964 100644 --- a/media-libs/assimp/Manifest +++ b/media-libs/assimp/Manifest @@ -6,7 +6,7 @@ AUX assimp-5.2.5-float-comparison.patch 3809 BLAKE2B 6a0474c759d6a4ff68ced5c7f92 AUX assimp-5.2.5-gtest.patch 843 BLAKE2B 044019d2036755c52f780e1bc4e842f181e067c1084432efe2fa6ce769fdd3f919224a7aece04a30593b477637e7e3760f023b50139ab9daecb741d5239dc021 SHA512 431ecd0dec29837a97323227311d795d1774cbe645098a945a05a8b5c36d3dd83f79ec99e99c3c27ec89adb5b90add09f030a0fdde6086381affdf91c83150ff DIST assimp-5.2.5.tar.gz 49543936 BLAKE2B 77e0eecd1307646211a86244a371e24401dffd03dceb569acdd63751cdb38bd169c8b12c942efd2e77b5f541653f2775739150b9fe352b8c903dcc4fe7bccca8 SHA512 ac0dc4243f9d1ff077966f0037187b4374075ac97e75e1a3cd6bdc1caf5f8e4d40953d9a8a316480969c09524d87daa9d3ed75e6ac6f037dd5b1c5f25fce3afb DIST assimp-5.3.1.tar.gz 52826870 BLAKE2B 1f3eac17deb6d19777f2a7cdf74e5be9d6df12a70e9b0449a90f3cc6f85b6d4170de2b870c028e2ad9c7f6ac7269daa0cbb3971dd1feb83a5b12a683ff8bb72f SHA512 49963f84ed0a8145f3af249890a533f0b12f5553ae09581289cb1f20cb49cb1a3ed3f3c4c966ceb43aa897b90deca268aa6554066b2bd34f2ac9c15041420ddb -EBUILD assimp-5.2.5-r1.ebuild 1600 BLAKE2B 60a268965f12bd95b0f2541439f8eab6a49248ea0829e312a39baefcca6f4a673715f055e4e439210834156f86028e2853d3ffaf208dffa53bcccdbe7e824628 SHA512 130dd44275b3051b028996cce856466dbf75ed92bffef8d316a6a27ec6724c133d84af53ce53611bc3b1bcd716c9e00c40b5c6ccb774c4e77ac18f6cca0960b9 -EBUILD assimp-5.2.5-r2.ebuild 2143 BLAKE2B 3c8a5929e27fc8946d145fd1b09d81a3b478d5b2f9a6174c4344d468ec40d31f41a0b9f550633aebd3840015a3b205b1ee95e641edeaeac3b2af07393e2da6f3 SHA512 139b20cf0d92e516697eb1f0d1758bb9e422673c774cdaaf5af630992555413d37902cbc60ac598ad9f83f9a90bb30934af61719ba9098127f7c5e1a2d29a00b -EBUILD assimp-5.3.1.ebuild 4115 BLAKE2B fdf1fe120c58ab70c21b94004dc637399b828cc3592237b7ca281f5a410d7d088dd9598124dfab4e2183d9a75871bc07dc1ce9d5d700f9d819244a57d6478462 SHA512 938c15e37c51e460bf770399a2d09f94b4eeb7f8282bea681c285c4dd15acbd5987c06e7b2bd2fe0d3dc3cdb0a70a78c000bfaed8dad3f3322585cd63a872679 +EBUILD assimp-5.2.5-r1.ebuild 1595 BLAKE2B a5e9c3a46add37729d9de5ce35776c406b3d91df1ad42f214c461231e66134eedab162230396af91adcd97f5a0d1f50d9947d0bc64d866674472ca6c8fdcdc34 SHA512 d201e464b78da2c2d727ac10c66b49aa4ce0b29b20843bd6d6c0ac00332c0a6fab720f5d9740b0b890584bd7a4a521b97bff9b6cfa09368a74725612210ad991 +EBUILD assimp-5.2.5-r2.ebuild 2138 BLAKE2B 552e176e867a7bf7f07b8c06d0174dceeeeca1473e6f78e62382d1eb45bf35b070c7ed58818ee4bccc9b57ebbcfe6a3d2c59cbc55e435db74a8ad4993c867020 SHA512 4edeef319197a0f7beae869551b6d376975da525abfc2eb4f08b11232aa1c105bdff7d62badf349dd173be4d4595c909f7d6f3f2cba9187204185320d20e9cf0 +EBUILD assimp-5.3.1.ebuild 4110 BLAKE2B 331260ac82d44d82f9bda70c1ef725d026da3fea49cb92e9ad9e8ec9f268e12ae281693d2e0b3b1207b5372cb40aca331f43a000f37359ac667012dcdd61f781 SHA512 463148006ae5a61b3969a05f5ace1a5741a9f7a07dd3a27fe8938b519af90d357f2a59feb25ed7c14ab9a63aa0d6e0e9ab385a0bd5afec9caddcf14742ce6f17 MISC metadata.xml 603 BLAKE2B 7f4388ccc6ecdc57b05eef962e349d4d1b3cb973b22918bc36a33814adf707f134ec35fa6cf9089f00bec166fbf49aa6b373f72177347a7ddd5f5cd074a353f1 SHA512 7276490bb3ce6e15d98060739d0002bf8de543ca962f958fad4bcfb4a0451a4bc0d2d882004cf70d97414b986e95f6732b206ab40af2bb2b24315e6858c8f560 diff --git a/media-libs/assimp/assimp-5.2.5-r1.ebuild b/media-libs/assimp/assimp-5.2.5-r1.ebuild index a40338c56f48..a8b3bd836a56 100644 --- a/media-libs/assimp/assimp-5.2.5-r1.ebuild +++ b/media-libs/assimp/assimp-5.2.5-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0/5.2.5" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="samples test" RESTRICT="!test? ( test )" diff --git a/media-libs/assimp/assimp-5.2.5-r2.ebuild b/media-libs/assimp/assimp-5.2.5-r2.ebuild index fc010b398f41..5e1d140d1642 100644 --- a/media-libs/assimp/assimp-5.2.5-r2.ebuild +++ b/media-libs/assimp/assimp-5.2.5-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" IUSE="samples test" RESTRICT="!test? ( test )" diff --git a/media-libs/assimp/assimp-5.3.1.ebuild b/media-libs/assimp/assimp-5.3.1.ebuild index e0fd11950b06..6d6e3b40b1f3 100644 --- a/media-libs/assimp/assimp-5.3.1.ebuild +++ b/media-libs/assimp/assimp-5.3.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86" +KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86" IUSE="doc samples test" RESTRICT="!test? ( test )" diff --git a/media-libs/cimg/Manifest b/media-libs/cimg/Manifest index fec273bac150..53b2f7543826 100644 --- a/media-libs/cimg/Manifest +++ b/media-libs/cimg/Manifest @@ -1,5 +1,7 @@ DIST cimg-2.9.3.tar.gz 11222797 BLAKE2B c2135a0219305dafde642198888f5a813f7c73a34dbb015b271cbfd601a4265fe0495cbd74a0ac502cbbd1b8ead49687a945d35d7eaffe5127cbdc9c67664c14 SHA512 038cfa0dbb8beeffa53cc84491988bfee27b0e3e74c3f802185669be5ddc85f0ab002a6bce0e57e3692aa6380715436078cbcccadb0e2b34442db50fc19c1aed DIST cimg-3.2.4.tar.gz 12660194 BLAKE2B f30f24e388a066a6923a72be00055449862cc643bbe870e55198718e185d2fe9213cb8f19cb83c68fe6ff5ea4e93c2529f70c7256b2d022b304cb2b020f0db11 SHA512 71cbf5161a7778a14e105d8aa41bf0431303b6f4a0f4982d3788903b0505f5ae96be9515c67ea6a52e0e76fdcb25efe3cfd7684980545d078ff41e10dbb4fbb6 +DIST cimg-3.4.0.tar.gz 12666868 BLAKE2B e3beea58774b687a310c8aac594571c34097205bf2efd02abd0af50e8bb87afb8db1cd4a38a5ad9ed6e7cdd777f269434e033bdab8dd795957dd2bc30714b711 SHA512 a960354bc245e933a0b6e175bfe1f9d03abff300a9d9e74e67203e204302349a9ec9dc500e2023776c614180d07a408bdfe9f044185c0707b25714f6ac9d8b85 EBUILD cimg-2.9.3.ebuild 593 BLAKE2B 70b3d6bc70942f9296567570d314ec26a1c95c080b543a5ccce0b6444eb6d8d0ddc0cadda74c487c214de92033af187f2c1489ebe3e73f612b510a74ef451960 SHA512 d974bee754336765eec6ec5488fe25089b725ce8057d53a0965072438bdbf784d776c6616d28bfea0953a0db41722f6dfa66ab56e72104e008d9d40f8b8839d6 EBUILD cimg-3.2.4.ebuild 592 BLAKE2B 6a1d471309cddac88153b113d90e92870f1037cfe54b8b6d0d9f7afea058879c02628227f717a97d072d50798d959243679bbcb09b07985e10e1fe3630670160 SHA512 4d22c05e8c37666810a2403d93e9096f89840ed9e574d2953b0dfb714e03a0b4b951543b7fee41fe43fbe2d29c1bd3af6de7741c532ce5a9c53523e7070c778f -MISC metadata.xml 348 BLAKE2B 5d1a8915f037183b86b6df233986b747c9c3f288a44f50384e6946b311a4f82145024ec0cc7e06880903724bcfa92ef3e3c7de98714072749d6a555b4922601a SHA512 aa18c74c6ab9bc318bda782ebbdcb7b83601bb3a92fac01863acd56785df38c6dab91c53a99b08bd278fd79be73ccefe47d98e339168c72c5631941604c9f506 +EBUILD cimg-3.4.0.ebuild 592 BLAKE2B 85b45e53554357ec149a6125a8d545bf0152324f34b99d5a3064123d79a691a1f4f895a28be73a8bedfadd074016cd5a1f9869854878045d1e0a1259cfe88ae6 SHA512 f4d2728375dc7ff893dafc2da8f942a4a0498c5666adad3ad1404b4b47ff711a9d3e8fb9698756d31b18f061631456be1e59bd36be7d711499a77cb57e32d1d2 +MISC metadata.xml 299 BLAKE2B dd8e2707db89c2dc70b41134566ee0ddd45fe680d09193578112ec2dfc580f6dfa523a0891a0c1685d08e8876c745894569d50c9bcddde93cf3c63d5124e8aca SHA512 3e6f11de12e1d83026f948fcb55ef9b7a0eb7b8688c5f91b729a3d593e664058eb2b617d1ba74224b6950c6ff972c7157240a3065fb0265db628b2bb2cde04ec diff --git a/media-libs/cimg/cimg-3.4.0.ebuild b/media-libs/cimg/cimg-3.4.0.ebuild new file mode 100644 index 000000000000..81ead1e98430 --- /dev/null +++ b/media-libs/cimg/cimg-3.4.0.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="C++ template image processing toolkit" +HOMEPAGE="https://cimg.eu/ https://github.com/GreycLab/CImg" +SRC_URI="https://github.com/GreycLab/CImg/archive/v.${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/CImg-v.${PV}" + +LICENSE="CeCILL-2 CeCILL-C" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc examples" + +src_install() { + doheader CImg.h + dodoc README.txt + + use doc && dodoc -r html + if use examples; then + dodoc -r examples + docompress -x "/usr/share/doc/${PF}/examples" + fi +} diff --git a/media-libs/cimg/metadata.xml b/media-libs/cimg/metadata.xml index b8430415cf27..5d7cc3ce7038 100644 --- a/media-libs/cimg/metadata.xml +++ b/media-libs/cimg/metadata.xml @@ -4,7 +4,6 @@ <!-- maintainer-needed --> <upstream> <remote-id type="github">GreycLab/CImg</remote-id> - <remote-id type="sourceforge">cimg</remote-id> <remote-id type="cpe">cpe:/a:cimg:cimg</remote-id> </upstream> </pkgmetadata> diff --git a/media-libs/elles_icc_profiles/Manifest b/media-libs/elles_icc_profiles/Manifest index d3c76a21e424..88378a4d3749 100644 --- a/media-libs/elles_icc_profiles/Manifest +++ b/media-libs/elles_icc_profiles/Manifest @@ -1,3 +1,3 @@ DIST elles_icc_profiles-20160501.0932.tar.gz 334145 BLAKE2B c2aa9b8720a83d9296e87e0dc56c18e34536a395d80412589d29a5d39bb36ea8c83929afdc1c36b335f3bff4b6d19b5793fd25b8ec45ca49ad159008a70e1f2e SHA512 10a3df45aadf923b2d7ff9c8ee906b000e70ad7d17c1a5005f889b49c6d57849c8befb5c4ed92748908bd5506789b6877c0504666de43c1a8621f646ab665e2f EBUILD elles_icc_profiles-20160501.0932-r1.ebuild 566 BLAKE2B 244cd876b0bb0e9aeb1af6eb60d7822849f921df2b6796a617cc5afe58f4b4ea6f8fdc432f9d94fbaed699e920a3f880eb74f8ac6890f988e47fee73a207a865 SHA512 f56fcc232011c10ad57f468c9479578375c808e033390a5f05cfe5d48f19566ae467a6e6ae8d5ce0a96d9a0cf0cc050c2c21c0b80529ddfd5df35c65404e5e81 -MISC metadata.xml 1180 BLAKE2B a071ad5d9b4d0b99eef944a1809f1fa7d78dfe0fd1d89b148869e96a0ff242b137785a690efe71517bc3e3803b77ba51e17112427023d63cd375ce6da36ca96e SHA512 a470f06245232d344c30baed374a77118350ead2cb0dcd6bfa20115adaab733b672d7fdeff0dcec467efcbc126d133290ff031c351d3b21c9ff736ffd5d0f891 +MISC metadata.xml 1102 BLAKE2B 546e7c0625693d993edb8beb50c4505f259799165514b2844621852d5241f95bda86baa2bc0bc4a2f45389abd8edba6912329792e63ea3f6b35929831c142b1d SHA512 83c07e3a60deb136ecc908b73b8209290d169ed12321a72a8fb64589cc07a956641b6542a8f4720b3485e2b7ff76465888cf36fb136878d5d172cac68727a610 diff --git a/media-libs/elles_icc_profiles/metadata.xml b/media-libs/elles_icc_profiles/metadata.xml index 011f464ec752..e968f56724f4 100644 --- a/media-libs/elles_icc_profiles/metadata.xml +++ b/media-libs/elles_icc_profiles/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>marecki@gentoo.org</email> - <name>Marek Szuba</name> - </maintainer> + <!-- maintainer-needed --> <stabilize-allarches/> <longdescription lang="en"> Elle Stone has developed LCMS-based ICC profile-making code which diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest index 6a1e1486dce8..5315d21d1299 100644 --- a/media-libs/harfbuzz/Manifest +++ b/media-libs/harfbuzz/Manifest @@ -1,10 +1,8 @@ -DIST harfbuzz-8.3.0.tar.xz 19002808 BLAKE2B 3749d2ff7955e135cf0d740bf6fe8b5c20a6bbf171480a29e6ae14fde8c26e1457506278b8c66e3b9630cbeb006874c19075c784a575e490c41297274a27fe59 SHA512 6b8753c0b55d34a1a46a64466b9b0de8bc4748c42b29fa9463616a5f48db08ceb4a80cce416e10861778b98dc96d0638d9dd8d7204e404662154f419f3f61f21 -DIST harfbuzz-8.3.1.tar.xz 19228384 BLAKE2B 84a371284a281a19c3b1f6f9a47dd92060e6fe2b6f4d2469e45e5dbce58b0b151414fa70057bca352a626d8b852ac251168a9749ccac5436ee06280165d31821 SHA512 47bb8150faf215d317a434f78c3029261924aae5ff479fbd3a5d62dbbbfce159460fcbc6f53c3c8ec85b09fad5ae0c9d591d67a0ca70424f43ed5b7849eef4ea DIST harfbuzz-8.4.0.tar.xz 19241260 BLAKE2B 03d6bf0f70354d01ee85edb9fb80d48a91301f862f94f66fddc57ec808105dbeea013e595e2ee616d364773bb68bf5135d4cd44f31a5d3894952a1dced98855c SHA512 9d79ea86f7642f2f1a8726e12a48363eb395162c9b50524e7651b63ad3bb458a69fc82427dbcbfe2550231138f7e454b2c12097a51890f63c645fa3dc668f542 DIST harfbuzz-8.5.0.tar.xz 19468172 BLAKE2B f598d7de953834499d1ab36c0fc9d95099fd7e99b87f630e1527aaa39deb2d339b9f3caaea3643238c6c1b321557f794f273929950b54fe9de2faa430d77855a SHA512 d5762f77b0913792d34596e6f3adb98ab693e2ef928396f997ca2e647ca7cad13fdd204fa15b49e2f7c33320ff210d7f078215d5765c9365571458b919a4f10c -EBUILD harfbuzz-8.3.0.ebuild 2658 BLAKE2B 34ffbc7643580e719a5322ea2eeade70283f8228b3df4b04f1415b7dbeb9fa1f616c719e724d47130635dd02c2eedc7e485172c8d43b9d8b53d32d1489a74bf9 SHA512 355605cea7c1769706c8446057209539dc1bdb320af6501095c09ec51677fd0f017aefd46d3463af9d2248f96ce0e65e000f8350bef4aa63960d657f68be4e43 -EBUILD harfbuzz-8.3.1.ebuild 2666 BLAKE2B ce30bfc0d75c1f8c3ab878ba84b13a2f67b42aa99f2ff59fd4be558dc23ae7da0a08b90d0aa78e291c9d2edbfa8f199a1092793605feeb488aa42c0edec05940 SHA512 73edd912dd62c16c83cf9e05622d55e386aad1aa7bb942a6253608200b2fc067e969e0c029eef9166c9d6b049f9f9da58f863e29cb81a6a3639622cbdc85f0dd +DIST harfbuzz-9.0.0.tar.xz 17895360 BLAKE2B fd35c41d25e77c96b1fc760b8ca0ffd1ac8f3382b51991bb28797d55c2171bf0700ac65266996bf5cab82b8e9c835c2fad9c8374d9c60d2a361c924d805afbf6 SHA512 2700b560727d9c4440ad9c74a170b857f20f9e553e5d98b0c4bcf086a25ba644149d7c89009a41d964af7a924efcc486da4dcbfa5cc4d47f9f10e9b6b8c689af EBUILD harfbuzz-8.4.0.ebuild 2714 BLAKE2B 9384baff4e8f17ea5eed5d98c06154f8b0b9c44d91a2c9711f9be092d10801de9a0125ab9f27b8450b18e86b69a5d6f8a5fd0f277670c84d5bfc8b5f71053129 SHA512 3eee664d83089939d5b4b085d971518958445e1594403fae2f1bc19c58e0a4bdea62dc23a931b823ac373dfe2adedc1a2aa2a2709e86f087095300bc9970f8c1 -EBUILD harfbuzz-8.5.0.ebuild 2722 BLAKE2B e46cb23de9dec781febd032783f135026709049c36a4bf8e936432d048a3acca07cc500b67c3023b5669e3002aa66cf62e9375177e1b35c502ed98ed726dbc5d SHA512 6c4da7c265bf31599f30b009b9b0a0c42b13e6df8736ac8cd862b1b469e141980c3a53be646b93f979d9d7655fdb301c3a33498dffbd7f547d21be5d0ae4db42 -EBUILD harfbuzz-9999.ebuild 2722 BLAKE2B e46cb23de9dec781febd032783f135026709049c36a4bf8e936432d048a3acca07cc500b67c3023b5669e3002aa66cf62e9375177e1b35c502ed98ed726dbc5d SHA512 6c4da7c265bf31599f30b009b9b0a0c42b13e6df8736ac8cd862b1b469e141980c3a53be646b93f979d9d7655fdb301c3a33498dffbd7f547d21be5d0ae4db42 +EBUILD harfbuzz-8.5.0.ebuild 2716 BLAKE2B d0b04bb0dad2402e17616dddd9f4b576d4af00080b2a03aaa35eda405f2de5f6a5999f2532d7d350bfe945e50c33bf9d4273b70394cf3188e39366173f8ab395 SHA512 18c9a73f7a1695056c71c17a878a74dadf41c88d35b7cfc0726ddac7002278716c268ff979ffdb99e78d4b65c7b6ec15797ae3ed57a10d9ad801692e6531bfb3 +EBUILD harfbuzz-9.0.0.ebuild 2426 BLAKE2B 173e25f2d675f85245d22639e6ea4600923b824edc3d611a9eb27809c11cb2f17cec4bce92f1ffcf8a8f43fa5f4ff2c0806dce233eb52642d2cceab167d43349 SHA512 fb86b70e62f260f49f0429d4d3202a26be2a806eff44190bd280c13e1f7c02ff4cbc576f22ccefa4a8448757bdb54c5bc1c2a130a1df00c3f4e7dc0b6d6a26cc +EBUILD harfbuzz-9999.ebuild 2426 BLAKE2B 173e25f2d675f85245d22639e6ea4600923b824edc3d611a9eb27809c11cb2f17cec4bce92f1ffcf8a8f43fa5f4ff2c0806dce233eb52642d2cceab167d43349 SHA512 fb86b70e62f260f49f0429d4d3202a26be2a806eff44190bd280c13e1f7c02ff4cbc576f22ccefa4a8448757bdb54c5bc1c2a130a1df00c3f4e7dc0b6d6a26cc MISC metadata.xml 649 BLAKE2B a03eb9e2b09fab01af900957a9f5d0a43836a77ce770bc2327bc8da299139d1175b59cc413d0a02d74d4fc4169ff3c9180a5c1cf8d6ff570b054bbceb55e89ba SHA512 94c0c007157e240abc17056e2efe877770ee0267bf9d710fdbac796110f4507d2bc628c3b22f74652a9c568e7c60fa513e680aeeb8895831aafede268c14be70 diff --git a/media-libs/harfbuzz/harfbuzz-8.3.0.ebuild b/media-libs/harfbuzz/harfbuzz-8.3.0.ebuild deleted file mode 100644 index 5606c7d68029..000000000000 --- a/media-libs/harfbuzz/harfbuzz-8.3.0.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit flag-o-matic meson-multilib python-any-r1 xdg-utils - -DESCRIPTION="An OpenType text shaping engine" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz" - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git" - inherit git-r3 -else - SRC_URI="https://github.com/harfbuzz/harfbuzz/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -fi - -LICENSE="Old-MIT ISC icu" -# 0.9.18 introduced the harfbuzz-icu split; bug #472416 -# 3.0.0 dropped some unstable APIs; bug #813705 -# 6.0.0 changed libharfbuzz-subset.so ABI -SLOT="0/6.0.0" - -IUSE="+cairo debug doc experimental +glib +graphite icu +introspection test +truetype" -RESTRICT="!test? ( test )" -REQUIRED_USE="introspection? ( glib )" - -RDEPEND=" - cairo? ( x11-libs/cairo:=[${MULTILIB_USEDEP}] ) - glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] ) - graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] ) - icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-1.34:= ) - truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - ${PYTHON_DEPS} - virtual/pkgconfig - doc? ( dev-util/gtk-doc ) - introspection? ( dev-util/glib-utils ) -" - -src_prepare() { - default - - xdg_environment_reset - - # bug #726120 - sed -i \ - -e '/tests\/macos\.tests/d' \ - test/shape/data/in-house/Makefile.sources \ - || die - - # bug #790359 - filter-flags -fexceptions -fthreadsafe-statics - - if ! use debug ; then - append-cppflags -DHB_NDEBUG - fi - - # bug #762415 - local pyscript - for pyscript in $(find -type f -name "*.py") ; do - python_fix_shebang -q "${pyscript}" - done -} - -multilib_src_configure() { - # harfbuzz-gobject only used for introspection, bug #535852 - local emesonargs=( - -Dcoretext=disabled - -Dchafa=disabled - -Dwasm=disabled - - $(meson_feature cairo) - $(meson_feature glib) - $(meson_feature graphite graphite2) - $(meson_feature icu) - $(meson_feature introspection gobject) - $(meson_feature test tests) - $(meson_feature truetype freetype) - - $(meson_native_use_feature doc docs) - $(meson_native_use_feature introspection) - # Breaks building tests.. - #$(meson_native_use_feature utilities) - - $(meson_use experimental experimental_api) - ) - - meson_src_configure -} - -multilib_src_test() { - # harfbuzz:src / check-static-inits times out on hppa - meson_src_test --timeout-multiplier 5 -} diff --git a/media-libs/harfbuzz/harfbuzz-8.5.0.ebuild b/media-libs/harfbuzz/harfbuzz-8.5.0.ebuild index 3fd6ad53a21a..87add1e03cad 100644 --- a/media-libs/harfbuzz/harfbuzz-8.5.0.ebuild +++ b/media-libs/harfbuzz/harfbuzz-8.5.0.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/harfbuzz/harfbuzz/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="Old-MIT ISC icu" diff --git a/media-libs/harfbuzz/harfbuzz-8.3.1.ebuild b/media-libs/harfbuzz/harfbuzz-9.0.0.ebuild index d4d3515eea9d..a5dd866908b4 100644 --- a/media-libs/harfbuzz/harfbuzz-8.3.1.ebuild +++ b/media-libs/harfbuzz/harfbuzz-9.0.0.ebuild @@ -49,24 +49,12 @@ src_prepare() { xdg_environment_reset - # bug #726120 - sed -i \ - -e '/tests\/macos\.tests/d' \ - test/shape/data/in-house/Makefile.sources \ - || die - # bug #790359 filter-flags -fexceptions -fthreadsafe-statics if ! use debug ; then append-cppflags -DHB_NDEBUG fi - - # bug #762415 - local pyscript - for pyscript in $(find -type f -name "*.py") ; do - python_fix_shebang -q "${pyscript}" - done } multilib_src_configure() { diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild index 3fd6ad53a21a..a5dd866908b4 100644 --- a/media-libs/harfbuzz/harfbuzz-9999.ebuild +++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild @@ -49,32 +49,17 @@ src_prepare() { xdg_environment_reset - # bug #726120 - sed -i \ - -e '/tests\/macos\.tests/d' \ - test/shape/data/in-house/Makefile.sources \ - || die - # bug #790359 filter-flags -fexceptions -fthreadsafe-statics if ! use debug ; then append-cppflags -DHB_NDEBUG fi - - # bug #762415 - local pyscript - for pyscript in $(find -type f -name "*.py") ; do - python_fix_shebang -q "${pyscript}" - done } multilib_src_configure() { # harfbuzz-gobject only used for introspection, bug #535852 local emesonargs=( - # ICU 75 needs C++17 (bug #931090) - -Dcpp_std=c++17 - -Dcoretext=disabled -Dchafa=disabled -Dwasm=disabled diff --git a/media-libs/libcddb/Manifest b/media-libs/libcddb/Manifest index eaadf882f0b2..2cd10d3c1b2c 100644 --- a/media-libs/libcddb/Manifest +++ b/media-libs/libcddb/Manifest @@ -1,5 +1,5 @@ AUX libcddb-1.3.2-c99.patch 591 BLAKE2B 504043c76ef660727a1972e368852fa9b1ef4c7c70127e024e84b31a6a878b9bdca94d35c0027bf527dfa97aa7bb71bd67b6df1132a33fc8d4cdafd555ef8752 SHA512 7c82bd6d61b03faea4c0e9bfd59ac91bb3f0f03d0be6058c2c4081f1a017bc0ba8ba59a71d283cb212759f37f513e684db52778f8e13f0fad027d361936a2f80 DIST libcddb-1.3.2.tar.bz2 352909 BLAKE2B 8386ea051f23004396d53ad228a595d13c8c194361223026e901ff859f8e3d2dadb93d5e779902ec4698c164a3e06073fc82f331b22b4cf42f5ab8b1fae562e6 SHA512 0e07e7d37f2013164d75b530a5528f54847271fd20f3b7bedb192a05d1f61dcf006d10dc2927efe155a01eddcc57b940bc31d8ac88d5dfc4f1a09771caa84e0a EBUILD libcddb-1.3.2-r1.ebuild 1221 BLAKE2B 0fc20982808a80080d9cb4014b7f2839bc81233b712ab70af250b47340f9820986be7f2eb534ef57970deb8f288d100d17add1c4072f5a9f9ee1723790030da9 SHA512 0edcafde2a1e423c9ca59e74bcea904a7a611b578e8a4448a91be73bce31425c4583254735289f3b960df67b387c08dabb47c115db68c66abf85f4e8dd5be9ec -EBUILD libcddb-1.3.2-r2.ebuild 1278 BLAKE2B 3f935c7632338af4fa5f6a49b7959c3b94f363a8c2e2dec611a8bf8b4f0b43e8f1be8e54e52d30882ed4c82bf79845ec0b9a644ed79a110ac24b2adebe1edd6e SHA512 549c41602e271286dac4df57925159d18fc8a884e061f048f756cf98b33f9176e9880cc3184fd53784984659fe1745470eeae2772cbbd3a35bf96d14709741f4 +EBUILD libcddb-1.3.2-r2.ebuild 1271 BLAKE2B 50bfb5d9fb40ec153042c6aa8acf4f0d079344cb310e4a59279308a7208531253691c12d84ace315d15590303f6049762213429a8caf4c0d0c19977f5517ee66 SHA512 c775a0a0e6d9f5435c3dcc36e48c98bfbe6f259f82b2418cd663de15d08805d562b944929ae4399c5f59386cabb48cd451516adc7b6e147481dd2ae0a1ac66cf MISC metadata.xml 331 BLAKE2B 08fdd45ed8c06d710353283e93f825766554b6b2dfcca76ee250173172236375a94e968ca380512b8406be2d86031bb1084989262e180c4c1ad8901df72309e9 SHA512 421db591a3d825b41f15d08a13b2d9c98c18b0c220a5716c608d61e0e6c78a7e82749cbdf6ad8feffdf05667eef1d8f8e4dd8c29f7f0764556b2f1f9aec32738 diff --git a/media-libs/libcddb/libcddb-1.3.2-r2.ebuild b/media-libs/libcddb/libcddb-1.3.2-r2.ebuild index 63506b46fe3b..bbdb10ac9293 100644 --- a/media-libs/libcddb/libcddb-1.3.2-r2.ebuild +++ b/media-libs/libcddb/libcddb-1.3.2-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2" LICENSE="LGPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" IUSE="doc static-libs" RDEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]" diff --git a/media-libs/libdisplay-info/Manifest b/media-libs/libdisplay-info/Manifest index 02c7b3a9d93b..bedfcf89b085 100644 --- a/media-libs/libdisplay-info/Manifest +++ b/media-libs/libdisplay-info/Manifest @@ -1,3 +1,5 @@ DIST libdisplay-info-0.1.1.tar.xz 76864 BLAKE2B 262f275a61efefaa57ec48558c4b9f9dd9cb6d8012e50a9873e10a593e1b03e2cc37c2d690be392f26ded171be9dcc8a7e80139129d2b4d85ebc7f9ef0eedaf9 SHA512 95c199211504af96816d92ec8e531bea993dd5d4a2935f1977f1e665b924b1628df25b81cd20da29543d008a8e6d757bdbceb09c74e031c0c213d60be9a10d7a -EBUILD libdisplay-info-0.1.1.ebuild 639 BLAKE2B c4814bf12a50f7dc55c67fbbfa0ea88d76fe71906a5dfb1c8a996899cd1f082b0ea6bc034c94d323833a6aa3be2bc4e1d0e01205eae5fdb3c543751295a96424 SHA512 3bfd7b112872d50c5adea607255f1c6318606566ac3e0d268f4644e00d0371d0d01d7e61c39a0dcb21c1c6fc704eb8f96025944e04f884cd489e090050a3f01e +DIST libdisplay-info-0.2.0.tar.xz 95280 BLAKE2B bcfec916c1f30204e5e0af9e3e57a5ef9929c09912a5c1302fbfb76b54208ad4b96fe1c972afe1814c5762f9f78b0ff093f2249ee0dbf6f1b30202722bd05449 SHA512 6e910b832860d920a4be298a2b6925f701654bd7cdd8b3457e64663c25caa20a74b81b91f71878b9e7f5f70c5c067235f0c99293650231920c67d1241a61e1fb +EBUILD libdisplay-info-0.1.1.ebuild 638 BLAKE2B 2377f2e2160d5fbaa0e68d89c45826731925ce2ca0caf827926be1e36aa38c8808981759e33e04a8c5254f0e5b26fa6003e922f297afc1fce0ef89c1e45147b3 SHA512 c62506b8ce12d7180c4ff9cb38b91d9d9123ef4b38266a55a634bcb2eb278a0915fc57189a6d061559d2093f86f0a9ffc9c32824224d17eb67538cc87f07da7d +EBUILD libdisplay-info-0.2.0.ebuild 558 BLAKE2B deebd396189da4b3113e996d4eacd1761f6013fb70e894a933535907b6e701951272baeddd89201da0cd7b44c21e4065b2d5ffcb9b39f0c5f5e25a568b7036e3 SHA512 024940429819adf78e96465a24bba22057bc5e6abeb9a4459a785f301e5c2237c32e9a7f4bc93dd28e9c7e1135d3f97a31dc777c7559ce874b4db1ff344a3b7d MISC metadata.xml 349 BLAKE2B 0a82833d63b02c6572b7ee005a433ab4768fc3b6b4f6af5ef1bcbb2651d48bf8638cb32994c12370347302f0b8fb66e17b85b188177e1df8bb98e0a2bc65f920 SHA512 e5c06e09ec11cf204a2cf82176778d0fac91c658813d20e7da4e6dbb80ba6b2e27eb4a12b1daa244dceee894c24e9617c313a2d07732f5ca8ee2aa79cc162cf5 diff --git a/media-libs/libdisplay-info/libdisplay-info-0.1.1.ebuild b/media-libs/libdisplay-info/libdisplay-info-0.1.1.ebuild index 6c147ce2cb64..72e98a8a227b 100644 --- a/media-libs/libdisplay-info/libdisplay-info-0.1.1.ebuild +++ b/media-libs/libdisplay-info/libdisplay-info-0.1.1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://gitlab.freedesktop.org/emersion/${PN}/-/releases/${PV}/download LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" +KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/media-libs/libdisplay-info/libdisplay-info-0.2.0.ebuild b/media-libs/libdisplay-info/libdisplay-info-0.2.0.ebuild new file mode 100644 index 000000000000..0f71c25d22ab --- /dev/null +++ b/media-libs/libdisplay-info/libdisplay-info-0.2.0.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) + +inherit meson python-any-r1 + +DESCRIPTION="EDID and DisplayID library" +HOMEPAGE="https://gitlab.freedesktop.org/emersion/libdisplay-info" +SRC_URI="https://gitlab.freedesktop.org/emersion/${PN}/-/releases/${PV}/downloads/${P}.tar.xz" + +LICENSE="MIT" +SLOT="0/2" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" + +RDEPEND="sys-apps/hwdata" +DEPEND="${RDEPEND}" + +BDEPEND=" + ${PYTHON_DEPS} + virtual/pkgconfig +" diff --git a/media-libs/libjxl/Manifest b/media-libs/libjxl/Manifest index 205fd1f119cd..a732c3be3907 100644 --- a/media-libs/libjxl/Manifest +++ b/media-libs/libjxl/Manifest @@ -2,15 +2,18 @@ AUX libjxl-0.8.2-backport-pr2596.patch 2017 BLAKE2B 3155febe7e02fc34dfdf69282102 AUX libjxl-0.8.2-backport-pr2617.patch 2853 BLAKE2B edeafa5bfa85f9868d98f4ee38be2dd4a5d747517e6aec59688d5314f1b6ede74bc3d20a11d08e3e2e2e87e8da987730a8a8cafcecce69369fdfa7bcb8ef2828 SHA512 ad8ddbe50d23895a3127d11bf36832ad1a1762e9b54bacc5f4d881accb5c81801618254b9b56afc4b145a7fb19bab8ca739974ff3bcb498e7db812d3a6cf004d AUX libjxl-0.9.1-backport-pr3143.patch 1065 BLAKE2B acc6ab904994f42cffe19296966587dbbf316289277d91e1a17cd635161b51eed770ab95fc682d93b8693d50def9bb205290c3eb534effdfdc2cd057db36647c SHA512 d5eeca764e13175eb64ba5ee47a9bf03080d0830395ba9b626b7144674a5ce8fbb694705a4d2c55f3b52507a59c5793e21e9c99dded65803857a0859a1f9f466 DIST libjxl-0.10.2.tar.gz 1912303 BLAKE2B 9677d0d35d877ce269c9958accfbb5ee55d446dc0e8fa64df9323c1db3993613752803aae63a48c18eeb72ae91c2a044a1fab0a83ddf28fdf8395ddb67a72414 SHA512 1d19f30c0ae94e212326a15dc128612bce207e619c55c2a020401a27d01a933de71bb35e907521dc8fd853dd5578d74d74f7a5a282f0083fd22cf9cb07ccb96e +DIST libjxl-0.10.3.tar.gz 1912351 BLAKE2B 4432ecf34ac03d9ce8fc814835c7ee31fcc1e516b95e347dcb201a6996e1ffaadbd2e78a6a235ee1c4ff5121af495b8bc621e6738e2d03a8eb1639fb397e5246 SHA512 5ece482f4c5f0312e87e020f921525622a6d3f1a3834f3cd8666638fc8d0fba8cd072ef58f7b153dc17ca19071ebae2fbad7b08e6d440c2669f4f1b35888a7d4 DIST libjxl-0.8.2.tar.gz 1612062 BLAKE2B 2b5e65cde6c85881c5f26f676afec825c974f6919c3cc3f056ca4a9679162e89f2de35ab7d0b2a60782d39eca1f4ddad779f8d25d3f520417f6d9dea71e854db SHA512 769f102c46755d11a705ce47ae9e2ef49627ae708f416693bf1293aeeb713934baf4466e45b9c70b04ec1fc8b4a00d5ca7688c8ca03f0a91c9a15252c522a887 +DIST libjxl-0.8.3.tar.gz 1612441 BLAKE2B d1c3b108c67d0a3a63ce50cdc7305b6853b182ec6c210d499e15120fbb858dada23997a4a0eb545f936e02230ed773506b066f24e19cce1f99aedaafd2bd7803 SHA512 f7fb4b2b0fd2459bec86918371369e80de59549c8dc24ff5c83546f564e54c81ea6a72720af151e3f9b64ef326f3ec8a5a6e0023b7fe2de14b056e501af579ef DIST libjxl-0.9.2.tar.gz 1873156 BLAKE2B 558d82dfaa2e5e4fdb07542b2daf4b80f661dec46986d412bdc2b1af0ac4b501f9e533eefd73e923b94a54f82695c4aed5cc531abc9e818ab4faf0aab0267b94 SHA512 97bc0ccd249fe0fa6d0f52c470a0d0bd181e3f00cd9820dda5ca437dff260e6c9e2c95dceec4bd9354c3adc4fc6724228cb027c537af6df7d3f90ab8ee61653f +DIST libjxl-0.9.3.tar.gz 1873236 BLAKE2B eb3811ef4fc64bb5df2e06b6b86cbc1b5dbe6eb9728e5ad5a8b791be57359eb63442722cdf629b006be518bf575409b93758d7ec0376a596de4405fb7686b7f2 SHA512 8aace2d8c0ece9db64a1620a10581ddc5a450543db64d44f864eaa5d3b8b3f0466c501fed5d58abdbf6eb5f90af25f6370c33718847bd070e851a02b560f541e DIST libjxl-testdata-d6168ffb9e1cc24007e64b65dd84d822ad1fc759.tar.gz 67553075 BLAKE2B 779fee87386e617edd93bca7a523fa1ab223ae88114c3cc5484987a7c92cca2d0bb3d668fa3c8064b2a0255c17a06447c009f4fbf9ef379692ddfa37dee1be97 SHA512 a48d74a1ccff404eb7675225b59965e056dc3fc09930572785d83bae03fa1c38e105336dbf5ecfc3f0995e8b8bfb1097b451ae661f2933590b2b152192c8aa2f DIST libjxl-testdata-ff8d743aaba05b3014f17e5475e576242fa979fc.tar.gz 69105882 BLAKE2B a80fce437b810e7b99b4c7bd106ec7eba01a1eeddc90e1b82cb8d75f3ca194c357ef8e7b7e1e9da65aa39dc2cd11d32cb6de8558188c5258c7446d58787603ff SHA512 0d237e706fd8d001a9cb245b685e8e39085416daedec019c348ccc64cf15a34cecdb0c245f94f57507f5934e487ee5157f51f59bb6a000f5899862c582336384 -EBUILD libjxl-0.10.2-r1.ebuild 2945 BLAKE2B 00773bbe7fe462c425558fc9456f5871ab70a9083a52746e5fd8f0a0bf939654d4528213a85aa0cff31ee9722891b2306e14b962c58953ed65ceaa4585c778e2 SHA512 1b3470cb66f1bad55f76c4bb1b24f01a85973be5199e9cddba758e40714dce21b90a28eaeb5693c9906784448492e049ab337ddb6f07e5cb8651d57b9b52fe86 -EBUILD libjxl-0.10.2.ebuild 2722 BLAKE2B 628d35e59657616b49b5ab54308c3d8600bc18c135cf9c464055ba739239cc67e079693251f5da9c0f0f509f4d88bcd95b47c1472549fb8ed0bc6964424336aa SHA512 9b78395438c0116b286b8f56996cfce92845186f23d644621008de619fe9c87c6554a9749b5b121a2e226ae68b087c05dcb1a0ffc663131cf5ee151696bc222d -EBUILD libjxl-0.8.2-r1.ebuild 2339 BLAKE2B 5e919bdd10fe20de0b45122a7ed2f037ef3e54c4c17a385bdc930288c8b9ccbabf0de82bedfe8510999ea8085d37981764243662fccd872f29ba19ac14d9c407 SHA512 f9227486972af086b08140bd81bd02cb3f303792f168fb05ef9dc5c743c6ad576da3f2a5616b31aeefdaa77d1c7fef6a04da0fdd36648ad7361aaaee2ce7f603 -EBUILD libjxl-0.8.2-r2.ebuild 2571 BLAKE2B 3d66e80efb11dd03ab12446eba565a26b136cd75644c8d5dd976fb2bc47bb0129e9afdd091b2200b9e62076ec0586b72cdcb4eb3c919aebfde91b02b6acc78a9 SHA512 f1ba0c1652f21bcba6bf8825d925cc97e2c9340711afeade8d7aa76ca2588bb81f7949e84139fe44aebb150e560a11f301e580a1f5564073f789d91d35c261ff -EBUILD libjxl-0.9.2-r1.ebuild 3007 BLAKE2B 6ded330ffaf6eb2daf3a402c91b4abd16769ff3e41b86d08f7717d27b76806a4e95a27a5f5a5b824b6068038616d863145e75458d1716ab0bcf9720acb38c6ea SHA512 1fcf2d77d03f317f07569d2124771abda3827043738e98c105961ae9ed1d9099aafa7972d7c57d154465fd7ae9f400390c3764287f7758663cf4f860cf25910a -EBUILD libjxl-0.9.2.ebuild 2784 BLAKE2B bb08ef63e10bcc07381fac168baa3b596f93e91c3d648b89f2a7ec0296b1bb4713fa91459faab76a08f89fe77cb23051131f19b3dcf1d6be3843b41ad6f8f271 SHA512 aeeca7ebde32c21a18e07d0b8e3c54fbdaa13b53d1c9eb642f53d34a56fd7b206d519c8f617d78fc691ffcd69745282577c589df3bef8af0692e9ef3346c2c06 +EBUILD libjxl-0.10.2-r1.ebuild 2940 BLAKE2B 49f3c0f3f32d56c976afc6fe35d983a561493c33e95fd706f414599a7abf99af46f79d1484230cfd05106114338b2a4ee5511aa23232a03e6a7463420165b805 SHA512 f41aac4c7594e972464ce6f5e646f618f013603a56d1ecd937515d56942b46161f765276f90c6ee4dd8194fcd2a0c8fe9b9711ab5de952e62b6e5fbb12cd7d6a +EBUILD libjxl-0.10.3.ebuild 2945 BLAKE2B 00773bbe7fe462c425558fc9456f5871ab70a9083a52746e5fd8f0a0bf939654d4528213a85aa0cff31ee9722891b2306e14b962c58953ed65ceaa4585c778e2 SHA512 1b3470cb66f1bad55f76c4bb1b24f01a85973be5199e9cddba758e40714dce21b90a28eaeb5693c9906784448492e049ab337ddb6f07e5cb8651d57b9b52fe86 +EBUILD libjxl-0.8.2-r2.ebuild 2566 BLAKE2B 98867a0d0f9d5dc63a0bd82bbe0d38d3b9503439177d28943166eec16cdd593318c5eaa8c3f3d05c8fc55f4e2f63e6a309ad4a728232a703cfebc868e9141aa0 SHA512 5966e0eab345b00e50f20d2d94d6ff6b21dbc5bffbf4504a65e161d658763252ad76d556b21926ee7caf9255adbb9182bcdab0fe7a9bf77506bc988b0df85b9c +EBUILD libjxl-0.8.3.ebuild 2571 BLAKE2B 3d66e80efb11dd03ab12446eba565a26b136cd75644c8d5dd976fb2bc47bb0129e9afdd091b2200b9e62076ec0586b72cdcb4eb3c919aebfde91b02b6acc78a9 SHA512 f1ba0c1652f21bcba6bf8825d925cc97e2c9340711afeade8d7aa76ca2588bb81f7949e84139fe44aebb150e560a11f301e580a1f5564073f789d91d35c261ff +EBUILD libjxl-0.9.2-r1.ebuild 3002 BLAKE2B a0aeb136c356fae12bf8ee5d21f9ff63c23c8768bc6bcb66741d4213e1e8da823d44909c9d5093809b41807de009dcfa9e3d9b65745d92d7d97a49afa5660522 SHA512 bb1ae9fa5dc74cacb8a04e99dadb92ba8a5e96909c47e1a1a9414ffd044e4a29075a60d65a921abcfb2d98d29009bdd701679446405fc574d824beceacbe8de7 +EBUILD libjxl-0.9.3.ebuild 3007 BLAKE2B 6ded330ffaf6eb2daf3a402c91b4abd16769ff3e41b86d08f7717d27b76806a4e95a27a5f5a5b824b6068038616d863145e75458d1716ab0bcf9720acb38c6ea SHA512 1fcf2d77d03f317f07569d2124771abda3827043738e98c105961ae9ed1d9099aafa7972d7c57d154465fd7ae9f400390c3764287f7758663cf4f860cf25910a EBUILD libjxl-9999.ebuild 2608 BLAKE2B e4247be931c67d10fa9e200bc113731a940678547be3743a282087dc09b1afe1bee0063ec0d090f60c3860d4542d210f50fdc762263f2609f6fedcb10df058f3 SHA512 63b91932054fd351b091daa652b0f000ad7675e48cb489e4b52da4d99991066dc501d8814b02c2b005e5211f032fe7f6dee1b53944fc239b7bbadd46ee143339 MISC metadata.xml 1029 BLAKE2B 4c5ef3d7aca316b497d964b1afcee9f71b165545691182c3818ef4f9a8bc7f10fdbed36a8bd58b0051b1f9851018a11efa3e9f7b57c5ec935435e16bd26b6036 SHA512 a3129f77efc640e78a2f1fa481fb6363249be74e74aabccb51970ec101808db95a326deeecfa557b669cfb2bf26622fc7dbcbe7624a0315d770e697bc3734296 diff --git a/media-libs/libjxl/libjxl-0.10.2-r1.ebuild b/media-libs/libjxl/libjxl-0.10.2-r1.ebuild index 3430ddbc8d00..ed0c6b72ce32 100644 --- a/media-libs/libjxl/libjxl-0.10.2-r1.ebuild +++ b/media-libs/libjxl/libjxl-0.10.2-r1.ebuild @@ -20,7 +20,7 @@ SRC_URI=" LICENSE="BSD" SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc64 ~riscv ~sparc x86" IUSE="+gdk-pixbuf gif jpeg openexr +png test" REQUIRED_USE="test? ( png )" RESTRICT="!test? ( test )" diff --git a/media-libs/libjxl/libjxl-0.10.2.ebuild b/media-libs/libjxl/libjxl-0.10.3.ebuild index 27f9a5132637..3430ddbc8d00 100644 --- a/media-libs/libjxl/libjxl-0.10.2.ebuild +++ b/media-libs/libjxl/libjxl-0.10.3.ebuild @@ -20,22 +20,23 @@ SRC_URI=" LICENSE="BSD" SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc64 ~riscv ~sparc x86" -IUSE="+gdk-pixbuf openexr test" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc64 ~riscv ~sparc ~x86" +IUSE="+gdk-pixbuf gif jpeg openexr +png test" +REQUIRED_USE="test? ( png )" RESTRICT="!test? ( test )" DEPEND=" app-arch/brotli:=[${MULTILIB_USEDEP}] >=dev-cpp/highway-1.0.7[${MULTILIB_USEDEP}] - media-libs/giflib:=[${MULTILIB_USEDEP}] >=media-libs/lcms-2.13:2[${MULTILIB_USEDEP}] - media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] - media-libs/libpng:=[${MULTILIB_USEDEP}] gdk-pixbuf? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 ) + gif? ( media-libs/giflib:=[${MULTILIB_USEDEP}] ) + jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) openexr? ( media-libs/openexr:= ) + png? ( media-libs/libpng:=[${MULTILIB_USEDEP}] ) " RDEPEND=" ${DEPEND} @@ -53,6 +54,10 @@ multilib_src_configure() { -DJPEGXL_ENABLE_SJPEG=OFF -DJPEGXL_WARNINGS_AS_ERRORS=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_GIF=$(usex !gif) + -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex !jpeg) + -DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(usex !png) + -DJPEGXL_ENABLE_SKCMS=OFF -DJPEGXL_ENABLE_VIEWERS=OFF -DJPEGXL_FORCE_SYSTEM_BROTLI=ON diff --git a/media-libs/libjxl/libjxl-0.8.2-r2.ebuild b/media-libs/libjxl/libjxl-0.8.2-r2.ebuild index ff3f34b606fb..ea3c8f0cc52c 100644 --- a/media-libs/libjxl/libjxl-0.8.2-r2.ebuild +++ b/media-libs/libjxl/libjxl-0.8.2-r2.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz -> ${P LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc64 ~riscv ~sparc x86" IUSE="gif jpeg openexr +png test" RESTRICT="!test? ( test )" diff --git a/media-libs/libjxl/libjxl-0.8.2-r1.ebuild b/media-libs/libjxl/libjxl-0.8.3.ebuild index 64b13ee3f527..ff3f34b606fb 100644 --- a/media-libs/libjxl/libjxl-0.8.2-r1.ebuild +++ b/media-libs/libjxl/libjxl-0.8.3.ebuild @@ -15,21 +15,27 @@ SRC_URI="https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz -> ${P LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc64 ~riscv ~sparc x86" -IUSE="openexr test" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc64 ~riscv ~sparc ~x86" +IUSE="gif jpeg openexr +png test" RESTRICT="!test? ( test )" -DEPEND="app-arch/brotli:=[${MULTILIB_USEDEP}] +DEPEND=" + app-arch/brotli:=[${MULTILIB_USEDEP}] >=dev-cpp/highway-1.0.0[${MULTILIB_USEDEP}] - media-libs/giflib:=[${MULTILIB_USEDEP}] >=media-libs/lcms-2.13:2[${MULTILIB_USEDEP}] - media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] - media-libs/libpng:=[${MULTILIB_USEDEP}] - >=x11-misc/shared-mime-info-2.2 + gif? ( media-libs/giflib:=[${MULTILIB_USEDEP}] ) + jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) openexr? ( media-libs/openexr:= ) - test? ( dev-cpp/gtest ) + png? ( media-libs/libpng:=[${MULTILIB_USEDEP}] ) +" +RDEPEND=" + ${DEPEND} + >=x11-misc/shared-mime-info-2.2 " -RDEPEND="${DEPEND}" +DEPEND+=" + test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] ) +" + PATCHES=( "${FILESDIR}/${PN}-0.8.2-backport-pr2596.patch" "${FILESDIR}/${PN}-0.8.2-backport-pr2617.patch" @@ -43,6 +49,10 @@ multilib_src_configure() { -DJPEGXL_ENABLE_SJPEG=OFF -DJPEGXL_WARNINGS_AS_ERRORS=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_GIF=$(usex !gif) + -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex !jpeg) + -DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(usex !png) + -DJPEGXL_ENABLE_SKCMS=OFF -DJPEGXL_ENABLE_VIEWERS=OFF -DJPEGXL_ENABLE_PLUGINS=OFF diff --git a/media-libs/libjxl/libjxl-0.9.2-r1.ebuild b/media-libs/libjxl/libjxl-0.9.2-r1.ebuild index 00adab4f5232..3d567834e99f 100644 --- a/media-libs/libjxl/libjxl-0.9.2-r1.ebuild +++ b/media-libs/libjxl/libjxl-0.9.2-r1.ebuild @@ -20,7 +20,7 @@ SRC_URI=" LICENSE="BSD" SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc64 ~riscv ~sparc x86" IUSE="+gdk-pixbuf gif jpeg openexr +png test" REQUIRED_USE="test? ( png )" RESTRICT="!test? ( test )" diff --git a/media-libs/libjxl/libjxl-0.9.2.ebuild b/media-libs/libjxl/libjxl-0.9.3.ebuild index 566d2cf5113b..00adab4f5232 100644 --- a/media-libs/libjxl/libjxl-0.9.2.ebuild +++ b/media-libs/libjxl/libjxl-0.9.3.ebuild @@ -20,22 +20,23 @@ SRC_URI=" LICENSE="BSD" SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc64 ~riscv ~sparc x86" -IUSE="+gdk-pixbuf openexr test" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc64 ~riscv ~sparc ~x86" +IUSE="+gdk-pixbuf gif jpeg openexr +png test" +REQUIRED_USE="test? ( png )" RESTRICT="!test? ( test )" DEPEND=" app-arch/brotli:=[${MULTILIB_USEDEP}] >=dev-cpp/highway-1.0.7[${MULTILIB_USEDEP}] - media-libs/giflib:=[${MULTILIB_USEDEP}] >=media-libs/lcms-2.13:2[${MULTILIB_USEDEP}] - media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] - media-libs/libpng:=[${MULTILIB_USEDEP}] gdk-pixbuf? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 ) + gif? ( media-libs/giflib:=[${MULTILIB_USEDEP}] ) + jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) openexr? ( media-libs/openexr:= ) + png? ( media-libs/libpng:=[${MULTILIB_USEDEP}] ) " RDEPEND=" ${DEPEND} @@ -57,6 +58,10 @@ multilib_src_configure() { -DJPEGXL_ENABLE_SJPEG=OFF -DJPEGXL_WARNINGS_AS_ERRORS=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_GIF=$(usex !gif) + -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex !jpeg) + -DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(usex !png) + -DJPEGXL_ENABLE_SKCMS=OFF -DJPEGXL_ENABLE_VIEWERS=OFF -DJPEGXL_FORCE_SYSTEM_BROTLI=ON diff --git a/media-libs/libprojectm/Manifest b/media-libs/libprojectm/Manifest index 17b71cfd131c..a91a5bce7ce6 100644 --- a/media-libs/libprojectm/Manifest +++ b/media-libs/libprojectm/Manifest @@ -1,9 +1,6 @@ -AUX libprojectm-4.1.0-patch-include-dir.patch 352 BLAKE2B a5259cb92ab401f04fb24dcf615bf2ec04491c650b39db246fed2b6c889a5781a7ace32edaf58a2baf04e5724adc123c1bde45f95440ca489af20ae7937ba358 SHA512 37ee8f7662ab2cd5135159b071297c4c72bce602b4af9bbbff3769f6c22795a9421aa14270cbdfb7ba831d0b37456b0dc1b343f713aead6ae77e415374314164 DIST libprojectm-3.1.12.tar.gz 52831726 BLAKE2B f9a9ecf8fc55b49e664a61a5c0ca3eef745b00390d5dd3b1549d6d68985c246834d35adb96ab8595e2bf78997c4688096c7931a6be54ea9d867bfdbe5a427832 SHA512 6d265280f3e3e952686ebf77afd8b083669e9ab81d2d9d122168d47747c367ff3b17ab682cc041e4ac9cee9607b7393b5dcb067deac95fcbb97d63a9656912a5 -DIST libprojectm-4.1.0.tar.gz 47988290 BLAKE2B e593ddec881880fd767b0a89272e12fd383bf4695962243e2f9a968d0a09ee9522d5b60b783ec04b202fec53df4dfb006d940102bb2e548571275f525357e0fd SHA512 034b217e65ddea246c460ea72b69fdb5836b2e8e34cf9d72d705258e10dba01132265010902da0ac1baf2bb52f2453ce38bfb3934a4816f17304a01963829a42 DIST libprojectm-4.1.1.tar.gz 47988154 BLAKE2B 47fd71d857f307ea09c87d36102662423d1df4d62f36f23373fcba36760312bd4e4d11408a3f4820b5caedd2e31bfd0dfc1e551c1bf27eb0ba33149f8ea13ebe SHA512 af38913e56d46ed15118b2dccd2701f9bf043bb3103f58ad2ebbfaffc60c3ed4e1b0eb3d8f922bdffb0001acfa5e3d23633a4903250fd00ede0dede1e6e1ba47 -EBUILD libprojectm-3.1.12-r1.ebuild 1388 BLAKE2B 3bf676723ef85052920d596d1ce534f19e4fa8b6c80750063c0d0accca8f01f4048eb12389471c9edabf573b4820f83b8e310cb8ad75f16afe9c0595ac4784f0 SHA512 96439122ae71e39eb4338648d864417991c6cfddb36e0842996515c33e47e8ac9f1fa7a2fcd58d77fd2ceba981080fd1b0726266b3654b034ea25ffd59487dff -EBUILD libprojectm-4.1.0-r1.ebuild 1158 BLAKE2B ffb2b17b20b51753e35d4a0901de21f077e81110593a28328a4cd600712436a9b983f4b21581e2bc8408feec29af7d88609df112b501611842f4bbd29af39b78 SHA512 e88d72e162c5c1a93474e319cf542bd198d270f544075e89e67cea7c5d417ef7b59fb3604ada1a956b6e2406129fd60dc6d6b723891494ad6edb57860c8900b2 -EBUILD libprojectm-4.1.1-r1.ebuild 1088 BLAKE2B 138bf437496a54eddecf96cad58e689e5561d52e78682c1db20e313eff7a14976dde0ee46464d46725ab6a451a699eef1383e3ea84a7f77cafa7be81452997a1 SHA512 28d151be05c67e57955bacd24a2ff88a4d2d229ccfa2681bdfed24ee3544cc79464ffbcc7f7757933ddd583f0ec04fe609636d35f25b3edb0dd8cfc4af733c94 -EBUILD libprojectm-9999.ebuild 1088 BLAKE2B 138bf437496a54eddecf96cad58e689e5561d52e78682c1db20e313eff7a14976dde0ee46464d46725ab6a451a699eef1383e3ea84a7f77cafa7be81452997a1 SHA512 28d151be05c67e57955bacd24a2ff88a4d2d229ccfa2681bdfed24ee3544cc79464ffbcc7f7757933ddd583f0ec04fe609636d35f25b3edb0dd8cfc4af733c94 +EBUILD libprojectm-3.1.12-r2.ebuild 1430 BLAKE2B b258d36deab18db1cd795941e9f8314974d33504e0b7b8c2fb0caa3e892f1f475eefa85df17689c9b7404899170b4b250a0d01512351d91672690caac1e8c34e SHA512 2ccc4cc5912c88cbf6460f76d7beffa2f5c0cedb9fe2142a00d1e597bed23f94d2db03b8a7b7b6f89890789a3cfb7adc095a450c39c32e4ee152a6d34a24e400 +EBUILD libprojectm-4.1.1-r1.ebuild 1107 BLAKE2B 3becb7095e128e72ffefe14d186c9f6a3ea9ab4f3f0c6b4d7795811b39df15ab350be26968312f441ab2e56609889d6225570e34847510f757add590f4fe6442 SHA512 450fe7c191016c180f63b1b9c0b6dab2dc130599c47ae4c28b199123656c340ebca16118aa1e2f4ac9d6aa843d0babf931d17433faa407ac0c851c3bcdef2015 +EBUILD libprojectm-9999.ebuild 1107 BLAKE2B 3becb7095e128e72ffefe14d186c9f6a3ea9ab4f3f0c6b4d7795811b39df15ab350be26968312f441ab2e56609889d6225570e34847510f757add590f4fe6442 SHA512 450fe7c191016c180f63b1b9c0b6dab2dc130599c47ae4c28b199123656c340ebca16118aa1e2f4ac9d6aa843d0babf931d17433faa407ac0c851c3bcdef2015 MISC metadata.xml 537 BLAKE2B 10a5d33fab64136cfe13e98831827ac21db70fc50262f89b88c0e444981b951695788a939e902c57ed3ccb69a740d8743a3bdca465bc51be0c14f28adb107242 SHA512 648699f222528a76e343792d819e69ff933e3e2d96fe4b38148b4053ad38ac684c4917ce62636abaaee8b3093837af09448e1a7e65cfcd928606295bcc0a36b4 diff --git a/media-libs/libprojectm/files/libprojectm-4.1.0-patch-include-dir.patch b/media-libs/libprojectm/files/libprojectm-4.1.0-patch-include-dir.patch deleted file mode 100644 index 5bb0ac6507ba..000000000000 --- a/media-libs/libprojectm/files/libprojectm-4.1.0-patch-include-dir.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/vendor/SOIL2/CMakeLists.txt 2024-03-06 16:13:12.614370496 +0100 -+++ b/vendor/SOIL2/CMakeLists.txt 2024-03-06 16:10:54.700987578 +0100 -@@ -22,8 +22,10 @@ - ) - - target_include_directories(SOIL2 -- PUBLIC -+ PRIVATE - "." -+ PUBLIC -+ "${CMAKE_CURRENT_SOURCE_DIR}/.." - ) - - target_link_libraries(SOIL2 diff --git a/media-libs/libprojectm/libprojectm-3.1.12-r1.ebuild b/media-libs/libprojectm/libprojectm-3.1.12-r2.ebuild index c3d809e3beee..3a4f384196d3 100644 --- a/media-libs/libprojectm/libprojectm-3.1.12-r1.ebuild +++ b/media-libs/libprojectm/libprojectm-3.1.12-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools +inherit autotools xdg DESCRIPTION="A graphical music visualization plugin similar to milkdrop" HOMEPAGE="https://github.com/projectM-visualizer/projectm" @@ -40,7 +40,7 @@ RDEPEND=" dev-qt/qtopengl:5 ) pulseaudio? ( - media-sound/pulseaudio + media-libs/libpulse ) sdl? ( >=media-libs/libsdl2-2.0.5 ) sys-libs/zlib" @@ -70,4 +70,5 @@ src_configure() { src_install() { default find "${ED}" -name '*.la' -delete || die + find "${ED}" -name '*.a' -delete || die } diff --git a/media-libs/libprojectm/libprojectm-4.1.0-r1.ebuild b/media-libs/libprojectm/libprojectm-4.1.0-r1.ebuild deleted file mode 100644 index 810bd4f46b26..000000000000 --- a/media-libs/libprojectm/libprojectm-4.1.0-r1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib - -DESCRIPTION="A graphical music visualization plugin similar to milkdrop" -HOMEPAGE="https://github.com/projectM-visualizer/projectm" - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/projectM-visualizer/projectm.git" - inherit git-r3 -else - MY_PV="${PV/_/-}" - SRC_URI="https://github.com/projectM-visualizer/projectm/releases/download/v${MY_PV}/libprojectM-${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" - S="${WORKDIR}/libprojectM-${MY_PV}" -fi - -LICENSE="LGPL-2" -SLOT="4" -IUSE="gles2-only static-libs" - -RDEPEND="media-libs/libglvnd[X(+)]" - -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/libprojectm-4.1.0-patch-include-dir.patch -) - -multilib_prc_prepare() { - cmake_src_prepare -} - -multilib_src_configure() { - local mycmakeargs=( - -DENABLE_SDL_UI=OFF - -DENABLE_CXX_INTERFACE=OFF - -DENABLE_GLES=$(usex gles2-only) - -DENABLE_SYSTEM_GLM=ON - -DBUILD_SHARED_LIBS=$(usex static-libs OFF ON) - ) - - cmake_src_configure -} - -multilib_src_install_all() { - default -} diff --git a/media-libs/libprojectm/libprojectm-4.1.1-r1.ebuild b/media-libs/libprojectm/libprojectm-4.1.1-r1.ebuild index 85e9805a42d7..404241093774 100644 --- a/media-libs/libprojectm/libprojectm-4.1.1-r1.ebuild +++ b/media-libs/libprojectm/libprojectm-4.1.1-r1.ebuild @@ -22,7 +22,10 @@ LICENSE="LGPL-2" SLOT="4" IUSE="gles2-only static-libs" -RDEPEND="media-libs/libglvnd[X(+)]" +RDEPEND=" + media-libs/glm + media-libs/libglvnd[X(+)] +" DEPEND="${RDEPEND}" diff --git a/media-libs/libprojectm/libprojectm-9999.ebuild b/media-libs/libprojectm/libprojectm-9999.ebuild index 85e9805a42d7..404241093774 100644 --- a/media-libs/libprojectm/libprojectm-9999.ebuild +++ b/media-libs/libprojectm/libprojectm-9999.ebuild @@ -22,7 +22,10 @@ LICENSE="LGPL-2" SLOT="4" IUSE="gles2-only static-libs" -RDEPEND="media-libs/libglvnd[X(+)]" +RDEPEND=" + media-libs/glm + media-libs/libglvnd[X(+)] +" DEPEND="${RDEPEND}" diff --git a/media-libs/libqaccessibilityclient/Manifest b/media-libs/libqaccessibilityclient/Manifest index 266760231b40..bd6f49d25e13 100644 --- a/media-libs/libqaccessibilityclient/Manifest +++ b/media-libs/libqaccessibilityclient/Manifest @@ -2,5 +2,5 @@ AUX libqaccessibilityclient-0.5.0-memleak.patch 607 BLAKE2B f661045001090cfe8bca DIST libqaccessibilityclient-0.5.0.tar.xz 107288 BLAKE2B 1d2208adfba72d55818f25cb46901097ded51784fdfe6fafd02927f09edf4cdb285a767e174d64278cd87e907d943648856e67c7ffcffc6f7ca0082cfbf2d19c SHA512 560526596e490b19263b3a6fb77b06e69611b34865a8fe18c593348fdeba22c1afd2b6ac44bee15ad94d402996e113c41dd7fa601f815559957729e18d9d9537 DIST libqaccessibilityclient-0.6.0.tar.xz 92812 BLAKE2B 333b88003e53369c2a31955995688f7ce74c53695c392b2b4d3e2b7d312dd014617162c99d0d2c64ff4dacf8a1ed47b5f5b7ddb2ee8e8753ec212957db8d8467 SHA512 d8752b020e0f7c85dd885d2c313b2dc5a97892c9913eb430aa405b6e391e84b827abc7fcc1f9e36fee2216713cab1be41fc148ce612ed9ae3e164c5d52e2419a EBUILD libqaccessibilityclient-0.5.0-r1.ebuild 786 BLAKE2B c962472c1513796b950fb6eb70ee4506e97645f894a32564cb04e990bd95a027d8fe9760acdb104ef554029eb40cec926d76e00b78ba940b89d77803e39eca8b SHA512 a7db183d79effefa8a84a7bb18c2488278ef421680b7d52f66655c1cddd76d1ffbc4f1ec1bdcea0359cf6e0d0d50c2204b8ac9ecd5151c382a5e06a3792e3c06 -EBUILD libqaccessibilityclient-0.6.0.ebuild 675 BLAKE2B c577cb7e0d7ddae8caf0121cd231898439a0f784fd58a16bd614bddcc9fccd87ae5e66785cd5aba105313cde518dd343ceb9b8a94d3fbb062666f2b669d00c79 SHA512 297e308a8b4e4ddc25aa56cc9a75bfd140d728a1c02161751c676c3b1cf6a12145b14721f451a2a581c9ac5c4e9a87760d216a93dff2b7d4e129a342d37de5c4 +EBUILD libqaccessibilityclient-0.6.0.ebuild 682 BLAKE2B 12742ea98b68e07a91f2e642df55a175234a592e4538fe7c221d5d720ace973ff4e65d3fa8bf18e6e31b5bae6f94dfe10df4693712f538707b9ba91184941d6e SHA512 c85b5c5840da758456d9ce3d259fc636e5acb9d3caf9d49e4b530793e0071ebd0e2851012ba2b3cce9064939b69b678478d821cfaff0059785f18e515f84ade7 MISC metadata.xml 395 BLAKE2B 538aa83daab942d1e06d11b44e519d69d6082600eea8e3800d1f3c2f90e3aa120f46711bd27b969ed88a022fbebf4cd3ec33d75af9b9e139c816fed9d8dbacad SHA512 9718e57485b7731432060c34bfd382afb9889881253182218ba8c505a742b2162b0c7e50e4a41e0e3ca56e9ca1516650cc06f06ef12f736e35b62ac1c3bd0646 diff --git a/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.6.0.ebuild b/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.6.0.ebuild index 251216552ce8..cde82a69a68d 100644 --- a/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.6.0.ebuild +++ b/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.6.0.ebuild @@ -16,7 +16,7 @@ https://invent.kde.org/libraries/libqaccessibilityclient" if [[ ${KDE_BUILD_TYPE} = release ]]; then SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~arm64" fi LICENSE="LGPL-2.1" diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest index 795a92983539..96d3b3615b8b 100644 --- a/media-libs/mlt/Manifest +++ b/media-libs/mlt/Manifest @@ -1,8 +1,6 @@ AUX mlt-6.10.0-swig-underlinking.patch 596 BLAKE2B b51670d051ae2bd016da65f560ed861518845d11e46aa5b4971a68f196452b86af3e00cb9af02bf23b32028731eb5352214aa63a047ebe12386c9f749df1236c SHA512 95cf9339b88979eb19cda3698474fc386c0c2d01333435e95b5a7662dbc5c359f5c78e05a0d78836023191c07a97e0dbf20c354e10cf6d1ad59d64fa9a203160 AUX mlt-6.22.1-no_lua_bdepend.patch 153 BLAKE2B 3ea31c570e7bef81bda0905549baedee8b9eed2bc14c535abff02985d573e4606f4f8f42213bcbc86fa68af905ba6c39dddcbf63efa20172c608659153d79073 SHA512 b382ee68f2815b4aa62ce7708a7452536f2bc0287dc4d59f557c08fbf51d6bef7607f63e11e991b4f52eb7e06afbde06d53aac3d42b4a0c96f59332ec17d48cd AUX mlt-7.0.1-cmake-symlink.patch 569 BLAKE2B 06f7c8e7ec78206bb1344bab98f1d9ec816b16c458300964fe31ff30f8f2cc64d8f25a795773fd64db7249b031a164c350b55b6326c4d07d73ffd27f8786a911 SHA512 6deb458c3a89f800b4770460330c1e545c22d3a7304f0713b7ae214145d1413a3061c7c026ab2f6fc44801d1d7505352f03c0da7034e817b684e0ebb25d9a94f -DIST mlt-7.22.0.tar.gz 1659954 BLAKE2B ab3dff26446a048e79d5f11942b05fa557ec91a813b14bd46492fe66c46a2e6685f3835ff647b69e6b6ebe137a345fc7eb17c8e88bdfd3bdb81e41eeca910aaa SHA512 84763e1cb8495be9476637d2474aa492906b904990905f9283faffff75829553cf87b097166fe6d382acc043422e6da45014ca4ba281c7fc68f10ebe3cec4fee DIST mlt-7.24.0.tar.gz 1662552 BLAKE2B f6e83b3c3fd9e3bf64366a6f6165b1839003b0fd058e1368e0648e011eff6da1a9af9fa7652aff032bc4ed4465be4648b5f1ae25fc102397aa9ae2d19981643a SHA512 a9e7fd5dc04152e523456bad244416b4fdeb5961ee7cadb816dd1393277d1d801200db595dcd28e520d76e6b2caca17e65c39b0256beb7c42a58ef241b85471d -EBUILD mlt-7.22.0-r1.ebuild 4020 BLAKE2B f60580244f294e9b798b09558dea8c5a53edf516e5cd91c9e7382259529acd45c3837e2efc5ec9fd8948ee209de24cc12ef32ef33ef6e4dd3c0b73c739220143 SHA512 127762a63d82e7cad76d8729a0509d7e030f287d004e10acf0fb5554f9b7d215abc30764c8dd5a635de29f00bf84ad42e4592493a0da914f5beed3b29e1cfa2c EBUILD mlt-7.24.0.ebuild 4077 BLAKE2B 751b8720dba5aa2df8ce12cde88604983b25887b88abf4b8c8a7a97d0546993383d6a0112d73ca7f5641cf668e0b3c5d88248e32ff86073c2308e083dc5b2690 SHA512 f797e0200874a6ac284fee89abd7634b5c6b7710e170765cc0bb3884d6302af5ce796acd9a7d281b8a82b4d3b096ce35b2320882bc3d21517ae6b8b05b04838a MISC metadata.xml 1412 BLAKE2B 8d4eed394f1d1e95e5559466ef1840978966e8f1f7b89fdfd2549b2a35b6ce8f114c9373374fdaefe320cc34a4dc8cbd9f6c4433740d1ae9680de54484b5e3d1 SHA512 b19c711dc3798f952e0223dc0628b25aa3c9a296d66ee2f2b7f46a55b82e71c0c583ee64517be88dcc55eb1e9c31aa782b9043eb7630a853077afb1bf8b4dedd diff --git a/media-libs/mlt/mlt-7.22.0-r1.ebuild b/media-libs/mlt/mlt-7.22.0-r1.ebuild deleted file mode 100644 index b2226b723708..000000000000 --- a/media-libs/mlt/mlt-7.22.0-r1.ebuild +++ /dev/null @@ -1,175 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..12} ) -inherit python-single-r1 cmake flag-o-matic - -DESCRIPTION="Open source multimedia framework for television broadcasting" -HOMEPAGE="https://www.mltframework.org/" -SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0/7" -KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux" -IUSE="debug ffmpeg frei0r gtk jack libsamplerate opencv opengl python qt5 qt6 rtaudio rubberband sdl test vdpau vidstab xine xml" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -# Needs unpackaged 'kwalify' -RESTRICT="test" - -# rtaudio will use OSS on non linux OSes -# Qt already needs FFTW/PLUS so let's just always have it on to ensure -# MLT is useful: bug #603168. -DEPEND=" - >=media-libs/libebur128-1.2.2:= - sci-libs/fftw:3.0= - ffmpeg? ( media-video/ffmpeg:0=[vdpau?] ) - frei0r? ( media-plugins/frei0r-plugins ) - gtk? ( - media-libs/libexif - x11-libs/pango - ) - jack? ( - >=dev-libs/libxml2-2.5 - media-libs/ladspa-sdk - virtual/jack - ) - libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) - opencv? ( >=media-libs/opencv-4.5.1:=[contrib] ) - opengl? ( - media-libs/libglvnd - media-video/movit - ) - python? ( ${PYTHON_DEPS} ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - media-libs/libexif - x11-libs/libX11 - ) - qt6? ( - dev-qt/qt5compat:6 - dev-qt/qtbase:6[gui,network,opengl,widgets,xml] - dev-qt/qtsvg:6 - media-libs/libexif - x11-libs/libX11 - ) - rtaudio? ( - >=media-libs/rtaudio-4.1.2 - kernel_linux? ( media-libs/alsa-lib ) - ) - rubberband? ( media-libs/rubberband ) - sdl? ( - media-libs/libsdl2[X,opengl,video] - media-libs/sdl2-image - ) - vidstab? ( media-libs/vidstab ) - xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) - xml? ( >=dev-libs/libxml2-2.5 ) -" -# java? ( >=virtual/jre-1.8:* ) -# perl? ( dev-lang/perl ) -# php? ( dev-lang/php ) -# ruby? ( ${RUBY_DEPS} ) -# sox? ( media-sound/sox ) -# tcl? ( dev-lang/tcl:0= ) -RDEPEND="${DEPEND}" -BDEPEND=" - virtual/pkgconfig - python? ( >=dev-lang/swig-2.0 ) -" - -DOCS=( AUTHORS NEWS README.md ) - -PATCHES=( - # downstream - "${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch - "${FILESDIR}"/${PN}-6.22.1-no_lua_bdepend.patch - "${FILESDIR}"/${PN}-7.0.1-cmake-symlink.patch -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - # Respect CFLAGS LDFLAGS when building shared libraries. Bug #308873 - if use python; then - sed -i "/mlt.so/s/ -lmlt++ /& ${CFLAGS} ${LDFLAGS} /" src/swig/python/build || die - python_fix_shebang src/swig/python - fi - - cmake_src_prepare -} - -src_configure() { - # Workaround for bug #919981 - append-ldflags $(test-flags-CCLD -Wl,--undefined-version) - - local mycmakeargs=( - -DCMAKE_SKIP_RPATH=ON - -DCLANG_FORMAT=OFF - -DGPL=ON - -DGPL3=ON - -DBUILD_TESTING=$(usex test) - -DMOD_KDENLIVE=ON - -DMOD_SDL1=OFF - -DMOD_SDL2=$(usex sdl) - -DMOD_AVFORMAT=$(usex ffmpeg) - -DMOD_PLUS=ON - -DMOD_FREI0R=$(usex frei0r) - -DMOD_GDK=$(usex gtk) - -DMOD_JACKRACK=$(usex jack) - -DMOD_RESAMPLE=$(usex libsamplerate) - -DMOD_OPENCV=$(usex opencv) - -DMOD_MOVIT=$(usex opengl) - -DMOD_QT=$(usex qt5) - -DMOD_GLAXNIMATE=$(usex qt5) - -DMOD_QT6=$(usex qt6) - -DMOD_GLAXNIMATE_QT6=$(usex qt6) - -DMOD_RTAUDIO=$(usex rtaudio) - -DMOD_RUBBERBAND=$(usex rubberband) - -DMOD_VIDSTAB=$(usex vidstab) - -DMOD_XINE=$(usex xine) - -DMOD_XML=$(usex xml) - -DMOD_SOX=OFF - ) - - # TODO: rework upstream CMake to allow controlling MMX/SSE/SSE2 - # TODO: add swig language bindings? - # see also https://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover - - if use python; then - mycmakeargs+=( - -DSWIG_PYTHON=ON - -DPython3_EXECUTABLE="${PYTHON}" - ) - fi - - cmake_src_configure -} - -src_install() { - cmake_src_install - - insinto /usr/share/${PN} - doins -r demo - - # - # Install SWIG bindings - # - - docinto swig - - if use python; then - dodoc "${S}"/src/swig/python/play.py - python_optimize - fi -} diff --git a/media-libs/mutagen/Manifest b/media-libs/mutagen/Manifest index fb1fdf8cb8e6..0de2170a934a 100644 --- a/media-libs/mutagen/Manifest +++ b/media-libs/mutagen/Manifest @@ -1,3 +1,3 @@ DIST mutagen-1.47.0.tar.gz 1274186 BLAKE2B 220d8e136e8f41d2f3953ce61b4784a24b1e450b6cfe0d0e0c610aeccb9ff3248493b8a0ea78f801e62b2f6ac87cd219a05cff535e04586a5ce9b03aa3540278 SHA512 40f9a8a898c9fdae00fd0bdd38eb91a6fb813cf8319f888590bdfd4b5efcb614aa5322c0b9e017f49c3f5155ccf82d5cae80aad79df285c50b5ef270c09f4c9d -EBUILD mutagen-1.47.0.ebuild 823 BLAKE2B b33ff39c1607f7190358ad218790235aaaa595e32674b6b49087e45baa5d19d8f227b0d9b3853f13712b74fa3bfa17eada3aee5b91bcdb5900dd3a7597bc8977 SHA512 115c823bb649aae55ec9255be5585ce45f18812354f321a9a55a25a1353fcc74609603d5db7d45a098bf063e05fed4b7607da6a1f9c211590fb45d0852f9521e +EBUILD mutagen-1.47.0.ebuild 823 BLAKE2B e881680224184bbaf19f2ba60c815103ca61911bb78ad01b7f0a9a26a5e800b795abd5b4ccefc23e6cd9b9c629da25b42ecdc9092f5792d03611d518f8c7962a SHA512 4b86d45395b4ed2eac06cbb27c0e08bddb82c733764838871f6156cd039ef49c814392426bfa980124c393949e02ad448a00af3d5fa0cab514ee39a888dda7ed MISC metadata.xml 482 BLAKE2B 3ae30f618d887acb7bcabfb63ceafd422ee356b1a2f0b812dd51196e1a3e4f5afd6fc2c5fb36ff137060d710a8a7e1800ff25e2246a6dd4bb5dc3301cd559171 SHA512 13450efc95ce24cacf3c882c78acb2605c10bd803e1b63a700bd6a7bff103946f905ef39e15bc2b86e7302940c7b0a6fe9a5767c8de51f77ee1f11cfc31bfa6f diff --git a/media-libs/mutagen/mutagen-1.47.0.ebuild b/media-libs/mutagen/mutagen-1.47.0.ebuild index 9d2eaa2a08a9..28997364d215 100644 --- a/media-libs/mutagen/mutagen-1.47.0.ebuild +++ b/media-libs/mutagen/mutagen-1.47.0.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit distutils-r1 diff --git a/media-libs/nanosvg/Manifest b/media-libs/nanosvg/Manifest index 7e092c99ba19..e7a7ed6a53ba 100644 --- a/media-libs/nanosvg/Manifest +++ b/media-libs/nanosvg/Manifest @@ -1,3 +1,5 @@ DIST nanosvg-20221222.gh.tar.gz 298209 BLAKE2B 64e3342ad354dd08f4a1ffcb243603f6d3b940031415c3a1aed43f9879fca349bc0f71305584cd999bb44095bf6d157a8824c2f9ad8c49fdc66b37a0a6ea54b7 SHA512 a9b62cdc54c1803907da8d3553a71451a5a19588b951c32e3765e9d620a1dacb618d768e4df8f3dbf507518a6ce8fcfde5d8e8f5edcfccc975c1ad57e3e7f22c +DIST nanosvg-20231202.gh.tar.gz 298249 BLAKE2B 938f0a20791c3975336fc273e4cf160f631eacf47a47a0a34038e6877eedf08539f21e7a2c65ed75965258beed935c35c146cc278f39ce2540493bd2ba843574 SHA512 eb7feebe3349b8eaa54eb40406515070533d292670bfbd654e955a3fcdb16b381b1489c95ac5989c1154f2305b7fbd68af1f097889ba5359a4a5d534fbfdacae EBUILD nanosvg-20221222.ebuild 500 BLAKE2B bd87db58bdd2670189cc75e5c2c361cf8602f99c6e113da6ab9977f1f6a5a26c5caf2627b47873f921e77b876934ce5f077a61b0128a67ba29704795878611a1 SHA512 37b329b3e4c66a6fc88e0aef1f97e4609345b809a8bdbb8ead0950951f8169fc364513a5968cda9b5407337c40b49c1231b1c02a3d8e22524387c5612d16113c +EBUILD nanosvg-20231202.ebuild 463 BLAKE2B 29201dd138bdf5488f6240ca0caf604507c9553996ed185cc466ada20f8b60e5e0b292737be5fba62c28b726558afe3f2ffb0889777ad0d4465fb302a461a2ad SHA512 1c0c5b5df6e1ebe2813e05ab788cf3688fa4e14238da056d06a39fe0901c3bcd637731e7ddc59f728eac67fbc4e6a8b894e4b8c8929a9657c9c502f420715dcb MISC metadata.xml 245 BLAKE2B 88a70bee970cde88d22b83bf91ac664d8435a85c11d8bab0bb5be93bb35fbcf331fcc2b02627826e43f0678fb3c8aac75570f672de8506a24172c8ace7a9eefd SHA512 b23e06e41dfeae8931ec1c5441e65304eb137966f011d8ac98d56134b9fed9c08e786778c5f2e7540ce7c2faa4a3be33e859f854d9c4d2221ee93c1c2c51e4db diff --git a/media-libs/nanosvg/nanosvg-20231202.ebuild b/media-libs/nanosvg/nanosvg-20231202.ebuild new file mode 100644 index 000000000000..5ed44ccfc76b --- /dev/null +++ b/media-libs/nanosvg/nanosvg-20231202.ebuild @@ -0,0 +1,17 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +MY_PV="fltk_${PV:0:4}-${PV:4:2}-${PV:6:2}" + +DESCRIPTION="NanoSVG is a simple stupid single-header-file SVG parse." +HOMEPAGE="https://github.com/fltk/nanosvg" +SRC_URI="https://github.com/fltk/${PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.gh.tar.gz" +S="${WORKDIR}/${PN}-${MY_PV}" + +LICENSE="ZLIB" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" diff --git a/media-libs/nas/Manifest b/media-libs/nas/Manifest index e38e99f99060..5a4db0f995ba 100644 --- a/media-libs/nas/Manifest +++ b/media-libs/nas/Manifest @@ -1,9 +1,10 @@ AUX nas-1.9.2-asneeded.patch 374 BLAKE2B a142f505190214db4f235ef8ec6283029c127b9b3c313b2405e6222a6f3d6d89931066d64a71b350b289ed07bed198bbc71a862396ef77d3fb5e7a2426b5abad SHA512 ad9275577d2e10f5201556e21f6251065d392a9620c475e1451b673fa62dc50ac8e45248862a802a70cd0efb19ad67205b50e05df1588f91ef854e66860334a3 AUX nas-1.9.4-libfl.patch 349 BLAKE2B ee8d3ec8859fc47c87bf5d9a40cc2b468c136983a6b8dfb22d4c6469630b5dae92d3ec382ff7afc5ac2f94435ac8208059f90313a03700c4da7b93a19e34c05c SHA512 e4291fce8199f4340b969da6e2742e26ef6589e71ecc947a0fb1d68b9f995ae7dd514ad98232a4c11d1ebc7ea0ab3ea95674893fedbae7626c97c06c9ba88459 +AUX nas-1.9.5-gcc14-build-fix.patch 3319 BLAKE2B d72a07e751b176e76b97791cf0eb551ed4e6ce7cfb290ca41ec69fa07573894bc383e4db34a67858e731e197e056ac24ce81a790332538474afcffa8f29ed880 SHA512 f29e77ef52a923787017a9451fcf83ffb63612bfd06aef403ac6e9ce1caa7502bd2a96c8135366fa29e37ad2c94e5f942b130a2a26121339e975be70b8dbdf5a AUX nas.conf.d 229 BLAKE2B 2ac8a6d914d02bc92258d7dfe3118e89ed6e3fe9d98e7a24eb8d72ded22dbb68a2d8129d066dc1457c0b8959f1762197b61f90502d3c60cdefd8aaeced04bbb3 SHA512 53cb9906d169b63b3592443bc0b63d59c4d0683e4b2194c60b1bc4297e6556f04b3ee9bf81da3a7f144757354de9aebe08c8445fccaa9a458a3b6537da68a2ac AUX nas.init.d 347 BLAKE2B 8b87c877fafd0e5993f909a4e132ed9f7042a3d8bdced8c7487afc962dfcad24a586ac754b99cbff815475f1326f44d52effb8eefd65cd0e25e6bc45991233af SHA512 556fc5d5135f789b0691de889aeaadce29319964443052787db5cb4cda480ed68c547c772de97c07ba2e0800f25cfa859376a3d80e9518995aae8136fe171468 DIST nas-1.9.5-patches.tar.xz 7788 BLAKE2B 54172eba6547b0890cdef7b87a38b7d85bf05ffbec2d459da6b66b48ce7e627a9c7a4c4d4550729d0c4acd3de99a0299d57d2cc75ecea74f745764f284a9d0e7 SHA512 dce3e68c3018aa0553b4c48baa66e37db4db54ed33aad388902e2b05c9dcc6e696b69b1c00f9adbcfddcd262ed65758ea5897a13856315edd522297814df0899 DIST nas-1.9.5.tar.gz 1170144 BLAKE2B 81b063f888d66534f8779d6b0534397ada703868ff711c49b998fbf56bc6e4313fa245b6168fe9913936afa0685bab595df24f9f4bd5663dfa560c4b64534466 SHA512 051b32593e7ace09cf2d12720fb80e38d4f83f36858debacfb828c759e98b3e29401c76e3e3770f57fbbd1750a84b17a18e712f0de3dbe0ff56f2505c2488d9a -EBUILD nas-1.9.5-r1.ebuild 2814 BLAKE2B 1c0cf5f1bb726d21e101107a008094beb2911f7e8da2be51e9ffb6621fd768a07f255ca5230b78ae8abc10da9fe633f1c240104b632e5d8fcbf75a25874c548b SHA512 8af6f82b14aed22d54485d498008cdb38316e5a648761a7bd72fd39f0971f1a487bb505fd6708b12fb7ac252381cb872900d3508a69f1f29f37a921324d16d20 +EBUILD nas-1.9.5-r2.ebuild 2848 BLAKE2B 8a8864723605c928d38c5065d21e4d3f8c07a299eb5af2f860063f267b3ede25aaa9c8f0d6a6e79b8900be1a9a20f7178e1faa93cb7d5a4c82a3a417aff6f7b1 SHA512 9f55dde0117aa4ed5c8c06cc37eb96bb7e86d53419deeeaad53dac96ad9841ac37c419264287ad3da5f7979c2c23496d1656b2ad27b3486b05eb9a0be5406bcf EBUILD nas-1.9.5.ebuild 2628 BLAKE2B ebb4afbf0d60114193377c788ef96aa86537aaa26779c5175e5351d930a9b1504ff3c21958d5e0af5b01fd2c3cf2957425bbe8d26aab91e9f8d912e276b6f3cc SHA512 c99ac280908dc1ee24d1627ca0c3289d6e3a0a0cf85ea78a61a88201da3a860794230d2dcb203df2528b80cd5707eef77325a0dac5c2518322ebba2a81035ae4 MISC metadata.xml 327 BLAKE2B 61fd2aff2796ecff70b16eb84bc90e9242cc3b08d8fb8fff9eb702310ad248ed2c0946fa3f974a420684ad9db4c47f871111ec1170e7d44eca89f263ce533f80 SHA512 bc1d1fa01d3ae21da48bc805c5f822cdff2f14f6a9c6c1ad5ee65063c265bd1c62efb3f45746fe9d1cbf55ff742c7812113f94068a47907042952016067310a7 diff --git a/media-libs/nas/files/nas-1.9.5-gcc14-build-fix.patch b/media-libs/nas/files/nas-1.9.5-gcc14-build-fix.patch new file mode 100644 index 000000000000..629bd5dff2f0 --- /dev/null +++ b/media-libs/nas/files/nas-1.9.5-gcc14-build-fix.patch @@ -0,0 +1,76 @@ +https://sourceforge.net/p/nas/bugs/15/ +From: Brahmajit Das <brahmajit.xyz@gmail.com> +Date: Tue, 30 Apr 2024 01:06:32 +0530 +Subject: [PATCH 1/1] Partially revert commit e792e42 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Commit e792e42 introduced some regression with GCC 14 and 15 espcially +to the chaged sections of the code in audemo.c. Thus resutling in errors +such as: + +audemo.c: In function ‘rescanCB’: +audemo.c:524:23: error: passing argument 2 of ‘XawListChange’ from incompatible pointer type [-Wincompatible-pointer-types] + 524 | (const char **)makeFileList(globals->fileNames, globals->numFiles), + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + | | + | const char ** +In file included from audemo.c:97: +/usr/include/X11/Xaw/List.h:170:26: note: expected ‘char **’ but argument is of type ‘const char **’ + 170 | String *list, + | ~~~~~~~~~~~~~~~~~~~~~~~~^~~~ +audemo.c:530:41: error: passing argument 2 of ‘XawListChange’ from incompatible pointer type [-Wincompatible-pointer-types] + 530 | XawListChange(globals->samples, &noFilesString, 1, -1, True); + | ^~~~~~~~~~~~~~ + | | + | const char ** +/usr/include/X11/Xaw/List.h:170:26: note: expected ‘char **’ but argument is of type ‘const char **’ + 170 | String *list, + | ~~~~~~~~~~~~~~~~~~~~~~~~^~~~ + +First observed on Gentoo Linux with GCC 14, I reproduced with GCC 15 as +well. Please reffer: https://bugs.gentoo.org/927451 + +Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com> +--- a/clients/audio/audemo/audemo.c ++++ b/clients/audio/audemo/audemo.c +@@ -501,7 +501,7 @@ static void + rescanCB(Widget w, XtPointer globalsp, XtPointer call_data) + { + GlobalDataPtr globals = (GlobalDataPtr) globalsp; +- static const char *noFilesString = "No files found"; ++ static char *noFilesString = "No files found"; + char *dir, + *template; + int i; +@@ -521,7 +521,7 @@ rescanCB(Widget w, XtPointer globalsp, XtPointer call_data) + if (globals->numFiles) + { + XawListChange(globals->samples, +- (const char **)makeFileList(globals->fileNames, globals->numFiles), ++ makeFileList(globals->fileNames, globals->numFiles), + globals->numFiles, -1, True); + XtSetSensitive(globals->samples, True); + } +@@ -597,7 +597,7 @@ bucketQueryCB(Widget w, XtPointer globalsp, XtPointer call_data) + access[4], + desc[COMMENT_LEN]; + int i; +- static const char *noBucketString = "No buckets"; ++ static char *noBucketString = "No buckets"; + + if (buf->numBuckets) + { +@@ -652,7 +652,7 @@ bucketQueryCB(Widget w, XtPointer globalsp, XtPointer call_data) + + if (buf->numBuckets) + { +- XawListChange(buf->bucketList, (const char **)buf->bucketText, ++ XawListChange(buf->bucketList, buf->bucketText, + buf->numBuckets, -1, True); + XtSetSensitive(buf->bucketList, True); + } +-- +2.45.0.rc1.218.g7b19149425.dirty + diff --git a/media-libs/nas/nas-1.9.5-r1.ebuild b/media-libs/nas/nas-1.9.5-r2.ebuild index 79a34f036d84..3fb113d0881f 100644 --- a/media-libs/nas/nas-1.9.5-r1.ebuild +++ b/media-libs/nas/nas-1.9.5-r2.ebuild @@ -7,12 +7,12 @@ inherit flag-o-matic multilib multilib-minimal toolchain-funcs DESCRIPTION="Network Audio System" HOMEPAGE="https://radscan.com/nas.html" -SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" +SRC_URI="https://sourceforge.net/${PN}/${P}.tar.gz" SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-1.9.5-patches.tar.xz" LICENSE="HPND MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv sparc x86" IUSE="doc static-libs" RDEPEND=" @@ -41,6 +41,7 @@ DOCS=( BUILDNOTES FAQ HISTORY README RELEASE TODO ) PATCHES=( "${WORKDIR}"/${PN}-1.9.5-patches + "${FILESDIR}"/${PN}-1.9.5-gcc14-build-fix.patch ) src_prepare() { diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest index 81d6262ef5af..a76134ebeeca 100644 --- a/media-libs/netpbm/Manifest +++ b/media-libs/netpbm/Manifest @@ -5,7 +5,7 @@ AUX netpbm-11.1.0-fix-clang-O2.patch 773 BLAKE2B a8d2bef659d384b0f94560fec847d37 AUX netpbm-11.2.7-fix-pnmcolormap2-test.patch 7051 BLAKE2B 741d4943b2e9eab1fb0061d6265271df8e25e458c1eb39f50aed8a392edf8369c9f0f3c43fc6ca0b940dd376166c9419c5039ddeaf10487859a7ea9bec4e6075 SHA512 4c7be95b582db27e3ce542b8f53bfdad2e6882b22ccc383aa7ca480cb5ba2a6aa000724dae3c5107efd1071bb87fac0648061dd46b0b75f1072ef05b7e128a68 AUX netpbm-11.6.1-incompatible-pointer-types.patch 514 BLAKE2B 0ea8a3c50838776ee645e61accc13645a690dc7e75cde2c33afd1ac7f07abbcb85a97b7e113217af12617ec5ad314eca0324c7bfbe7beb445aee85de47649ffb SHA512 a3a46607904c8ff9757f0a136aa2336382033760bc69bcca5a5d7662ca824f9a7d4281fe3996efc57456c3b30ddf7319fb70a1cb950ef974507f82340a226abb DIST netpbm-11.2.9.tar.xz 3782172 BLAKE2B b5acec8306c820e7b0ac2dec21ab5df8f2cdbec01d3d59f82b307d90111954e81e1b01ad7d8e25e8fbd0ea7cf61e8b023e3dfaed6d1cab71b51f7e367d792e56 SHA512 02961bb2ac4a4292e028ed5dbd05daf89ac795f50d36d97be67c49a61be0cbd977e954aa9266c4649d9a46de3fbe7c4b2b51c8363cc7bee322926dd4a9af2ab1 -DIST netpbm-11.6.1.tar.xz 3792940 BLAKE2B e48ec658708baac53708c96feb7aac94c32debae675d8f9114393aaccabc1f59309bf577bff98d252fecab37fb0faa1cc29955269636f736563a859edbdd947d SHA512 844256dc61d29c4f1ba164d5c1ec0b7c6cb8e97c4c6c04cf7b92cd7c118b99994cf7dda4a256f35ef575cb718a7a7f253468b60ba567733a613da8102d23bebf +DIST netpbm-11.7.0.tar.xz 3805348 BLAKE2B fa42e4806e9573a6dc6d2df3bde6e8318269a88669e6417022e7c5c6c995a46b7762acca47cb5eea301824d8ec78c57a29df34ec68fd3146d9e785271524e205 SHA512 b9cd20c568056a32314addce7d9d059e4c4475a36aabbaebf3f8e74ae4b127a62e8280a32dafd17a2cf1e06fa3f509818ddb5d11700132810b93ee65c933f099 EBUILD netpbm-11.2.9-r1.ebuild 7110 BLAKE2B f1286bc6c56a4665bb6eee95c22eb4280a502b6cde45d3eae15a3c61782fd8d8edc09e232e8dc112347bdf107bb1db0ad2c8812a68e0661a98566c9a454569e2 SHA512 b676b61d9b8b8a28a5e3fcf8be1dcb3d115fe31de714fbeba6c2187929e974ddeb789ef401abef83c28a58209020a333d903ed39807e0ce7639f367ddb308e7f -EBUILD netpbm-11.6.1-r1.ebuild 6984 BLAKE2B ee29cdaf8e397781efdca52bf3b55f9912158381328b8b05fdab124fee06fa2e988a5a7d32d3d0245662716f85cdb924b151fb966e5b75450f368502e1da7a9a SHA512 4e40c3d736311711de6c1bd21b041086215499b9bdc9e3a7ca0e248f196d6a50431128faba4fa572909b5dba75d4b5156e87592e75e552716710a3def25cb03f +EBUILD netpbm-11.7.0.ebuild 6906 BLAKE2B ebe384a5f39da3e5a6976ed15cdbef152c9664701a8cecc33db5fd16cde9195a15b1e4513aae21567e81b116966d79d5af536252ff2405d92d05984d277ea4b7 SHA512 486d33ab4c49231325deda664bb321a4a65de18b33d1aebfeaea14753cfcbfc99e85c12d41dc713bcbdffb0273aa72d59b50f5d0f1a9df173f52792c04060901 MISC metadata.xml 424 BLAKE2B 9ccc907d6c15cb1a7d6cfe4679d6fa9f488642948897ca34958a06b439ebcfb912cfb18fa9d93f15f19573aed4bd7083d277151c477410a59cd64b4c9c0446d4 SHA512 a987be2134a44cc916d5a026068219b8ccaa149e577eaf2a53a7802321793129777cc79b069df95ec9320f15279249a5f9d8a61509452ef02effcb6c66cf9e80 diff --git a/media-libs/netpbm/netpbm-11.6.1-r1.ebuild b/media-libs/netpbm/netpbm-11.7.0.ebuild index b63b5a302d37..a0a3d3f56e04 100644 --- a/media-libs/netpbm/netpbm-11.6.1-r1.ebuild +++ b/media-libs/netpbm/netpbm-11.7.0.ebuild @@ -8,7 +8,7 @@ inherit flag-o-matic multilib toolchain-funcs # Upstream has 3 flavors of netpbm: super stable, stable and advanced. # They only provide a tarball for super stable, but super stable is a bit lagging. # So we package the stable branch of their svn (currently versions 11.2.xx) on SLOT "0/stable" -# and the advanced branch of their svn (currently versions 11.6.yy) on SLOT "0/advanced". +# and the advanced branch of their svn (currently versions 11.7.yy) on SLOT "0/advanced". # The stable branch is stabilized according to usual Gentoo rules, while the # advanced branch will not be stabilized. # A detailed explanation is here https://netpbm.sourceforge.net/release.html @@ -131,9 +131,6 @@ src_prepare() { -i test/ps-{alt-,flate-,}roundtrip.test || die fi - # the new postscript test needs +x - chmod +x test/lps-roundtrip.test || die - # Do not test png if not built if ! use png ; then sed -E \ diff --git a/media-libs/oidn/Manifest b/media-libs/oidn/Manifest index 049d78f07762..a44a14da182e 100644 --- a/media-libs/oidn/Manifest +++ b/media-libs/oidn/Manifest @@ -4,8 +4,10 @@ DIST oidn-1.4.2.tar.gz 54221996 BLAKE2B bb6593e2e15877f65d9224fc93dac72aff6d567a DIST oidn-1.4.3.tar.gz 54222682 BLAKE2B f9b585c318258fd78e221a453b64e83965a3e5035a912baa49e4d5b48466441bf1d3c15291de2cd4d36e9da187ff7a643bb9d4af5282cdbb8b6bc99fb3cda0d0 SHA512 6fbdf347763c0734140195a523cf0878b1dbd91d4943c9ce4928f6991549f8b3d5ab4d57b90e20a8d04a87d00e3a1554ce73a3a3c1e64fcb016a3c1f8aa07982 DIST oidn-2.1.0.tar.gz 48977314 BLAKE2B 0fc32697df7fc6b8b367a78312a5b16ab68a5c88a2d19a8780e9de87c7e7096d7fe43dbd07928f2eba44c62fb4545338fc92f918dd4c33623259d0088a06a854 SHA512 508cb100f1a0a825774c2c01e0fc983e697341745fa0bfa48a99bfa70fc431f66fcdf17c3f170e40baefd7c3796a25d147f49cb17efbf1a1886556367c5c4566 DIST oidn-2.2.2.tar.gz 49006605 BLAKE2B e3d32cc2112ded280e642c5d69fb2ef14db59df4f5224bff79e82ede207899c9dbfa43dc663ad9ccc15a6497e363df0b91b43660729962c410b7ec75ac1b3465 SHA512 eca18e9e22a40bc1381e75985e5f5e79f48cc6d168a2a703e54540967646487d347db290459e9a612d8ab4924e8d3c83d84664fd5318cca4f17745da1e47cf50 +DIST oidn-2.3.0.tar.gz 75300547 BLAKE2B 88a5922b4db63c48ab69047dca8d1077205a6d7a2112971badb0cd35e0b770017f5cdcc95d2ef07016fe2e990e3e5806ac6a0800b67086b958948c542f0dff6f SHA512 4f68ce3b0da37e1861090d60d7cd823046f325c45a8e2c3f4098eb3b4f7ec676d2acbb9c138ff60a9f83188dd0dcbaba42106aad96beafc5e65045c77c00f2f8 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 1541 BLAKE2B 4acca5cb50fb55ca815cf9223f4369222b7e52d0ffe2a32e9a8ae07d73590abc606e7d766d575c651e56995e54d29fcd7fe62fb4a3982148f29a49191a3cb2ff SHA512 4b0a917c7c4bcf58cbe2c2bfff6a45cdf57a2b5d4828ef4b8ee1ee74e145593a4b0418181483e36eb3bf83061643ba62fb2c19b40220e0dccc37356ae6de016a -EBUILD oidn-2.2.2.ebuild 1999 BLAKE2B a9622bdf44c181f3199e21b5fc79cc14b18169120b7d5fb0e317ea5262eb60c13971f34dd86b45bf4945b805c8ee5397ebcad86f2ebea45ea10b5e53d79a0677 SHA512 a4ccce38b7caf2e09a54bdcea667a81a5dc22439e3e953a484707d8d7dd0c126e7a4b806520af30d0a21eebb02d44bf8e078825c0b511a788ead4cd446ce8c25 -MISC metadata.xml 1002 BLAKE2B 09f5331ff0755f9d90597922ee23547ba27ba799bc75e7371bc43c9127e5d9b04954fb9741adb8df264b151afac78e1f51d157fdd2a917b3fd7bd4247fe0bf90 SHA512 8facceffdbe156e4216d70cce518d0bc4806b82fa58aa23f1a2feab7f29543d53cb79f91e525f67cd994e5d328a646cf47321fd054a4d37a2b2dcfb35aa2c318 +EBUILD oidn-2.1.0.ebuild 1745 BLAKE2B 623facc91063e88b56fdc80546e9b1b233a9b245f2441ba20277d11a11959d27a2d5277848530231b26b5b91cd583a43ac3c3a26bc9434678192510ece924ba5 SHA512 42ce153e58919b7addc88adacc11c30c8b7de2813b9f5d6a15dbdfa9b31b2ac39b097077a598bd2f7b2bc693892d64e8111e93e5de30cea39a712fdea1c87a17 +EBUILD oidn-2.2.2.ebuild 2191 BLAKE2B eb83d6bd78509557526685805f24fb64b3e422cd4b3e3fbc3011196a16a6a9386587f056bda509779a01d55e41b4bf5a497fb96cbdc078f98bd1b518aa3dbffe SHA512 3c81dab899bd07b05e2bd97764217e24eeb8e6644f47c9bc75f663c4d8b31f657af72b811bbec39b3024db49ea5ebc1108446b60431edcc9878ef736b8c6139a +EBUILD oidn-2.3.0.ebuild 2192 BLAKE2B 43a1e3fa26d2245721072dfc2471e2b5a767314d56a5806b1233f22d75434dadf7bb160f4faf2f46ed71eb844bbe569012c0cb072ac8d789ad1007a150bc7570 SHA512 b774dafdca5a616fd04127442d2e40cb7c0486fbe0aa6269ab13cfec1eb7ccd20536d806d115bbd20962b650ad7596c0a3122edff1bfccd070cfea701bef4fc1 +MISC metadata.xml 995 BLAKE2B e4acf06e236b5d7497d7e19f20ccc961ea25da8dc3180d51ff76decd6f92cf4c927d6dbf96876ed47cb02e2ad7a42aa2571aa98d65e6b90afbe8a8142a3f090b SHA512 7f3b6cce23de7b0aade535b1fe1cb5af8bf622347731837e87cebcf28471a782825a599be79bf96bb69cd1ce5d36c9a9531d51cde1267cfc86453f94beb70d34 diff --git a/media-libs/oidn/metadata.xml b/media-libs/oidn/metadata.xml index 228559585b99..eb65b09493a5 100644 --- a/media-libs/oidn/metadata.xml +++ b/media-libs/oidn/metadata.xml @@ -26,6 +26,6 @@ </flag> </use> <upstream> - <remote-id type="github">OpenImageDenoise/oidn</remote-id> + <remote-id type="github">RenderKit/oidn</remote-id> </upstream> </pkgmetadata> diff --git a/media-libs/oidn/oidn-2.1.0.ebuild b/media-libs/oidn/oidn-2.1.0.ebuild index f3b63b4ce34d..6f9b87d1f737 100644 --- a/media-libs/oidn/oidn-2.1.0.ebuild +++ b/media-libs/oidn/oidn-2.1.0.ebuild @@ -43,6 +43,16 @@ PATCHES=( "${FILESDIR}/${PN}-2.1.0-amdgpu-targets.patch" ) +src_prepare() { + if use hip; then + # https://bugs.gentoo.org/930391 + sed "/-Wno-unused-result/s:): --rocm-path=${EPREFIX}/usr/lib):" \ + -i devices/hip/CMakeLists.txt || die + fi + + cmake_src_prepare +} + src_configure() { local mycmakeargs=( -DOIDN_DEVICE_CUDA=$(usex cuda) diff --git a/media-libs/oidn/oidn-2.2.2.ebuild b/media-libs/oidn/oidn-2.2.2.ebuild index 224f56744910..1d059c48a8b6 100644 --- a/media-libs/oidn/oidn-2.2.2.ebuild +++ b/media-libs/oidn/oidn-2.2.2.ebuild @@ -50,6 +50,12 @@ src_prepare() { addpredict "/proc/self/task/" fi + if use hip; then + # https://bugs.gentoo.org/930391 + sed "/-Wno-unused-result/s:): --rocm-path=${EPREFIX}/usr/lib):" \ + -i devices/hip/CMakeLists.txt || die + fi + sed -e "/^install.*llvm_macros.cmake.*cmake/d" -i CMakeLists.txt || die cmake_src_prepare @@ -58,7 +64,6 @@ src_prepare() { src_configure() { local mycmakeargs=( -DOIDN_APPS="$(usex apps)" - -DOIDN_APPS_OPENIMAGEIO="$(usex apps "$(usex openimageio)")" -DOIDN_DEVICE_CPU="yes" -DOIDN_DEVICE_CUDA="$(usex cuda)" @@ -66,6 +71,10 @@ src_configure() { # -DOIDN_DEVICE_SYCL="$(usex sycl)" ) + if use apps; then + mycmakeargs+=( -DOIDN_APPS_OPENIMAGEIO="$(usex openimageio)" ) + fi + if use cuda; then export CUDAHOSTCXX="$(cuda_gccdir)" fi diff --git a/media-libs/oidn/oidn-2.3.0.ebuild b/media-libs/oidn/oidn-2.3.0.ebuild new file mode 100644 index 000000000000..0dd6f000d711 --- /dev/null +++ b/media-libs/oidn/oidn-2.3.0.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) +LLVM_COMPAT=( {15..17} ) +ROCM_VERSION=5.7 + +inherit cmake cuda llvm-r1 python-any-r1 rocm + +DESCRIPTION="Intel® Open Image Denoise library" +HOMEPAGE="https://www.openimagedenoise.org https://github.com/RenderKit/oidn" + +if [[ ${PV} = *9999 ]]; then + EGIT_REPO_URI="https://github.com/RenderKit/oidn.git" + EGIT_BRANCH="master" + inherit git-r3 +else + SRC_URI="https://github.com/RenderKit/${PN}/releases/download/v${PV}/${P}.src.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +fi + +LICENSE="Apache-2.0" +SLOT="0" +REQUIRED_USE=" + test? ( apps ) +" +IUSE="apps cuda hip openimageio test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-cpp/tbb:= + dev-lang/ispc + cuda? ( dev-util/nvidia-cuda-toolkit ) + hip? ( dev-util/hip ) + openimageio? ( media-libs/openimageio:= ) +" +DEPEND="${RDEPEND}" +BDEPEND="${PYTHON_DEPS}" + +PATCHES=( + "${FILESDIR}/${PN}-2.2.2-amdgpu-targets.patch" +) + +src_prepare() { + if use cuda; then + cuda_src_prepare + addpredict "/proc/self/task/" + fi + + if use hip; then + # https://bugs.gentoo.org/930391 + sed "/-Wno-unused-result/s:): --rocm-path=${EPREFIX}/usr/lib):" \ + -i devices/hip/CMakeLists.txt || die + fi + + sed -e "/^install.*llvm_macros.cmake.*cmake/d" -i CMakeLists.txt || die + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DOIDN_APPS="$(usex apps)" + + -DOIDN_DEVICE_CPU="yes" + -DOIDN_DEVICE_CUDA="$(usex cuda)" + -DOIDN_DEVICE_HIP="$(usex hip)" + # -DOIDN_DEVICE_SYCL="$(usex sycl)" + ) + + if use apps; then + mycmakeargs+=( -DOIDN_APPS_OPENIMAGEIO="$(usex openimageio)" ) + fi + + if use cuda; then + export CUDAHOSTCXX="$(cuda_gccdir)" + fi + + if use hip; then + mycmakeargs+=( + -DROCM_PATH="${EPREFIX}/usr" + -DOIDN_DEVICE_HIP_COMPILER="$(get_llvm_prefix)/bin/clang++" # use HIPHOSTCOMPILER + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + ) + fi + + cmake_src_configure +} + +src_test() { + "${BUILD_DIR}"/oidnTest || die "There were test faliures!" +} + +src_install() { + cmake_src_install + + if use hip || use cuda ; then + # remove garbage in /var/tmp left by subprojects + rm -rf "${ED}"/var || die + fi +} diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest index eb1238c3b83d..096bc8e98c67 100644 --- a/media-libs/osl/Manifest +++ b/media-libs/osl/Manifest @@ -1,13 +1,9 @@ -DIST osl-1.12.11.0.tar.gz 20287156 BLAKE2B 178db816980929cc61a0deea63f715a9f10adc41c6dd264bca8df451ef9531c4ee9477f6374f160b2a7d6fb72289a3edcbe5a3e8050ff2fdcc6bfe57fda58626 SHA512 9cf7b08f43e66d280cb90bf8c579f3a7d949934ac8e7a9289113a4a34158a43e32c9b73863f2a94a628ebc1a988923c3a7d32f0944745ae7c74dc164fdd5125e -DIST osl-1.12.13.0.tar.gz 20286745 BLAKE2B 75a2a5d10000ba26cd11463dde710d5be3b8b2d227de45263d8bd39fd87ca064f7c6d2b2f9cea2fdb8f29ccaa94d3ef60e2ff2e0e6d867385e2298dd10ef61b6 SHA512 d7e6ab79f77f2854cbb4fa2fbe5fc92659bb015b1bbffcee2ef86185cf20235990fa3b20308601aa298fedc85d3fcd4451b7b7ff0df7def97027efe4fb8a02bc DIST osl-1.12.14.0.tar.gz 20555853 BLAKE2B 4f6bc2084e4c1b25e707a37830961f20926e6ab5cb915c763cbd8126127e70f6368832077729ab5e044f573e8c38c4afb413eff8adccee5ea1ae96cb9be43b6e SHA512 51641e58fb0bba042853e3976c104decc788f1b1d3ec2e33a3f5504b11b05950dc38766ffb066b0f76edc4e0a8829d6b7dd408d9288b74d69380395b1d991bd5 -DIST osl-1.12.7.0.tar.gz 20250356 BLAKE2B a9398243546b1bfc1e3f9602f6112a72a8e7cb6ace54e93d0e5f30d943474e82c3317596597d6a09e0f2cf04b1b21f05c31a2357e3d667d710cd2aa340f5fd63 SHA512 ec0391dfc95140fee4fa8332991cdcb0978dafc436f3e07d0293e2baa2014b8765e6b60631ae5a8bbd6e16dbcf37f04c076d7d6b2d8bfa58b78471f0d92c433f +DIST osl-1.13.10.0.tar.gz 21776721 BLAKE2B 6b40adcf50403292003ae8216e60328d5af6d25bf22cd241aeb4f99b1d39c628c78fe1bc8372226c984ca38b6e08427525f12dc38e5b6d3355de02cbc71f1b7b SHA512 f005b8797a7bb882bcdf4fd644551d42c150956baa8dd9deff39ff1121321f33b8e144a9a96ac940ae6bf60985c6131457131baa87c73c2b498298aaa77c3c7d DIST osl-1.13.7.0.tar.gz 21774349 BLAKE2B 1fd731f14b8dce948d7995efadb63eec8ce028ed6b095db391d2dfedcbbd62ca3aad9cd5d7d40f94c9e358f952d841899103467a2f81b12a605ae8c8436a16ff SHA512 15ffc6a5eed44141672af3d7ddab5d97abacad2062cddb35ef2a8484538a9a9a86cbd7e7170deafcefd3b69df764bfd207685603ca17a2fbff4299ccd1afe569 -EBUILD osl-1.12.11.0.ebuild 2654 BLAKE2B 03dbc702cf4ee912aaa9c8e6fc367c1d329e4197c921b83530ef067655bc5d9707709ff1faabccec73afc5cdca1c35e13b332f27c1753e995d15e175be27faa2 SHA512 eb64532b37668c315ece45468dff7de849a80cd4a4d977e9ec3fe248d844deb431eeefeb54e6cfdc886cdae8db25573cd6345e7df0ab09c8dd8a0844f5bc17bc -EBUILD osl-1.12.13.0.ebuild 2937 BLAKE2B d0cc000f15b02c06109d3bfeec16423da744b8b3aa4eae200cc2e34edc92d5aa9dc63652e6291e4deb37e96dc0c2815a936e920cbb560c72936543e63b977876 SHA512 d0293f173cbaff89eef8c7d00bf4a1c23b10af4cfe4091d9cf0dbda9a4321ebc8f8954e1fca40c59ca2f539583dfced2ac61f634a9d3a5579fdffde97a3defc9 -EBUILD osl-1.12.14.0-r1.ebuild 9769 BLAKE2B d1f775a39538c35f1c71f48cf3632829909267aea2c4fa4ffc3f08b64fe75c90d8c71e44f00271c295e1918b2028c90523c599e74ddae22de576034e5268ad35 SHA512 bfc4af1faec258234b46f914941b068731fadfea032d3dba81e942471d020742612e1e8a892d31f840bab586723c47e75c480559e2dcda455cf92ab0ab5e88c5 -EBUILD osl-1.12.14.0.ebuild 3851 BLAKE2B 18ce77a6deb606691bd3d6f6ba1b5cd58601adfb113f5acc8e62a53f718b19cb9765092f1039ce81ac5f85a90d453e5b4412e304c69700a47dc18a21bfef4259 SHA512 efae1c24a25cf8b67df5ac3281103b37b6ec9694d6bb33aab78a44382f4e51079debfd16e6677091b2dfdb768937ad17be8948aaa2e1d0d7299e37adcad28924 -EBUILD osl-1.12.7.0.ebuild 2761 BLAKE2B b70f2c5c5d7a8cd3d5031f35562e3266d21e5212a53ca5ea2ea4c8d2476651095e6140c6490648ab0fcc2c629e81d4ec628155bbea8d78899446e906596d065d SHA512 daede9ce4d5d366bcba462adfad893fe19d9d41b05adc807632b9d67422b452170a2cb453fefba826877f4bbafc4639311aab457f16ffc324b66f8688c0e517c -EBUILD osl-1.13.7.0.ebuild 11688 BLAKE2B 3b01aebbe3554756e20a42e1c2bc077ca143450b5f4465007451b48a7d075319a4e033bc6b6ce3ea2622d96d82af8098ba59b15a87327b2bd5a2c286cc034c39 SHA512 0e6a1f57c24176f62b5e37940641a0df55ad5cf316beacd0399d25bf1377039ae1bf1f773e7a8d0341e390ee29876de3352c14fe007ef0c649cf990cb73ff4f3 -EBUILD osl-9999.ebuild 11412 BLAKE2B 8eba646ab0607806e4ddd027d42474c100f7236dde0e80835cffdbd9f7f195880e07d0da5ea29c81e8f4045dbe5210b9bb166c02f52f9ac5f6746c9e99b39a06 SHA512 8439688fab91350530eae23181cf148289681258cf9383abd9c0203ba0d89179c33947c389ffed71c3a9a5a2c4ccc75fb39f6967962a807e6b99d2efcc67ca2c +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 7682 BLAKE2B 2088ec50cc26da7374f29f5da59f302f04c626010f687d9365dac517894ef101d7e15730d96efe109deb5adf0a44e34f3d32748258f5525589c19ca71c9f9e39 SHA512 5f1a8c990888f4af09b2676fe131dacaf13855a0ac49fc1c614b1e849c1b1afbbc4029b6c7258e1530190edf4db02374fff1b2db74a61434dc2658e0b0ef229c +EBUILD osl-1.13.7.0.ebuild 11741 BLAKE2B 98ae068b097406fcbfeed428c051e3049a2a7b0feda20f4744664072d5be18ac2d6b5eeaf6e96d8573997ff0ba6da3240afb307f6a84f178d4915daa4ff6617a SHA512 74254e8793acc25a7429fb4915912f7f2f14cf810e83b0ad922be4ec6853f5cd8e12992bb7532d891b66bbf2078f89c46bd416b61e21c88487d4008ed48590ce +EBUILD osl-9999.ebuild 7682 BLAKE2B 2088ec50cc26da7374f29f5da59f302f04c626010f687d9365dac517894ef101d7e15730d96efe109deb5adf0a44e34f3d32748258f5525589c19ca71c9f9e39 SHA512 5f1a8c990888f4af09b2676fe131dacaf13855a0ac49fc1c614b1e849c1b1afbbc4029b6c7258e1530190edf4db02374fff1b2db74a61434dc2658e0b0ef229c MISC metadata.xml 1162 BLAKE2B 56fc654915ef7d354844d8b9d99cbe1e2fa8ece1bf3ee2028847d8add16c663cab3110598ae78b7da05c6f3b06bc0926ff1797827c5b2750c03ec02d4c5effe2 SHA512 6e391782385aca530fb9526dd4675845aefd42d760555a7633b0daec2d2890e5d2ce93f39b4c297c1f1056e2c4607c228baba4a1875f05c47362abeb50455dba diff --git a/media-libs/osl/osl-1.12.11.0.ebuild b/media-libs/osl/osl-1.12.11.0.ebuild deleted file mode 100644 index 677938550873..000000000000 --- a/media-libs/osl/osl-1.12.11.0.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -# Check this on updates -LLVM_MAX_SLOT=15 - -inherit cmake llvm toolchain-funcs python-single-r1 - -DESCRIPTION="Advanced shading language for production GI renderers" -HOMEPAGE="http://opensource.imageworks.com/?p=osl" -# If a development release, please don't keyword! -SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/OpenShadingLanguage-${PV}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" - -X86_CPU_FEATURES=( - sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 - avx:avx avx2:avx2 avx512f:avx512f f16c:f16c -) -CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} ) - -IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*} python" -RESTRICT="!test? ( test )" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - dev-libs/boost:= - dev-libs/pugixml - >=media-libs/openexr-3:0= - >=media-libs/openimageio-2.3.12.0:= - <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):= - sys-libs/zlib:= - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/pybind11[${PYTHON_USEDEP}] - ') - ) - partio? ( media-libs/partio ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) -" - -DEPEND="${RDEPEND}" -BDEPEND=" - app-alternatives/yacc - app-alternatives/lex - virtual/pkgconfig -" - -llvm_check_deps() { - has_version -r "sys-devel/clang:${LLVM_SLOT}" -} - -pkg_setup() { - llvm_pkg_setup - - use python && python-single-r1_pkg_setup -} - -src_configure() { - local cpufeature - local mysimd=() - for cpufeature in "${CPU_FEATURES[@]}"; do - use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}") - done - - # If no CPU SIMDs were used, completely disable them - [[ -z ${mysimd} ]] && mysimd=("0") - - local gcc="$(tc-getCC)" - local mycmakeargs=( - -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" - -DINSTALL_DOCS=$(usex doc) - -DUSE_CCACHE=OFF - -DLLVM_STATIC=OFF - -DOSL_BUILD_TESTS=$(usex test) - -DSTOP_ON_WARNING=OFF - -DUSE_PARTIO=$(usex partio) - -DUSE_QT=$(usex qt5) - -DUSE_PYTHON=$(usex python) - -DPYTHON_VERSION="${EPYTHON/python}" - -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")" - ) - - cmake_src_configure -} - -src_test() { - # TODO: investigate failures - local myctestargs=( - -E "(osl-imageio|osl-imageio.opt|render-background|render-bumptest|render-mx-furnace-burley-diffuse|render-mx-furnace-sheen|render-mx-burley-diffuse|render-mx-conductor|render-mx-generalized-schlick|render-mx-generalized-schlick-glass|render-microfacet|render-oren-nayar|render-uv|render-veachmis|render-ward|render-raytypes.opt|color|color.opt|example-deformer)" - ) - - cmake_src_test -} diff --git a/media-libs/osl/osl-1.12.13.0.ebuild b/media-libs/osl/osl-1.12.13.0.ebuild deleted file mode 100644 index e3c4c2e1a16a..000000000000 --- a/media-libs/osl/osl-1.12.13.0.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) - -# Check this on updates -LLVM_MAX_SLOT=15 - -inherit cmake flag-o-matic llvm toolchain-funcs python-single-r1 - -DESCRIPTION="Advanced shading language for production GI renderers" -HOMEPAGE="http://opensource.imageworks.com/?p=osl" -# If a development release, please don't keyword! -SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/OpenShadingLanguage-${PV}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" - -X86_CPU_FEATURES=( - sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 - avx:avx avx2:avx2 avx512f:avx512f f16c:f16c -) -CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} ) - -IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*} python" -RESTRICT="!test? ( test )" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - dev-libs/boost:= - dev-libs/pugixml - >=media-libs/openexr-3:0= - >=media-libs/openimageio-2.3.12.0:= - <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):= - sys-libs/zlib:= - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/pybind11[${PYTHON_USEDEP}] - ') - ) - partio? ( media-libs/partio ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) -" - -DEPEND="${RDEPEND}" -BDEPEND=" - app-alternatives/yacc - app-alternatives/lex - virtual/pkgconfig -" - -llvm_check_deps() { - has_version -r "sys-devel/clang:${LLVM_SLOT}" -} - -pkg_setup() { - llvm_pkg_setup - - use python && python-single-r1_pkg_setup -} - -src_configure() { - local cpufeature - local mysimd=() - for cpufeature in "${CPU_FEATURES[@]}"; do - use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}") - done - - # If no CPU SIMDs were used, completely disable them - [[ -z ${mysimd} ]] && mysimd=("0") - - # This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully - # Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available. - use arm64 && append-flags -flax-vector-conversions - - local gcc="$(tc-getCC)" - local mycmakeargs=( - -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" - -DINSTALL_DOCS=$(usex doc) - -DUSE_CCACHE=OFF - -DLLVM_STATIC=OFF - -DOSL_BUILD_TESTS=$(usex test) - -DSTOP_ON_WARNING=OFF - -DUSE_PARTIO=$(usex partio) - -DUSE_QT=$(usex qt5) - -DUSE_PYTHON=$(usex python) - -DPYTHON_VERSION="${EPYTHON/python}" - -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")" - ) - - cmake_src_configure -} - -src_test() { - # TODO: investigate failures - local myctestargs=( - -E "(osl-imageio|osl-imageio.opt|render-background|render-bumptest|render-mx-furnace-burley-diffuse|render-mx-furnace-sheen|render-mx-burley-diffuse|render-mx-conductor|render-mx-generalized-schlick|render-mx-generalized-schlick-glass|render-microfacet|render-oren-nayar|render-uv|render-veachmis|render-ward|render-raytypes.opt|color|color.opt|example-deformer)" - ) - - cmake_src_test -} 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 50363e61e508..e450385f5016 100644 --- a/media-libs/osl/osl-1.12.14.0-r1.ebuild +++ b/media-libs/osl/osl-1.12.14.0-r1.ebuild @@ -32,7 +32,7 @@ X86_CPU_FEATURES=( ) CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" ) -IUSE="doc gui libcxx nofma partio qt6 test ${CPU_FEATURES[*]%:*} python" +IUSE="debug doc gui libcxx nofma partio qt6 test ${CPU_FEATURES[*]%:*} python" RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -173,16 +173,20 @@ src_configure() { -DSTOP_ON_WARNING="no" -DUSE_PARTIO="$(usex partio)" -DUSE_PYTHON="$(usex python)" - -DPYTHON_VERSION="${EPYTHON/python}" -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")" -DUSE_BATCHED="$(IFS=","; echo "${mybatched[*]}")" -DUSE_LIBCPLUSPLUS="$(usex libcxx)" -DUSE_OPTIX="no" - -DVEC_REPORT="yes" -DOpenImageIO_ROOT="${EPREFIX}/usr" ) + if use debug; then + mycmakeargs+=( + -DVEC_REPORT="yes" + ) + fi + if use gui; then mycmakeargs+=( -DUSE_QT="yes" ) if ! use qt6; then @@ -198,6 +202,13 @@ src_configure() { ) fi + if use python; then + mycmakeargs+=( + "-DPYTHON_VERSION=${EPYTHON#python}" + "-DPYTHON_SITE_DIR=$(python_get_sitedir)" + ) + fi + cmake_src_configure } diff --git a/media-libs/osl/osl-1.12.14.0.ebuild b/media-libs/osl/osl-1.12.14.0.ebuild index 5af6590d6486..459fa3084277 100644 --- a/media-libs/osl/osl-1.12.14.0.ebuild +++ b/media-libs/osl/osl-1.12.14.0.ebuild @@ -26,7 +26,7 @@ X86_CPU_FEATURES=( ) CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} ) -IUSE="doc gui partio qt6 test ${CPU_FEATURES[@]%:*} python" +IUSE="debug doc gui partio qt6 test ${CPU_FEATURES[@]%:*} python" RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -124,9 +124,14 @@ src_configure() { -DPYTHON_VERSION="${EPYTHON/python}" -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")" -DUSE_BATCHED="$(IFS=","; echo "${mybatched[*]}")" - -DVEC_REPORT=yes ) + if use debug; then + mycmakeargs+=( + -DVEC_REPORT="yes" + ) + fi + if use gui; then mycmakeargs+=( -DUSE_QT=yes ) if ! use qt6; then diff --git a/media-libs/osl/osl-1.12.7.0.ebuild b/media-libs/osl/osl-1.12.7.0.ebuild deleted file mode 100644 index d778aa560c98..000000000000 --- a/media-libs/osl/osl-1.12.7.0.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -# Check this on updates -LLVM_MAX_SLOT=15 - -inherit cmake llvm toolchain-funcs python-single-r1 - -DESCRIPTION="Advanced shading language for production GI renderers" -HOMEPAGE="http://opensource.imageworks.com/?p=osl" -# If a development release, please don't keyword! -SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/OpenShadingLanguage-${PV}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64" - -X86_CPU_FEATURES=( - sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 - avx:avx avx2:avx2 avx512f:avx512f f16c:f16c -) -CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} ) - -IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*} python" -RESTRICT="!test? ( test )" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - dev-libs/boost:= - dev-libs/pugixml - >=media-libs/openexr-3:0= - >=media-libs/openimageio-2.3.12.0:= - <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):= - sys-libs/zlib:= - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/pybind11[${PYTHON_USEDEP}] - ') - ) - partio? ( media-libs/partio ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) -" - -DEPEND="${RDEPEND}" -BDEPEND=" - app-alternatives/yacc - app-alternatives/lex - virtual/pkgconfig -" - -llvm_check_deps() { - has_version -r "sys-devel/clang:${LLVM_SLOT}" -} - -pkg_setup() { - llvm_pkg_setup - - use python && python-single-r1_pkg_setup -} - -src_configure() { - local cpufeature - local mysimd=() - for cpufeature in "${CPU_FEATURES[@]}"; do - use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}") - done - - # If no CPU SIMDs were used, completely disable them - [[ -z ${mysimd} ]] && mysimd=("0") - - local gcc="$(tc-getCC)" - local mycmakeargs=( - # Still needed? - # See https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pull/1454 - #-DCMAKE_CXX_STANDARD=14 - -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" - -DINSTALL_DOCS=$(usex doc) - -DUSE_CCACHE=OFF - -DLLVM_STATIC=OFF - -DOSL_BUILD_TESTS=$(usex test) - -DSTOP_ON_WARNING=OFF - -DUSE_PARTIO=$(usex partio) - -DUSE_QT=$(usex qt5) - -DUSE_PYTHON=$(usex python) - -DPYTHON_VERSION="${EPYTHON/python}" - -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")" - ) - - cmake_src_configure -} - -src_test() { - # TODO: investigate failures - local myctestargs=( - -E "(osl-imageio|osl-imageio.opt|render-background|render-bumptest|render-mx-furnace-burley-diffuse|render-mx-furnace-sheen|render-mx-burley-diffuse|render-mx-conductor|render-mx-generalized-schlick|render-mx-generalized-schlick-glass|render-microfacet|render-oren-nayar|render-uv|render-veachmis|render-ward|color|color.opt|example-deformer)" - ) - - cmake_src_test -} diff --git a/media-libs/osl/osl-1.13.10.0.ebuild b/media-libs/osl/osl-1.13.10.0.ebuild new file mode 100644 index 000000000000..3df3ad89ba3b --- /dev/null +++ b/media-libs/osl/osl-1.13.10.0.ebuild @@ -0,0 +1,337 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +# Check this on updates +LLVM_COMPAT=( {15..18} ) + +inherit cmake cuda flag-o-matic llvm-r1 toolchain-funcs python-single-r1 + +DESCRIPTION="Advanced shading language for production GI renderers" +HOMEPAGE="https://www.imageworks.com/technology/opensource https://github.com/AcademySoftwareFoundation/OpenShadingLanguage" + +if [[ ${PV} = *9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage.git" +else + # If a development release, please don't keyword! + SRC_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" + S="${WORKDIR}/OpenShadingLanguage-${PV}" +fi + +LICENSE="BSD" +SLOT="0/$(ver_cut 1-2)" # based on SONAME + +X86_CPU_FEATURES=( + sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 + avx:avx avx2:avx2 avx512f:avx512f f16c:f16c +) +CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" ) + +IUSE="debug doc gui libcxx nofma optix partio qt6 test ${CPU_FEATURES[*]%:*} python" + +RESTRICT="!test? ( test )" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# TODO optix +RDEPEND=" + dev-libs/boost:= + dev-libs/pugixml + >=media-libs/openexr-3:0= + >=media-libs/openimageio-2.4:= + $(llvm_gen_dep ' + sys-devel/clang:${LLVM_SLOT} + sys-devel/llvm:${LLVM_SLOT} + ') + sys-libs/zlib:= + optix? ( dev-libs/optix[-headers-only] ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/pybind11[${PYTHON_USEDEP}] + media-libs/openimageio[python,${PYTHON_SINGLE_USEDEP}] + ') + ) + partio? ( media-libs/partio ) + gui? ( + !qt6? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtopengl:5 + ) + qt6? ( + dev-qt/qtbase:6[gui,widgets,opengl] + ) + ) +" + +DEPEND="${RDEPEND} + dev-util/patchelf + test? ( + media-fonts/droid + ) +" +BDEPEND=" + sys-devel/bison + sys-devel/flex + virtual/pkgconfig +" + +pkg_setup() { + llvm-r1_pkg_setup + + use python && python-single-r1_pkg_setup +} + +src_prepare() { + if use optix; then + cuda_src_prepare + cuda_add_sandbox -w + fi + + sed -e "/^install.*llvm_macros.cmake.*cmake/d" -i CMakeLists.txt || die + + cmake_src_prepare +} + +src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/875836 + # https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/issues/1810 + filter-lto + + # pick the highest we support + local mysimd=() + if use cpu_flags_x86_avx512f; then + mysimd+=( avx512f ) + elif use cpu_flags_x86_avx2 ; then + mysimd+=( avx2 ) + if use cpu_flags_x86_f16c ; then + mysimd+=( f16c ) + fi + elif use cpu_flags_x86_avx ; then + mysimd+=( avx ) + elif use cpu_flags_x86_sse4_2 ; then + mysimd+=( sse4.2 ) + elif use cpu_flags_x86_sse4_1 ; then + mysimd+=( sse4.1 ) + elif use cpu_flags_x86_ssse3 ; then + mysimd+=( ssse3 ) + elif use cpu_flags_x86_sse3 ; then + mysimd+=( sse3 ) + elif use cpu_flags_x86_sse2 ; then + mysimd+=( sse2 ) + fi + + local mybatched=() + if use cpu_flags_x86_avx512f || use cpu_flags_x86_avx2 ; then + if use cpu_flags_x86_avx512f ; then + if use nofma; then + mybatched+=( + "b8_AVX512_noFMA" + "b16_AVX512_noFMA" + ) + fi + mybatched+=( + "b8_AVX512" + "b16_AVX512" + ) + fi + if use cpu_flags_x86_avx2 ; then + if use nofma; then + mybatched+=( + "b8_AVX2_noFMA" + ) + fi + mybatched+=( + "b8_AVX2" + ) + fi + fi + if use cpu_flags_x86_avx ; then + mybatched+=( + "b8_AVX" + ) + fi + + # If no CPU SIMDs were used, completely disable them + [[ -z "${mysimd[*]}" ]] && mysimd=("0") + [[ -z "${mybatched[*]}" ]] && mybatched=("0") + + # This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully + # Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available. + use arm64 && append-flags -flax-vector-conversions + + local gcc + gcc="$(tc-getCC)" + + local mycmakeargs=( + -DCMAKE_POLICY_DEFAULT_CMP0146="OLD" # BUG FindCUDA + + # std::tuple_size_v is c++17 + -DCMAKE_CXX_STANDARD="17" + + -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" + -DINSTALL_DOCS="$(usex doc)" + -DUSE_CCACHE="no" + -DLLVM_STATIC="no" + -DOSL_BUILD_TESTS="$(usex test)" + -DSTOP_ON_WARNING="no" + -DUSE_PARTIO="$(usex partio)" + -DUSE_PYTHON="$(usex python)" + -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")" + -DUSE_BATCHED="$(IFS=","; echo "${mybatched[*]}")" + -DUSE_LIBCPLUSPLUS="$(usex libcxx)" + -DOSL_USE_OPTIX="$(usex optix)" + + -DOpenImageIO_ROOT="${EPREFIX}/usr" + ) + + if use debug; then + mycmakeargs+=( + -DVEC_REPORT="yes" + ) + fi + + if use gui; then + mycmakeargs+=( -DUSE_QT="yes" ) + if ! use qt6; then + mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6="yes" ) + fi + else + mycmakeargs+=( -DUSE_QT="no" ) + fi + + if use optix; then + mycmakeargs+=( + -DOptiX_FIND_QUIETLY="no" + -DCUDA_FIND_QUIETLY="no" + + -DOPTIXHOME="${EPREFIX}/opt/optix" + -DCUDA_TOOLKIT_ROOT_DIR="${EPREFIX}/opt/cuda" + + -DCUDA_NVCC_FLAGS="--compiler-bindir;$(cuda_gccdir)" + -DOSL_EXTRA_NVCC_ARGS="--compiler-bindir;$(cuda_gccdir)" + -DCUDA_VERBOSE_BUILD="yes" + ) + fi + + if use partio; then + mycmakeargs+=( + -Dpartio_DIR="${EPREFIX}/usr" + ) + fi + + if use python; then + mycmakeargs+=( + "-DPYTHON_VERSION=${EPYTHON#python}" + "-DPYTHON_SITE_DIR=$(python_get_sitedir)" + ) + fi + + cmake_src_configure +} + +src_test() { + # A bunch of tests only work when installed. + # So install them into the temp directory now. + DESTDIR="${T}" cmake_build install + + ln -s "${CMAKE_USE_DIR}/src/cmake/" "${BUILD_DIR}/src/cmake" || die + + if use optix; then + cp \ + "${BUILD_DIR}/src/liboslexec/shadeops_cuda.ptx" \ + "${BUILD_DIR}/src/testrender/"{optix_raytracer,quad,rend_lib_testrender,sphere,wrapper}".ptx" \ + "${BUILD_DIR}/src/testshade/"{optix_grid_renderer,rend_lib_testshade}".ptx" \ + "${BUILD_DIR}/bin/" || die + + # NOTE this should go to cuda eclass + addwrite /dev/nvidiactl + addwrite /dev/nvidia0 + addwrite /dev/nvidia-uvm + addwrite /dev/nvidia-caps + addwrite "/dev/char/" + fi + + CMAKE_SKIP_TESTS=( + "-broken$" + "^render" + + # broken with in-tree <=dev-libs/optix-7.5.0 and out of date + "^example-cuda$" + + # outright fail + "^testoptix.optix.opt$" + "^testoptix-noise.optix.opt$" + "^testoptix-reparam.optix.opt$" + "^transform-reg.regress.batched.opt$" + "^spline-reg.regress.batched.opt$" + + # doesn't handle parameters + "^osl-imageio$" + "^osl-imageio.opt$" + "^osl-imageio.opt.rs_bitcode$" + ) + + myctestargs=( + # src/build-scripts/ci-test.bash + '--force-new-ctest-process' + ) + + local -x DEBUG CXXFLAGS LD_LIBRARY_PATH DIR OSL_DIR OSL_SOURCE_DIR PYTHONPATH + DEBUG=1 # doubles the floating point tolerance so we avoid FMA related issues + CXXFLAGS="-I${T}/usr/include" + LD_LIBRARY_PATH="${T}/usr/$(get_libdir)" + OSL_DIR="${T}/usr/$(get_libdir)/cmake/OSL" + OSL_SOURCE_DIR="${S}" + + if use python; then + PYTHONPATH="${BUILD_DIR}/lib/python/site-packages" + fi + + cmake_src_test + + einfo "" + einfo "testing render tests in isolation" + einfo "" + + CMAKE_SKIP_TESTS=( + "^render-background$" + "^render-mx-furnace-sheen$" + "^render-mx-burley-diffuse$" + "^render-mx-conductor$" + "^render-microfacet$" + "^render-veachmis$" + "^render-ward$" + "^render-raytypes.opt$" + "^render-raytypes.opt.rs_bitcode$" + ) + + myctestargs=( + # src/build-scripts/ci-test.bash + '--force-new-ctest-process' + --repeat until-pass:10 + -R "^render" + ) + + cmake_src_test +} + +src_install() { + cmake_src_install + + if [[ -d "${ED}/usr/build-scripts" ]]; then + rm -rf "${ED}/usr/build-scripts" || die + fi + + for batched_lib in "${ED}/usr/$(get_libdir)/lib_"*"_oslexec.so"; do + patchelf --set-soname "$(basename "${batched_lib}")" "${batched_lib}" || die + done +} diff --git a/media-libs/osl/osl-1.13.7.0.ebuild b/media-libs/osl/osl-1.13.7.0.ebuild index 404090f7e9f3..a8e64ed97c5f 100644 --- a/media-libs/osl/osl-1.13.7.0.ebuild +++ b/media-libs/osl/osl-1.13.7.0.ebuild @@ -32,7 +32,7 @@ X86_CPU_FEATURES=( ) CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" ) -IUSE="doc gui libcxx nofma optix partio qt6 test ${CPU_FEATURES[*]%:*} python" +IUSE="debug doc gui libcxx nofma optix partio qt6 test ${CPU_FEATURES[*]%:*} python" RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -185,11 +185,16 @@ src_configure() { -DUSE_BATCHED="$(IFS=","; echo "${mybatched[*]}")" -DUSE_LIBCPLUSPLUS="$(usex libcxx)" -DOSL_USE_OPTIX="$(usex optix)" - -DVEC_REPORT="yes" -DOpenImageIO_ROOT="${EPREFIX}/usr" ) + if use debug; then + mycmakeargs+=( + -DVEC_REPORT="yes" + ) + fi + if use gui; then mycmakeargs+=( -DUSE_QT="yes" ) if ! use qt6; then diff --git a/media-libs/osl/osl-9999.ebuild b/media-libs/osl/osl-9999.ebuild index 68654d760dc8..3df3ad89ba3b 100644 --- a/media-libs/osl/osl-9999.ebuild +++ b/media-libs/osl/osl-9999.ebuild @@ -6,7 +6,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) # Check this on updates -LLVM_COMPAT=( {15..17} ) +LLVM_COMPAT=( {15..18} ) inherit cmake cuda flag-o-matic llvm-r1 toolchain-funcs python-single-r1 @@ -24,7 +24,7 @@ else fi LICENSE="BSD" -SLOT="0/$(ver_cut 1-3)" +SLOT="0/$(ver_cut 1-2)" # based on SONAME X86_CPU_FEATURES=( sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 @@ -32,8 +32,10 @@ X86_CPU_FEATURES=( ) CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" ) -IUSE="doc gui libcxx nofma optix partio qt6 test ${CPU_FEATURES[*]%:*} python" +IUSE="debug doc gui libcxx nofma optix partio qt6 test ${CPU_FEATURES[*]%:*} python" + RESTRICT="!test? ( test )" + REQUIRED_USE="${PYTHON_REQUIRED_USE}" # TODO optix @@ -69,7 +71,12 @@ RDEPEND=" ) " -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + dev-util/patchelf + test? ( + media-fonts/droid + ) +" BDEPEND=" sys-devel/bison sys-devel/flex @@ -130,25 +137,24 @@ src_configure() { "b8_AVX512_noFMA" "b16_AVX512_noFMA" ) - else - mybatched+=( - "b8_AVX512" - "b16_AVX512" - ) fi + mybatched+=( + "b8_AVX512" + "b16_AVX512" + ) fi if use cpu_flags_x86_avx2 ; then if use nofma; then mybatched+=( "b8_AVX2_noFMA" ) - else - mybatched+=( - "b8_AVX2" - ) fi + mybatched+=( + "b8_AVX2" + ) fi - elif use cpu_flags_x86_avx ; then + fi + if use cpu_flags_x86_avx ; then mybatched+=( "b8_AVX" ) @@ -167,7 +173,6 @@ src_configure() { local mycmakeargs=( -DCMAKE_POLICY_DEFAULT_CMP0146="OLD" # BUG FindCUDA - -DCMAKE_POLICY_DEFAULT_CMP0148="OLD" # BUG FindPythonInterp # std::tuple_size_v is c++17 -DCMAKE_CXX_STANDARD="17" @@ -180,16 +185,20 @@ src_configure() { -DSTOP_ON_WARNING="no" -DUSE_PARTIO="$(usex partio)" -DUSE_PYTHON="$(usex python)" - -DPYTHON_VERSION="${EPYTHON/python}" -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")" -DUSE_BATCHED="$(IFS=","; echo "${mybatched[*]}")" -DUSE_LIBCPLUSPLUS="$(usex libcxx)" -DOSL_USE_OPTIX="$(usex optix)" - -DVEC_REPORT="yes" -DOpenImageIO_ROOT="${EPREFIX}/usr" ) + if use debug; then + mycmakeargs+=( + -DVEC_REPORT="yes" + ) + fi + if use gui; then mycmakeargs+=( -DUSE_QT="yes" ) if ! use qt6; then @@ -219,6 +228,13 @@ src_configure() { ) fi + if use python; then + mycmakeargs+=( + "-DPYTHON_VERSION=${EPYTHON#python}" + "-DPYTHON_SITE_DIR=$(python_get_sitedir)" + ) + fi + cmake_src_configure } @@ -245,166 +261,24 @@ src_test() { fi CMAKE_SKIP_TESTS=( - "broken" + "-broken$" "^render" # broken with in-tree <=dev-libs/optix-7.5.0 and out of date "^example-cuda$" # outright fail + "^testoptix.optix.opt$" + "^testoptix-noise.optix.opt$" + "^testoptix-reparam.optix.opt$" "^transform-reg.regress.batched.opt$" - - # SIGABRT similar to https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/issues/1363 - "^derivs.opt.rs_bitcode$" - "^geomath.batched$" - "^matrix.batched$" - "^matrix.batched.opt$" "^spline-reg.regress.batched.opt$" - "^transformc.batched$" - ) - # These only fail inside sandbox - if [[ "${OSL_OPTIONAL_TESTS}" != "true" ]]; then - CMAKE_SKIP_TESTS+=( - # TODO: investigate failures - # SIGABRT similar to https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/issues/1363 - "^andor-reg.regress.batched.opt$" - "^arithmetic-reg.regress.batched.opt$" - "^array-assign-reg.regress.batched.opt$" - "^array-copy-reg.regress.batched.opt$" - "^array-length-reg.regress.batched$" - "^closure-parameters.batched$" - "^closure-parameters.batched.opt$" - "^closure.batched$" - "^closure.batched.opt$" - "^debug-uninit$" - "^debug-uninit.batched$" - "^debug-uninit.batched.opt$" - "^debug-uninit.opt$" - "^debug-uninit.opt.rs_bitcode$" - "^derivs$" - "^derivs.batched$" - "^derivs.batched.opt$" - "^derivs.opt$" - "^exponential$" - "^exponential.opt$" - "^exponential.opt.rs_bitcode$" - "^filterwidth-reg.regress.batched.opt$" - "^geomath$" - "^geomath.batched.opt$" - "^geomath.opt$" - "^geomath.opt.rs_bitcode$" - "^getattribute-camera.batched$" - "^getattribute-camera.batched.opt$" - "^getattribute-shader.batched.opt$" - "^gettextureinfo-reg.regress.batched.opt$" - "^gettextureinfo-udim-reg.regress.batched.opt$" - "^gettextureinfo.batched$" - "^hyperb.batched.opt$" - "^hyperb.opt$" - "^hyperb.opt.rs_bitcode$" - "^initlist.batched$" - "^initlist.batched.opt$" - "^linearstep.batched$" - "^linearstep.batched.opt$" - "^loop.batched$" - "^loop.batched.opt$" - "^matrix$" - "^matrix-compref-reg.regress.batched.opt$" - "^matrix-reg.regress.rsbitcode.opt$" - "^matrix.opt$" - "^matrix.opt.rs_bitcode$" - "^matrix.rsbitcode.opt$" - "^message-no-closure.batched$" - "^message-no-closure.batched.opt$" - "^message-reg.regress.batched.opt$" - "^miscmath$" - "^miscmath.batched$" - "^miscmath.batched.opt$" - "^miscmath.opt$" - "^miscmath.opt.rs_bitcode$" - "^noise-cell.batched$" - "^noise-gabor-reg.regress.batched.opt$" - "^noise-gabor.batched$" - "^noise-gabor.batched.opt$" - "^noise-generic.batched$" - "^noise-generic.batched.opt$" - "^noise-perlin.batched$" - "^noise-perlin.batched.opt$" - "^noise-reg.regress.batched.opt$" - "^noise-simplex.batched$" - "^noise-simplex.batched.opt$" - "^noise.batched$" - "^opt-warnings.batched$" - "^opt-warnings.batched.opt$" - "^pnoise-cell.batched$" - "^pnoise-gabor.batched$" - "^pnoise-gabor.batched.opt$" - "^pnoise-generic.batched$" - "^pnoise-generic.batched.opt$" - "^pnoise-perlin.batched$" - "^pnoise-perlin.batched.opt$" - "^pnoise-reg.regress.batched.opt$" - "^pnoise.batched$" - "^pointcloud.batched$" - "^pointcloud.batched.opt$" - "^regex-reg.regress.batched.opt$" - "^select.batched$" - "^select.batched.opt$" - "^shaderglobals.batched$" - "^shaderglobals.batched.opt$" - "^smoothstep-reg.regress.batched.opt$" - "^spline-derivbug.batched$" - "^spline-derivbug.batched.opt$" - "^spline.batched$" - "^spline.batched.opt$" - "^splineinverse-ident.batched$" - "^splineinverse-ident.batched.opt$" - "^split-reg.regress.batched.opt$" - "^string$" - "^string-reg.regress.batched.opt$" - "^string.batched$" - "^string.batched.opt$" - "^string.opt$" - "^string.opt.rs_bitcode$" - "^struct-array-mixture.batched$" - "^struct-array-mixture.batched.opt$" - "^struct.batched$" - "^test-fmt-matrixcolor.opt.rs_bitcode$" - "^testoptix-noise.optix.opt$" - "^testoptix-reparam.optix.opt$" - "^texture-environment-opts-reg.regress.batched.opt$" - "^texture-opts-reg.regress.batched.opt$" - "^texture-wrap.batched$" - "^texture-wrap.batched.opt$" - "^transcendental-reg.regress.batched.opt$" - "^transform$" - "^transform.batched$" - "^transform.batched.opt$" - "^transform.opt$" - "^transform.opt.rs_bitcode$" - "^transformc$" - "^transformc.batched.opt$" - "^transformc.opt$" - "^transformc.opt.rs_bitcode$" - "^transformc.rsbitcode.opt$" - "^trig$" - "^trig-reg.regress.batched.opt$" - "^trig.batched$" - "^trig.batched.opt$" - "^trig.opt$" - "^trig.opt.rs_bitcode$" - "^vecctr.batched$" - "^vecctr.batched.opt$" - "^vector$" - "^vector-reg.regress.batched.opt$" - "^vector.opt$" - "^vector.opt.rs_bitcode$" - "^xml-reg.regress.batched.opt$" - # diff - "^testoptix.optix.opt$" - ) - fi + # doesn't handle parameters + "^osl-imageio$" + "^osl-imageio.opt$" + "^osl-imageio.opt.rs_bitcode$" + ) myctestargs=( # src/build-scripts/ci-test.bash @@ -412,7 +286,7 @@ src_test() { ) local -x DEBUG CXXFLAGS LD_LIBRARY_PATH DIR OSL_DIR OSL_SOURCE_DIR PYTHONPATH - DEBUG=1 # doubles the floating point tolerance + DEBUG=1 # doubles the floating point tolerance so we avoid FMA related issues CXXFLAGS="-I${T}/usr/include" LD_LIBRARY_PATH="${T}/usr/$(get_libdir)" OSL_DIR="${T}/usr/$(get_libdir)/cmake/OSL" @@ -424,6 +298,10 @@ src_test() { cmake_src_test + einfo "" + einfo "testing render tests in isolation" + einfo "" + CMAKE_SKIP_TESTS=( "^render-background$" "^render-mx-furnace-sheen$" @@ -445,3 +323,15 @@ src_test() { cmake_src_test } + +src_install() { + cmake_src_install + + if [[ -d "${ED}/usr/build-scripts" ]]; then + rm -rf "${ED}/usr/build-scripts" || die + fi + + for batched_lib in "${ED}/usr/$(get_libdir)/lib_"*"_oslexec.so"; do + patchelf --set-soname "$(basename "${batched_lib}")" "${batched_lib}" || die + done +} diff --git a/media-libs/phonon-vlc/Manifest b/media-libs/phonon-vlc/Manifest index a6479d26bbe8..7f73c1253a5a 100644 --- a/media-libs/phonon-vlc/Manifest +++ b/media-libs/phonon-vlc/Manifest @@ -1,5 +1,5 @@ DIST phonon-backend-vlc-0.11.3.tar.xz 67196 BLAKE2B 597ead8300bfcd4dd1a94ee1733e77ea15436eea01924093ba6655d08de7b2334cd39c10e61655adcbf12e5ca1afb239c0ee0bd05fefe2e294cc1cb1ef5c7799 SHA512 11593d15874734d92922bcfd8e038a2a4f528d9145d525d6654aad7bb9d7edb911f31f564d83217341dff3be973c8cf00d91f03b66a90305f4f7ed97c2d57033 DIST phonon-backend-vlc-0.12.0.tar.xz 71664 BLAKE2B 9ace1020d8e9a9e97243706ff81703d3f22bf892f402e44451147a24547d09bcf12f5745377c01d65b4d1fb03cd975b323b2cab62f8136880d1d9c004cca7d7b SHA512 78f5ead829d5025c7cb9e01b33819514d795651d1d932c03bd8cc2ad5d427e5aaaeeb6016820d5a7bb9907f6df1142a0fbc097830d7c63b01f77d2167a0c9264 EBUILD phonon-vlc-0.11.3-r1.ebuild 736 BLAKE2B 68e053bf42c51ecbbad2f94e76cb8b1d982d706320cd4913aa9954cff08b7f4f6332d1f8739bf664c6dda930dbec3ec88177dd6a530c95a36caf6ec59467fa6a SHA512 f5c1296f63b6d71265c4d77b224b38bbc2ccc3b70349bd07db9432643796407f4661d3da97b8a75a556bc50e560a3290c47e4a264a3303c92d060e6fc1b4039e -EBUILD phonon-vlc-0.12.0-r1.ebuild 1743 BLAKE2B cfad7b3782a0f9dd38c78d67121b48cd73eb332b63616ebc3e3a5306695db196b8110e83ffdc4186feaebcec63fd2d52e7dbd2c057f854a63296d73667b686d4 SHA512 74108c53cde16bc7f21194c91a34c9eaaecc67eddb4ec41335e5a3ebf923c5c2bd88b7557e7aaeab32a0871e8a2deee4a79dfc3e13c6dce0abad74d3d491b30a +EBUILD phonon-vlc-0.12.0-r1.ebuild 1719 BLAKE2B 8620f2a9d060edc6f09db5cb15b951683b21d4b340a4c624203edaaad36e90c6ed8b8d24bf252f1073fcbba7e6a4cbceb4a45c24202d605744742536aaa65fa6 SHA512 3456b92382e9f7470f1b8352845e71fd54dd6b0e307a40894388d88ce4f730ee07ae8626dc41ef13bf5a2d236397ca28367fe8157992f9e3a6c339597296bc64 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/media-libs/phonon-vlc/phonon-vlc-0.12.0-r1.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.12.0-r1.ebuild index b056b9ec82ae..62f5f652f8ac 100644 --- a/media-libs/phonon-vlc/phonon-vlc-0.12.0-r1.ebuild +++ b/media-libs/phonon-vlc/phonon-vlc-0.12.0-r1.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://community.kde.org/Phonon" if [[ ${KDE_BUILD_TYPE} = release ]]; then SRC_URI="mirror://kde/stable/phonon/phonon-backend-vlc/${PV}/phonon-backend-vlc-${PV}.tar.xz" S="${WORKDIR}"/phonon-backend-vlc-${PV} - KEYWORDS="~amd64" + KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86" fi LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )" @@ -32,15 +32,10 @@ DEPEND=" RDEPEND="${DEPEND}" BDEPEND=" dev-libs/libpcre2:* + >=kde-frameworks/extra-cmake-modules-5.115.0:* virtual/pkgconfig - qt5? ( - dev-qt/linguist-tools:5 - >=kde-frameworks/extra-cmake-modules-5.115.0:* - ) - qt6? ( - dev-qt/qttools:6[linguist] - >=kde-frameworks/extra-cmake-modules-6.0.0:* - ) + qt5? ( dev-qt/linguist-tools:5 ) + qt6? ( dev-qt/qttools:6[linguist] ) " pkg_setup() { diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest index 3a9223ab9d48..2e5e64b3d764 100644 --- a/media-libs/phonon/Manifest +++ b/media-libs/phonon/Manifest @@ -2,5 +2,5 @@ AUX phonon-4.11.1-clang-16.patch 1356 BLAKE2B 2adbe00797db0efab8a065c455b8122bea DIST phonon-4.11.1.tar.xz 314732 BLAKE2B 9be341f8df643b352392a208c7f24d799edcc94146b71c73d93974a7ef02cc75b5baa1e2ddd037e7e2d3afeb52347d96caaa8b3a2319631802261735a3a751df SHA512 858b2b0d7b0336af76d226b30f3acd1914e7297e0879d5a417fa1b87b13c812f9aab7e20adcad33ce1a03624ce78323dd9968b4b277caf85f800ca60aa134f74 DIST phonon-4.12.0.tar.xz 408996 BLAKE2B 568af4aec5247759e49db2137978b9f1828256f817bcb321f02e69d597d78e97c9ce437e89cd63b5a8b15c312f74ccee11b34270e74be2dc24c2af9ee97490f0 SHA512 0dbd88464985051f4c43e64a4d0b7e2d65e7f6b54fd2bae4ec1790fbdf9f79348aa91d4839c72a4f66297d5a9c7b379cc34923b99b97130a5443e5b2c0cc8a9a EBUILD phonon-4.11.1-r2.ebuild 1307 BLAKE2B 69c75e346c77710c52591a8debe93bb09c34217584a520622dbfcfb2b4442b3039f1705ee5550f4b35edef1fc65a33286517deb24373264adceef2d365679ebd SHA512 daae7f938573ea831c299c0ef584ae4526570e64e3cb0790cfc7dae34b364fb4bb72ac0f312d0733fb17de6bcc3f74e3dbd9a08247c5d43e2776bae5deb8ec3b -EBUILD phonon-4.12.0-r2.ebuild 2315 BLAKE2B 80c2bb691bdd9d758b4171ce9cb9b8bd707062c6279f1abcc3a6ac45eafa4443a1314cd56b15f4827e504798a8ffe7c4278fb7b9538e1e06e96706293d5162c0 SHA512 033950b0d3bf823542003acf1c62fc8cd78dda550fb404f811d0201c7e1b99236b9c464f3ab4dbc370375fa5cefd38a6a6e9034933bf398ef6253c66216a01a2 +EBUILD phonon-4.12.0-r3.ebuild 2299 BLAKE2B c06645d8024ff377535d591e7bb90152765987d9a8b5ed6afc9487b92e56bcd8196492a51bd6b721296b3027e40d2b56cce43488da014d9ef7857f575307794f SHA512 af90f3df9ef4b7ad04a951363806f2dcb031cc437e3f8886e2a3f704ced271ca3e7c87319b55fdb28acc82fefac31ca1b5c7c726b849acbff24fb90bdc7aab5f MISC metadata.xml 463 BLAKE2B 856a539bfa489dac4d6550f9fb4104b419dc6dd12a5d6ec67ac7d9f743fa31d96c3323937558704b7941a914c1ca342b5a6030e9f16b7d84f2339f93d2a1fb9f SHA512 c6aa1e0f8f11e813c228619f9c857bfa3e15d3278a1b5af3910f8f789a7d93f889a9adb9121f19b4b52abbfa0b4a67d89a037679ae0eab00b0db04ed5e16526e diff --git a/media-libs/phonon/phonon-4.12.0-r2.ebuild b/media-libs/phonon/phonon-4.12.0-r3.ebuild index d47b6cab6593..b821463b8b9a 100644 --- a/media-libs/phonon/phonon-4.12.0-r2.ebuild +++ b/media-libs/phonon/phonon-4.12.0-r3.ebuild @@ -10,12 +10,12 @@ HOMEPAGE="https://community.kde.org/Phonon" if [[ ${KDE_BUILD_TYPE} = release ]]; then SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz" - KEYWORDS="~amd64" + KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86" fi LICENSE="|| ( LGPL-2.1 LGPL-3 ) !pulseaudio? ( || ( GPL-2 GPL-3 ) )" SLOT="0" -IUSE="debug designer pulseaudio +qt5 qt6 +vlc" +IUSE="debug designer minimal pulseaudio +qt5 qt6" REQUIRED_USE="|| ( qt5 qt6 )" DEPEND=" @@ -44,18 +44,13 @@ RDEPEND="${DEPEND} " BDEPEND=" dev-libs/libpcre2:* + >=kde-frameworks/extra-cmake-modules-5.115.0:* virtual/pkgconfig - qt5? ( - dev-qt/linguist-tools:5 - >=kde-frameworks/extra-cmake-modules-5.115.0:* - ) - qt6? ( - dev-qt/qttools:6[linguist] - >=kde-frameworks/extra-cmake-modules-6.0.0:* - ) + qt5? ( dev-qt/linguist-tools:5 ) + qt6? ( dev-qt/qttools:6[linguist] ) " PDEPEND=" - vlc? ( >=media-libs/phonon-vlc-0.12.0[qt5?,qt6?] ) + !minimal? ( >=media-libs/phonon-vlc-0.12.0[qt5?,qt6?] ) " pkg_setup() { diff --git a/media-libs/pulseaudio-qt/Manifest b/media-libs/pulseaudio-qt/Manifest index 5ee091d67ec2..f9cae21d4a15 100644 --- a/media-libs/pulseaudio-qt/Manifest +++ b/media-libs/pulseaudio-qt/Manifest @@ -2,5 +2,5 @@ AUX pulseaudio-qt-1.3-no-crash-if-no-server-response.patch 1523 BLAKE2B c13e9cae DIST pulseaudio-qt-1.3.tar.xz 34148 BLAKE2B f283c369fcbeaf57537fe28d6f8aa02c34d7567ab8260ec8ba05edf8320b65e29e6ac88489ff0b49ae57b0bc8b8a49da83886f50ed9641850c84939a979e930c SHA512 2326277fd37327db29a5984056949fcf935c36e7b39184d1307a5d0a891efed4f0e4f32e783f3f7da2c7e6b7409eb908b2521064c6d24a28561ed38db9f8d4e8 DIST pulseaudio-qt-1.5.0.tar.xz 36004 BLAKE2B ef61c70b1fdfc850c2cd0bde7621da9ff088347f1134b970eb2c5383b3f1dc2aa0d07a37d27b617c5647def3cda92fc745a847e9234826acc825d64d7e542426 SHA512 c0ce24c10b607b2866eb08bae14bac340de028bbf6ebfdd57ae8f9bd3bbb182cc681a124f20a4f309fd56c97598a33db07c6289d2c9801cc8f395cd424e588b8 EBUILD pulseaudio-qt-1.3-r4.ebuild 797 BLAKE2B f347863f987751483c98ce28492dcb54c5fd88f9f757c8b6019cf7367dc14e26a64cd8d898d72218c2efdff407f0476edc17cb31b84f34f9896f49e125a5af7f SHA512 b8c980c899c77b728d6ccaec83669cd934a02611d6ea75dc1efe803cb72dbe5ceecec3baff89a00ba277707c00bd2ee740b4bf1f57aaad5d8087841c2b68aee8 -EBUILD pulseaudio-qt-1.5.0.ebuild 636 BLAKE2B b07beb4da8b7c3a2ab512d2e59a395a60d7baaf63a5ec20b3fdfb9e564b3b96cdddca00e6cc370daa2d03ac1213a3b3c747bbe55da1fce14c4ba18f36fff7015 SHA512 04e39f86536149844bf418428f1a4c701bc9e36bc775762f25a722159005486996f859a7a47e6cdb8b7d0e429c1c2f843e778c60cd851ea59e8bd8ed80c01a84 +EBUILD pulseaudio-qt-1.5.0.ebuild 643 BLAKE2B 94407a0ffbc133072d3564aef87a03c762f2641e505fed5d9356963d12f01bfb33319dd55fa8fee5c38118557b5eeb609033a27505e0a1b8432b4454a1aa2e25 SHA512 51c1294439d45387ba1f008167ed918441250723a04ad9f5c931b93be1171d0cb32ab89992b7a12886f5209fe3671cff344dc4f355dcfda33efb784bddac7f5a MISC metadata.xml 385 BLAKE2B 66910b8057aee5141d69520b1a4485d15182552cc027156ea4929987c66128fac2e06d2b5ae450692ffd8fac97fcdfdd27e30fc4ebc9915cad50e480af1425a6 SHA512 1b549f3f3e21a2a2dee45285ac8c7a61f4f06d8e6b4d7fdc42d8aa3c537a921c613faef3d57e36efa86a74117e7f71f54fcb4d7fca8c747980d63f314f4ba1db diff --git a/media-libs/pulseaudio-qt/pulseaudio-qt-1.5.0.ebuild b/media-libs/pulseaudio-qt/pulseaudio-qt-1.5.0.ebuild index ebd4d0bbdd47..b8fb17530779 100644 --- a/media-libs/pulseaudio-qt/pulseaudio-qt-1.5.0.ebuild +++ b/media-libs/pulseaudio-qt/pulseaudio-qt-1.5.0.ebuild @@ -15,7 +15,7 @@ HOMEPAGE="https://invent.kde.org/libraries/pulseaudio-qt" if [[ ${KDE_BUILD_TYPE} = release ]]; then SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~arm64" fi LICENSE="LGPL-2.1" |