diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-06-30 08:00:51 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-06-30 08:00:51 +0100 |
commit | d5ee59790ee8298b8599b0aa0fa21a98b972a44d (patch) | |
tree | 2cc4393cdcfae28879cee110e5975f6e6b798f91 /media-libs | |
parent | d855918b46ba8714cf1320fe63b55fd0ed1748a6 (diff) |
gentoo auto-resync : 30:06:2024 - 08:00:50
Diffstat (limited to 'media-libs')
28 files changed, 441 insertions, 1248 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz Binary files differindex 745e2c2c4a19..cd5d70523a0e 100644 --- a/media-libs/Manifest.gz +++ b/media-libs/Manifest.gz diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest index 7583b8a4bb34..5315d21d1299 100644 --- a/media-libs/harfbuzz/Manifest +++ b/media-libs/harfbuzz/Manifest @@ -1,12 +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 DIST harfbuzz-9.0.0.tar.xz 17895360 BLAKE2B fd35c41d25e77c96b1fc760b8ca0ffd1ac8f3382b51991bb28797d55c2171bf0700ac65266996bf5cab82b8e9c835c2fad9c8374d9c60d2a361c924d805afbf6 SHA512 2700b560727d9c4440ad9c74a170b857f20f9e553e5d98b0c4bcf086a25ba644149d7c89009a41d964af7a924efcc486da4dcbfa5cc4d47f9f10e9b6b8c689af -EBUILD harfbuzz-8.3.0.ebuild 2658 BLAKE2B 34ffbc7643580e719a5322ea2eeade70283f8228b3df4b04f1415b7dbeb9fa1f616c719e724d47130635dd02c2eedc7e485172c8d43b9d8b53d32d1489a74bf9 SHA512 355605cea7c1769706c8446057209539dc1bdb320af6501095c09ec51677fd0f017aefd46d3463af9d2248f96ce0e65e000f8350bef4aa63960d657f68be4e43 -EBUILD harfbuzz-8.3.1.ebuild 2666 BLAKE2B ce30bfc0d75c1f8c3ab878ba84b13a2f67b42aa99f2ff59fd4be558dc23ae7da0a08b90d0aa78e291c9d2edbfa8f199a1092793605feeb488aa42c0edec05940 SHA512 73edd912dd62c16c83cf9e05622d55e386aad1aa7bb942a6253608200b2fc067e969e0c029eef9166c9d6b049f9f9da58f863e29cb81a6a3639622cbdc85f0dd EBUILD harfbuzz-8.4.0.ebuild 2714 BLAKE2B 9384baff4e8f17ea5eed5d98c06154f8b0b9c44d91a2c9711f9be092d10801de9a0125ab9f27b8450b18e86b69a5d6f8a5fd0f277670c84d5bfc8b5f71053129 SHA512 3eee664d83089939d5b4b085d971518958445e1594403fae2f1bc19c58e0a4bdea62dc23a931b823ac373dfe2adedc1a2aa2a2709e86f087095300bc9970f8c1 -EBUILD harfbuzz-8.5.0.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.3.1.ebuild b/media-libs/harfbuzz/harfbuzz-8.3.1.ebuild deleted file mode 100644 index d4d3515eea9d..000000000000 --- a/media-libs/harfbuzz/harfbuzz-8.3.1.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/libjxl/Manifest b/media-libs/libjxl/Manifest index a9b594813897..a732c3be3907 100644 --- a/media-libs/libjxl/Manifest +++ b/media-libs/libjxl/Manifest @@ -9,14 +9,11 @@ DIST libjxl-0.9.2.tar.gz 1873156 BLAKE2B 558d82dfaa2e5e4fdb07542b2daf4b80f661dec 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.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-r1.ebuild 2339 BLAKE2B 5e919bdd10fe20de0b45122a7ed2f037ef3e54c4c17a385bdc930288c8b9ccbabf0de82bedfe8510999ea8085d37981764243662fccd872f29ba19ac14d9c407 SHA512 f9227486972af086b08140bd81bd02cb3f303792f168fb05ef9dc5c743c6ad576da3f2a5616b31aeefdaa77d1c7fef6a04da0fdd36648ad7361aaaee2ce7f603 -EBUILD libjxl-0.8.2-r2.ebuild 2571 BLAKE2B 3d66e80efb11dd03ab12446eba565a26b136cd75644c8d5dd976fb2bc47bb0129e9afdd091b2200b9e62076ec0586b72cdcb4eb3c919aebfde91b02b6acc78a9 SHA512 f1ba0c1652f21bcba6bf8825d925cc97e2c9340711afeade8d7aa76ca2588bb81f7949e84139fe44aebb150e560a11f301e580a1f5564073f789d91d35c261ff +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 3007 BLAKE2B 6ded330ffaf6eb2daf3a402c91b4abd16769ff3e41b86d08f7717d27b76806a4e95a27a5f5a5b824b6068038616d863145e75458d1716ab0bcf9720acb38c6ea SHA512 1fcf2d77d03f317f07569d2124771abda3827043738e98c105961ae9ed1d9099aafa7972d7c57d154465fd7ae9f400390c3764287f7758663cf4f860cf25910a -EBUILD libjxl-0.9.2.ebuild 2784 BLAKE2B bb08ef63e10bcc07381fac168baa3b596f93e91c3d648b89f2a7ec0296b1bb4713fa91459faab76a08f89fe77cb23051131f19b3dcf1d6be3843b41ad6f8f271 SHA512 aeeca7ebde32c21a18e07d0b8e3c54fbdaa13b53d1c9eb642f53d34a56fd7b206d519c8f617d78fc691ffcd69745282577c589df3bef8af0692e9ef3346c2c06 +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.2.ebuild deleted file mode 100644 index 27f9a5132637..000000000000 --- a/media-libs/libjxl/libjxl-0.10.2.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib gnome2-utils - -# This changes frequently. Please check the testdata submodule when bumping. -TESTDATA_COMMIT="ff8d743aaba05b3014f17e5475e576242fa979fc" -DESCRIPTION="JPEG XL image format reference implementation" -HOMEPAGE="https://github.com/libjxl/libjxl/" -SRC_URI=" - https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz - -> ${P}.tar.gz - test? ( - https://github.com/libjxl/testdata/archive/${TESTDATA_COMMIT}.tar.gz - -> ${PN}-testdata-${TESTDATA_COMMIT}.tar.gz - ) -" - -LICENSE="BSD" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc64 ~riscv ~sparc x86" -IUSE="+gdk-pixbuf openexr test" -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 - ) - openexr? ( media-libs/openexr:= ) -" -RDEPEND=" - ${DEPEND} - >=x11-misc/shared-mime-info-2.2 -" -DEPEND+=" - test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] ) -" - -multilib_src_configure() { - local mycmakeargs=( - -DJPEGXL_ENABLE_BENCHMARK=OFF - -DJPEGXL_ENABLE_COVERAGE=OFF - -DJPEGXL_ENABLE_FUZZERS=OFF - -DJPEGXL_ENABLE_SJPEG=OFF - -DJPEGXL_WARNINGS_AS_ERRORS=OFF - - -DJPEGXL_ENABLE_SKCMS=OFF - -DJPEGXL_ENABLE_VIEWERS=OFF - -DJPEGXL_FORCE_SYSTEM_BROTLI=ON - -DJPEGXL_FORCE_SYSTEM_GTEST=ON - -DJPEGXL_FORCE_SYSTEM_HWY=ON - -DJPEGXL_FORCE_SYSTEM_LCMS2=ON - -DJPEGXL_ENABLE_DOXYGEN=OFF - -DJPEGXL_ENABLE_MANPAGES=OFF - -DJPEGXL_ENABLE_JNI=OFF - -DJPEGXL_ENABLE_JPEGLI=OFF - -DJPEGXL_ENABLE_JPEGLI_LIBJPEG=OFF - -DJPEGXL_ENABLE_TCMALLOC=OFF - -DJPEGXL_ENABLE_EXAMPLES=OFF - -DBUILD_TESTING=$(usex test ON OFF) - ) - - if use test; then - mycmakeargs+=( - -DJPEGXL_TEST_DATA_PATH="${WORKDIR}/testdata-${TESTDATA_COMMIT}" - ) - fi - - if multilib_is_native_abi; then - mycmakeargs+=( - -DJPEGXL_ENABLE_TOOLS=ON - -DJPEGXL_ENABLE_OPENEXR=$(usex openexr) - -DJPEGXL_ENABLE_PLUGINS=ON - -DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=$(usex gdk-pixbuf) - -DJPEGXL_ENABLE_PLUGIN_GIMP210=OFF - -DJPEGXL_ENABLE_PLUGIN_MIME=OFF - ) - else - mycmakeargs+=( - -DJPEGXL_ENABLE_TOOLS=OFF - -DJPEGXL_ENABLE_OPENEXR=OFF - -DJPEGXL_ENABLE_PLUGINS=OFF - ) - fi - - cmake_src_configure -} - -multilib_src_install() { - cmake_src_install - - find "${ED}" -name '*.a' -delete || die -} - -pkg_postinst() { - use gdk-pixbuf && multilib_foreach_abi gnome2_gdk_pixbuf_update -} - -pkg_postrm() { - use gdk-pixbuf && multilib_foreach_abi gnome2_gdk_pixbuf_update -} diff --git a/media-libs/libjxl/libjxl-0.8.2-r1.ebuild b/media-libs/libjxl/libjxl-0.8.2-r1.ebuild deleted file mode 100644 index 64b13ee3f527..000000000000 --- a/media-libs/libjxl/libjxl-0.8.2-r1.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib - -# This changes frequently. Please check the testdata submodule when bumping. -TESTDATA_COMMIT="d6168ffb9e1cc24007e64b65dd84d822ad1fc759" -DESCRIPTION="JPEG XL image format reference implementation" -HOMEPAGE="https://github.com/libjxl/libjxl" -SRC_URI="https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - test? ( https://github.com/libjxl/testdata/archive/${TESTDATA_COMMIT}.tar.gz - -> ${PN}-testdata-${TESTDATA_COMMIT}.tar.gz )" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc64 ~riscv ~sparc x86" -IUSE="openexr test" -RESTRICT="!test? ( test )" - -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 - openexr? ( media-libs/openexr:= ) - test? ( dev-cpp/gtest ) -" -RDEPEND="${DEPEND}" -PATCHES=( - "${FILESDIR}/${PN}-0.8.2-backport-pr2596.patch" - "${FILESDIR}/${PN}-0.8.2-backport-pr2617.patch" -) - -multilib_src_configure() { - local mycmakeargs=( - -DJPEGXL_ENABLE_BENCHMARK=OFF - -DJPEGXL_ENABLE_COVERAGE=OFF - -DJPEGXL_ENABLE_FUZZERS=OFF - -DJPEGXL_ENABLE_SJPEG=OFF - -DJPEGXL_WARNINGS_AS_ERRORS=OFF - - -DJPEGXL_ENABLE_SKCMS=OFF - -DJPEGXL_ENABLE_VIEWERS=OFF - -DJPEGXL_ENABLE_PLUGINS=OFF - -DJPEGXL_FORCE_SYSTEM_BROTLI=ON - -DJPEGXL_FORCE_SYSTEM_GTEST=ON - -DJPEGXL_FORCE_SYSTEM_HWY=ON - -DJPEGXL_FORCE_SYSTEM_LCMS2=ON - -DJPEGXL_ENABLE_DOXYGEN=OFF - -DJPEGXL_ENABLE_MANPAGES=OFF - -DJPEGXL_ENABLE_JNI=OFF - -DJPEGXL_ENABLE_JPEGLI_LIBJPEG=OFF - -DJPEGXL_ENABLE_TCMALLOC=OFF - -DJPEGXL_ENABLE_EXAMPLES=OFF - ) - - if multilib_is_native_abi; then - mycmakeargs+=( - -DJPEGXL_ENABLE_TOOLS=ON - -DJPEGXL_ENABLE_OPENEXR=$(usex openexr) - -DBUILD_TESTING=$(usex test ON OFF) - ) - use test && - mycmakeargs+=( -DJPEGXL_TEST_DATA_PATH="${WORKDIR}/testdata-${TESTDATA_COMMIT}" ) - else - mycmakeargs+=( - -DJPEGXL_ENABLE_TOOLS=OFF - -DJPEGXL_ENABLE_OPENEXR=OFF - -DBUILD_TESTING=OFF - ) - fi - - cmake_src_configure -} - -multilib_src_install() { - cmake_src_install - - find "${ED}" -name '*.a' -delete || die -} diff --git a/media-libs/libjxl/libjxl-0.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.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.2.ebuild deleted file mode 100644 index 566d2cf5113b..000000000000 --- a/media-libs/libjxl/libjxl-0.9.2.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib gnome2-utils - -# This changes frequently. Please check the testdata submodule when bumping. -TESTDATA_COMMIT="ff8d743aaba05b3014f17e5475e576242fa979fc" -DESCRIPTION="JPEG XL image format reference implementation" -HOMEPAGE="https://github.com/libjxl/libjxl/" -SRC_URI=" - https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz - -> ${P}.tar.gz - test? ( - https://github.com/libjxl/testdata/archive/${TESTDATA_COMMIT}.tar.gz - -> ${PN}-testdata-${TESTDATA_COMMIT}.tar.gz - ) -" - -LICENSE="BSD" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc64 ~riscv ~sparc x86" -IUSE="+gdk-pixbuf openexr test" -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 - ) - openexr? ( media-libs/openexr:= ) -" -RDEPEND=" - ${DEPEND} - >=x11-misc/shared-mime-info-2.2 -" -DEPEND+=" - test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] ) -" - -PATCHES=( - "${FILESDIR}/${PN}-0.9.1-backport-pr3143.patch" -) - -multilib_src_configure() { - local mycmakeargs=( - -DJPEGXL_ENABLE_BENCHMARK=OFF - -DJPEGXL_ENABLE_COVERAGE=OFF - -DJPEGXL_ENABLE_FUZZERS=OFF - -DJPEGXL_ENABLE_SJPEG=OFF - -DJPEGXL_WARNINGS_AS_ERRORS=OFF - - -DJPEGXL_ENABLE_SKCMS=OFF - -DJPEGXL_ENABLE_VIEWERS=OFF - -DJPEGXL_FORCE_SYSTEM_BROTLI=ON - -DJPEGXL_FORCE_SYSTEM_GTEST=ON - -DJPEGXL_FORCE_SYSTEM_HWY=ON - -DJPEGXL_FORCE_SYSTEM_LCMS2=ON - -DJPEGXL_ENABLE_DOXYGEN=OFF - -DJPEGXL_ENABLE_MANPAGES=OFF - -DJPEGXL_ENABLE_JNI=OFF - -DJPEGXL_ENABLE_JPEGLI=OFF - -DJPEGXL_ENABLE_JPEGLI_LIBJPEG=OFF - -DJPEGXL_ENABLE_TCMALLOC=OFF - -DJPEGXL_ENABLE_EXAMPLES=OFF - -DBUILD_TESTING=$(usex test ON OFF) - ) - - if use test; then - mycmakeargs+=( - -DJPEGXL_TEST_DATA_PATH="${WORKDIR}/testdata-${TESTDATA_COMMIT}" - ) - fi - - if multilib_is_native_abi; then - mycmakeargs+=( - -DJPEGXL_ENABLE_TOOLS=ON - -DJPEGXL_ENABLE_OPENEXR=$(usex openexr) - -DJPEGXL_ENABLE_PLUGINS=ON - -DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=$(usex gdk-pixbuf) - -DJPEGXL_ENABLE_PLUGIN_GIMP210=OFF - -DJPEGXL_ENABLE_PLUGIN_MIME=OFF - ) - else - mycmakeargs+=( - -DJPEGXL_ENABLE_TOOLS=OFF - -DJPEGXL_ENABLE_OPENEXR=OFF - -DJPEGXL_ENABLE_PLUGINS=OFF - ) - fi - - cmake_src_configure -} - -multilib_src_install() { - cmake_src_install - - find "${ED}" -name '*.a' -delete || die -} - -pkg_postinst() { - use gdk-pixbuf && multilib_foreach_abi gnome2_gdk_pixbuf_update -} - -pkg_postrm() { - use gdk-pixbuf && multilib_foreach_abi gnome2_gdk_pixbuf_update -} diff --git a/media-libs/libprojectm/Manifest b/media-libs/libprojectm/Manifest index d4e94acdab43..a91a5bce7ce6 100644 --- a/media-libs/libprojectm/Manifest +++ b/media-libs/libprojectm/Manifest @@ -1,5 +1,3 @@ -AUX libprojectm-3.1.12-GL_SMOOTH.patch 555 BLAKE2B b282f0182a3844feaeda0ab9332cdc4ab234cd38410d7ab4715d0a0fc270b0bc82f233122211740c6afe95b12b703e47e139597c553956af1a94355fd04d6b2b SHA512 f0ceb5132987437c4293228ccf8ef4ffc4de84400b5bafbdedb52fe6d23a074cb0532e741bcb8a098529b07600ba2296e62312927f93f288144880040f201c5d -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.1.tar.gz 47988154 BLAKE2B 47fd71d857f307ea09c87d36102662423d1df4d62f36f23373fcba36760312bd4e4d11408a3f4820b5caedd2e31bfd0dfc1e551c1bf27eb0ba33149f8ea13ebe SHA512 af38913e56d46ed15118b2dccd2701f9bf043bb3103f58ad2ebbfaffc60c3ed4e1b0eb3d8f922bdffb0001acfa5e3d23633a4903250fd00ede0dede1e6e1ba47 EBUILD libprojectm-3.1.12-r2.ebuild 1430 BLAKE2B b258d36deab18db1cd795941e9f8314974d33504e0b7b8c2fb0caa3e892f1f475eefa85df17689c9b7404899170b4b250a0d01512351d91672690caac1e8c34e SHA512 2ccc4cc5912c88cbf6460f76d7beffa2f5c0cedb9fe2142a00d1e597bed23f94d2db03b8a7b7b6f89890789a3cfb7adc095a450c39c32e4ee152a6d34a24e400 diff --git a/media-libs/libprojectm/files/libprojectm-3.1.12-GL_SMOOTH.patch b/media-libs/libprojectm/files/libprojectm-3.1.12-GL_SMOOTH.patch deleted file mode 100644 index 874d22aab6d0..000000000000 --- a/media-libs/libprojectm/files/libprojectm-3.1.12-GL_SMOOTH.patch +++ /dev/null @@ -1,13 +0,0 @@ -Unable to replicate error myself, but fix for https://bugs.gentoo.org/792204 -from https://github.com/projectM-visualizer/projectm/issues/449 -diff '--color=auto' -ru a/src/projectM-qt/qprojectmwidget.hpp b/src/projectM-qt/qprojectmwidget.hpp ---- a/src/projectM-qt/qprojectmwidget.hpp 2024-06-26 10:48:30.825008203 -0000 -+++ b/src/projectM-qt/qprojectmwidget.hpp 2024-06-26 10:49:03.265800570 -0000 -@@ -23,6 +23,7 @@ - #define QPROJECTM_WIDGET_HPP - - #include <iostream> -+#include <GL/gl.h> - #include "qprojectm.hpp" - #include <QGLWidget> - #include <QMutex> 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/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/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/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 +} |