diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-04-16 13:07:24 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-04-16 13:07:24 +0100 |
| commit | 0c100b7dd2b30e75b799d806df4ef899fd98e1ea (patch) | |
| tree | 464c922e949c7e4d5d891fb2cdda5daee5612537 /media-libs | |
| parent | e68d405c5d712af4387159df07e226217bdda049 (diff) | |
gentoo resync : 16.04.2022
Diffstat (limited to 'media-libs')
69 files changed, 684 insertions, 1819 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz Binary files differindex 78e25be4b621..712272101544 100644 --- a/media-libs/Manifest.gz +++ b/media-libs/Manifest.gz diff --git a/media-libs/amdgpu-pro-vulkan/Manifest b/media-libs/amdgpu-pro-vulkan/Manifest index aa7f76ebdcd9..02d5a98fbdbf 100644 --- a/media-libs/amdgpu-pro-vulkan/Manifest +++ b/media-libs/amdgpu-pro-vulkan/Manifest @@ -4,6 +4,9 @@ DIST amdgpu-pro-vulkan-21.50.1.1376756-amd64.deb 8342920 BLAKE2B a99ba48ded384e3 DIST amdgpu-pro-vulkan-21.50.1.1376756-i386.deb 8124604 BLAKE2B 5d325d2b6fe0b22c227df41049330f394315f17aa97203c7032131d5932e75d494539eac4d5e7ea89193a2736068e3a8e5f7a60de9a1a94b8af0b7fba757da21 SHA512 11480ebec72408a5727f99055c32d979912f838256d622c77c7efec37735d2805cf5c52e78d3c86dc0420d29ad52df2d65cd788b67cef1b2df1cfaa5a30c4bc2 DIST amdgpu-pro-vulkan-21.50.2.1384496-amd64.deb 8320356 BLAKE2B 1a5997ee983bf4729c429dae7d333fd49f8bb24a5022238299fd87e4ad8a7579c0535a8198fc3869db3b8079634b1e06e9bb90ff761239486cb4ffb7ea6ead4a SHA512 16299cb567d9573080d6e3b83124e931692392c5282a3be5f39638682b2c8d4aa9395787382e0145d61dc5a5df3f3e143d9f01b1710ad11e940f3e8ea5137c7a DIST amdgpu-pro-vulkan-21.50.2.1384496-i386.deb 8124180 BLAKE2B 697899e40cedc584d8507c3c4c908c54db3676d47d720fb7b7fcab6e1f542e1d1e5efedb5b46231d4cd6974d3d03a19816d6ab4cc6d2f0279547058b5e4143e3 SHA512 8662efb65f14172f4261401115737f3c7eebbe071a9660f5146eaee9a1d4684c30174b18bea94d31686dbe679d66ab77f252192c1cda27ed57784cc9a57e5fdf +DIST amdgpu-pro-vulkan-22.10.0.1395274-amd64.deb 9243596 BLAKE2B b083b636cc2f4e1b62a1e89a168a718a16690e7a605daa93693da5ce03b7a03c501db6ddf59b2823016c90cac28ba5e7f9288486799408b76bb85ca86bdd9424 SHA512 6791e536700fcc3558b74978b2a717a8da4e24f4a391fbd00264d1bf505b09fe8fc9bffd3817cfc1cbf5294761dcf6ad38c4c0191d20948b9e219c1b7f393100 +DIST amdgpu-pro-vulkan-22.10.0.1395274-i386.deb 8992376 BLAKE2B 7b3ea214e5cc6a987cc8cfefa3bce1e06426fca6e0cf125b71e90b5f3d350a8f15c635abb541d479703b5ca0f546a968076a522d526a68e1ec12a90b466721da SHA512 5e5ba42933c820be524cd21685f85c0efc3787e9f1f2bf1d985aea7fd3a386ca98ea7f9f75d32d15d3f9d66e444177cbc7e6f357fe1092bbf193bc9b0f97ee8a EBUILD amdgpu-pro-vulkan-21.50.1.1376756.ebuild 2842 BLAKE2B 22dbb1146620527c2815d33952de07436c9c8982daee2ad216217d853a3f80c5622c67882c448dc6b90b9999147b4f66135c580785b89fdf042dfeed85b1dd09 SHA512 5278c756dd3684d4cc61295d8bff1c1e9a00cdd404a1478c623f85d21fc901c8d2f856149b4fb87d31a3647d17e5f39193501de4f5a7ac5a72eaef65352c9c77 EBUILD amdgpu-pro-vulkan-21.50.2.1384496.ebuild 2842 BLAKE2B 22dbb1146620527c2815d33952de07436c9c8982daee2ad216217d853a3f80c5622c67882c448dc6b90b9999147b4f66135c580785b89fdf042dfeed85b1dd09 SHA512 5278c756dd3684d4cc61295d8bff1c1e9a00cdd404a1478c623f85d21fc901c8d2f856149b4fb87d31a3647d17e5f39193501de4f5a7ac5a72eaef65352c9c77 +EBUILD amdgpu-pro-vulkan-22.10.0.1395274.ebuild 3792 BLAKE2B 2d09ae3c28e6cec3f648c8e4ea1eee0101e66e79aa82277f84508810437ce239776cf9818bbee8e89333e61f2e94de557c7b2e3d620ec808140088b4f61f73f1 SHA512 28d54066de38baa0466fd295bd11e9e708d96777972136bc492c790bf78558257a663975fcf8f8154e9d03ee9aabf30f5646e0fd99c6c8f6b5ec941ed48adeb8 MISC metadata.xml 401 BLAKE2B c46c3e3729fe8721b57a97a504997e1dd773fceb8ba0ff302f985eca3053abba5ac5f1103d6e4437074b854a3c4c55f7fc6991def0054fb768c8db9eec27ce16 SHA512 08ef778f6f5675ec9848b8f0a8e9296d41a4f21f18a344ba5a0f915a5933280dbd21e66692aaee5ca854785b3a639707d41c0912fdbe43373b51aa173c751383 diff --git a/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-22.10.0.1395274.ebuild b/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-22.10.0.1395274.ebuild new file mode 100644 index 000000000000..dabe6936012a --- /dev/null +++ b/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-22.10.0.1395274.ebuild @@ -0,0 +1,134 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit unpacker + +MY_PV_HIGH=$(ver_cut 1) +MY_PV_MIDDLE=$(ver_cut 2) +MY_PV_LOW=$(ver_cut 3) +MY_PV_REV=$(ver_cut 4) + +MY_PV="${MY_PV_HIGH}.${MY_PV_MIDDLE}.${MY_PV_LOW}" +[[ $MY_PV_LOW = "0" ]] && MY_PV="${MY_PV_HIGH}.${MY_PV_MIDDLE}" + +MY_PV_FULL="${MY_PV}-${MY_PV_REV}" + +MY_PN="vulkan-amdgpu-pro" + +MY_LINK="https://repo.radeon.com/amdgpu/${MY_PV}/ubuntu/pool/proprietary/v/${MY_PN}" + +DESCRIPTION="AMD's closed source vulkan driver, from Radeon Software for Linux" +HOMEPAGE="https://www.amd.com/en/support" +SRC_URI=" + abi_x86_64? ( ${MY_LINK}/${MY_PN}_${MY_PV_FULL}_amd64.deb -> ${P}-amd64.deb ) + abi_x86_32? ( ${MY_LINK}/${MY_PN}_${MY_PV_FULL}_i386.deb -> ${P}-i386.deb ) +" +S="${WORKDIR}" + +RESTRICT="bindist mirror" + +LICENSE="AMD-GPU-PRO-EULA" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="abi_x86_32 abi_x86_64 video_cards_amdgpu" + +REQUIRED_USE="video_cards_amdgpu" + +BDEPEND="dev-util/patchelf" + +QA_PREBUILT=" + usr/lib64/amdvlkpro64.so* + usr/lib/amdvlkpro32.so* +" + +src_unpack() { + if use abi_x86_64 ; then + mkdir "${S}/${PN}-amd64" || die + cd "${S}/${PN}-amd64" || die + unpack_deb "${DISTDIR}/${P}-amd64.deb" + fi + + if use abi_x86_32 ; then + mkdir "${S}/${PN}-i386" || die + cd "${S}/${PN}-i386" || die + unpack_deb "${DISTDIR}/${P}-i386.deb" + fi +} + +src_prepare() { + if use abi_x86_64 ; then + cd "${S}/${PN}-amd64/opt/amdgpu-pro/lib/x86_64-linux-gnu/" || die + + # Make sure there's only one file in the folder, to prevent unexpected behavior of the next command + [[ "$(ls | wc -l)" = '1' ]] || die "more than one file in opt/amdgpu-pro/lib/x86_64-linux-gnu/" + + # Add "pro" in the .so file's name, and remove any numeric extension "e.g. amdvlk64.so.1" + mv amdvlk64.so* amdvlkpro64.so || die + + # same with the SONAME + patchelf --set-soname amdvlkpro64.so "${PWD}"/amdvlkpro64.so || die + + cd "${S}/${PN}-amd64/opt/amdgpu-pro/etc/vulkan/icd.d/" || die + eapply "${FILESDIR}"/icd_amd64.patch + mv amd_icd64.json amd_pro_icd64.json || die + fi + + if use abi_x86_32 ; then + cd "${S}/${PN}-i386/opt/amdgpu-pro/lib/i386-linux-gnu/" || die + + # Make sure there's only one file in the folder, to prevent unexpected behavior of the next command + [[ "$(ls | wc -l)" = '1' ]] || die "more than one file in opt/amdgpu-pro/lib/i386-linux-gnu/" + + # Add "pro" in the .so file's name, and remove any numeric extension "e.g. amdvlk32.so.1" + mv amdvlk32.so* amdvlkpro32.so || die + + # same with the SONAME + patchelf --set-soname amdvlkpro32.so "${PWD}"/amdvlkpro32.so || die + + cd "${S}/${PN}-i386/opt/amdgpu-pro/etc/vulkan/icd.d/" || die + eapply "${FILESDIR}"/icd_x86.patch + mv amd_icd32.json amd_pro_icd32.json || die + fi + + default +} + +src_install() { + if use abi_x86_64 ; then + # Vulkan driver + insinto /usr/lib64 + doins "${S}"/"${PN}"-amd64/opt/amdgpu-pro/lib/x86_64-linux-gnu/amdvlkpro64.so + + # ICD loader + insinto /usr/share/vulkan/icd.d + doins "${S}"/"${PN}"-amd64/opt/amdgpu-pro/etc/vulkan/icd.d/amd_pro_icd64.json + fi + + if use abi_x86_32 ; then + # Vulkan driver + insinto /usr/lib + doins "${S}"/"${PN}"-i386/opt/amdgpu-pro/lib/i386-linux-gnu/amdvlkpro32.so + + # ICD loader + insinto /usr/share/vulkan/icd.d + doins "${S}"/"${PN}"-i386/opt/amdgpu-pro/etc/vulkan/icd.d/amd_pro_icd32.json + fi +} + +pkg_postinst() { + + if use abi_x86_32; then + elog "To run a 32bit program using the amdgpu-pro vulkan driver, the environment variable" + elog " VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/amd_pro_icd32.json" + elog "must be set beforehand" + elog + fi + + if use abi_x86_64; then + elog "To run a 64bit program using the amdgpu-pro vulkan driver, the environment variable" + elog " VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/amd_pro_icd64.json" + elog "must be set beforehand" + fi +} diff --git a/media-libs/esdl/Manifest b/media-libs/esdl/Manifest index 20fde4b04cc1..97c0a78e7b07 100644 --- a/media-libs/esdl/Manifest +++ b/media-libs/esdl/Manifest @@ -1,3 +1,3 @@ DIST esdl-1.3.1.src.tgz 308475 BLAKE2B 258d4c774ee56cf1c4afbb1f0a712cd42a1ca5742c7dde6c03b3f297351d3c3cda918491ad58338551450fb68ea29da04477c4057cebb7ffa81b9bba25a918b7 SHA512 66e8f69fa29fc0400f58dfa892656e00536a481a3dc364b9b295aee98818ff325f6475a009287352520ef428941e866b46e6f0267a7df184831c87b9304d385d -EBUILD esdl-1.3.1.ebuild 786 BLAKE2B 26d87f93e0eac4edf4be6177656aa9dcdba75c4b5ac936c8e7cedc244c1ddcf907bb3d7c79000d9330c8bf83c0572b61dbc15cb415d24fbf71a2df3421d8ffd2 SHA512 8f1c420ca6f69935f68b3a8cd34fa6bda586025c42955e26f4807fc5aeaae93cb21ad3d6a3fea8c4023fb2ecd3e591c4e933464009ff17848c86726dbbccf9af +EBUILD esdl-1.3.1.ebuild 788 BLAKE2B 56456e0cbe38af7e8f6513276f6d2dc993a3b3eb9833dcbf1d04ee89a0b86273d451564282e31243b666a53f6a3af7a8c00235d4e8a2db94833cd124e8818ec0 SHA512 5526fdc7dee78c8d86b3ca2630ab085b35babb9527879efebc4d944bbde1d2df8815e9fc944b1760c1d80f9865da09e006b0cc6680dd947acac68e6269a402f3 MISC metadata.xml 570 BLAKE2B 514b7669ab11a0bf7cbb1793992d8f463e1cb112f4ec2f152eb4bb1bf0c306213bf0b0b417bbb9ec30b38451440bda9816433adadaaeca25892a36309a9cac0b SHA512 a1ef49f9869e3fedaf81feb8f4d13c7238205d829a6c31ce8d0d1c9f3d051d4c3a1c9a9f230302e05294331ec2cbf148bf56a4d56a710e4d942879bdd428a06c diff --git a/media-libs/esdl/esdl-1.3.1.ebuild b/media-libs/esdl/esdl-1.3.1.ebuild index 9f7a826ca320..914c6cb7ef44 100644 --- a/media-libs/esdl/esdl-1.3.1.ebuild +++ b/media-libs/esdl/esdl-1.3.1.ebuild @@ -23,7 +23,7 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - dev-util/rebar + dev-util/rebar:0 " src_compile() { diff --git a/media-libs/ganv/Manifest b/media-libs/ganv/Manifest index c9033e9a4883..e8693d9c6e33 100644 --- a/media-libs/ganv/Manifest +++ b/media-libs/ganv/Manifest @@ -1,3 +1,3 @@ DIST ganv-1.8.0.tar.bz2 382822 BLAKE2B 4936b7f87fa7cf17ed86b8165558684f0f59387c9673144d57d8505e41f367735117e9f5b08508dcecb831b77b6bbc6559323417824a9f8defc43c81cc91d469 SHA512 00969879592af11d211ad790b970a8a3765ec0591515af856230e3fc9371b1611f2a4edc73d1fc59371a4c4a49c7479f279dc6f298d843296e6707cd2d495af4 -EBUILD ganv-1.8.0.ebuild 980 BLAKE2B 3db5196143c90c82b6f606d3548c6f7b3d3299c46f6ac2507fca0f7fd6f8861662a336f3bfbc0da11ae23bc87550e46366abb21264b993b3622242680e3097f0 SHA512 2809c86a2d807614f9079f05cd8332396add6769952a5355fb937cf6e769470115f28fab09d6ffd03df7cfa9cc1f7585f04ea867ef0171c99a855a0f99b20439 +EBUILD ganv-1.8.0-r1.ebuild 981 BLAKE2B f4d213d715d8657435cfd22d4f7ca89e9192fd094d42703f8618bdefb61523f29dfb3c95812989a14fb670bca5efedf61d9562ebb7859da1a38eb4e6502a0d56 SHA512 9c4da8f5bb4f77b1ce323f1cfc44c0be1344980398b8a03fd7df12d7f672491da4e7d283dbd35402919eb0f0b75a76d0e6c80103b6e5c3e7d1dde34339747600 MISC metadata.xml 357 BLAKE2B 26c69418b0a428bc0fb7a026ffb009ba1a2dff036ecfac2774f87bd4808a1126af0391c0a3d95d9a02e07928dd25e3f394839c34cd8d037de86a87ba8981cbb8 SHA512 ea05a50c736fc2e838b53efd5a8133dababcaea1b2d076e827c41127dc35c33f84ba846646d7d6e4fa6ec867d9a2d0488920a2480c4d27d9f5ab34005b1c44d0 diff --git a/media-libs/ganv/ganv-1.8.0.ebuild b/media-libs/ganv/ganv-1.8.0-r1.ebuild index 44fd56077d02..6ed5c20f508f 100644 --- a/media-libs/ganv/ganv-1.8.0.ebuild +++ b/media-libs/ganv/ganv-1.8.0-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE='threads(+)' inherit flag-o-matic waf-utils python-any-r1 @@ -19,7 +19,7 @@ RDEPEND=" dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 x11-libs/gtk+:2 - graphviz? ( media-gfx/graphviz[gtk] ) + graphviz? ( media-gfx/graphviz[gtk2] ) introspection? ( app-text/yelp-tools dev-libs/gobject-introspection:=[doctool] ) diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest index 1b219c783ac1..1a29fbfd9df2 100644 --- a/media-libs/gmmlib/Manifest +++ b/media-libs/gmmlib/Manifest @@ -2,13 +2,11 @@ AUX gmmlib-20.2.2_conditional_testing.patch 1151 BLAKE2B edeb2ff121efeb39e674bc6 AUX gmmlib-20.3.2_cmake_project.patch 145 BLAKE2B f42306b41a0c62ea9d3d5bfe3d1e1f85c23028e632c44f1cfe41a5fa47c7e94416ac1e5c58a4018a5da024d65e662c301e8d935994f6b53b52414a5f8081208c SHA512 feafa316267e903a25e7889fcbcfb31bd77402715d84d82464ae25f2cf013866c812b1c37bc1d64a8c5e1a0dd3f00e9333658532ad6d7abebf4f67bd6fc46d64 AUX gmmlib-20.4.1_custom_cflags.patch 2995 BLAKE2B 2e344bd4576c83490dc09e49c6d739e1a06df138fe7f3ff5fd5b4c788f9115f9284a8967b02832ab71ed0f19a4d202e81b865e65ea0c7aa2225a818c366ed465 SHA512 7d4d82aa320ca1aa8f281162e39cc5f9f2e50cb70d2a8df572dd544a8a1b60ed52c903131ee41dd8454f2d1836a8d0a2bf82257f8648d419e0b550c6fe5795bf AUX gmmlib-22.1.1_custom_cflags.patch 2963 BLAKE2B af9979ee3c7977c93288b6afd0c0a65451f6f06cffbb00d32d53541410beded1feb6212bb0a5b7820e4ba8c4ee03656f274b94a26e0688e90e0ad140b37ee4a2 SHA512 933a9234f178ec566ca88fd3b48d746ac869936acfd5541d8b6b3cac3125c029054fe385101d734e5e35eeb9393f1609be96c9bcc2f1e0bb79a7295ccdd6c292 -DIST intel-gmmlib-22.0.2.tar.gz 757146 BLAKE2B 1a1045fea6cb5f3b56732febccaa50b45a8d7019b7977a8edd99e3ebadd53449a70de23e28d1518a41b0e875bd9d879fde424bc7cd9760253084d518e2b29f0d SHA512 87c43a6f730ac13301f2ce0ec75dcd160bfa7a44d32480544f534519937744e618143831e207d3461a6a9dc7409adefd32c318bd8776939599d367a4c4bd9b4a DIST intel-gmmlib-22.0.3.tar.gz 757738 BLAKE2B 37247195cfbfa787f8f0d9c4541bb03034a492a2edc4f8747740abecd5519f7803048d3be1f7f26965d78121deb2865e703764e8f1aeb8b9d944ab0967453da7 SHA512 ee4d51153e498540ba1528d7f1f792ff7c6b3684a38094af41ca323b0467e30b231ac346411aa12efd53cbc5f4dfb83869472a03181669e79074f3fcdf2c1e9d DIST intel-gmmlib-22.1.1.tar.gz 813482 BLAKE2B 756741d0624a55a9ec3fdcf42a3d98a7e396424901f9035d1540c42f4b5bac281c1eb6dcc3753e0495fb52597a5b90f831cb7c5ef7fc4e5b0014b5cfe9584001 SHA512 5640d3d2b01ffa980be867d63bacefef5a241ca7dc3a1f39d48f9538cfefcc7274f40e3cc259c958e0f5abd1d12edd4e64377dbc245962781c6f0dd922ab298e DIST intel-gmmlib-22.1.2.tar.gz 813247 BLAKE2B 5d2c632239bbe12779f3aa07744de966501a5182ae415746f9bdf141f1ec9f94fae67df21424effeefbbfe2b5bd58d267687ca7623e7d1e736c92da09135868b SHA512 fa265f8cdb1a0c6ec067073cf5e188c86540709d98d384c61dfb34863f61d93d78cfaadba1b5bfb04bb8808bb1702282f76b57507c2a8946d0291419ac558c53 -EBUILD gmmlib-22.0.2.ebuild 765 BLAKE2B bf289e742c872cf9c69906a70a4fcf7678bcfd2cc80fc40a89e2e2958913c8505bc74d1a99111f30bf9bef31f15c1e8e5065c2648368327cc5ae8de261c64d10 SHA512 bcc09dace580e72b76eb253af9def8715ebf2c9490704b0234e0269e63f05edfce38d4ad060ccaba3808abdab2db33fcaf2a59c134b8f713d2691bb710259488 -EBUILD gmmlib-22.0.3-r1.ebuild 962 BLAKE2B b985222af586f9481786480fa90fcb9d53ca94526ee12a52050a557d04d92d7dccbf12738c857ea121e918f53a07b7cd438d26aa4bf83e03fa247b1d7c5c8d7f SHA512 dfbad61d40e0d7ef12b1802e360ea884cd0c6721873cc56f2ea4a201ccdcbcfaf9e3103472966ab04b0361ca8fff81b17c12fc455d63837afc9143e079028048 +EBUILD gmmlib-22.0.3-r1.ebuild 961 BLAKE2B 2f5c2d6559bd93f099d0fe52483d251a099472c7a028b5c1773b6ee9e6bf9060129cf239166998d25619a8fc56510a98061faf243fea9093c2037298f6b2d420 SHA512 a39b38a83da902d4c7e072ac0e4bdffc19c5b1438c96789d58a05b0c142bccec0367ab38a4858a7511b3685e5f8ca96f4085db52f430915aa86e05579453ea87 EBUILD gmmlib-22.1.1.ebuild 768 BLAKE2B 991d06057e2943fde16416890451fb8fcfd7e779388a3ebeafa06c7536abf657b8d3eb5d2c7d76a66c484bd062109c49d302b8ed46ff77b815c8c271631d9de5 SHA512 a7a26366048b0e5f53598dbaba9e4ecfedda0ba30de8ebf647bb7cffe532d993d4c6371a84270b1c8a4b629c9affdcc072f3968cf0ff5a862ed56a99d256adfd EBUILD gmmlib-22.1.2.ebuild 768 BLAKE2B 991d06057e2943fde16416890451fb8fcfd7e779388a3ebeafa06c7536abf657b8d3eb5d2c7d76a66c484bd062109c49d302b8ed46ff77b815c8c271631d9de5 SHA512 a7a26366048b0e5f53598dbaba9e4ecfedda0ba30de8ebf647bb7cffe532d993d4c6371a84270b1c8a4b629c9affdcc072f3968cf0ff5a862ed56a99d256adfd -EBUILD gmmlib-9999.ebuild 1041 BLAKE2B ec38f9b28cd6be9bc9698c2e30e05dce3a67b80069d56a280d86676646537de50c0fa679a92b5bc852941b50cd2cf54187aa9c3a157fc1eb409aa036cc0202cb SHA512 5a9e3bfecc94e7e68d8d1917800323fd39dbed6ee11ec3823b443af4de3c19b980ef9c16ddb76d783165f2c05f4d9df09a428dbc8d5d8db3d62a24943f7bb524 +EBUILD gmmlib-9999.ebuild 847 BLAKE2B c9b0e8885ed3223e349447caa3253b3ddca1f2bc1a98404271c0d26085b107240aeaa27bb535a6251707899e204cd7b87a7d3e84a0843c4af4c55418a2eb982a SHA512 93cc4374dfcb1b5af52c1c7fa0845ba57940a823eb0313add092a72dd039afd323cbc73918fdd044426238553c65c2ab95b6e8f90f5e4939761e458d6b0e7423 MISC metadata.xml 602 BLAKE2B 3dd974d0293b434877d26265e65ff26cf3b024556b22614012e31169cf7230703f092310cbd4b7bdcf82da4f439e0590f49279e3adbd845de08e7320996032b1 SHA512 48b892b2ad978c1736f8487ea6c3020ba9b94fe0f77306c6c3c48c8d320d04fa513a28bfcb60b991870503fe6dcf7fbf7848e840fd6470c382b4a808bab5b159 diff --git a/media-libs/gmmlib/gmmlib-22.0.2.ebuild b/media-libs/gmmlib/gmmlib-22.0.2.ebuild deleted file mode 100644 index 2e977a3d2a9e..000000000000 --- a/media-libs/gmmlib/gmmlib-22.0.2.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Intel Graphics Memory Management Library" -HOMEPAGE="https://github.com/intel/gmmlib" -SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz" -S="${WORKDIR}/${PN}-intel-${P}" - -KEYWORDS="amd64" -LICENSE="MIT" -SLOT="0/12" -IUSE="+custom-cflags test" -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch - "${FILESDIR}"/${PN}-20.4.1_custom_cflags.patch - "${FILESDIR}"/${PN}-20.3.2_cmake_project.patch -) - -src_configure() { - local mycmakeargs=( - -DBUILD_TESTING="$(usex test)" - -DBUILD_TYPE="Release" - -DOVERRIDE_COMPILER_FLAGS="$(usex !custom-cflags)" - ) - - cmake_src_configure -} diff --git a/media-libs/gmmlib/gmmlib-22.0.3-r1.ebuild b/media-libs/gmmlib/gmmlib-22.0.3-r1.ebuild index c99bb7dfa852..bb933ef7407b 100644 --- a/media-libs/gmmlib/gmmlib-22.0.3-r1.ebuild +++ b/media-libs/gmmlib/gmmlib-22.0.3-r1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/intel/gmmlib" SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz" S="${WORKDIR}/${PN}-intel-${P}" -KEYWORDS="~amd64" +KEYWORDS="amd64" LICENSE="MIT" # gmmlib version 22.0.3 made breaking ABI changes without changing the # soname, so the "_1" subslot suffix was added. There is no need to keep diff --git a/media-libs/gmmlib/gmmlib-9999.ebuild b/media-libs/gmmlib/gmmlib-9999.ebuild index 813c2d6ebd0e..a8ca9840f39e 100644 --- a/media-libs/gmmlib/gmmlib-9999.ebuild +++ b/media-libs/gmmlib/gmmlib-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,10 +18,7 @@ HOMEPAGE="https://github.com/intel/gmmlib" SRC_URI="" LICENSE="MIT" -# gmmlib version 22.0.3 made breaking ABI changes without changing the -# soname, so the "_1" subslot suffix was added. There is no need to keep -# this suffix after the next soname version bump. -SLOT="0/12_1" +SLOT="0/12.1" IUSE="test +custom-cflags" RESTRICT="!test? ( test )" diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest index 0f438381e05c..7bdecab0d0e9 100644 --- a/media-libs/hamlib/Manifest +++ b/media-libs/hamlib/Manifest @@ -1,5 +1,5 @@ DIST hamlib-4.3.1.tar.gz 2356944 BLAKE2B c803d253c867303cbde98b6f2e10f610aac111b7bd81fd343e1396cb86384b1c26942e5ccb8e395e073f9aa3d48e6f9edc1b64da14b2ec5ca09f98fbd3dee667 SHA512 8dee4676a19de7ac1ef733a4285b76e918f11aad6594d0557d36df295faf04c615e0993edb2f9ed5e7aea718c184603fec831caf28b75026c705f0b2e4b9eca7 DIST hamlib-4.4.tar.gz 2401399 BLAKE2B 4256b5b4374c62ef4fb957d29deda95aa9d15a8b52b81c5db1c07f3ebbf4c8e48c6c082769cef82c8457b3f813ac00ef7a37136615747f2c93e5275a112891e7 SHA512 37366ba180031de34da447c3d4e0086f156b893f57b5ab9bbc38b8e1f4bf9310fa1a9eb2a6d7884f1f11900dbdb811b4071e023aba571ea0ac5d07ddb122bf7b EBUILD hamlib-4.3.1.ebuild 2087 BLAKE2B f9bcfec7f4c00bd47e11aef68fb7c654ef4aba2989f25a1b1092766e7fca445d5c24047e240ac65ab359432b9aa32d6d6b0fea54e2659e515280fb840def7ddf SHA512 759eecc58675fe9899cd50d5ec1fda46a61e328c91eeb6e4ede7a02d3000ed07b07e4d42e9c09e35db11cad56f757aa710cc4ae070f1c3a10a98301021d71f80 -EBUILD hamlib-4.4.ebuild 2087 BLAKE2B 74b18da8565cc98e296ebb99a6cca515683c10dfd04d14bf04ac23222e778063564887c7efa2d274f2f159dbfc0be5195845f214caad0aef025b130b3494b60c SHA512 d4c74d3b840cbdad6590faca12e1ca0cbd0dba24a1377b6b4ee8a9c1da571d5eea646f18f30d2150d7a97f6a307b5886ce1dcd9769d8978dfb85fa73af410a65 +EBUILD hamlib-4.4.ebuild 2101 BLAKE2B 0f79cbf701ba16823387ec54b3f238b7bf566645da15b5ab94d905471b3328e7b0fcf034246a0f3f0035050fb15e80bb297b2c1c48d38b02f848144b778e73bf SHA512 f8e3db88a05bc7c2e26fba93c07c52c8d26558d13ce34dee006b6b2e3529d736f7538edc4ca0290b7ba2b6be616bd405d24f5d204db59e1f9f6e80a854a83383 MISC metadata.xml 326 BLAKE2B ea402b17f863a6a0370743d2756c6c3c15a8d7bdfd0777db2cec56cc41dd93198ad36ff114f3c9bc265ea54228d87856f3edd35f9696ac5c89136fce4c5acf87 SHA512 84642d6397e97ea348a12d44a01015a51af72b40af5456416ac3477e55da9ef5ab1934f66b2fac0762c4b0483e20e92c3a49f334bf136de16b01043a15073f7f diff --git a/media-libs/hamlib/hamlib-4.4.ebuild b/media-libs/hamlib/hamlib-4.4.ebuild index 1cc6e90cd16f..e29daf2b83f0 100644 --- a/media-libs/hamlib/hamlib-4.4.ebuild +++ b/media-libs/hamlib/hamlib-4.4.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/hamlib/${MY_P}.tar.gz" LICENSE="LGPL-2 GPL-2" SLOT="0/4.2" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~arm64 ~riscv x86" IUSE="doc perl python tcl" RESTRICT="test" diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest index e031321d3447..4ff04973b82a 100644 --- a/media-libs/harfbuzz/Manifest +++ b/media-libs/harfbuzz/Manifest @@ -5,7 +5,7 @@ DIST harfbuzz-4.0.1.tar.gz 29070744 BLAKE2B c88aa93908a8203d53eff0e2dabe29fd619e DIST harfbuzz-4.1.0.tar.gz 29069953 BLAKE2B 6f8fd1889e36b20309609cc0e0d75c06167345273c78998a481c00e14fb219c3f61538c85e1956d14141b475bbe7cbffed5dfe26313e30ac970231c4e1eb50fb SHA512 e558b58233a13570693cc35764ce2824dea8b6388f47ced228f1317a9f08b6f482c1bc8d5c46352b74e84e709f569b164bea81647212c7e82467e19dfcb703a6 DIST harfbuzz-4.2.0.tar.gz 29092181 BLAKE2B 75e2461932a17b2da50331b5bbdddd4c68ddafeea59088e2ad34e2de6b9f679154fddaf6579de1ef244f5f55baf61fa0b7f66459d9e16b365e152f973471f649 SHA512 2aff1e6a41d6186b71f2915296c46c0b2ffc67371e1f05c13a62c237ff7a84d7d78d414d7a395e1616a2861c83c4792ef5936a492713780564b994d18e2d3e38 EBUILD harfbuzz-3.2.0.ebuild 2561 BLAKE2B e495672f81b0d3cc4c3dea9c811b9c305415b7a49345baeef24ea4d13f2460402c059c7e2733750865b47de4be03ec7270980797e8ef601ba3d89abed90c7442 SHA512 59cbf266b6046116e503a783345fc53e517b012b0fb2ade0409a99d2470d330d8411fd6cc9b850dbf114f7c157241ac0b16aa28973344a537960dd26c322aae8 -EBUILD harfbuzz-3.4.0-r1.ebuild 2634 BLAKE2B 11d283633a330394fed087949f23577949d8cf2f4cd62f1412bd2dd4446eeed93d4dceab953a4a8478d63f73f55db09ba3ad1413134bc2187434ae59b6bf86c7 SHA512 8156848580a041b5f4fd2e53758caec3c1490fa4d48806646d5b7437862c56c1b61a9cd434ab9047e4cc9f33c4b8cc439780a833c84653fa9af15f24089d9230 +EBUILD harfbuzz-3.4.0-r1.ebuild 2629 BLAKE2B caa8a6b067b8d95ec5a43d060bbca12b6a04674526e2aa0824fc1845ced4271f9826476ab2de094989dee20d2cd6dfd8d1b70e49ac50c69a7f1f97950452aadd SHA512 b2c741b61779855dc2745b45f1f337a2f7e27da6f066c62569b040a9434334bbdd352b427369c6002e8a491dcadd15500856ed4cb1dca48d98a2a7edf440ef76 EBUILD harfbuzz-4.0.1.ebuild 2569 BLAKE2B f434eeadafaceda6b51cbf3a47bb1bfdb930950fc5976064744c285708a04f2484d2f2bb85310dd36a177ff3e129c65cd7a09c5417d1cddf699f65c4dc2e22fe SHA512 e62ee2c1623a8a321462ae119aa2485b9e479a66c224961905e2958e9c4cb036a3de399f15ddff9d09619dd6ee8b7d84c295c3d5e15c91af778e04edf969e866 EBUILD harfbuzz-4.1.0.ebuild 2569 BLAKE2B f434eeadafaceda6b51cbf3a47bb1bfdb930950fc5976064744c285708a04f2484d2f2bb85310dd36a177ff3e129c65cd7a09c5417d1cddf699f65c4dc2e22fe SHA512 e62ee2c1623a8a321462ae119aa2485b9e479a66c224961905e2958e9c4cb036a3de399f15ddff9d09619dd6ee8b7d84c295c3d5e15c91af778e04edf969e866 EBUILD harfbuzz-4.2.0.ebuild 2569 BLAKE2B f434eeadafaceda6b51cbf3a47bb1bfdb930950fc5976064744c285708a04f2484d2f2bb85310dd36a177ff3e129c65cd7a09c5417d1cddf699f65c4dc2e22fe SHA512 e62ee2c1623a8a321462ae119aa2485b9e479a66c224961905e2958e9c4cb036a3de399f15ddff9d09619dd6ee8b7d84c295c3d5e15c91af778e04edf969e866 diff --git a/media-libs/harfbuzz/harfbuzz-3.4.0-r1.ebuild b/media-libs/harfbuzz/harfbuzz-3.4.0-r1.ebuild index fc9f7e995db4..68b9e0f0ae42 100644 --- a/media-libs/harfbuzz/harfbuzz-3.4.0-r1.ebuild +++ b/media-libs/harfbuzz/harfbuzz-3.4.0-r1.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="Old-MIT ISC icu" diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest index 2e2f4df7f5b1..7eb0112a9847 100644 --- a/media-libs/ilmbase/Manifest +++ b/media-libs/ilmbase/Manifest @@ -1,5 +1,7 @@ AUX ilmbase-2.5.4-0001-disable-failing-test-on-x86_32.patch 623 BLAKE2B 578335e554fa65342c4c364ba51f13717c3c96806417cc7ae814a34a59137da3a93c442cc436bfe7f4330f0a537ba7ed9579a45a4b8c986b443fdfab3fcb42f2 SHA512 06318e4c019fd02c49f7e3c2cf0ecbf0701ee625607763709b010984fa96f2681e19955ad0538397ac9ee3c1a514840f84423b0fe98bafad5e399c43e619175b DIST ilmbase-2.5.7.tar.gz 27539574 BLAKE2B 58fd81be52e13d2815b6aa8cea6793359379f5ebf866fd45b31ce30cf5f72aa4699625e7cec51189d62fe76f53418c3e0938f9b827d54ad18342e7aa67c8a3d2 SHA512 e44edfa2dcfff2fe372ed2ba07b39a472e549025978de178eff26be641767d22d1a3b543fb7672d9b7b2e9f4c308667f785829ed6d9032a2b42f2ffa0163de40 +DIST ilmbase-2.5.8.tar.gz 27539605 BLAKE2B b54b72aa82c947fd7f252bf4d15b2727be2da7cdd257a9d96c6c2a3c892438ff850177549144e492617bfe5d260ddd14d21eac70a55f124784bbdf5f7077d1e9 SHA512 5b1ad99cfa639892292109a26c084868b3fe0acf572dd69750e951cec2127d63c78309241de92b0052f0abe50d86f2518e3185194121010db5f826d217e37f4f EBUILD ilmbase-2.5.7-r2.ebuild 1089 BLAKE2B a23dfaf5e1af5e869882ff36a3f3c594d92243fc4cc3d029a9e3b666814d2464237cb5708647d9702880695249d5879687d4cb22987ed40a65517f0072a0ac39 SHA512 34b375053d274b9c8cbb994471c9b1393ed7f00be8ff60e2cc76ef9cff338f71d549d768223d25b16424614af46cf406c0372a338c508225350ccc2d1ba5e8a7 EBUILD ilmbase-2.5.7-r3.ebuild 1142 BLAKE2B cffd679f9c0b88a7173445bdcf0242b2e7f694162b74faf5c335b18832a32178a5fa9419ccb58bd38d889229181283e0fbcf5a49ff5e2b0d111d68a2ed655cd5 SHA512 69cd3492ac065772db9829027afa1c6d559d534bf7b7859532367e14a776f6cbc0c3308f0a73d90a4abd0a804ab22cebd4005e16bbc9c044dd633cf580efcd3f +EBUILD ilmbase-2.5.8.ebuild 1133 BLAKE2B b124fa881d7a6c05752fc5f42ac3b5e7a240a5c1f500138ee95bc768da3d9ad97bec15b72c94748118eb751d9563029142959e81f9690b1315fa51d040086560 SHA512 4e8c9297eefc292aa350a5f89e0a3c0218ca47da08155b4537e64866f2a919e70fabccb855ca4a1599a751a85a697bcba48f9e318354f70d7924b0c533a37f34 MISC metadata.xml 692 BLAKE2B 7127a8f7a09d330611b53333d304a65edc9e97ed0d64ee8c0be87ce14c072f2f58507a84800f0ad1191ff2307b97401611aae00f3406bb197ef08294e2cd4639 SHA512 ab1157b16c56c47ae496b12da23f08670bfcae120a00b6c37f5d93cf82fc6981c7f054dd945a67cff17c8c282a4a3e45dc8924cd2ccce78ba6e232f24fa16c99 diff --git a/media-libs/ilmbase/ilmbase-2.5.8.ebuild b/media-libs/ilmbase/ilmbase-2.5.8.ebuild new file mode 100644 index 000000000000..04019509e220 --- /dev/null +++ b/media-libs/ilmbase/ilmbase-2.5.8.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CMAKE_ECLASS=cmake +inherit cmake-multilib + +DESCRIPTION="OpenEXR ILM Base libraries" +HOMEPAGE="https://www.openexr.com/" +SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/openexr-${PV}/IlmBase" + +LICENSE="BSD" +SLOT="0/25" # based on SONAME +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" +IUSE="large-stack static-libs test" +RESTRICT="!test? ( test )" + +RDEPEND="!media-libs/openexr:3" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +DOCS=( README.md ) + +src_prepare() { + if use abi_x86_32 && use test; then + eapply "${FILESDIR}"/${PN}-2.5.4-0001-disable-failing-test-on-x86_32.patch + fi + + multilib_foreach_abi cmake_src_prepare +} + +multilib_src_configure() { + local mycmakeargs=( + -DBUILD_TESTING=$(usex test) + -DILMBASE_BUILD_BOTH_STATIC_SHARED=$(usex static-libs) + -DILMBASE_ENABLE_LARGE_STACK=$(usex large-stack) + -DILMBASE_INSTALL_PKG_CONFIG=ON + ) + + cmake_src_configure +} diff --git a/media-libs/libcanberra/Manifest b/media-libs/libcanberra/Manifest index 035431d258c7..d6cdfa34ea5d 100644 --- a/media-libs/libcanberra/Manifest +++ b/media-libs/libcanberra/Manifest @@ -1,5 +1,5 @@ AUX libcanberra-0.30-wayland.patch 2382 BLAKE2B bc2be1eb32541c80483538b8e3105f281023cee22a2a0f67c8210b8cfc97273f5323cf31e3b7955e8b944af1a414b30554c9dff7d2de97cb1bcfb13f4cd56baa SHA512 9822e67dea1b541fedb0fa9779cfcb101ba8bd24d9ff238af59920b937cb1f5fbe5854ee5e642ff53e65f8d2d0996f2c46be67a51a211d2e76ae89ae98ec553a AUX libcanberra-gtk-module.sh 275 BLAKE2B d7f863f77983d4144035eefc7ce3abb4eb411ecc3aac5f5737b7ce0f44e42cf713b963a17c6a6afdaa95833eedaa510ccd9371056c2c6f0e805febf16c245e36 SHA512 6c945211ad9d461e5bdac209c83e0fc0c714eb194f6d57e4f18db1d904528fe845cd628572d0ab9eb4d53005c00073b376b6d718bcd0cddaeee83dc90042643d DIST libcanberra-0.30.tar.xz 318960 BLAKE2B c90c6863738b103c256eeb0907060a0f74b73ef50ac0728d2114aa558a7a1ad7cbae4184860573d3fac0032eba77327a4de94c459b99a81c3dc19da0e98adfda SHA512 f7543582122256826cd01d0f5673e1e58d979941a93906400182305463d6166855cb51f35c56d807a56dc20b7a64f7ce4391368d24990c1b70782a7d0b4429c2 -EBUILD libcanberra-0.30-r5.ebuild 2480 BLAKE2B d3a4239b06184fc719085709ff575d5f096f2c1370b1ec36f0a27f1d5370bb72129b3f104701594369cf9f14a37dbbcaa8ee1b1737105408499b8005c02fe0c2 SHA512 28ece8b5b706195d873c860778a69635f1dbdf45a8341e0a1c74a22eeabcb8199920df893be23bff35d144791dd3e42f1f3e3b4511d639a3df116cb4d2110625 -MISC metadata.xml 1731 BLAKE2B 797d180bd02a18e361548340001611c4e71e780ed77829d88da1b8c526f1615a40a670f42a2b0a9a3533b54f73b2df6dfc0bf895a266496e08842dff5fa0483c SHA512 b9b8d4d3609e37fb1e4ee4e3bd38283560dc6bed9926dcc2328c8b4321f57fbdc2abe6a3ea7998c91458e9ad10825d3fefeefac1e6c0354210be6aa925a4e35b +EBUILD libcanberra-0.30-r6.ebuild 2486 BLAKE2B 74009a2fbeb3a9935a3eafe92dfc2614da550383555a04f8a70f548ea07537c042a31cbeefe30cb53b818c6fe9f298c7042759dfeecd847cbff66a0661d4679b SHA512 b8fa45a77925dd88bfd54465b13fb2465b9996f978507234b28e093115a6127b76789c30e2259aa754514436147db83b8db823ce9fdb9c6cab4154a264663814 +MISC metadata.xml 1732 BLAKE2B e7307dd14ac921c509bb6168ca6a7ca54c3874f184304386bb9311094b52a215b9a67ee73eee4b1ed00f29be8aa47343ca334da2dffe3c1ba91827aa76fbaa7a SHA512 6e4b57703d7b9e7729042724162dbbf3f05b558b59d8c6f41f08ade946c285f924b5bfcc17af57ccdadcca4642cb6f15154348c7960495a83ced9bcfdbf11c40 diff --git a/media-libs/libcanberra/libcanberra-0.30-r5.ebuild b/media-libs/libcanberra/libcanberra-0.30-r6.ebuild index 034fb8144e22..8d44484cd997 100644 --- a/media-libs/libcanberra/libcanberra-0.30-r5.ebuild +++ b/media-libs/libcanberra/libcanberra-0.30-r6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.xz" LICENSE="LGPL-2.1+" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" -IUSE="alsa gnome gstreamer +gtk +gtk3 oss pulseaudio +sound tdb udev" +IUSE="alsa gnome gstreamer gtk2 +gtk3 oss pulseaudio +sound tdb udev" DEPEND=" dev-libs/libltdl:0[${MULTILIB_USEDEP}] @@ -20,7 +20,7 @@ DEPEND=" media-libs/alsa-lib:=[${MULTILIB_USEDEP}] udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) ) gstreamer? ( media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] ) - gtk? ( + gtk2? ( >=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}] >=x11-libs/gtk+-2.20.0:2[${MULTILIB_USEDEP}] x11-libs/libX11[${MULTILIB_USEDEP}] ) @@ -55,7 +55,7 @@ multilib_src_configure() { $(use_enable oss) \ $(use_enable pulseaudio pulse) \ $(use_enable gstreamer) \ - $(use_enable gtk) \ + $(use_enable gtk2 gtk) \ $(use_enable gtk3) \ $(use_enable tdb) \ $(use_enable udev) \ diff --git a/media-libs/libcanberra/metadata.xml b/media-libs/libcanberra/metadata.xml index c7135cf3b2f1..516948872738 100644 --- a/media-libs/libcanberra/metadata.xml +++ b/media-libs/libcanberra/metadata.xml @@ -17,7 +17,7 @@ <flag name="alsa">Enables ALSA sound driver.</flag> <flag name="gstreamer">Enables gstreamer sound driver. Not useful when alsa or pulseaudio is available.</flag> - <flag name="gtk">Enables building of gtk+ helper library, gtk+ runtime + <flag name="gtk2">Enables building of gtk+ helper library, gtk+ runtime sound effects and the canberra-gtk-play utility. To enable the gtk+ sound effects add canberra-gtk-module to the colon separated list of modules in the GTK_MODULES environment variable.</flag> diff --git a/media-libs/libebur128/Manifest b/media-libs/libebur128/Manifest index 4259e8b873fb..2338f6b7d58a 100644 --- a/media-libs/libebur128/Manifest +++ b/media-libs/libebur128/Manifest @@ -1,4 +1,4 @@ DIST ebu-loudness-test-setv05.zip 91631421 BLAKE2B 95a345b0700893ab96854c7563ecc9c667db30e8137352226d1f1ac7a666f6b08d1748d88ef11f72056d0a4bd513f365a1336de568ea45917a6ba9af5bc526ea SHA512 60d022fdac47ad0be2688411be9daecbff85da994d6fa4921bba6cffab841b081d8b15d9ce284ad2253efb686463450a84a0d19cb0bad7a934546cc52dd73771 DIST libebur128-1.2.6.tar.gz 25890 BLAKE2B 8f497091d201f05efc02c423ac3e83e9d056c11ac0dd67cc89d43b7d50f1a28f22ea0f35d329e6f7c8e3df4fb1f245e729fcf7201bdf0c83477211f67472fd00 SHA512 ab188c6d32cd14613119258313a8a3fb1167b55501c9f5b6d3ba738d674bc58f24ac3034c23d9730ed8dc3e95a23619bfb81719e4c79807a9a16c1a5b3423582 -EBUILD libebur128-1.2.6.ebuild 962 BLAKE2B 4446d4dbc570d0e7e7c4ec2b4e05a8c29715047f3f3738fa11f3baf0ac5f3db2d6f4354a443b672cd321bd21fd54ae025fd410adf75eeef06a8e09dfd524e363 SHA512 e8714b42aa28df8f8cbdd1cd1f7a08939433cf6560020e7d1cb8c51192385085475356539b650d7aa09c551de21e840b99203d044e26f2d037f2d119d7e1f0dd +EBUILD libebur128-1.2.6.ebuild 969 BLAKE2B 402f95949ae670cae1c36437eed73eab85bb7372d46d6d259b6c496fa33a9c45b750198e67e9bcb7bb35d2d29acca7be4713a90fa307ab51e9c810990ba234b3 SHA512 84802dc24e51ca609d2c62fb652f399fa2e1a9ab7bd3158a212dd4842321901d2f67aaf8a3017e0cea30f110cec502e2cc99b7d000a67689529899e62954ff0b MISC metadata.xml 614 BLAKE2B 64b3dd9b7b0614a49e904c9c14e2ed32b817e5a6d8a1a952c3212891dc713a5b872ca139e300f19bddba05c71b1435050adecaaebc5ff336c90ee47eb179ade0 SHA512 796bf4fd1d66fb686e20b4b59fb073beadbe2779f3cdb71cc76e6089fe3794e113efe7e6b495e5476d844701718caa5bcdc567155820255f1fa7f13a909f0052 diff --git a/media-libs/libebur128/libebur128-1.2.6.ebuild b/media-libs/libebur128/libebur128-1.2.6.ebuild index 2f6ba7d05ebd..54724f97b121 100644 --- a/media-libs/libebur128/libebur128-1.2.6.ebuild +++ b/media-libs/libebur128/libebur128-1.2.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ SRC_URI="https://github.com/jiixyj/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="MIT" SLOT="0/1" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/media-libs/liboggz/Manifest b/media-libs/liboggz/Manifest index 0dbcc500f32a..d67ab8530349 100644 --- a/media-libs/liboggz/Manifest +++ b/media-libs/liboggz/Manifest @@ -1,4 +1,4 @@ AUX liboggz-1.1.1-destdir.patch 550 BLAKE2B a8823cc2159aa869fb1f6888be83819407bcc9832cda8ed0b43d5b3292914ef1e9fbf2737814904650423df8e60f7e0b2892a5862494b8a9c9b6d63e64e280ae SHA512 e988d3eae103874b905929f749687eba6e539b06ba4d4a4963e6030ede04cb86af6a9dcf84bf7456a25d267fb02a3b55ccd20bb907c3cb7e5e19049f05a78fdf DIST liboggz-1.1.1.tar.gz 702261 BLAKE2B 0631d1c30a045c67b38b9de107a97dc8963890a867262b01271adfb4483c77f8d14e203dffd057194b19b4e6cc28169a3a085fbb79d683a48ee091316cca8a4f SHA512 8f5fc8ca49cb6f7a1160a9c1932876b771d55985d59ddc1f48497dfc08641414a58244d7a7e52bfcecdb69f52913d0123efd8f92513f8b9064e4abe1442f2cba -EBUILD liboggz-1.1.1.ebuild 972 BLAKE2B 6e568b2878239ec68fa95a88d72f45fff3a7f74469281c5a0f1a0b026204c0830847eb0968831c67a68af4f24fe4f7265e4eadd0626621ca97e53a8b3bd0f43c SHA512 20035b845d178a50ca28b413aed0c4e4bde7de269d410fa8db6e96f118d500e123a73d66ff6c8e058411a772efd7b149fb28227555b74934b901bf3870d89700 +EBUILD liboggz-1.1.1.ebuild 958 BLAKE2B 463af01956890efe40d55a1dc69b320f78841739f4b83726e88a889cf99b869b61ea4760ff22e0e3795d77ca60ba8710ec8d7b39c23e2e62e67ced4e70b2e680 SHA512 678f8d0d65bb745935f3590b89f62121362c607c749ba65d89cc93848d7c014299da3d7f1e36e6fb0b52d32cffe6974406cd9699a03ccbf3142557befbf34d7c MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8 diff --git a/media-libs/liboggz/liboggz-1.1.1.ebuild b/media-libs/liboggz/liboggz-1.1.1.ebuild index 99c9083902df..7a548e7c20c7 100644 --- a/media-libs/liboggz/liboggz-1.1.1.ebuild +++ b/media-libs/liboggz/liboggz-1.1.1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 inherit autotools -DESCRIPTION="Oggz provides a simple programming interface for reading and writing Ogg files and streams" +DESCRIPTION="A simple programming interface for reading and writing Ogg files and streams" HOMEPAGE="https://www.xiph.org/oggz/" SRC_URI="https://downloads.xiph.org/releases/${PN}/${P}.tar.gz" diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest index c4e85a746bd8..6fdf03f120e3 100644 --- a/media-libs/libsdl2/Manifest +++ b/media-libs/libsdl2/Manifest @@ -1,6 +1,4 @@ AUX libsdl2-2.0.16-static-libs.patch 2076 BLAKE2B fc2fd18ef413216d2992863adb839ce266dafe8cd79167911bceac5341e58c5ff13ff9604b741ee8726bd4990238345327038cf2cd61df5c28d7a15eeae67b62 SHA512 da34e0da810b119d230e40b17b8f3bb3b3f7c9414960bc41c528a366c9b5f5b2afb321bdfa5871d898ba2bcb98610c2848619ef0f0bc54a0675f75a40a6ce8d4 -DIST SDL2-2.0.16.tar.gz 7227262 BLAKE2B b17c531bc51157c7e64c6ea457342f0707f3f069f0cc096bcd658acc9d70c52416427d9e84bb18f36abe2d6e85095f1704ce6e7bba9e45a9766d78cbe93a5d17 SHA512 ec75ef8526792650c2647b78bb0244f973774418aeae33a2182d90ce696b30acb652f8be9c2012a16c1c5d5622f7630ff2e1eadae27ea3dc78ab47730cf5e62f DIST SDL2-2.0.20.tar.gz 7207221 BLAKE2B 03c6d462674aeb90559003e9f4c74f66833e193d2de3f3975f1e1684c5bdccb5c1b3c64c22c822777a63ee218d87fd04ff047b012d8db30a1565dafa34161623 SHA512 4889949eaa674948bdb0a01bb2a842a0943b15b08ff27ec0079b0fd4f79d071ffb32488a5a51c12ad7c74ed5fe73b608cdf6336a44c95dae8a0fb3f47d0f01de -EBUILD libsdl2-2.0.16-r1.ebuild 6465 BLAKE2B b1abfb4334df0bb3857d23c4b92f2ca158c75d70bea5aef5dd7643b7f4c5c9b6ba5f280d8a130b6a63fe5331d88012d7924bb5fd9525ad69c07b521b82eaacf4 SHA512 71a675c646db408f01da627c40651bdcbdcc59aff11a8d22ea8bdc13c13de42337082e4b2ee4157aa5081071609c2479be0334f4a119721ebe79bf0d336361c7 -EBUILD libsdl2-2.0.20-r1.ebuild 6512 BLAKE2B 1c03fae7d5066a6e0c9baadea85ea570d158352963fa386a87a462908cac498106710bee7a2efab6699d59bbfe361a29a281968dec7f72d55021a5b47011d3ad SHA512 5fe836e28e584854225b7183c00a53ae64fc991e35faf71eb9f587395a626511b8e9e1f212d286bd4846d4a882bc3e5cf7b40c007d1b1d827eeaaddbd43bfdff +EBUILD libsdl2-2.0.20-r1.ebuild 6510 BLAKE2B 71aaed856e9fd299578c4145f649787a3fa089d991f8364a6711682b6ecc40c4f5bad74c50b10a5617b716ee33b641cc2aa8abe44a027737fd3dfb49d04d3f80 SHA512 5f19a8d206a40123c4afde838c09c3a9cc3367f1e26de6b2c97fba1dd6dd47ea9e526a15a7ef2bf3a31b7205c8b4ed042a847fa5fc0a0c511e0dc192234779f0 MISC metadata.xml 1975 BLAKE2B 7ebb6f5306b8d525ff7564f19e86d11ba36579e376b9b691f421fc47f2ac887cda3baa3ad0cac3ab5d761b7df5ee50ce0c6636ed77287eb86a7fd7e587c70dfb SHA512 e163aaa04637301da96ac9fca8c68582227b24fac1ca929f2ff1f2db8b0e0f7c84914b3a4ccb54367d41082d2e24c761228b2110bf099afed9599a5cb3014db7 diff --git a/media-libs/libsdl2/libsdl2-2.0.16-r1.ebuild b/media-libs/libsdl2/libsdl2-2.0.16-r1.ebuild deleted file mode 100644 index c74bfff69b26..000000000000 --- a/media-libs/libsdl2/libsdl2-2.0.16-r1.ebuild +++ /dev/null @@ -1,230 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic multilib-minimal - -MY_P="SDL2-${PV}" -DESCRIPTION="Simple Direct Media Layer" -HOMEPAGE="https://www.libsdl.org/" -SRC_URI="https://www.libsdl.org/release/${MY_P}.tar.gz" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86" - -IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus doc fcitx4 gles1 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs +threads udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver" -REQUIRED_USE=" - alsa? ( sound ) - fcitx4? ( dbus ) - gles1? ( video ) - gles2? ( video ) - haptic? ( joystick ) - ibus? ( dbus ) - jack? ( sound ) - nas? ( sound ) - opengl? ( video ) - pulseaudio? ( sound ) - sndio? ( sound ) - vulkan? ( video ) - wayland? ( gles2 ) - xinerama? ( X ) - xscreensaver? ( X )" - -CDEPEND=" - alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) - dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) - fcitx4? ( app-i18n/fcitx:4 ) - gles1? ( media-libs/mesa[${MULTILIB_USEDEP},gles1] ) - gles2? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] ) - ibus? ( app-i18n/ibus ) - jack? ( virtual/jack[${MULTILIB_USEDEP}] ) - kms? ( - >=x11-libs/libdrm-2.4.82[${MULTILIB_USEDEP}] - >=media-libs/mesa-9.0.0[${MULTILIB_USEDEP},gbm(+)] - ) - libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] ) - nas? ( - >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] - >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] - ) - opengl? ( - >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] - >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}] - ) - pipewire? ( media-video/pipewire:=[${MULTILIB_USEDEP}] ) - pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) - sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] ) - udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] ) - wayland? ( - >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] - >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl(+),gles2,wayland] - >=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}] - ) - X? ( - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}] - >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}] - >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}] - xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] ) - xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] ) - )" -RDEPEND="${CDEPEND} - vulkan? ( media-libs/vulkan-loader )" -DEPEND="${CDEPEND} - ibus? ( dev-libs/glib:2[${MULTILIB_USEDEP}] ) - vulkan? ( dev-util/vulkan-headers ) - X? ( x11-base/xorg-proto ) -" -BDEPEND=" - virtual/pkgconfig - doc? ( - app-doc/doxygen - media-gfx/graphviz - ) -" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/SDL2/SDL_config.h - /usr/include/SDL2/SDL_platform.h - /usr/include/SDL2/begin_code.h - /usr/include/SDL2/close_code.h -) - -PATCHES=( - "${FILESDIR}"/${PN}-2.0.16-static-libs.patch -) - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - - # Unbundle some headers. - rm -r src/video/khronos || die - ln -s "${ESYSROOT}/usr/include" src/video/khronos || die - - # SDL seems to customize SDL_config.h.in to remove macros like - # PACKAGE_NAME. Add AT_NOEAUTOHEADER="yes" to prevent those macros from - # being reintroduced. - # https://bugs.gentoo.org/764959 - AT_NOEAUTOHEADER="yes" AT_M4DIR="/usr/share/aclocal acinclude" \ - eautoreconf -} - -multilib_src_configure() { - use custom-cflags || strip-flags - - if use ibus; then - local -x IBUS_CFLAGS="-I${ESYSROOT}/usr/include/ibus-1.0 -I${ESYSROOT}/usr/include/glib-2.0 -I${ESYSROOT}/usr/$(get_libdir)/glib-2.0/include" - fi - - # sorted by `./configure --help` - local myeconfargs=( - $(use_enable static-libs static) - --enable-atomic - $(use_enable sound audio) - $(use_enable video) - --enable-render - --enable-events - $(use_enable joystick) - $(use_enable haptic) - --enable-power - --enable-filesystem - $(use_enable threads) - --enable-timers - --enable-file - --enable-loadso - --enable-cpuinfo - --enable-assembly - $(use_enable cpu_flags_ppc_altivec altivec) - $(use_enable cpu_flags_x86_sse ssemath) - $(use_enable cpu_flags_x86_mmx mmx) - $(use_enable cpu_flags_x86_3dnow 3dnow) - $(use_enable cpu_flags_x86_sse sse) - $(use_enable cpu_flags_x86_sse2 sse2) - $(use_enable oss) - $(use_enable alsa) - --disable-alsa-shared - $(use_enable jack) - --disable-jack-shared - --disable-esd - $(use_enable pipewire) - --disable-pipewire-shared - $(use_enable pulseaudio) - --disable-pulseaudio-shared - --disable-arts - $(use_enable libsamplerate) - $(use_enable nas) - --disable-nas-shared - $(use_enable sndio) - --disable-sndio-shared - $(use_enable sound diskaudio) - $(use_enable sound dummyaudio) - $(use_enable wayland video-wayland) - --disable-wayland-shared - $(use_enable video_cards_vc4 video-rpi) - $(use_enable X video-x11) - --disable-x11-shared - $(use_enable X video-x11-xcursor) - $(use_enable X video-x11-xdbe) - $(use_enable xinerama video-x11-xinerama) - $(use_enable X video-x11-xinput) - $(use_enable X video-x11-xrandr) - $(use_enable xscreensaver video-x11-scrnsaver) - $(use_enable X video-x11-xshape) - $(use_enable X video-x11-vm) - $(use_enable aqua video-cocoa) - --disable-video-directfb - --disable-fusionsound - --disable-fusionsound-shared - $(use_enable kms video-kmsdrm) - --disable-kmsdrm-shared - $(use_enable video video-dummy) - $(use_enable opengl video-opengl) - $(use_enable gles1 video-opengles1) - $(use_enable gles2 video-opengles2) - $(use_enable vulkan video-vulkan) - $(use_enable udev libudev) - $(use_enable dbus) - $(use_enable fcitx4 fcitx) - $(use_enable ibus) - --disable-directx - --disable-rpath - --disable-render-d3d - $(use_with X x) - ) - - ECONF_SOURCE="${S}" \ - econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - emake V=1 -} - -src_compile() { - multilib-minimal_src_compile - - if use doc; then - cd docs || die - doxygen || die - fi -} - -multilib_src_install() { - emake DESTDIR="${D}" install -} - -multilib_src_install_all() { - # Do not delete the static .a libraries here as some are - # mandatory. They may be needed even when linking dynamically. - find "${ED}" -type f -name "*.la" -delete || die - - dodoc {BUGS,CREDITS,README-SDL,TODO,WhatsNew}.txt README.md docs/README*.md - doman debian/sdl2-config.1 - use doc && dodoc -r docs/output/html/ -} diff --git a/media-libs/libsdl2/libsdl2-2.0.20-r1.ebuild b/media-libs/libsdl2/libsdl2-2.0.20-r1.ebuild index 673d3087e19e..b80a501e25f9 100644 --- a/media-libs/libsdl2/libsdl2-2.0.20-r1.ebuild +++ b/media-libs/libsdl2/libsdl2-2.0.20-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://www.libsdl.org/release/${MY_P}.tar.gz" LICENSE="ZLIB" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86" IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus doc fcitx4 gles1 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs +threads udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver" REQUIRED_USE=" diff --git a/media-libs/libshout/Manifest b/media-libs/libshout/Manifest index 7d2ef22e0ea2..3a613ca8db70 100644 --- a/media-libs/libshout/Manifest +++ b/media-libs/libshout/Manifest @@ -1,3 +1,5 @@ DIST libshout-2.4.5.tar.gz 543991 BLAKE2B a3ceabd150413e9d1cee2118fe9576959bfa05d86e261b2574969a9a665aba3da4ac1c39db2b27d033fe587232a69a569d80362f856bba667277b5454dd170ca SHA512 290844185da16961f03434d3e341573dd6cb0139e5fa81902903021b641382d2629302d7c356bc591b35656754e07f4e44a8d9e782e092b17a051b9ae8f54341 +DIST libshout-2.4.6.tar.gz 571153 BLAKE2B 68a24ecd3fa8c1057883d2d9013b18b9b7507d0ee79876efe79c8ad1ae32c408421879340968b77c3d6bf6e8eb3c3c87a8ee5447f351fd871f13683fcbb5ab52 SHA512 e8478cdbf9a27674c16a7b620d1576f2e31a47262b8e29b314d0f46d4e5be24b9a29790b7b226f48939bc34cacf5734fae0aa5686c7ed5879cdbd827ff8e0339 EBUILD libshout-2.4.5.ebuild 1179 BLAKE2B d9794825746c62695e92dc92bc0a053695e7ac7c894e2326808d5f31e17f0a39c5f7e449284e19cdee9ccc1f3fd8926c2849b21a75c7cd537ff2f8b7f76c1a2b SHA512 e3805e9628da4e55cc4e9d24cb8c9d4c43c75de532e5559f286b28b950485ea3e836bc5f5934966f58a0345bedda52bd6954572542bebdeb1cfd24aa855dc902 +EBUILD libshout-2.4.6.ebuild 1186 BLAKE2B 4a47fc6228cc56690dab5ca9d99d3f289931adbe5f125844049d0e54ba6de0edf78f5879eb1faf9f1f9c9cae6a42ebcd488eaf515720e36dca46e7429c7c800b SHA512 c86a68d543905308316990ca576ccfa1e06f4aebc77223d108b4f41f45c678f69715373ed11a74a894b9e9d60c472956df92705aa727352c6f36b6f784a57c2c MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8 diff --git a/media-libs/libshout/libshout-2.4.6.ebuild b/media-libs/libshout/libshout-2.4.6.ebuild new file mode 100644 index 000000000000..39e327e11c39 --- /dev/null +++ b/media-libs/libshout/libshout-2.4.6.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools multilib-minimal + +DESCRIPTION="library for connecting and sending data to icecast servers" +HOMEPAGE="https://www.icecast.org/" +SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="speex static-libs theora" + +RDEPEND=" + >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] + >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] + dev-libs/openssl:0= + speex? ( media-libs/speex[${MULTILIB_USEDEP}] ) + theora? ( media-libs/libtheora[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND} + virtual/pkgconfig +" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/shout/shout.h +) + +src_prepare() { + default + # Fix docdir + sed '/^docdir/s@$(PACKAGE)@$(PF)@' -i Makefile.am || die + eautoreconf + multilib_copy_sources +} + +multilib_src_configure() { + local myeconfargs=( + $(use_enable speex) + $(use_enable static-libs static) + $(use_enable theora) + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_install_all() { + find "${ED}" -name '*.la' -delete || die +} diff --git a/media-libs/libtgvoip/Manifest b/media-libs/libtgvoip/Manifest index 29b4d05dd600..ddd8ca237a6a 100644 --- a/media-libs/libtgvoip/Manifest +++ b/media-libs/libtgvoip/Manifest @@ -1,5 +1,3 @@ -DIST libtgvoip-2.4.4_p20211129.tar.gz 1098091 BLAKE2B 20d90b10a2f87d05fdb5bf723e87045262cfa06a33a0543a9a73e946f44d7017e04faeba19a13d20ab531c4c335d234c172d0cc93819b35477a990cfcb87dab3 SHA512 e55f05e5459e453d33ff717b928324c39adcb0ab2e6aaefa0f2deb35ca76c956ffc723d7138964a3bc10a7bc1e3bc66360ff8c55a080eb3210f5728542ec7d96 DIST libtgvoip-2.4.4_p20220117.tar.gz 1098045 BLAKE2B 752b3b26f511316b8261d9ebb833e2b74df91377daca255fbbeefb18b3ab3811b97eaee1d9965e95ed9d215467e6ff5dc857369d381d470570cb87c3bfec33af SHA512 b9d8e354e9b8f9226d5e06397fdf3c91f71fee890db7d180dffae2e3fb6f74bca1c31b7f87049257c3edf44c2171780ed5781877cf8f2d40b2d56c1f5385ef77 -EBUILD libtgvoip-2.4.4_p20211129.ebuild 1472 BLAKE2B 80eb1ec657b03564c40074717ddcfffadaeeef7764a97ee9f2720b50d0d787eda07e028256d6e762ac0343825d178a256f2fcb3adcf8c53cd3f7f83a9e577462 SHA512 562654cb431b6fbc2baa7d152acdd6fb0c9767117ecfada99c9b860544cf40444729365ffa4d268596ab63365af0d778dd8a9a1a11ed97892451bfa33cccba78 EBUILD libtgvoip-2.4.4_p20220117.ebuild 1586 BLAKE2B 8ee4658a921472e3c5aaa2cccb6059620041f71ee4c8fb24fdcf3759b4f5bbb99c481c888f71300cc82a49ec4037fec96065f89c36145b57b293a9818cba3e54 SHA512 0159bdc29c80a8c2ac03783bded57b68908d814a1113431db85b62042b1c00b433f9bce4359201ec43a79205e27463c84b33a33254cf3aa3b25a9343fe1039e2 MISC metadata.xml 543 BLAKE2B 56f3e74859e09ff7ecaa4f068e1872257213a7239cd946c920c0b2e7e12cfc0bdb314ca1fb0a75b489abd5ae5c4e5b4218ced1b3ee78e60a4e82558100d68e1f SHA512 83e39833446eb97c76280a81e428bdd64b5c46a052e1b87bdc19a5db31478f1004e3ae6f323c7983992541bf9d15f155037523990964ccae4ad8653396f7534b diff --git a/media-libs/libtgvoip/libtgvoip-2.4.4_p20211129.ebuild b/media-libs/libtgvoip/libtgvoip-2.4.4_p20211129.ebuild deleted file mode 100644 index 8c2c2aee32a2..000000000000 --- a/media-libs/libtgvoip/libtgvoip-2.4.4_p20211129.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 2020-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic autotools - -DESCRIPTION="VoIP library for Telegram clients" -HOMEPAGE="https://github.com/telegramdesktop/libtgvoip" - -LIBTGVOIP_COMMIT="2cffda6222f07cd7d0aa4627a06fa99b05a3956d" -SRC_URI="https://github.com/telegramdesktop/libtgvoip/archive/${LIBTGVOIP_COMMIT}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-${LIBTGVOIP_COMMIT}" - -LICENSE="Unlicense" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv" -IUSE="+dsp +alsa pulseaudio" - -DEPEND=" - dev-libs/openssl:= - media-libs/opus - alsa? ( media-libs/alsa-lib ) - dsp? ( media-libs/tg_owt:= ) - pulseaudio? ( media-sound/pulseaudio ) -" -RDEPEND="${DEPEND}" -BDEPEND="virtual/pkgconfig" -REQUIRED_USE=" - || ( alsa pulseaudio ) -" - -src_prepare() { - # Will be controlled by us - sed -i -e '/^CFLAGS += -DTGVOIP_NO_DSP/d' Makefile.am || die - # https://bugs.gentoo.org/717210 - echo 'libtgvoip_la_LIBTOOLFLAGS = --tag=CXX' >> Makefile.am || die - default - eautoreconf -} - -src_configure() { - local myconf=( - --disable-dsp # WebRTC is linked from tg_owt - $(use_with alsa) - $(use_with pulseaudio pulse) - ) - if use dsp; then - append-cppflags "-I${ESYSROOT}/usr/include/tg_owt" - append-cppflags "-I${ESYSROOT}/usr/include/tg_owt/third_party/abseil-cpp" - append-libs '-ltg_owt' - else - append-cppflags '-DTGVOIP_NO_DSP' - fi - econf "${myconf[@]}" -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} diff --git a/media-libs/libvmaf/Manifest b/media-libs/libvmaf/Manifest index 3489ec9eec62..4be1bfae01ce 100644 --- a/media-libs/libvmaf/Manifest +++ b/media-libs/libvmaf/Manifest @@ -1,3 +1,3 @@ DIST libvmaf-2.3.0.tar.gz 18373659 BLAKE2B a08f18cabf99bf421c61c1fa60b946ee62027f06d5ec2a1b78c7d14ef7541a850b83216eed815f586711365ac2e31bdc6b5be811ae4fd6882717bf030d9ffc0f SHA512 10f0af2b1e868d9780a2766c6c06451ea79f4a8cd8f6c546473382587011f9a7c8c5bf80952021980ede62e2188bcb388337c8903a906d50c739be7cdbb8f61b -EBUILD libvmaf-2.3.0.ebuild 956 BLAKE2B 4eae65d0a60b7a35814eb0450fed6810f6df17a300932947fd05cde7f90d90da354526536be3497e0b3932f384f73bc0fe4ce442eb8a47aa11df779e3fd5c916 SHA512 77e59212f4604f39ced71a8cf2f6b50ba1da0fa0732388de8236dfadef08aad672f39520a23d07fe8227fee23f57fbe46f601bbaf36fc9ac1c8f784625204dd4 +EBUILD libvmaf-2.3.0-r1.ebuild 1120 BLAKE2B b618cf7ec8db20ce4114af5b5318d393d44dd33eaf8808291bd0f485fb4e86d9023f5caf0efc0d381850f205c33cd6ac1c2f395fa3e725cf0bdcc3e3ab5487ea SHA512 acf24ec08c15c15f0d9bb517e7d9a4286b55461f863af8fe2d2741a99996342951e99e40e44a97adbb9046bcf9d075ca2e94abfc6177c46bb9ca9c0592bad9cb MISC metadata.xml 721 BLAKE2B f0e82d2d6d28429c7d0a91b111b82d3a5df006f27142f063d527b73ee37ed82892c4d85db473098ca32ce09d3a1eca926666830e2d1ea3256f0598b413861c7d SHA512 741de386e11eeb0cde13121604fa60d1c22012f9e4c351ec423ce3d7cbc164006441e37d49682c0f1ab64dffc6b949a39ed971755b2f026bb6964e53acc6ff95 diff --git a/media-libs/libvmaf/libvmaf-2.3.0.ebuild b/media-libs/libvmaf/libvmaf-2.3.0-r1.ebuild index 7adc3c9eca99..d83062357877 100644 --- a/media-libs/libvmaf/libvmaf-2.3.0.ebuild +++ b/media-libs/libvmaf/libvmaf-2.3.0-r1.ebuild @@ -5,7 +5,7 @@ EAPI=8 inherit meson-multilib -DESCRIPTION="C libary for Netflix's Perceptual video quality assessment based on multi-method fusion." +DESCRIPTION="C libary for Netflix's Perceptual video quality assessment" HOMEPAGE="https://github.com/Netflix/vmaf" if [[ ${PV} == "9999" ]]; then @@ -21,12 +21,13 @@ fi LICENSE="BSD-2-with-patent" SLOT="0" -# upstream issue, see bug #835471 -RESTRICT="test" - BDEPEND=" dev-lang/nasm + app-editors/vim-core " +# The app-editors/vim-core dep is needed to embed models within the library +# could be made into a useflag if someones express the need for it +# see https://github.com/Netflix/vmaf/blob/master/libvmaf/meson_options.txt#L21 RDEPEND="${BDEPEND}" diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest index 72a5f0b7407f..625efcf93a0e 100644 --- a/media-libs/mlt/Manifest +++ b/media-libs/mlt/Manifest @@ -2,5 +2,5 @@ AUX mlt-6.10.0-swig-underlinking.patch 596 BLAKE2B b51670d051ae2bd016da65f560ed8 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.4.0.tar.gz 1206316 BLAKE2B 56e6ea7a5545b80de45cffd206e555a577ada8e59f9b63c6487491e130ba7e4fdca5dc1b3836fcff22d49b6dcb048779dc8db1e9888b1137653c80196bdb81e2 SHA512 e9a65e76ca0a2464fb923d19d6f21bd49f13d637b0a974eeeb1e123ab753914d742e373f9fdcfe07cdeb9f39ebd2f0dde75a7299c0b6cd4807ee48ec710b3fd4 -EBUILD mlt-7.4.0.ebuild 3589 BLAKE2B dbc1dae71c00468d4f5ee76cea52099b9e32037dfd50909fa50fb803ca19a3b424e6060f53e09967e0a0b9ef8d85ac388bd05ed25aa2d026cd6c5bc71b6f1bca SHA512 d45459c61394da80d9a14cfa89465301e95a12d6ed2009b7e175c5c964c5d4592d981838d9617860c122a396eaca58e82d86fefaf9edd38ae7ade82ba3ac5912 +EBUILD mlt-7.4.0.ebuild 3596 BLAKE2B 215102d8ca8e712d0f90d7ecb67a8b60d0e6c152475816e788a7d4601ea7fda06e6e6a9ad7ff05a43ecf8c9c0eb741c7365968b5d4ed834639418f39f7079cd5 SHA512 0ff79cba34831b6ad96815703934369d79e42dc153dd96c7b839333752421ae0df45d5bcfd4ed6dd8be2ac102c2f31c772b2587fa3bce734e5dae6404dba8243 MISC metadata.xml 1412 BLAKE2B 8d4eed394f1d1e95e5559466ef1840978966e8f1f7b89fdfd2549b2a35b6ce8f114c9373374fdaefe320cc34a4dc8cbd9f6c4433740d1ae9680de54484b5e3d1 SHA512 b19c711dc3798f952e0223dc0628b25aa3c9a296d66ee2f2b7f46a55b82e71c0c583ee64517be88dcc55eb1e9c31aa782b9043eb7630a853077afb1bf8b4dedd diff --git a/media-libs/mlt/mlt-7.4.0.ebuild b/media-libs/mlt/mlt-7.4.0.ebuild index e0c70f26c65e..fc98138c61ed 100644 --- a/media-libs/mlt/mlt-7.4.0.ebuild +++ b/media-libs/mlt/mlt-7.4.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar LICENSE="GPL-3" SLOT="0/7" -KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux" IUSE="debug ffmpeg frei0r gtk jack libsamplerate opencv opengl python qt5 rtaudio rubberband sdl test vdpau vidstab xine xml" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest index 72a8fc7d9c1d..afcae2ef45ff 100644 --- a/media-libs/opencv/Manifest +++ b/media-libs/opencv/Manifest @@ -14,9 +14,9 @@ DIST opencv-4.5.4_contrib.tar.gz 61054226 BLAKE2B c553bfc6fd1b5fd17f562b27248ddd DIST opencv-4.5.5.tar.gz 89879893 BLAKE2B 6f2ce34b33132ad544d661417f730e17aedfbe17a22048ad0b8d287970626756c51309410d0fb5bf487af773ff4415d36b6768158ebc3cb963b37bb888ee4ba6 SHA512 4d1783fd78425cc43bb2153446dd634cedd366a49592bccc0c538a40aa161fcf67db8f1b6b68f1ce0b4a93504b3f06f65931709277afb1a1ee9fe963094bca02 DIST opencv-4.5.5_contrib.tar.gz 60563220 BLAKE2B 4a020824688e379f1d127fb834b0008b3cbf78acea4847cb4994e9e0b6ddfeec3f06867967b8546725cf050c1fd0df042a18caff80463ad101cf14dc66daea9a SHA512 8469de524e8e6f4c50a74b8cbec5e4cfc48a63a6dfc787609696099eca40dc02b9dc7a347a014d4416fd4efd66955d3af5f4847f44612312a8362f453e6c2e35 DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44 -EBUILD opencv-4.5.2-r3.ebuild 20667 BLAKE2B 1482e70d2c5dcaa6d568f6c4326eac12a5380433fb40267cd1961a83f4ea3a2ca2b2d2c4351b0304d9882a84b144d81a52a9da6ccc34fb05987356a8d21f6e86 SHA512 121fa6c8b4297290808ea1fd67d56dec075c96d90c7b60484294cc939fb5bd9595d6aa9cf833eefcd93f36ea31e1c3c032791a21074ebe6da460bc01fd2d0945 -EBUILD opencv-4.5.2-r5.ebuild 20722 BLAKE2B 1eff4e40444049fa054ebe99b6675b9ae780310aaa85a678ac1216936773afffab32d372f181bbfc72bdd3ee86732639ae02383a16344a6fdb1a3bad55bec159 SHA512 c28a914751319a8fa7140838debba1d745fe09e4f2f6d5564549246c916f91b69446e823aa6262a7d94176d60404f37b271bf79299100f47d14a22a045ddc12b -EBUILD opencv-4.5.4.ebuild 21206 BLAKE2B 4de0279868389f82d0ca24dc95fc597fc5ec20c8e8cb112164ff78e942f01b9119163e41b162ac409912f5b8a6d601ec065f3b51755114a4642cefc379a03ca2 SHA512 611816ed458371f63f870d1b1df2f73839a8005d23aaf14b72893d47a63f07807fbc7b7053afac620833e8f8fbe664f75ec851b0d5e73c9b9cdb4d79e4f55ef1 -EBUILD opencv-4.5.5-r1.ebuild 21072 BLAKE2B f79f65cf5e0b986117ffd70536cb4e63eb64478f55b0bea34a7ff986093fa7e03b5903e280419bc863c7cf004c0ab218e56a99489156dd0d07d9f9e68e5b750e SHA512 e626da1a6b335822bc563fe4fd8ad8eb50273c42c69320e157b2d15d9bb57722161c6339318dadf5319fc54f1abdf35670692cae57bae95c11afdbd8a8094a85 -EBUILD opencv-4.5.5.ebuild 21194 BLAKE2B b7251fe4655f7800ed2183b36b6c7c6bee778e08de1c75ac723e240daea951c8bf27a5bb4dcfbc9900bf0ad6cdd7c81d26c343a51bfab923669274348d050c28 SHA512 c11df51fa83b6477e0bd4e49b18e20936fbbfa153912d81712bb05fc764045558d18dc8ff0bec41bce51b9fbb407333e6122a2c6bd3369b23d11c7b626d3b2c5 -MISC metadata.xml 3186 BLAKE2B 0293399368d675e350992184bcaad2de17e68aae0ea3fa15bb885ac975f14f0350efc5a00a17737be22cf8b5c0808b3853c77b66ff43294f443305ee188aaa06 SHA512 6d3ee73a3b78581b3e4f12287578cae84afa8747d2432fa436860c265ae92f1072cb83a1b41a2f80ed9141f4c097224df6280c78970d7d68e1c9baa92d383395 +EBUILD opencv-4.5.2-r3.ebuild 20738 BLAKE2B ae2fe653392330cd42b4cd5eeb2d2ac2fdf94f2ce16ab5fb842866323b8dcb1e2373452e48b2ba3030d8734938df84bf577c7039ee6fa1918044c396770b468f SHA512 043b5e2fa1a1620d0e107f43ed26957b9e2353948d7f105354d82b419e552443d68e25319f3739ba1d4dfb22edc9671a80bfd8ecfd2f64a5f650e329b2babf78 +EBUILD opencv-4.5.2-r5.ebuild 20793 BLAKE2B 42bb20d0e21de9354fbdc141b4235b7f2c5225c244615e699638b92cb223c7f227fb8818fbc20c6cf156cb476f168d4e9e0c6509da59104d8848e8e5f7ffcdfe SHA512 056d75e7b8c587e326eb837a8fd1aca0d61e6b2a32b298498217c9fa21b0172371938284014c4d577936cab78ebad15356161018b211999c88b06ed1176358d1 +EBUILD opencv-4.5.4.ebuild 21277 BLAKE2B 6a6102565d52e2711d92cf8d7456986cffac8a0f34b669c7f3d77e12e53e9146870d997d9fb4bbe0fd53811e85786bc0f84f49d7d7be6bb663601385d167d2e4 SHA512 809bc5b748b9a1c098bf06d9fd925d989d8ffa88d3de210e62dd287649b23439b2b97c26a789b7c38ef02443f83dc3fdc2d091639b946a8956e5902bacc5debd +EBUILD opencv-4.5.5-r1.ebuild 21143 BLAKE2B 450b67dc03ee0105d1bce190b807de37444b41c8ac90d9e72438e194aef388ac32ecef75398c99fb66bb5a67bd43f516d74749193f721cd1b4f17e189fe8d1af SHA512 8776814f44bcaef3c6ff1382f31d58caee045da504062e13493e42b7c7af9734122635b3a82699df7696d291c9d1085b470db03dac48719721812ac466806c8d +EBUILD opencv-4.5.5.ebuild 21265 BLAKE2B a58a5315af741c43c0686cb9f25bfd7afd08f54a3482a76952264e5a6cfdc9892746555cbf786bea8d080d26917ea43925be969db110e66e7032ff97e39135c4 SHA512 3be510f4e0639baf3957877028a5d6081d52467e7df87a68cfed7a421babd8ea3774d04c51d617c9034b58bba8d9118193093d55725c412325cdeca144634efb +MISC metadata.xml 3110 BLAKE2B 56215511d99a98894fdb70f5db8423b307b4a487acbc88a836a78cf48e249015856e33b85ce741a4cde9d55fbf8d653d1197a9a4abb692284ab03457e14453ff SHA512 93df09d61b5be54d8d14ec15a3274326db1bd7de9cc56c876d788d5e5d94b62de311b30cb46a9d864f3c8b0974c5a9e59418519de7a9d28666ffee33572bab23 diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml index 1626a4e4bc45..2837852f1792 100644 --- a/media-libs/opencv/metadata.xml +++ b/media-libs/opencv/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>amynka@gentoo.org</email> - <name>Amy Liffey</name> - </maintainer> + <!-- maintainer-needed --> <longdescription> OpenCV (Open Source Computer Vision) is a library of programming functions mainly aimed at real time computer vision. Example applications of the OpenCV library are Human-Computer Interaction (HCI); Object Identification, Segmentation and Recognition; diff --git a/media-libs/opencv/opencv-4.5.2-r3.ebuild b/media-libs/opencv/opencv-4.5.2-r3.ebuild index 9b1bb3c11c7c..9b3f36c342d0 100644 --- a/media-libs/opencv/opencv-4.5.2-r3.ebuild +++ b/media-libs/opencv/opencv-4.5.2-r3.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 PYTHON_COMPAT=( python3_{7,8,9} ) CMAKE_ECLASS=cmake -inherit java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs +inherit flag-o-matic java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs DESCRIPTION="A collection of algorithms and sample code for various computer vision problems" HOMEPAGE="https://opencv.org" @@ -295,6 +295,9 @@ pkg_setup() { } src_prepare() { + # https://bugs.gentoo.org/838274 + replace-flags -O3 -O2 + cmake_src_prepare # remove bundled stuff diff --git a/media-libs/opencv/opencv-4.5.2-r5.ebuild b/media-libs/opencv/opencv-4.5.2-r5.ebuild index 21f9624b9049..2b66d2c57956 100644 --- a/media-libs/opencv/opencv-4.5.2-r5.ebuild +++ b/media-libs/opencv/opencv-4.5.2-r5.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 PYTHON_COMPAT=( python3_{7,8,9,10} ) CMAKE_ECLASS=cmake -inherit java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs +inherit flag-o-matic java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs DESCRIPTION="A collection of algorithms and sample code for various computer vision problems" HOMEPAGE="https://opencv.org" @@ -296,6 +296,9 @@ pkg_setup() { } src_prepare() { + # https://bugs.gentoo.org/838274 + replace-flags -O3 -O2 + cmake_src_prepare # remove bundled stuff diff --git a/media-libs/opencv/opencv-4.5.4.ebuild b/media-libs/opencv/opencv-4.5.4.ebuild index d294809c1d6a..24070fe0c2e4 100644 --- a/media-libs/opencv/opencv-4.5.4.ebuild +++ b/media-libs/opencv/opencv-4.5.4.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 PYTHON_COMPAT=( python3_{8..10} ) CMAKE_ECLASS=cmake -inherit java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs +inherit flag-o-matic java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs DESCRIPTION="A collection of algorithms and sample code for various computer vision problems" HOMEPAGE="https://opencv.org" @@ -307,6 +307,9 @@ pkg_setup() { } src_prepare() { + # https://bugs.gentoo.org/838274 + replace-flags -O3 -O2 + cmake_src_prepare # remove bundled stuff diff --git a/media-libs/opencv/opencv-4.5.5-r1.ebuild b/media-libs/opencv/opencv-4.5.5-r1.ebuild index 98288510a586..e3d2e5a3efbe 100644 --- a/media-libs/opencv/opencv-4.5.5-r1.ebuild +++ b/media-libs/opencv/opencv-4.5.5-r1.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{8..10} ) CMAKE_ECLASS=cmake -inherit java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs +inherit flag-o-matic java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs DESCRIPTION="A collection of algorithms and sample code for various computer vision problems" HOMEPAGE="https://opencv.org" @@ -303,6 +303,9 @@ pkg_setup() { } src_prepare() { + # https://bugs.gentoo.org/838274 + replace-flags -O3 -O2 + cmake_src_prepare # remove bundled stuff diff --git a/media-libs/opencv/opencv-4.5.5.ebuild b/media-libs/opencv/opencv-4.5.5.ebuild index cc9da840a605..7eddbcd042ce 100644 --- a/media-libs/opencv/opencv-4.5.5.ebuild +++ b/media-libs/opencv/opencv-4.5.5.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 PYTHON_COMPAT=( python3_{8..10} ) CMAKE_ECLASS=cmake -inherit java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs +inherit flag-o-matic java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs DESCRIPTION="A collection of algorithms and sample code for various computer vision problems" HOMEPAGE="https://opencv.org" @@ -303,6 +303,9 @@ pkg_setup() { } src_prepare() { + # https://bugs.gentoo.org/838274 + replace-flags -O3 -O2 + cmake_src_prepare # remove bundled stuff diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest index 408c151859e6..9d32e634dfa6 100644 --- a/media-libs/openexr/Manifest +++ b/media-libs/openexr/Manifest @@ -1,16 +1,11 @@ AUX openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch 1357 BLAKE2B f236a339d6b35878c9a63a8468e7be6652447646fe0f2567223b20087b2d64d144c95ad71ee218a4542f61bf9c7a65ea8f0e10b02f75d85ee2d3e6b4addc8052 SHA512 6c9c10ab74a24e7213c565eb357683949193b45d0475c529f8cc24dc73deb9392db36f80d38757eee54eded1c260049339f575f96217c733243c4c6a863d5857 AUX openexr-2.5.7-0001-disable-testRgba-on-sparc.patch 937 BLAKE2B e2e432649100457a3273b50aa6725625ac50f48bf95bb04b85a2587a44d4c9e87662a36b68c3b7ac0c741068223e439fb51c1b69d5ae8f852794b0a7ee238d4a SHA512 8c640d67f2db6ed2789b8e25dd25e6ba8db6b3ed0ddb2138027ca579b3fe5db43b60d5bffc4de3f31ba60521c6479cf89f1ff7a8b2bbba97dd22c13279b92f81 AUX openexr-2.5.7-0002-increase-IlmImfTest-timeout.patch 687 BLAKE2B 49aaf9d5282ad878ec415413106540d4a92aecceebbc9a03e30a4289377ec1d8ec4e1bacf49e0cec80a44e75f7f345c885c4746092c4dc3d57b03b317631d4d5 SHA512 9bcb62eec3bdf05ba54dff037ccd71e5e1dcd37831246f95d7803f1710b7335d930292dd27b5a6ddd927c45e7734d61d3a42a637fdf7e83724830f21b3d3db9e -AUX openexr-3.1.1-0001-changes-needed-for-proper-slotting.patch 6243 BLAKE2B 7c2d2f23153c098027f9edf2671dfa86d7b5924c3e1256db1dc9d3925e4e1f2b354e5524da25d90ef9f7123103947856820f426e51dd6e977fd098e6f35311ee SHA512 3a79c3eb66ff63b92fe45d51b2fbf25c2b4c863e12b4f59a8ea2e8275e3647d23af66d8133dc49dd935e5b5c4383455ce02bac767a4b84c8999285d57573b3a0 -AUX openexr-3.1.1-0002-add-version-to-binaries-for-slotting.patch 10834 BLAKE2B e789a55f14968089b27648e7989bfcb29e4fe634417348dffa8c24a6faafb85bdd9f9f523dc31a2ed26ec2e9d0ff2a2a3f5869317a20014b142085a6720c92f9 SHA512 b187ab8a4c25ffb865293eabb489232d151bfb9260cf2fd4700011e240029b91faa1d072e2f3c5865f79de7d5facfb5bb32fd53ece9f7338f9164c63d5d442f9 AUX openexr-3.1.1-0003-disable-failing-test.patch 1193 BLAKE2B d4a40151e2c0b2278bfbec06b88d1a2b1a0caccb651a53aa4d54945524e3c79fb03d9031540ed0f423be4503fff0881b2185cc33b614a2508135cec3113f9384 SHA512 e07602d78d15ab0f1076d7b5d3f3d16912e9d0ad792703af1b1d3d8fcf472eef2e410efc2abed2da70e39a97f4dd9194a47c6de50484da799d49cf44e62c9167 DIST openexr-2.5.7.tar.gz 27539574 BLAKE2B 58fd81be52e13d2815b6aa8cea6793359379f5ebf866fd45b31ce30cf5f72aa4699625e7cec51189d62fe76f53418c3e0938f9b827d54ad18342e7aa67c8a3d2 SHA512 e44edfa2dcfff2fe372ed2ba07b39a472e549025978de178eff26be641767d22d1a3b543fb7672d9b7b2e9f4c308667f785829ed6d9032a2b42f2ffa0163de40 -DIST openexr-3.1.2.tar.gz 20315253 BLAKE2B d11f26d3e2bb098c4c009271b40da1eca97b120e5683137a0b38f64e2862c226aebff7c17e79344da4a1be5a1967fb8ab0493ff919a7fb5bec16b34e494e49e2 SHA512 34fb28f149e49bb23b2dc230dd5277229f2c780de66aff0acc819601e6802a1dbf83110b5df455dffd63be6eaa286d4aedb4b0af559b8b034d98c3208ee9d969 -DIST openexr-3.1.3.tar.gz 20322346 BLAKE2B e65cb00d1d9ae7544f6d1adf9c6f05193986b8de7b657fa22d20466f2b6dfccf244b5aa3dbe7f2abb0c934aec68d2007dd9edb3eeee91b2bbd8aab331eea7e90 SHA512 12a8f3660104e68ccea0856caf334d1fafbf0ee79115aae23cdce5b835299294ab8a23bafed282acfacd159ce9bc7f6ffc620b1e0df0d40f9ca0eb15a288964d +DIST openexr-2.5.8.tar.gz 27539605 BLAKE2B b54b72aa82c947fd7f252bf4d15b2727be2da7cdd257a9d96c6c2a3c892438ff850177549144e492617bfe5d260ddd14d21eac70a55f124784bbdf5f7077d1e9 SHA512 5b1ad99cfa639892292109a26c084868b3fe0acf572dd69750e951cec2127d63c78309241de92b0052f0abe50d86f2518e3185194121010db5f826d217e37f4f DIST openexr-3.1.4.tar.gz 20323658 BLAKE2B d3726023f920fa719b1832d3be2df36a95cac8c67fdd4b23a7166398a282fa01d5c07065afd92f7b28f178c47843f82eb7a0f2b77742725b359c8f275d2ef1d0 SHA512 612ab3467f9ccf2779e1592361cb07459571122e10c0a0b3020430cfa34fa3b91ca1d63cc12a5f85d5b53b277b3f7a88862e6477f0f3566a4196b8245f6bfe12 EBUILD openexr-2.5.7.ebuild 2171 BLAKE2B fb59902ef509b75d58b1df078d3bb7ef9bf866fc55ee5de8211721745fbf048d2431aba65d1627ed9748862e751c04f58c51b50355fa34f3d22f163fbdde2a14 SHA512 4a91fa4d593dfc94aba295d5572ed9f7c73e9ccdba52b4f38053a0431bd4a89e1b195aa50aed4f5297464838815d62dbe388b24f72ff29ff40bcb0396c8c6e09 -EBUILD openexr-3.1.2.ebuild 2163 BLAKE2B 70e443af57f3f044be3e47030919b273b673a0c22f2d871ec9cfbb602dc0aa725f37704cc3d0a35c3a781c12c0dd6a780b386ed844094b0a6a3179c3962f9f41 SHA512 8c7e0d1ad8c15b11c5f6d8126dfcf648bf8f2b6a8b810a01856f26a8f65e49605b3941bd48e14539800114a49164c12fec71ae5f857bdf6f4496fa67139c16de -EBUILD openexr-3.1.3.ebuild 2173 BLAKE2B 08e48ceac80017c6fdcf10bffc832cf6b2d5249b78a156c551ac14336a9c06cd8f950a3d6d3689d1babc8b9641a86641d0486a421da34ccf074aba945067eb8e SHA512 76908e459cd81c57d678f52b6d3cceb6da8a2b2c1748af20bc2fcbddd9d3483fd0b90804ecc447d818c6cbd8bdf6b99daa842904f033413d80109ef71fe6b193 +EBUILD openexr-2.5.8.ebuild 2145 BLAKE2B 49a39e572b88139d1291d298f7f5f5eca6379e7ac604b92d91aebe6b71df3d0ffd3286eede949f9b31650062c448c5e76d1deaa7f134ceb0da4255efa3d4f565 SHA512 65c858b33cda707d99a751821a9cd10c77084890f8aa8e5b594eddca41df74444cce8a5426e95119b24d15786d102297e2801882f47d81f209e0b80633c8ce03 EBUILD openexr-3.1.4-r1.ebuild 1910 BLAKE2B 2eb8cad3ae2a3951a534b5d3173f0788ba8a3792eb0bf4462321fe073580b3b71c04b99669e1a2ab6d599c9e0ed2062ceeb9185d0b48fb8c307c670123272bcd SHA512 b65c849f91b3226cc751052511f517e10607ad2c64eb7f17f80ad4e0cb8b2e9b28767741057095ef661787c327815cae16b1d15dc49c330522203d3b38b41c21 -EBUILD openexr-3.1.4.ebuild 2170 BLAKE2B 1765dcd4eb7c504912301f59403d45195ac3a93cb72d1178e4f26f0f4bdfb6f68c9efdce16bef3f3a30ba60dd1de74977f3d9704f4bd92fe3d26d91fac57d473 SHA512 ded503632f4a0b75d3a15267c52d1ed37e652b4664d81260f071cadab4dd8a70d3c8ce6a3c5c289765afa11c805f1c9a44789ac9d9b305a9c891c2e6b0a7e7f0 MISC metadata.xml 797 BLAKE2B e9d8032b4c63b24e2e7b1874d46bbbcf4f31342c4540279d1ba243e69090c320e6d9caed29e15dee87f7fbfb4b806de3a1665b7a4385baa4107ea41a2ae74d32 SHA512 12f7cce7d5cee0a88e4c3f8babfa10f890d5b38c0131becafa46423dc642c2df03ac78b2e3bbcdb4846b929eeb7138e9b3d12cddbf1da984ac5446b6cc792dee diff --git a/media-libs/openexr/files/openexr-3.1.1-0001-changes-needed-for-proper-slotting.patch b/media-libs/openexr/files/openexr-3.1.1-0001-changes-needed-for-proper-slotting.patch deleted file mode 100644 index 29aef05acf5a..000000000000 --- a/media-libs/openexr/files/openexr-3.1.1-0001-changes-needed-for-proper-slotting.patch +++ /dev/null @@ -1,119 +0,0 @@ -From: Bernd Waibel <waebbl-gentoo@posteo.net> -Date: Tue, 3 Aug 2021 19:50:40 +0200 -Subject: [PATCH 1/2] changes needed for proper slotting - -Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> ---- - cmake/CMakeLists.txt | 8 ++++---- - cmake/LibraryDefine.cmake | 8 ++++---- - cmake/OpenEXR.pc.in | 4 ++-- - cmake/OpenEXRLibraryDefine.cmake | 8 ++++---- - 4 files changed, 14 insertions(+), 14 deletions(-) - -diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt -index 79497d9..a22afd1 100644 ---- a/cmake/CMakeLists.txt -+++ b/cmake/CMakeLists.txt -@@ -205,7 +205,7 @@ if(OPENEXR_INSTALL_PKG_CONFIG) - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig - ) - endfunction() -- openexr_pkg_config_help(OpenEXR.pc.in) -+ openexr_pkg_config_help(OpenEXR-${OpenEXR_VERSION_MAJOR}.pc.in) - else() - message(STATUS "-- pkg-config generation disabled") - endif() -@@ -225,7 +225,7 @@ include(CMakePackageConfigHelpers) - if(OPENEXR_INSTALL) - configure_package_config_file(${PROJECT_NAME}Config.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake -- INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} -+ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${OpenEXR_VERSION_MAJOR} - ) - write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake" - VERSION ${PROJECT_VERSION} -@@ -234,11 +234,11 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake" - - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake - ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${OpenEXR_VERSION_MAJOR} - ) - - install(EXPORT ${PROJECT_NAME} -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${OpenEXR_VERSION_MAJOR} - FILE ${PROJECT_NAME}Targets.cmake - NAMESPACE ${PROJECT_NAME}:: - EXPORT_LINK_INTERFACE_LIBRARIES -diff --git a/cmake/LibraryDefine.cmake b/cmake/LibraryDefine.cmake -index 5696f3f..b4787b1 100644 ---- a/cmake/LibraryDefine.cmake -+++ b/cmake/LibraryDefine.cmake -@@ -79,8 +79,8 @@ function(OPENEXR_DEFINE_LIBRARY libname) - install(TARGETS ${libname} - EXPORT ${PROJECT_NAME} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR} - INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - PUBLIC_HEADER - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENEXR_OUTPUT_SUBDIR} -@@ -90,8 +90,8 @@ function(OPENEXR_DEFINE_LIBRARY libname) - string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) - set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${OPENEXR_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}) - set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}) -- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") -- install(CODE "message(STATUS \"Creating symlink ${CMAKE_INSTALL_FULL_LIBDIR}/${baselibname} -> ${verlibname}\")") -+ install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") -+ install(CODE "message(STATUS \"Creating symlink ${CMAKE_INSTALL_FULL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}/${baselibname} -> ${verlibname}\")") - set(verlibname) - set(baselibname) - endif() -diff --git a/cmake/OpenEXR.pc.in b/cmake/OpenEXR.pc.in -index a74979b..e124b8f 100644 ---- a/cmake/OpenEXR.pc.in -+++ b/cmake/OpenEXR.pc.in -@@ -5,9 +5,9 @@ - - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@libdir@ -+libdir=@libdir@/@OPENEXR_OUTPUT_SUBDIR@ - includedir=@includedir@ --OpenEXR_includedir=@includedir@/OpenEXR -+OpenEXR_includedir=@includedir@/@OPENEXR_OUTPUT_SUBDIR@ - libsuffix=@LIB_SUFFIX_DASH@ - - Name: OpenEXR -diff --git a/cmake/OpenEXRLibraryDefine.cmake b/cmake/OpenEXRLibraryDefine.cmake -index c6ddd2e..0dc3663 100644 ---- a/cmake/OpenEXRLibraryDefine.cmake -+++ b/cmake/OpenEXRLibraryDefine.cmake -@@ -54,8 +54,8 @@ function(OPENEXR_DEFINE_LIBRARY libname) - install(TARGETS ${libname} - EXPORT ${PROJECT_NAME} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR} - INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - PUBLIC_HEADER - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENEXR_OUTPUT_SUBDIR} -@@ -65,8 +65,8 @@ function(OPENEXR_DEFINE_LIBRARY libname) - string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) - set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${OPENEXR_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}) - set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}) -- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") -- install(CODE "message(STATUS \"Creating symlink ${CMAKE_INSTALL_FULL_DIR}/${baselibname} -> ${verlibname}\")") -+ install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") -+ install(CODE "message(STATUS \"Creating symlink ${CMAKE_INSTALL_FULL_DIR}/${OPENEXR_OUTPUT_SUBDIR}/${baselibname} -> ${verlibname}\")") - set(verlibname) - set(baselibname) - endif() --- -2.32.0 - diff --git a/media-libs/openexr/files/openexr-3.1.1-0002-add-version-to-binaries-for-slotting.patch b/media-libs/openexr/files/openexr-3.1.1-0002-add-version-to-binaries-for-slotting.patch deleted file mode 100644 index d2f6dcd4bc33..000000000000 --- a/media-libs/openexr/files/openexr-3.1.1-0002-add-version-to-binaries-for-slotting.patch +++ /dev/null @@ -1,252 +0,0 @@ -From: Bernd Waibel <waebbl-gentoo@posteo.net> -Date: Tue, 3 Aug 2021 20:00:34 +0200 -Subject: [PATCH 2/2] add version to binaries for slotting - -Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> ---- - src/bin/exr2aces/CMakeLists.txt | 10 +++++----- - src/bin/exrenvmap/CMakeLists.txt | 10 +++++----- - src/bin/exrheader/CMakeLists.txt | 10 +++++----- - src/bin/exrinfo/CMakeLists.txt | 10 +++++----- - src/bin/exrmakepreview/CMakeLists.txt | 10 +++++----- - src/bin/exrmaketiled/CMakeLists.txt | 10 +++++----- - src/bin/exrmultipart/CMakeLists.txt | 10 +++++----- - src/bin/exrmultiview/CMakeLists.txt | 10 +++++----- - src/bin/exrstdattr/CMakeLists.txt | 10 +++++----- - 9 files changed, 45 insertions(+), 45 deletions(-) - -diff --git a/src/bin/exr2aces/CMakeLists.txt b/src/bin/exr2aces/CMakeLists.txt -index 72c4e1c..01b806f 100644 ---- a/src/bin/exr2aces/CMakeLists.txt -+++ b/src/bin/exr2aces/CMakeLists.txt -@@ -1,14 +1,14 @@ - # SPDX-License-Identifier: BSD-3-Clause - # Copyright (c) Contributors to the OpenEXR Project. - --add_executable(exr2aces main.cpp) --target_link_libraries(exr2aces OpenEXR::OpenEXR) --set_target_properties(exr2aces PROPERTIES -+add_executable(exr2aces-${OpenEXR_VERSION_MAJOR} main.cpp) -+target_link_libraries(exr2aces-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR) -+set_target_properties(exr2aces-${OpenEXR_VERSION_MAJOR} PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" - ) - if(OPENEXR_INSTALL_TOOLS) -- install(TARGETS exr2aces DESTINATION ${CMAKE_INSTALL_BINDIR}) -+ install(TARGETS exr2aces-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR}) - endif() - if(WIN32 AND BUILD_SHARED_LIBS) -- target_compile_definitions(exr2aces PRIVATE OPENEXR_DLL) -+ target_compile_definitions(exr2aces-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL) - endif() -diff --git a/src/bin/exrenvmap/CMakeLists.txt b/src/bin/exrenvmap/CMakeLists.txt -index c798a65..3d35a19 100644 ---- a/src/bin/exrenvmap/CMakeLists.txt -+++ b/src/bin/exrenvmap/CMakeLists.txt -@@ -1,7 +1,7 @@ - # SPDX-License-Identifier: BSD-3-Clause - # Copyright (c) Contributors to the OpenEXR Project. - --add_executable( exrenvmap -+add_executable( exrenvmap-${OpenEXR_VERSION_MAJOR} - blurImage.cpp - EnvmapImage.cpp - main.cpp -@@ -11,13 +11,13 @@ add_executable( exrenvmap - resizeImage.cpp - ) - --target_link_libraries(exrenvmap OpenEXR::OpenEXR) --set_target_properties(exrenvmap PROPERTIES -+target_link_libraries(exrenvmap-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR) -+set_target_properties(exrenvmap-${OpenEXR_VERSION_MAJOR} PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" - ) - if(OPENEXR_INSTALL_TOOLS) -- install(TARGETS exrenvmap DESTINATION ${CMAKE_INSTALL_BINDIR}) -+ install(TARGETS exrenvmap-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR}) - endif() - if(WIN32 AND BUILD_SHARED_LIBS) -- target_compile_definitions(exrenvmap PRIVATE OPENEXR_DLL) -+ target_compile_definitions(exrenvmap-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL) - endif() -diff --git a/src/bin/exrheader/CMakeLists.txt b/src/bin/exrheader/CMakeLists.txt -index c427445..8cdbb8e 100644 ---- a/src/bin/exrheader/CMakeLists.txt -+++ b/src/bin/exrheader/CMakeLists.txt -@@ -1,14 +1,14 @@ - # SPDX-License-Identifier: BSD-3-Clause - # Copyright (c) Contributors to the OpenEXR Project. - --add_executable(exrheader main.cpp) --target_link_libraries(exrheader OpenEXR::OpenEXR) --set_target_properties(exrheader PROPERTIES -+add_executable(exrheader-${OpenEXR_VERSION_MAJOR} main.cpp) -+target_link_libraries(exrheader-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR) -+set_target_properties(exrheader-${OpenEXR_VERSION_MAJOR} PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" - ) - if(OPENEXR_INSTALL_TOOLS) -- install(TARGETS exrheader DESTINATION ${CMAKE_INSTALL_BINDIR}) -+ install(TARGETS exrheader-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR}) - endif() - if(WIN32 AND BUILD_SHARED_LIBS) -- target_compile_definitions(exrheader PRIVATE OPENEXR_DLL) -+ target_compile_definitions(exrheader-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL) - endif() -diff --git a/src/bin/exrinfo/CMakeLists.txt b/src/bin/exrinfo/CMakeLists.txt -index 19ace5f..07aee1a 100644 ---- a/src/bin/exrinfo/CMakeLists.txt -+++ b/src/bin/exrinfo/CMakeLists.txt -@@ -1,12 +1,12 @@ - # SPDX-License-Identifier: BSD-3-Clause - # Copyright Contributors to the OpenEXR Project. - --add_executable(exrinfo main.c) --target_link_libraries(exrinfo OpenEXR::OpenEXRCore) --set_target_properties(exrinfo PROPERTIES -+add_executable(exrinfo-${OpenEXR_VERSION_MAJOR} main.c) -+target_link_libraries(exrinfo-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXRCore) -+set_target_properties(exrinfo-${OpenEXR_VERSION_MAJOR} PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" - ) --install(TARGETS exrinfo DESTINATION ${CMAKE_INSTALL_BINDIR}) -+install(TARGETS exrinfo-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR}) - if(WIN32 AND (BUILD_SHARED_LIBS OR OPENEXR_BUILD_BOTH_STATIC_SHARED)) -- target_compile_definitions(exrinfo PRIVATE OPENEXR_DLL) -+ target_compile_definitions(exrinfo-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL) - endif() -diff --git a/src/bin/exrmakepreview/CMakeLists.txt b/src/bin/exrmakepreview/CMakeLists.txt -index bb8b548..8b5e441 100644 ---- a/src/bin/exrmakepreview/CMakeLists.txt -+++ b/src/bin/exrmakepreview/CMakeLists.txt -@@ -1,17 +1,17 @@ - # SPDX-License-Identifier: BSD-3-Clause - # Copyright (c) Contributors to the OpenEXR Project. - --add_executable(exrmakepreview -+add_executable(exrmakepreview-${OpenEXR_VERSION_MAJOR} - main.cpp - makePreview.cpp - ) --target_link_libraries(exrmakepreview OpenEXR::OpenEXR) --set_target_properties(exrmakepreview PROPERTIES -+target_link_libraries(exrmakepreview-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR) -+set_target_properties(exrmakepreview-${OpenEXR_VERSION_MAJOR} PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" - ) - if(OPENEXR_INSTALL_TOOLS) -- install(TARGETS exrmakepreview DESTINATION ${CMAKE_INSTALL_BINDIR}) -+ install(TARGETS exrmakepreview-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR}) - endif() - if(WIN32 AND BUILD_SHARED_LIBS) -- target_compile_definitions(exrmakepreview PRIVATE OPENEXR_DLL) -+ target_compile_definitions(exrmakepreview-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL) - endif() -diff --git a/src/bin/exrmaketiled/CMakeLists.txt b/src/bin/exrmaketiled/CMakeLists.txt -index 1bc6cf4..6e70cf6 100644 ---- a/src/bin/exrmaketiled/CMakeLists.txt -+++ b/src/bin/exrmaketiled/CMakeLists.txt -@@ -1,18 +1,18 @@ - # SPDX-License-Identifier: BSD-3-Clause - # Copyright (c) Contributors (c) to the OpenEXR Project. - --add_executable(exrmaketiled -+add_executable(exrmaketiled-${OpenEXR_VERSION_MAJOR} - Image.cpp - main.cpp - makeTiled.cpp - ) --target_link_libraries(exrmaketiled OpenEXR::OpenEXR) --set_target_properties(exrmaketiled PROPERTIES -+target_link_libraries(exrmaketiled-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR) -+set_target_properties(exrmaketiled-${OpenEXR_VERSION_MAJOR} PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" - ) - if(OPENEXR_INSTALL_TOOLS) -- install(TARGETS exrmaketiled DESTINATION ${CMAKE_INSTALL_BINDIR}) -+ install(TARGETS exrmaketiled-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR}) - endif() - if(WIN32 AND BUILD_SHARED_LIBS) -- target_compile_definitions(exrmaketiled PRIVATE OPENEXR_DLL) -+ target_compile_definitions(exrmaketiled-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL) - endif() -diff --git a/src/bin/exrmultipart/CMakeLists.txt b/src/bin/exrmultipart/CMakeLists.txt -index 7f8fc1b..3770506 100644 ---- a/src/bin/exrmultipart/CMakeLists.txt -+++ b/src/bin/exrmultipart/CMakeLists.txt -@@ -1,14 +1,14 @@ - # SPDX-License-Identifier: BSD-3-Clause - # Copyright (c) Contributors to the OpenEXR Project. - --add_executable(exrmultipart exrmultipart.cpp) --target_link_libraries(exrmultipart OpenEXR::OpenEXR) --set_target_properties(exrmultipart PROPERTIES -+add_executable(exrmultipart-${OpenEXR_VERSION_MAJOR} exrmultipart.cpp) -+target_link_libraries(exrmultipart-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR) -+set_target_properties(exrmultipart-${OpenEXR_VERSION_MAJOR} PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" - ) - if(OPENEXR_INSTALL_TOOLS) -- install(TARGETS exrmultipart DESTINATION ${CMAKE_INSTALL_BINDIR}) -+ install(TARGETS exrmultipart-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR}) - endif() - if(WIN32 AND BUILD_SHARED_LIBS) -- target_compile_definitions(exrmultipart PRIVATE OPENEXR_DLL) -+ target_compile_definitions(exrmultipart-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL) - endif() -diff --git a/src/bin/exrmultiview/CMakeLists.txt b/src/bin/exrmultiview/CMakeLists.txt -index 05ad081..9e535ad 100644 ---- a/src/bin/exrmultiview/CMakeLists.txt -+++ b/src/bin/exrmultiview/CMakeLists.txt -@@ -1,18 +1,18 @@ - # SPDX-License-Identifier: BSD-3-Clause - # Copyright (c) Contributors to the OpenEXR Project. - --add_executable(exrmultiview -+add_executable(exrmultiview-${OpenEXR_VERSION_MAJOR} - Image.cpp - main.cpp - makeMultiView.cpp - ) --target_link_libraries(exrmultiview OpenEXR::OpenEXR) --set_target_properties(exrmultiview PROPERTIES -+target_link_libraries(exrmultiview-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR) -+set_target_properties(exrmultiview-${OpenEXR_VERSION_MAJOR} PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" - ) - if(OPENEXR_INSTALL_TOOLS) -- install(TARGETS exrmultiview DESTINATION ${CMAKE_INSTALL_BINDIR}) -+ install(TARGETS exrmultiview-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR}) - endif() - if(WIN32 AND BUILD_SHARED_LIBS) -- target_compile_definitions(exrmultiview PRIVATE OPENEXR_DLL) -+ target_compile_definitions(exrmultiview-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL) - endif() -diff --git a/src/bin/exrstdattr/CMakeLists.txt b/src/bin/exrstdattr/CMakeLists.txt -index 79205fc..3ad0ffe 100644 ---- a/src/bin/exrstdattr/CMakeLists.txt -+++ b/src/bin/exrstdattr/CMakeLists.txt -@@ -1,14 +1,14 @@ - # SPDX-License-Identifier: BSD-3-Clause - # Copyright (c) Contributors to the OpenEXR Project. - --add_executable(exrstdattr main.cpp) --target_link_libraries(exrstdattr OpenEXR::OpenEXR) --set_target_properties(exrstdattr PROPERTIES -+add_executable(exrstdattr-${OpenEXR_VERSION_MAJOR} main.cpp) -+target_link_libraries(exrstdattr-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR) -+set_target_properties(exrstdattr-${OpenEXR_VERSION_MAJOR} PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" - ) - if(OPENEXR_INSTALL_TOOLS) -- install(TARGETS exrstdattr DESTINATION ${CMAKE_INSTALL_BINDIR}) -+ install(TARGETS exrstdattr-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR}) - endif() - if(WIN32 AND BUILD_SHARED_LIBS) -- target_compile_definitions(exrstdattr PRIVATE OPENEXR_DLL) -+ target_compile_definitions(exrstdattr-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL) - endif() --- -2.32.0 - diff --git a/media-libs/openexr/openexr-2.5.8.ebuild b/media-libs/openexr/openexr-2.5.8.ebuild new file mode 100644 index 000000000000..50fc19f16ab7 --- /dev/null +++ b/media-libs/openexr/openexr-2.5.8.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CMAKE_ECLASS=cmake +inherit cmake-multilib + +DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries" +HOMEPAGE="https://www.openexr.com/" +SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P}/OpenEXR" + +LICENSE="BSD" +SLOT="0/25" # based on SONAME +# -ppc -sparc because broken on big endian, bug #818424 +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 -ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" +IUSE="cpu_flags_x86_avx doc examples static-libs utils test" +RESTRICT="!test? ( test )" + +RDEPEND=" + ~media-libs/ilmbase-${PV}:=[static-libs?,${MULTILIB_USEDEP}] + sys-libs/zlib[${MULTILIB_USEDEP}] +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +DOCS=( PATENTS README.md ) + +src_prepare() { + # Fix path for testsuite + sed -i -e "s:/var/tmp/:${T}:" "${S}"/IlmImfTest/tmpDir.h || die "failed to set temp path for tests" + + # disable failing tests on various arches + if use test; then + if use abi_x86_32; then + eapply "${FILESDIR}/${PN}-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch" + fi + + # Technically this doesn't disable anything, it just gives this test time to complete. + # Could probably be applied unconditionally but will leave this to the maintainers. + if use riscv; then + eapply "${FILESDIR}/${P}-0002-increase-IlmImfTest-timeout.patch" + fi + + if use sparc; then + eapply "${FILESDIR}/${P}-0001-disable-testRgba-on-sparc.patch" + fi + fi + + multilib_foreach_abi cmake_src_prepare +} + +multilib_src_configure() { + local mycmakeargs=( + -DBUILD_TESTING=$(usex test) + -DINSTALL_OPENEXR_DOCS=$(usex doc) + -DINSTALL_OPENEXR_EXAMPLES=$(usex examples) + -DOPENEXR_BUILD_BOTH_STATIC_SHARED=$(usex static-libs) + -DOPENEXR_BUILD_UTILS=$(usex utils) + -DOPENEXR_INSTALL_PKG_CONFIG=ON + -DOPENEXR_USE_CLANG_TIDY=OFF # don't look for clang-tidy + ) + + cmake_src_configure +} + +multilib_src_install_all() { + if use doc; then + DOCS+=( doc/*.pdf ) + fi + einstalldocs + + use examples && docompress -x /usr/share/doc/${PF}/examples +} diff --git a/media-libs/openexr/openexr-3.1.2.ebuild b/media-libs/openexr/openexr-3.1.2.ebuild deleted file mode 100644 index 5fb127134ee7..000000000000 --- a/media-libs/openexr/openexr-3.1.2.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -MY_PN=OpenEXR -MY_PV=$(ver_cut 1) -MY_P=${MY_PN}-${MY_PV} - -DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries" -HOMEPAGE="https://www.openexr.com/" -SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="3/30" # based on SONAME -# -ppc -sparc because broken on big endian, bug #818424 -KEYWORDS="amd64 ~arm arm64 ~ia64 -ppc ~ppc64 -sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" -IUSE="cpu_flags_x86_avx doc examples large-stack static-libs utils test threads" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/imath-3.1.0:= - sys-libs/zlib -" -DEPEND="${RDEPEND}" -BDEPEND=" - doc? ( dev-python/breathe ) - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-3.1.1-0001-changes-needed-for-proper-slotting.patch - "${FILESDIR}"/${PN}-3.1.1-0002-add-version-to-binaries-for-slotting.patch - "${FILESDIR}"/${PN}-3.1.1-0003-disable-failing-test.patch -) - -DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md docs/SymbolVisibility.md ) - -src_prepare() { - # Fix path for testsuite - sed -e "s:/var/tmp/:${T}:" \ - -i "${S}"/src/test/${MY_PN}{,Fuzz,Util}Test/tmpDir.h || die "failed to set temp path for tests" - - cmake_src_prepare - - mv "${S}"/cmake/${MY_PN}.pc.in "${S}"/cmake/${MY_P}.pc.in || die -} - -src_configure() { - local mycmakeargs=( - -DBUILD_SHARED_LIBS=$(usex !static-libs) - -DBUILD_TESTING=$(usex test) - -DDOCS=$(usex doc) - -DOPENEXR_BUILD_TOOLS=$(usex utils) - -DOPENEXR_ENABLE_LARGE_STACK=$(usex large-stack) - -DOPENEXR_ENABLE_THREADING=$(usex threads) - -DOPENEXR_INSTALL_EXAMPLES=$(usex examples) - -DOPENEXR_INSTALL_PKG_CONFIG=ON - -DOPENEXR_INSTALL_TOOLS=$(usex utils) - -DOPENEXR_OUTPUT_SUBDIR="${MY_P}" - -DOPENEXR_USE_CLANG_TIDY=OFF # don't look for clang-tidy - ) - - use test && mycmakeargs+=( -DOPENEXR_RUN_FUZZ_TESTS=ON ) - - cmake_src_configure -} - -src_install() { - use examples && docompress -x /usr/share/doc/${PF}/examples - cmake_src_install - - newenvd - 99${PN}3 <<-EOF - LDPATH=/usr/$(get_libdir)/${MY_P} - EOF -} diff --git a/media-libs/openexr/openexr-3.1.3.ebuild b/media-libs/openexr/openexr-3.1.3.ebuild deleted file mode 100644 index afd43341887c..000000000000 --- a/media-libs/openexr/openexr-3.1.3.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -MY_PN=OpenEXR -MY_PV=$(ver_cut 1) -MY_P=${MY_PN}-${MY_PV} - -DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries" -HOMEPAGE="https://www.openexr.com/" -SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="3/30" # based on SONAME -# -ppc -sparc because broken on big endian, bug #818424 -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 -ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" -IUSE="cpu_flags_x86_avx doc examples large-stack static-libs utils test threads" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/imath-3.1.0:= - sys-libs/zlib -" -DEPEND="${RDEPEND}" -BDEPEND=" - doc? ( dev-python/breathe ) - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-3.1.1-0001-changes-needed-for-proper-slotting.patch - "${FILESDIR}"/${PN}-3.1.1-0002-add-version-to-binaries-for-slotting.patch - "${FILESDIR}"/${PN}-3.1.1-0003-disable-failing-test.patch -) - -DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md docs/SymbolVisibility.md ) - -src_prepare() { - # Fix path for testsuite - sed -e "s:/var/tmp/:${T}:" \ - -i "${S}"/src/test/${MY_PN}{,Fuzz,Util}Test/tmpDir.h || die "failed to set temp path for tests" - - cmake_src_prepare - - mv "${S}"/cmake/${MY_PN}.pc.in "${S}"/cmake/${MY_P}.pc.in || die -} - -src_configure() { - local mycmakeargs=( - -DBUILD_SHARED_LIBS=$(usex !static-libs) - -DBUILD_TESTING=$(usex test) - -DDOCS=$(usex doc) - -DOPENEXR_BUILD_TOOLS=$(usex utils) - -DOPENEXR_ENABLE_LARGE_STACK=$(usex large-stack) - -DOPENEXR_ENABLE_THREADING=$(usex threads) - -DOPENEXR_INSTALL_EXAMPLES=$(usex examples) - -DOPENEXR_INSTALL_PKG_CONFIG=ON - -DOPENEXR_INSTALL_TOOLS=$(usex utils) - -DOPENEXR_OUTPUT_SUBDIR="${MY_P}" - -DOPENEXR_USE_CLANG_TIDY=OFF # don't look for clang-tidy - ) - - use test && mycmakeargs+=( -DOPENEXR_RUN_FUZZ_TESTS=ON ) - - cmake_src_configure -} - -src_install() { - use examples && docompress -x /usr/share/doc/${PF}/examples - cmake_src_install - - newenvd - 99${PN}3 <<-EOF - LDPATH=/usr/$(get_libdir)/${MY_P} - EOF -} diff --git a/media-libs/openexr/openexr-3.1.4.ebuild b/media-libs/openexr/openexr-3.1.4.ebuild deleted file mode 100644 index de5d41a68c51..000000000000 --- a/media-libs/openexr/openexr-3.1.4.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -MY_PN=OpenEXR -MY_PV=$(ver_cut 1) -MY_P=${MY_PN}-${MY_PV} - -DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries" -HOMEPAGE="https://www.openexr.com/" -SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="3/30" # based on SONAME -# -ppc -sparc because broken on big endian, bug #818424 -KEYWORDS="amd64 ~arm arm64 ~ia64 -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" -IUSE="cpu_flags_x86_avx doc examples large-stack static-libs utils test threads" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/imath-3.1.0:= - sys-libs/zlib -" -DEPEND="${RDEPEND}" -BDEPEND=" - doc? ( dev-python/breathe ) - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-3.1.1-0001-changes-needed-for-proper-slotting.patch - "${FILESDIR}"/${PN}-3.1.1-0002-add-version-to-binaries-for-slotting.patch - "${FILESDIR}"/${PN}-3.1.1-0003-disable-failing-test.patch -) - -DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md docs/SymbolVisibility.md ) - -src_prepare() { - # Fix path for testsuite - sed -e "s:/var/tmp/:${T}:" \ - -i "${S}"/src/test/${MY_PN}{,Fuzz,Util}Test/tmpDir.h || die "failed to set temp path for tests" - - cmake_src_prepare - - mv "${S}"/cmake/${MY_PN}.pc.in "${S}"/cmake/${MY_P}.pc.in || die -} - -src_configure() { - local mycmakeargs=( - -DBUILD_SHARED_LIBS=$(usex !static-libs) - -DBUILD_TESTING=$(usex test) - -DDOCS=$(usex doc) - -DOPENEXR_BUILD_TOOLS=$(usex utils) - -DOPENEXR_ENABLE_LARGE_STACK=$(usex large-stack) - -DOPENEXR_ENABLE_THREADING=$(usex threads) - -DOPENEXR_INSTALL_EXAMPLES=$(usex examples) - -DOPENEXR_INSTALL_PKG_CONFIG=ON - -DOPENEXR_INSTALL_TOOLS=$(usex utils) - -DOPENEXR_OUTPUT_SUBDIR="${MY_P}" - -DOPENEXR_USE_CLANG_TIDY=OFF # don't look for clang-tidy - ) - - use test && mycmakeargs+=( -DOPENEXR_RUN_FUZZ_TESTS=ON ) - - cmake_src_configure -} - -src_install() { - use examples && docompress -x /usr/share/doc/${PF}/examples - cmake_src_install - - newenvd - 99${PN}3 <<-EOF - LDPATH=/usr/$(get_libdir)/${MY_P} - EOF -} diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest index 6ce67e41494b..1275c535b354 100644 --- a/media-libs/openimageio/Manifest +++ b/media-libs/openimageio/Manifest @@ -1,14 +1,11 @@ DIST openimageio-2.2.18.0.tar.gz 29246567 BLAKE2B cb7297028b39b1616962b94aff61f0240b88beeae216c6e39f450cb860660b2c844393a759302dfd325ba95336e06944ad72acfb0e87aa2b1cadfe658bd6bdaa SHA512 22a61e8b1ca098c2293e972372d02f0ac8ce54b46eb957b1ffcacb9e0ca4ff13f560d67804e0db0a898d8bec2fdb73f3cdcd1ee1867f92f97f84c1c111e535be DIST openimageio-2.2.19.0.tar.gz 29252399 BLAKE2B f90b330944885271e117a01235a48f11e88960f5825d0c84e6e2c994479e76a26bf90e66afec4aae6a5c7164510963027bef79fe0265676ce0993235824d461d SHA512 63951d958daaa4bc62fc210efaeced51affd207be21c938ecd5da70217060bb9c8197bf95813e2fddb728a641e69d2889f9445b7d16653a110e45adf3cb86541 -DIST openimageio-2.3.11.0.tar.gz 32439595 BLAKE2B 6e64284c36de87fc077e839db808d4fab0cb6ea4951639cfed21e68900782c03ef6c2e64dcae5c1bf9360ad0a838ee36396d31634ad0ddd20f8fc9f683fc9dc8 SHA512 7e973f4f1b00dfc2486d074f5fdd03aa612a650411c7440868a4846ecfda8b172be33110fce35801dfed92d80f338b989f3ee001191938c48edef5ca760eff3c DIST openimageio-2.3.12.0.tar.gz 32452689 BLAKE2B f5fd428c597b573586a4749b56225ad3c035ab1c2122ff3e93df8e90be5796cc57978aa9fc5b102f2cf64d2407e70a11683b5bbee118c9fac3536b965ed044cc SHA512 c8ec0ead8396717b218d937b9193ef9162c68446f6f1d477f3f0ee4b5656c3d7d53b58bf55aa300fbf57d367a47d795861b5683157e0d0271e0ea56f0460c58d DIST openimageio-2.3.13.0.tar.gz 32456755 BLAKE2B 897a7db0eabb9a7cc29ab8fea368c32fc70b63b5ecebbcfa8d1fffe55c2435d9638f8a1f69069c45fad3723a2b7dc40e83971f48892afc631a7593a7629fb92a SHA512 fbefa341a11fd502ec9313ca48a0fe433c5822699e4934f6a14089f670314cbe1c9c0b9a491b1d1927bda0223e38a62192c6ddeec6c4c5e6215a8b3fb6900dd8 DIST openimageio-oexr-test-image-f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz 252226183 BLAKE2B b94fb08515e18821e5b88c10031ca53675c56f96397e00b4e186d8dfb9f8557bc935ff102d61835590dca6deeef90dba03b81fd76a7958ab4d0592c042c2130a SHA512 26b9b2cda9d48554b8a53f06bc20301f8ff77dc5e1d7caf9ec45aaaefd8578d3d4d4b2e0a1d1b0f697805fdc0c5d4bae4948cea21821df3006ac0f8b9020f85f DIST openimageio-oiio-test-image-b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb.tar.gz 137513393 BLAKE2B ebde02d57daaa58c08c7aab2251c39eefd5b736e1cc4a6d28603d8ee52b7828fa7529c9616207b8b0bcb04d88cd4c60c6325e6f09b4f3410dd6e61c5532b04ad SHA512 840a6785779d85f5da052cb635a92c27451e464414fefd2faaf5fc7a6b78936ff05a6a960c07bb968d7c18e753053ff0f425505de54577d30620fbff9be043fb EBUILD openimageio-2.2.18.0-r1.ebuild 4192 BLAKE2B 00a910784e52d4d50a2920641278b41a53847963d9cc0d31badea2e3a3497242f3af9fe6acec43efce043f7acd724ac8f30f475d7697cdfd73b0f39a59e09fcd SHA512 ba24aa74cbe44ab72f8f33397d0d29409d90b8c0263d4551970cb8e35bae4f28fb975414cddf35cb777597c671a8474e81f4b3157194f9c60b3df9bff265a4f8 EBUILD openimageio-2.2.19.0.ebuild 4205 BLAKE2B ef7cdd667669625a80665df60a203498603704ebdfd8b55eb9f7d4a81dbd62e94401d3e89c086d72f44ee8b82930d89714fdce4a9362925200627220df08365c SHA512 19ed3037b747b83a11ba5bb26f286545db12cb4eda9ac94ce3803f77b45ea37f87f6aa38deea87cf0ae6c955b7dcd34f13881e884254a6ae048111a2b3d5107d -EBUILD openimageio-2.3.11.0-r2.ebuild 5138 BLAKE2B 047c02e1765c1bc1ada09fd7a7b84b2cc9ba0683634e8a8f09d31c776cde68ae82361b38816ab23b6e40fc9a81950ce47e421b5a2227cabeb617b1d8d789d56c SHA512 66b8150acb3cad204ba55b01a6353ce94c8da4bfda734b1481b003a980f925aab1fb078d1bf0371de920bf11635332ee3a657072f73cedbe2e198da4ce1a6c8a -EBUILD openimageio-2.3.11.0.ebuild 4994 BLAKE2B bc098946528cdfc437abdcfdb18cc8c61910f7d9c32733c4d3052c6ae1d8e38eb0f59b7aebe751294980d54ac8bb70bab369ceb51a53e1c3fb40c3d50de030da SHA512 192508d42a4510817d7a2771a4391ef1c1f45e1f469e21b01a82ed2ac752a6edc978ce8e749f5a94d20eb18d935351001aa49378e7c161d3546c6f647d56eebe EBUILD openimageio-2.3.12.0-r3.ebuild 4640 BLAKE2B 7eeca5be1bd3c8e1fc81bf0fd1116aa5448df61d8cacab682a68472171e430c3cc9e1e30640972a927f76770954b5d2491abcde1a1b552bce4695d177971386f SHA512 0bf5d25e8a636a7c1a670d4481d46258f1ed3b6bb33ad64f5203bb0d0f32abf75ab35870f54311b5c4285ef87c383ce88747806269d7659646ff97fa6ea5bd0e EBUILD openimageio-2.3.13.0.ebuild 4642 BLAKE2B 74fa8fee521c7fc17e340b5c3932d3a119fb39a76e908a5d48654650651940f0cce2a7cdbe406da51c57e631301d105df4da59fb9c62765f0758abc6fa6eeee5 SHA512 901764f59f9482769688c5bd5fb1a18592197c6cee09889a88dd190206cd84a0028d40355fd8e46e16953ab4e055ed4ff834734283ade41c2354bafb51e2ab5a MISC metadata.xml 820 BLAKE2B fd092484e492bc042f5cfdbb717963a12596a00514f986cddccd5b8956891c95b996ac1f5831ab2314f0ee3fbe3fa1905e7601a7b017a9a91f2f7c1aba3a9d8f SHA512 5dfc9f4ab3300f94c611822d1b1badb785cfaeab90bdadf5db5e36d1eb6eff8851123470a1863e1a137f94ea4ce286d2b67f6c3a28cb18d65bb177e1d570b7b4 diff --git a/media-libs/openimageio/openimageio-2.3.11.0-r2.ebuild b/media-libs/openimageio/openimageio-2.3.11.0-r2.ebuild deleted file mode 100644 index 79438a824283..000000000000 --- a/media-libs/openimageio/openimageio-2.3.11.0-r2.ebuild +++ /dev/null @@ -1,190 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -FONT_PN=OpenImageIO -PYTHON_COMPAT=( python3_{8..10} ) - -TEST_OIIO_IMAGE_COMMIT="b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb" -TEST_OEXR_IMAGE_COMMIT="f17e353fbfcde3406fe02675f4d92aeae422a560" -inherit cmake font python-single-r1 flag-o-matic - -DESCRIPTION="A library for reading and writing images" -HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO" -SRC_URI="https://github.com/OpenImageIO/oiio/archive/v${PV}.tar.gz -> ${P}.tar.gz" -SRC_URI+=" test? ( - https://github.com/OpenImageIO/oiio-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz - https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz - )" -S="${WORKDIR}/oiio-${PV}" - -LICENSE="BSD" -# TODO: drop .1 on next SONAME change (2.3 -> 2.4?) as we needed to nudge it -# for changing to openexr 3 which broke ABI. -SLOT="0/$(ver_cut 1-2).1" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" - -X86_CPU_FEATURES=( - aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 - avx:avx avx2:avx2 avx512f:avx512f f16c:f16c -) -CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} ) - -IUSE="dicom doc ffmpeg gif jpeg2k opencv opengl openvdb ptex python qt5 raw test +truetype ${CPU_FEATURES[@]%:*}" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -# Not quite working yet -RESTRICT="!test? ( test ) test" - -BDEPEND=" - doc? ( - app-doc/doxygen - dev-texlive/texlive-bibtexextra - dev-texlive/texlive-fontsextra - dev-texlive/texlive-fontutils - dev-texlive/texlive-latex - dev-texlive/texlive-latexextra - ) -" -RDEPEND=" - >=dev-libs/boost-1.62:= - dev-cpp/robin-map - dev-libs/libfmt:= - dev-libs/pugixml:= - >=media-libs/libheif-1.7.0:= - media-libs/libpng:0= - >=media-libs/libwebp-0.2.1:= - dev-libs/imath:= - >=media-libs/opencolorio-2.1.1-r3:= - media-libs/openexr:3= - media-libs/tiff:0= - sys-libs/zlib:= - virtual/jpeg:0 - dicom? ( sci-libs/dcmtk ) - ffmpeg? ( media-video/ffmpeg:= ) - gif? ( media-libs/giflib:0= ) - jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) - opencv? ( media-libs/opencv:= ) - opengl? ( - media-libs/glew:= - virtual/glu - virtual/opengl - ) - openvdb? ( - dev-cpp/tbb:= - media-gfx/openvdb:= - ) - ptex? ( media-libs/ptex:= ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-libs/boost:=[python,${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - ') - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - opengl? ( dev-qt/qtopengl:5 ) - ) - raw? ( media-libs/libraw:= ) - truetype? ( media-libs/freetype:2= ) -" -DEPEND="${RDEPEND}" - -DOCS=( CHANGES.md CREDITS.md README.md ) - -PATCHES=( - "${FILESDIR}"/${PN}-2.3.11.0-imath-openexr-3.patch -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - # Note: on bumps, please try again with OpenEXR 3 + ilmmath! - # Sabotage finding OpenEXR 3 for now to force usage of OpenEXR 2 - # (because it mix and matches which version it uses; sed this to - # make sure it'll use OpenEXR 3 if it can, but it won't.) - # bug #821193 - #sed -i \ - # -e 's/find_package(OpenEXR CONFIG)/find_package(OpenEXR-3 CONFIG)/' \ - # src/cmake/modules/FindOpenEXR.cmake || die - - cmake_src_prepare - cmake_comment_add_subdirectory src/fonts - - if use test ; then - mkdir -p "${BUILD_DIR}"/testsuite || die - mv "${WORKDIR}"/oiio-images-${TEST_OIIO_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/oiio-images || die - mv "${WORKDIR}"/openexr-images-${TEST_OEXR_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/openexr-images || die - fi -} - -src_configure() { - # Build with SIMD support - local cpufeature - local mysimd=() - for cpufeature in "${CPU_FEATURES[@]}"; do - use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}") - done - - # If no CPU SIMDs were used, completely disable them - [[ -z ${mysimd} ]] && mysimd=("0") - - append-cppflags -DOIIO_USING_OPENEXR_3 - - local mycmakeargs=( - -DVERBOSE=ON - -DBUILD_TESTING=$(usex test) - -DOIIO_BUILD_TESTS=$(usex test) - -DINSTALL_FONTS=OFF - -DBUILD_DOCS=$(usex doc) - -DINSTALL_DOCS=$(usex doc) - -DSTOP_ON_WARNING=OFF - -DUSE_CCACHE=OFF - -DUSE_DCMTK=$(usex dicom) - -DUSE_EXTERNAL_PUGIXML=ON - -DUSE_JPEGTURBO=ON - -DUSE_NUKE=OFF # not in Gentoo - -DUSE_FFMPEG=$(usex ffmpeg) - -DUSE_GIF=$(usex gif) - -DUSE_OPENJPEG=$(usex jpeg2k) - -DUSE_OPENCV=$(usex opencv) - -DUSE_OPENGL=$(usex opengl) - -DUSE_OPENVDB=$(usex openvdb) - -DUSE_PTEX=$(usex ptex) - -DUSE_PYTHON=$(usex python) - -DUSE_QT=$(usex qt5) - -DUSE_LIBRAW=$(usex raw) - -DUSE_FREETYPE=$(usex truetype) - -DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}") - ) - if use python; then - mycmakeargs+=( - -DPYTHON_VERSION=${EPYTHON#python} - -DPYTHON_SITE_DIR=$(python_get_sitedir) - ) - fi - - cmake_src_configure -} - -src_install() { - cmake_src_install - # can't use font_src_install - # it does directory hierarchy recreation - FONT_S=( - "${S}/src/fonts/Droid_Sans" - "${S}/src/fonts/Droid_Sans_Mono" - "${S}/src/fonts/Droid_Serif" - ) - insinto ${FONTDIR} - for dir in "${FONT_S[@]}"; do - doins "${dir}"/*.ttf - done -} diff --git a/media-libs/openimageio/openimageio-2.3.11.0.ebuild b/media-libs/openimageio/openimageio-2.3.11.0.ebuild deleted file mode 100644 index 9de77bbf5c52..000000000000 --- a/media-libs/openimageio/openimageio-2.3.11.0.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -FONT_PN=OpenImageIO -PYTHON_COMPAT=( python3_{8..10} ) - -TEST_OIIO_IMAGE_COMMIT="b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb" -TEST_OEXR_IMAGE_COMMIT="f17e353fbfcde3406fe02675f4d92aeae422a560" -inherit cmake font python-single-r1 - -DESCRIPTION="A library for reading and writing images" -HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO" -SRC_URI="https://github.com/OpenImageIO/oiio/archive/v${PV}.tar.gz -> ${P}.tar.gz" -SRC_URI+=" test? ( - https://github.com/OpenImageIO/oiio-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz - https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz - )" -S="${WORKDIR}/oiio-${PV}" - -LICENSE="BSD" -SLOT="0/2.3" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" - -X86_CPU_FEATURES=( - aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 - avx:avx avx2:avx2 avx512f:avx512f f16c:f16c -) -CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} ) - -IUSE="dicom doc ffmpeg gif jpeg2k opencv opengl openvdb ptex python qt5 raw test +truetype ${CPU_FEATURES[@]%:*}" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -# Not quite working yet -RESTRICT="!test? ( test ) test" - -BDEPEND=" - doc? ( - app-doc/doxygen - dev-texlive/texlive-bibtexextra - dev-texlive/texlive-fontsextra - dev-texlive/texlive-fontutils - dev-texlive/texlive-latex - dev-texlive/texlive-latexextra - ) -" -# 2.3.8.0 should support OpenEXR 3 but it seems to prefer OpenEXR 2 -# when installed, so let's stick with that for now. -RDEPEND=" - >=dev-libs/boost-1.62:= - dev-cpp/robin-map - dev-libs/libfmt:= - dev-libs/pugixml:= - >=media-libs/libheif-1.7.0:= - media-libs/libpng:0= - >=media-libs/libwebp-0.2.1:= - media-libs/ilmbase:= - media-libs/opencolorio:= - media-libs/openexr:0= - media-libs/tiff:0= - sys-libs/zlib:= - virtual/jpeg:0 - dicom? ( sci-libs/dcmtk ) - ffmpeg? ( media-video/ffmpeg:= ) - gif? ( media-libs/giflib:0= ) - jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) - opencv? ( media-libs/opencv:= ) - opengl? ( - media-libs/glew:= - virtual/glu - virtual/opengl - ) - openvdb? ( - dev-cpp/tbb:= - media-gfx/openvdb:= - ) - ptex? ( media-libs/ptex:= ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-libs/boost:=[python,${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - ') - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - opengl? ( dev-qt/qtopengl:5 ) - ) - raw? ( media-libs/libraw:= ) - truetype? ( media-libs/freetype:2= ) -" -DEPEND="${RDEPEND}" - -DOCS=( CHANGES.md CREDITS.md README.md ) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - # Note: on bumps, please try again with OpenEXR 3 + ilmmath! - # Sabotage finding OpenEXR 3 for now to force usage of OpenEXR 2 - # (because it mix and matches which version it uses; sed this to - # make sure it'll use OpenEXR 3 if it can, but it won't.) - # bug #821193 - sed -i \ - -e 's/find_package(OpenEXR CONFIG)/find_package(OpenEXR-3 CONFIG)/' \ - src/cmake/modules/FindOpenEXR.cmake || die - - cmake_src_prepare - cmake_comment_add_subdirectory src/fonts - - if use test ; then - mkdir -p "${BUILD_DIR}"/testsuite || die - mv "${WORKDIR}"/oiio-images-${TEST_OIIO_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/oiio-images || die - mv "${WORKDIR}"/openexr-images-${TEST_OEXR_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/openexr-images || die - fi -} - -src_configure() { - # Build with SIMD support - local cpufeature - local mysimd=() - for cpufeature in "${CPU_FEATURES[@]}"; do - use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}") - done - - # If no CPU SIMDs were used, completely disable them - [[ -z ${mysimd} ]] && mysimd=("0") - - local mycmakeargs=( - -DVERBOSE=ON - -DBUILD_TESTING=$(usex test) - -DOIIO_BUILD_TESTS=$(usex test) - -DINSTALL_FONTS=OFF - -DBUILD_DOCS=$(usex doc) - -DINSTALL_DOCS=$(usex doc) - -DSTOP_ON_WARNING=OFF - -DUSE_CCACHE=OFF - -DUSE_DCMTK=$(usex dicom) - -DUSE_EXTERNAL_PUGIXML=ON - -DUSE_JPEGTURBO=ON - -DUSE_NUKE=OFF # not in Gentoo - -DUSE_FFMPEG=$(usex ffmpeg) - -DUSE_GIF=$(usex gif) - -DUSE_OPENJPEG=$(usex jpeg2k) - -DUSE_OPENCV=$(usex opencv) - -DUSE_OPENGL=$(usex opengl) - -DUSE_OPENVDB=$(usex openvdb) - -DUSE_PTEX=$(usex ptex) - -DUSE_PYTHON=$(usex python) - -DUSE_QT=$(usex qt5) - -DUSE_LIBRAW=$(usex raw) - -DUSE_FREETYPE=$(usex truetype) - -DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}") - ) - if use python; then - mycmakeargs+=( - -DPYTHON_VERSION=${EPYTHON#python} - -DPYTHON_SITE_DIR=$(python_get_sitedir) - ) - fi - - cmake_src_configure -} - -src_install() { - cmake_src_install - # can't use font_src_install - # it does directory hierarchy recreation - FONT_S=( - "${S}/src/fonts/Droid_Sans" - "${S}/src/fonts/Droid_Sans_Mono" - "${S}/src/fonts/Droid_Serif" - ) - insinto ${FONTDIR} - for dir in "${FONT_S[@]}"; do - doins "${dir}"/*.ttf - done -} diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest index 2192b3956662..55a846866a83 100644 --- a/media-libs/openjpeg/Manifest +++ b/media-libs/openjpeg/Manifest @@ -1,7 +1,9 @@ AUX openjpeg-2.4.0-gnuinstalldirs.patch 15977 BLAKE2B d1036c329d2f1b829e0bc019d2c761acf2f09a061ccf60421797f89005d194279eb880096d151a379fe3ee7edc36a0d3bceeabae0e8c7d9546baed4b7218d800 SHA512 8563a50c86c10b4306e4fb4a2077094268a58e0e2a468702fdbbccbd5f6db59d2f5a67f772dae17066611c09da0c4baeb6980d3aeddfd0690108336d70f39670 AUX openjpeg-2.4.0-r1-gnuinstalldirs.patch 15897 BLAKE2B ee5b28985348d9da58d930782420aa43d284efd64574d8f8b250e6d115d6bbb6f4756de2ce6e17251f03c1b6b3dbde2c0fa71b2308724eb84354b15fad650ea2 SHA512 899a112fc8dc65d1c17ec68bf80dc0e892e619bfc67b97784e72c0878ed1a0dc44345b9f5b86e4453df27124b20444ab81511fc66f3e871475a93d8f1f7700bc +AUX openjpeg-2.4.0-r2-fix-segfault.patch 721 BLAKE2B b26eaa1de6fc64e21477dbf1baeffae5a7df5f78228be117ff48d1d330e58702b516bcb345eddff03e344338c46b0ce66b6ac64198a9bf8a065e036be1e6c19a SHA512 adda72abdf46b9bd2aa0ddf8a653726181271bf1e680cd8caaa28150ee4ef83437246b563f26607b64305a50d68e7f24da81ccba306ad7451375d71fb896c702 DIST openjpeg-2.4.0.tar.gz 2233229 BLAKE2B ab8907638ac041ce7dcbcbcd9624ea5e4b7542c9ec38a850e363c071c27c4bc8b16e207700b12e67d8d32bdd9b0838735bede27084090ce95105d32c539b09cf SHA512 55daab47d33823af94e32e5d345b52c251a5410f0c8e0a13b693f17899eedc8b2bb107489ddcba9ab78ef17dfd7cd80d3c5ec80c1e429189cb041124b67e07a8 DIST openjpeg-data_20201130.tar.gz 497969983 BLAKE2B 35ff1ee234e3bbf47a822151c97cdf2764f864094973fa60adc7962f8065b38318b0cc41338b5ba3fffd9bb00eac3eaf4153ecc398abd49a8047168414c1c85b SHA512 4c367c8262fe894f90a1e63fb59d87e974ae0d750d3cee89adfe4d765040f0a2049b491a17a34a5b3ba79e183a508c9d592376fe3c112df56c311bf3212f0c31 EBUILD openjpeg-2.4.0-r1.ebuild 4478 BLAKE2B 46a5f1d2ea203610cb86b081c34477f1e8ff10d3467cbdecb5c218870d0e74aeffafd0925c90de5650a775f1b6f417df6ec2afbda3591ad6e9d2b044a11fc315 SHA512 686fdd68d37aa2b40a712b1f51711f509653f553e0dc0d3ad232c721e58146150c23f4eb5ec8c61d4fd147b7a32210664c0990035b2027001cd84c2bfe81db12 +EBUILD openjpeg-2.4.0-r2.ebuild 4540 BLAKE2B 4687d9a0481facc18df6ca69fd4f6065186cae265b0dfd187faf312a4a6258dc5ba18c2cebd9bbf16c99b3942476983fa5a47ae3ed5a4242854b75e6fd178a31 SHA512 92c25bce2326243646e2c9d7cf95053dd64f4ca2727e4a4c38fe03c58b08840ce95e0ea52d21d850528e4b8732f63cf07c4003b46a4b93cd2f6eae5aebe98779 EBUILD openjpeg-2.4.0.ebuild 4467 BLAKE2B c1940c9c26d9e010fee76fe1c5c894a0fbffa5be2bc8eba8bb6d1d74b28e37f3a1e1eaad6a9bab60e58ce82942019a7fe796b2672c518c7c519b5cd05d2778fb SHA512 40d63968fb5f16b086ed154ef407a02f1cac452e82ce4fbd853f05ec76ef336db75be867dd1767c2845019eab72e3a6142d0de526b870b1b9f6d8b847441def2 MISC metadata.xml 311 BLAKE2B f7da3c88ae13437c6dbd48c7468f091d1b87bea39a53a85b4abc97d6beb3869c5bb9bd0aeafb065961611be1098a25fdafd8f9b0eb6e395a0de734fc2df53dd5 SHA512 a5a60bfea83513d0eba56f9873bc2d38ca89bc2fade19744d32b767120b5c9e29f56ebddb903648643517f6e2488525e538a1810d91cc864640312c05b7031b2 diff --git a/media-libs/openjpeg/files/openjpeg-2.4.0-r2-fix-segfault.patch b/media-libs/openjpeg/files/openjpeg-2.4.0-r2-fix-segfault.patch new file mode 100644 index 000000000000..86e1c1fe39cc --- /dev/null +++ b/media-libs/openjpeg/files/openjpeg-2.4.0-r2-fix-segfault.patch @@ -0,0 +1,17 @@ +Upstream: https://github.com/uclouvain/openjpeg/commit/0afbdcf3e6d0d2bd2e16a0c4d513ee3cf86e460d +From: xiaoxiaoafeifei <lliangliang2007@163.com> +Date: Wed, 14 Jul 2021 09:35:13 +0800 +Subject: [PATCH] Fix segfault in src/bin/jp2/opj_decompress.c due to + uninitialized pointer (fixes #1368) (#1369) + +--- a/src/bin/jp2/opj_decompress.c ++++ b/src/bin/jp2/opj_decompress.c +@@ -1356,7 +1356,7 @@ int main(int argc, char **argv) + int it_image; + num_images = get_num_images(img_fol.imgdirpath); + +- dirptr = (dircnt_t*)malloc(sizeof(dircnt_t)); ++ dirptr = (dircnt_t*)calloc(1, sizeof(dircnt_t)); + if (!dirptr) { + destroy_parameters(¶meters); + return EXIT_FAILURE; diff --git a/media-libs/openjpeg/openjpeg-2.4.0-r2.ebuild b/media-libs/openjpeg/openjpeg-2.4.0-r2.ebuild new file mode 100644 index 000000000000..cecc59d76a7f --- /dev/null +++ b/media-libs/openjpeg/openjpeg-2.4.0-r2.ebuild @@ -0,0 +1,140 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_ECLASS=cmake +inherit cmake-multilib flag-o-matic + +# Make sure that test data are not newer than release; +# otherwise we will see "Found-But-No-Test" test failures! +MY_TESTDATA_COMMIT="cd724fb1f93e6af41ebc68c4904f4bf2a4cd1e60" + +DESCRIPTION="Open-source JPEG 2000 library" +HOMEPAGE="https://www.openjpeg.org" +SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz + test? ( https://github.com/uclouvain/openjpeg-data/archive/${MY_TESTDATA_COMMIT}.tar.gz -> ${PN}-data_20201130.tar.gz )" + +LICENSE="BSD-2" +SLOT="2/7" # based on SONAME +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="doc static-libs test" +RESTRICT="!test? ( test )" + +RDEPEND=" + media-libs/lcms:2 + media-libs/libpng:0= + media-libs/tiff:0 + sys-libs/zlib:=" +DEPEND="${RDEPEND}" +BDEPEND=" + doc? ( app-doc/doxygen )" + +DOCS=( AUTHORS.md CHANGELOG.md NEWS.md README.md THANKS.md ) + +PATCHES=( + "${FILESDIR}/${PN}-2.4.0-r1-gnuinstalldirs.patch" # bug 667150 + "${FILESDIR}/${PN}-2.4.0-r2-fix-segfault.patch" # bug 832007 +) + +src_prepare() { + if use test; then + mv "${WORKDIR}"/openjpeg-data-${MY_TESTDATA_COMMIT} "${WORKDIR}"/data || + die "Failed to rename test data" + fi + + cmake_src_prepare +} + +multilib_src_configure() { + local mycmakeargs=( + -DBUILD_PKGCONFIG_FILES=ON # always build pkgconfig files, bug #539834 + -DBUILD_TESTING="$(multilib_native_usex test)" + -DBUILD_DOC=$(multilib_native_usex doc ON OFF) + -DBUILD_CODEC=$(multilib_is_native_abi && echo ON || echo OFF) + -DBUILD_STATIC_LIBS=$(usex static-libs) + ) + + # Cheat a little bit and force disabling fixed point magic + # The test suite is extremely fragile to small changes + # bug 715130, bug 715422 + # https://github.com/uclouvain/openjpeg/issues/1017 + multilib_is_native_abi && use test && append-cflags "-ffp-contract=off" + + cmake_src_configure +} + +multilib_src_test() { + if ! multilib_is_native_abi ; then + elog "Cannot run tests for non-multilib abi." + return 0 + fi + + local myctestargs= + + pushd "${BUILD_DIR}" > /dev/null || die + [[ -e CTestTestfile.cmake ]] || die "Test suite not available! Check source!" + + [[ -n ${TEST_VERBOSE} ]] && myctestargs+=( --extra-verbose --output-on-failure ) + + echo ctest "${myctestargs[@]}" "$@" + if ctest "${myctestargs[@]}" "$@" ; then + einfo "Tests succeeded." + popd > /dev/null || die + return 0 + else + local FAILEDTEST_LOG="${BUILD_DIR}/Testing/Temporary/LastTestsFailed.log" + + if [[ ! -f "${FAILEDTEST_LOG}" ]] ; then + # Should never happen + die "Cannot analyze test failures: LastTestsFailed.log is missing!" + fi + + echo "" + einfo "Note: Upstream is maintaining a list of known test failures." + einfo "We will now compare our test results against this list and sort out any known failure." + + local KNOWN_FAILURES_LIST="${T}/known_failures_compiled.txt" + cat "${S}/tools/travis-ci/knownfailures-all.txt" > "${KNOWN_FAILURES_LIST}" || die + + local ARCH_SPECIFIC_FAILURES= + if use amd64 ; then + ARCH_SPECIFIC_FAILURES="$(find "${S}/tools/travis-ci/" -name 'knownfailures-*x86_64*.txt' -print0 | sort -z | tail -z -n 1 | tr -d '\0')" + elif use x86 || use arm || use arm64; then + ARCH_SPECIFIC_FAILURES="$(find "${S}/tools/travis-ci/" -name 'knownfailures-*i386*.txt' -print0 | sort -z | tail -z -n 1 | tr -d '\0')" + fi + + if [[ -f "${ARCH_SPECIFIC_FAILURES}" ]] ; then + einfo "Adding architecture specific failures (${ARCH_SPECIFIC_FAILURES}) to known failures list ..." + cat "${ARCH_SPECIFIC_FAILURES}" >> "${KNOWN_FAILURES_LIST}" || die + fi + + # Logic copied from $S/tools/travis-ci/run.sh + local FAILEDTEST= + local FAILURES_LOG="${BUILD_DIR}/Testing/Temporary/failures.txt" + local HAS_UNKNOWN_TEST_FAILURES=0 + + echo "" + + awk -F: '{ print $2 }' "${FAILEDTEST_LOG}" > "${FAILURES_LOG}" + while read FAILEDTEST; do + # is this failure known? + if grep -x "${FAILEDTEST}" "${KNOWN_FAILURES_LIST}" > /dev/null; then + ewarn "Test '${FAILEDTEST}' is known to fail, ignoring ..." + continue + fi + + eerror "New/unknown test failure found: '${FAILEDTEST}'" + HAS_UNKNOWN_TEST_FAILURES=1 + done < "${FAILURES_LOG}" + + if [[ ${HAS_UNKNOWN_TEST_FAILURES} -ne 0 ]]; then + die "Test suite failed. New/unknown test failure(s) found!" + else + echo "" + einfo "Test suite passed. No new/unknown test failure(s) found!" + fi + + return 0 + fi +} diff --git a/media-libs/quarter/Manifest b/media-libs/quarter/Manifest index 34a355535585..5de38fc1432c 100644 --- a/media-libs/quarter/Manifest +++ b/media-libs/quarter/Manifest @@ -1,6 +1,5 @@ AUX quarter-1.1.0-cmake.patch 535 BLAKE2B b800b87ff88a824170700f37599bd425c08d2defdd515f98314de531710ff56f916a7619cd9eac35c74664bc7dd55f4320234ac96b0e1c6b08ff64b04c312918 SHA512 fbd981e1af9003ee6f92a6218a2d150b110f3e86c580b2a57a7d5e496f3e7a36e0ee8b5e664ef38b7d5db7294b2500c64e1c8c4adf9a8ee3b877173f409bb411 AUX quarter-1.1.0-find-qhelpgenerator-binary.patch 864 BLAKE2B dbffc6c53bb6834b8825b4c515c749a1fbaf378a7b03b9f9d2509ba72ca9ba363b800f26eed68421e4bca0a68f721e0ef360cd29ca95f465f4fca7ee3054b99d SHA512 23e9a0bb5a3cabe7f2c4e1b977d5a01973331416633fa3f44c1869d22d420a5e60c1d3d61853f422b6ce4340a8b3352031e4a6841fcb4be5c3b0cdf416087ae3 DIST quarter-1.1.0-src.tar.gz 724762 BLAKE2B 8f1f0025706c4502ea178c09204e442b9c52148371863a5a49640ba751084cca9ca464398ee171729d85e8fc2f3fe3ea9d5f0492d114d810527601936abbd1e0 SHA512 2b2649132c66c709e3d5df2a99d621fb9cf61424c5376a5ca6a016ee5c7514841f8bbe390d1acc7b94688a86b56304ed12fb98840e11933162ac6ccb3f3d681c -EBUILD quarter-1.1.0-r1.ebuild 1548 BLAKE2B d5f36f88da213b610d6582c102d489ffe73d9ebeb12abe79b0b51d186072d6b3181d2ee8578d70f59d7f5656e60e4ad2bfaaff7521dcf1f1d12a2e50e2d87114 SHA512 8add446876bc3daae6cb9d45345e0255f4fce5f49b94b19a3c68b449e81cb9e7e81af98fa7eb90fd3bc060acac9d5ae2fdaf261b214552fbd16b3c846ce4a675 -EBUILD quarter-1.1.0.ebuild 1363 BLAKE2B dd6327391b0a12c2987f83b71a66d0e90484d89b5083eab58f79921e2e2a6332613fabdd139062d8bf675e3685c96ff20231a0bc535c386073b907ac2db3c11d SHA512 ea0579d3912689f1a36aca4bf832a2bd69c7446d4271d54e6e59a0acc75bcb0bca7aa4a28c68d3dea8016211ac54e3844cda0e19742da1e46c2571414367ff5f +EBUILD quarter-1.1.0-r1.ebuild 1546 BLAKE2B 3ea895ef2f3cbbffc30aa78ec7f9b29990b7e0043f4318459ad547ea77c13186fed5eec877a3c4f3e4a4cbba8eee02be3451c9abf0d13a414a5d602cfd0c131b SHA512 828f620d46fd8d0f11c58ea8ff5163ac3659940eac53b7d1d8d41425645f352f2eea3141d1f8789101d615123f809a369e0236a1e7e4ef1266675bce2b8ce569 MISC metadata.xml 1095 BLAKE2B d49405831d4200b0294c6bdedee25ce91e91f8a74f69d279fa557ab85df3f4a84b4f65d8824375ef943bbdf135ec0affbbdd74459b7dc3d16c813816c6405ff0 SHA512 c6ddcec450816262a64df90e9f081c0a6eb7572d8d3d2ff0dcf5980263d84ac2425a1d49997072dd9d7baf8e27007944a46a96cfcdde12282e8fcbe84c47fd0a diff --git a/media-libs/quarter/quarter-1.1.0-r1.ebuild b/media-libs/quarter/quarter-1.1.0-r1.ebuild index 9ccb1a4a1aac..2ebeaec65350 100644 --- a/media-libs/quarter/quarter-1.1.0-r1.ebuild +++ b/media-libs/quarter/quarter-1.1.0-r1.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}/quarter" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="debug designer doc man qthelp" REQUIRED_USE=" diff --git a/media-libs/quarter/quarter-1.1.0.ebuild b/media-libs/quarter/quarter-1.1.0.ebuild deleted file mode 100644 index 6567e2ff9627..000000000000 --- a/media-libs/quarter/quarter-1.1.0.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake flag-o-matic - -MY_P=${P/quarter/Quarter} - -HOMEPAGE="https://github.com/coin3d/coin/wiki" -DESCRIPTION="GUI binding for using Coin/Open Inventor with Qt" -SRC_URI="https://github.com/coin3d/quarter/releases/download/${MY_P}/${P}-src.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="amd64 x86" -SLOT="0" -IUSE="debug designer doc man qthelp" - -REQUIRED_USE=" - man? ( doc ) - qthelp? ( doc ) -" - -RDEPEND=" - media-libs/coin - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtopengl:5 - virtual/opengl - designer? ( dev-qt/designer:5 ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( - app-doc/doxygen - qthelp? ( dev-qt/qthelp:5 ) - ) -" - -S="${WORKDIR}/quarter" - -PATCHES=( - "${FILESDIR}"/${PN}-1.1.0-cmake.patch -) - -DOCS=(AUTHORS ChangeLog NEWS README) - -src_configure() { - use debug && append-cppflags -DQUARTER_DEBUG=1 - local mycmakeargs=( - -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" - -DQUARTER_BUILD_SHARED_LIBS=ON - -DQUARTER_BUILD_PLUGIN=$(usex designer) - -DQUARTER_BUILD_EXAMPLES=OFF - -DQUARTER_BUILD_DOCUMENTATION=$(usex doc) - -DQUARTER_BUILD_INTERNAL_DOCUMENTATION=OFF - -DQUARTER_BUILD_DOC_MAN=$(usex man) - -DQUARTER_BUILD_DOC_QTHELP=$(usex qthelp) - -DQUARTER_BUILD_DOC_CHM=OFF - -DQUARTER_USE_QT5=ON - ) - cmake_src_configure -} diff --git a/media-libs/rtaudio/Manifest b/media-libs/rtaudio/Manifest index 9e2592f3da1e..1349172b1b7f 100644 --- a/media-libs/rtaudio/Manifest +++ b/media-libs/rtaudio/Manifest @@ -1,4 +1,4 @@ AUX rtaudio-5.1.0-cflags.patch 416 BLAKE2B 6bc60ee1056a56e84a349b9677ab20a00f50fc22e053e0a2a29167db5f631f57749e96c73bbe585adaa346b878b43c5529f10f18b7153b79c10a4ac418d3c04e SHA512 7afad0bf9b562a9ed91567509aacc94d0cb3d95d8241e2bb14b6c826a499a296b99b7ee13317b65fb3bf4bc2526f357c1a34a290290b3fbd82810a43c820fdbf DIST rtaudio-5.2.0.tar.gz 247110 BLAKE2B 1949885c3cbb2846e083fd25ec06ed5ca716563dd4c121f6985e2487488d88b9ffb62078185fe2f4261083c8c1ed4c3e8502d25614767d70d2ab316d77f51eeb SHA512 34e78522778db13d95d4465d7c6a808a63b34d4e1bd0b88113b6390f7b192017e405d0d9ac8fbb1151129627688626d17569dc47da420f7b4631892eb1adff11 -EBUILD rtaudio-5.2.0.ebuild 1309 BLAKE2B be397ed46c5d7d2d21e5b6b1ddff5cbbf5dbc5d37b4cdbd4c2805fcb19c58a6e55043b79aae6ae06820165c28a7068906886696c9713b5561337d2198fe283a1 SHA512 ae2f87752dcbaa9c018f75cf30e08518720742cab6009df8167d216b51d2ef04488269f561bdb2a715c6007cf3fb385b1b891cf529d4f40a0bea9bd5fe0abe9d +EBUILD rtaudio-5.2.0.ebuild 1316 BLAKE2B 8a7620d8e9248825afdbb85d05dbb0c1fa5ef6e4a0d68533e35e3f5d8f06c3f616b008e00eab0987480aed6486a8bc6d3d20a52491ddfad15ea7c9da99a90600 SHA512 79ac9e1cb1f4ccc7a99618d8a88b4439bdcb8dd9e96e6d8a17b68f67b1e6f2e0effa82b8bc0b4f57738acaa33f15fda5f7b9c8621fee2bd9b261669923e60429 MISC metadata.xml 256 BLAKE2B 211ca90d8f704be5ca8a1994f0e8f1adbe1fd4937a10a301ced0b9be171dfdabb223661d168535cd7f5edfe0c8edca4620945e13dc3c43b5832ac183913188f0 SHA512 fde3b658512fa6742886d7dd84efc906331b43f5b0f8fdca353fe2280653381716d7143473c9237b9fe58b9df5889b38b008da34f6ce4b64336f38642d78e3dd diff --git a/media-libs/rtaudio/rtaudio-5.2.0.ebuild b/media-libs/rtaudio/rtaudio-5.2.0.ebuild index 3c251db639df..8647ed629805 100644 --- a/media-libs/rtaudio/rtaudio-5.2.0.ebuild +++ b/media-libs/rtaudio/rtaudio-5.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/thestk/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}. LICENSE="MIT" SLOT="0/6" -KEYWORDS="amd64 arm64 ~ppc64 x86" +KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" IUSE="+alsa doc jack pulseaudio static-libs" REQUIRED_USE="|| ( alsa jack pulseaudio )" diff --git a/media-libs/sdl_audiolib/Manifest b/media-libs/sdl_audiolib/Manifest new file mode 100644 index 000000000000..694d9709f00d --- /dev/null +++ b/media-libs/sdl_audiolib/Manifest @@ -0,0 +1,4 @@ +DIST sdl_audiolib-0_pre20220410.tar.xz 223932 BLAKE2B 09f35684b64b2b96fd0230612cc8458a8c7b0b94860c9d616c90141cd6d8088048e783170180191ed9998b2601676892686dc7d8373c8507d71db59b919c178b SHA512 01ef7f4d8987e1e27b4413d21eefbb8a83ab720f64ed76fd6314244d0d53bed5a061f4a22d4967e21cc9f6086532d33fea233f3e72e8a7abc5a80108f74710c1 +EBUILD sdl_audiolib-0_pre20220410.ebuild 1595 BLAKE2B baf2f56c4dd09145cf8d4a2f9d024c1677d6fdcd6f8d7d6bbd26e743c481fa2417d934973daf96bb74d66227518125450a912eb09b51a713c442421c74952c13 SHA512 4762073f00aaf4d08bca24d10280d045fb2b52babb05df5d23379820eb9bc1e5d0af6df6055acd29088f679c3ff222bed6a043a73b23890df5918129c2decb93 +EBUILD sdl_audiolib-9999.ebuild 1595 BLAKE2B baf2f56c4dd09145cf8d4a2f9d024c1677d6fdcd6f8d7d6bbd26e743c481fa2417d934973daf96bb74d66227518125450a912eb09b51a713c442421c74952c13 SHA512 4762073f00aaf4d08bca24d10280d045fb2b52babb05df5d23379820eb9bc1e5d0af6df6055acd29088f679c3ff222bed6a043a73b23890df5918129c2decb93 +MISC metadata.xml 716 BLAKE2B 0dcc948edf254f51677cc0d771aa5cb746fb6c64998be5a67eccde1d39730fc768375afe3510ef27b80b903bd41397479736fa431d9b933c2c32567f4d1e8417 SHA512 3d202f15e58075f6ea33b6837c82eca413f99c6b953ec8eca92c7aa8244dd25af76eefc57d56e9bd6bd21c66cb4e9744d6b6c59933964363ec5bfa979e39bf3a diff --git a/media-libs/sdl_audiolib/metadata.xml b/media-libs/sdl_audiolib/metadata.xml new file mode 100644 index 000000000000..d76fa399a830 --- /dev/null +++ b/media-libs/sdl_audiolib/metadata.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>polynomial-c@gentoo.org</email> + <name>Lars Wendler</name> + </maintainer> + <use> + <flag name="fluidsynth">use <pkg>media-sound/fluidsynth</pkg> for MIDI</flag> + <flag name="mpg123">Enable support for mp3 decoding via <pkg>media-sound/mpg123</pkg></flag> + <flag name="openmpt">OpenMPT decoder via <pkg>media-libs/libopenmpt</pkg></flag> + <flag name="soxr">Enable SoX Resampler support via <pkg>media-libs/soxr</pkg></flag> + </use> + <upstream> + <remote-id type="github">realnc/SDL_audiolib</remote-id> + </upstream> +</pkgmetadata> diff --git a/media-libs/sdl_audiolib/sdl_audiolib-0_pre20220410.ebuild b/media-libs/sdl_audiolib/sdl_audiolib-0_pre20220410.ebuild new file mode 100644 index 000000000000..d993c84aa88b --- /dev/null +++ b/media-libs/sdl_audiolib/sdl_audiolib-0_pre20220410.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="audio decoding, resampling and mixing library" +HOMEPAGE="https://github.com/realnc/SDL_audiolib" +if [[ "${PV}" == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/realnc/SDL_audiolib.git" +else + # No official releases from upstream yet + SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz" + KEYWORDS="~amd64 ~x86" +fi +LICENSE="LGPL-3" +SLOT="0" + +IUSE="fluidsynth libsamplerate modplug mpg123 musepack openmpt opus sndfile soxr vorbis" + +RDEPEND=" + media-libs/libsdl2 + fluidsynth? ( media-sound/fluidsynth ) + libsamplerate? ( media-libs/libsamplerate ) + modplug? ( media-libs/libmodplug ) + mpg123? ( media-sound/mpg123 ) + musepack? ( media-sound/musepack-tools ) + openmpt? ( media-libs/libopenmpt ) + opus? ( media-libs/opusfile ) + sndfile? ( media-libs/libsndfile ) + soxr? ( media-libs/soxr ) + vorbis? ( media-libs/libvorbis ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig +" + +src_configure() { + local mycmakeargs=( + -DUSE_DEC_ADLMIDI=OFF + -DUSE_DEC_BASSMIDI=OFF + -DUSE_DEC_FLUIDSYNTH="$(usex fluidsynth)" + -DUSE_DEC_MODPLUG="$(usex modplug)" + -DUSE_DEC_MPG123="$(usex mpg123)" + -DUSE_DEC_MUSEPACK="$(usex musepack)" + -DUSE_DEC_OPENMPT="$(usex openmpt)" + -DUSE_DEC_LIBOPUSFILE="$(usex opus)" + -DUSE_DEC_SNDFILE="$(usex sndfile)" + -DUSE_DEC_LIBVORBIS="$(usex vorbis)" + -DUSE_DEC_WILDMIDI=OFF + -DUSE_DEC_XMP=OFF + -DUSE_RESAMP_SOXR="$(usex soxr)" + -DUSE_RESAMP_SRC="$(usex libsamplerate)" + ) + cmake_src_configure +} diff --git a/media-libs/sdl_audiolib/sdl_audiolib-9999.ebuild b/media-libs/sdl_audiolib/sdl_audiolib-9999.ebuild new file mode 100644 index 000000000000..d993c84aa88b --- /dev/null +++ b/media-libs/sdl_audiolib/sdl_audiolib-9999.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="audio decoding, resampling and mixing library" +HOMEPAGE="https://github.com/realnc/SDL_audiolib" +if [[ "${PV}" == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/realnc/SDL_audiolib.git" +else + # No official releases from upstream yet + SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz" + KEYWORDS="~amd64 ~x86" +fi +LICENSE="LGPL-3" +SLOT="0" + +IUSE="fluidsynth libsamplerate modplug mpg123 musepack openmpt opus sndfile soxr vorbis" + +RDEPEND=" + media-libs/libsdl2 + fluidsynth? ( media-sound/fluidsynth ) + libsamplerate? ( media-libs/libsamplerate ) + modplug? ( media-libs/libmodplug ) + mpg123? ( media-sound/mpg123 ) + musepack? ( media-sound/musepack-tools ) + openmpt? ( media-libs/libopenmpt ) + opus? ( media-libs/opusfile ) + sndfile? ( media-libs/libsndfile ) + soxr? ( media-libs/soxr ) + vorbis? ( media-libs/libvorbis ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig +" + +src_configure() { + local mycmakeargs=( + -DUSE_DEC_ADLMIDI=OFF + -DUSE_DEC_BASSMIDI=OFF + -DUSE_DEC_FLUIDSYNTH="$(usex fluidsynth)" + -DUSE_DEC_MODPLUG="$(usex modplug)" + -DUSE_DEC_MPG123="$(usex mpg123)" + -DUSE_DEC_MUSEPACK="$(usex musepack)" + -DUSE_DEC_OPENMPT="$(usex openmpt)" + -DUSE_DEC_LIBOPUSFILE="$(usex opus)" + -DUSE_DEC_SNDFILE="$(usex sndfile)" + -DUSE_DEC_LIBVORBIS="$(usex vorbis)" + -DUSE_DEC_WILDMIDI=OFF + -DUSE_DEC_XMP=OFF + -DUSE_RESAMP_SOXR="$(usex soxr)" + -DUSE_RESAMP_SRC="$(usex libsamplerate)" + ) + cmake_src_configure +} diff --git a/media-libs/tg_owt/Manifest b/media-libs/tg_owt/Manifest index 2b27bc5016f0..16da389258a2 100644 --- a/media-libs/tg_owt/Manifest +++ b/media-libs/tg_owt/Manifest @@ -1,11 +1,6 @@ -AUX tg_owt-0_pre20210626-allow-disabling-pipewire.patch 1030 BLAKE2B e81b7fa348a1cfb148f0f64524a18ea48fb5cd01104137edb33e85a86c190418c0b8230564026527bea414c27b1a535415ad31279b705ea777241874ae3c1802 SHA512 8b16e49dad06aa71becb535600d411160e1cbef2c2cdc2258aebc282b4b64d87a0011b4c1ade4209116176965be3c2ee8ab2bf0ad5a33c451f184b32d0a7e77a -AUX tg_owt-0_pre20210626-allow-disabling-pulseaudio.patch 3322 BLAKE2B 61f04506af251a52f77a5b1289471e6519bc00aab1f0e2b0b703deec094109537506297dac55d6ece747beab889a2509a71ae862683c87e6f0c006573b3dffab SHA512 7c5a4851cfe982b069c1ce752414a7771805ab1edf00a88d16e46b11cda8a85692cc2534e04a562aba1519638e2c128b66b11f24ac93f7b8e3b2b9be6d031d55 -AUX tg_owt-0_pre20211207-allow-disabling-X11.patch 4240 BLAKE2B 923aea93bcc64c946a5a3729e6e3e419ef78d99ed85195fdc7b364b5eb931350d09c4ae3bfadef4e72fdccfd7c322ac8b6a98fe8a789aa88ed490a57db355ab0 SHA512 d2e05f07a86381aea1bc2cdc7e4dffc6ff2b866769dd7fe20808fdea5e00514830f709bea30123097c5942cddee887aa98cfd4d6ce45dd772a06391e2df0761c AUX tg_owt-0_pre20211207-fix-dcsctp-references.patch 1337 BLAKE2B cf74aefd4a350ebdcef76bbded02fd86fdf499809aef338969d75c5f91ae68b00daac4f2778b5ce2ee89461b81f4702e5181e3ea4aaf7145aea23096b2ba341e SHA512 b21b0fe8f75c1ec03755197b3db82a0fe51d9ba3e2cf6b976392515ba04032f8a676e92ab992aed6525eabb81318282710460bbfa8aa594e7b152129d0314e85 AUX tg_owt-0_pre20220209-allow-disabling-X11.patch 4382 BLAKE2B 26db92be5b8e75542a62618c7cda08dd7a54a95532df616cacb7d5fb2d39ab791758593e8f9a41494e23e529c0dc2a48aca2a87310fdb62acbd27a7eaf456e4e SHA512 dba0d14b14dc63f8372f50ab8cd4cb02067bcdb338d3dfb33ea2d8977eb2fa2738c93edd42b9a36ed97bcbfd2c7a123e27a7b161d318338d0ff1450780abe98a DIST libyuv-ad890067f661dc747a975bc55ba3767fe30d4452.tar.gz 473845 BLAKE2B 664be51c166440e6b03fa98f65d907efc446800804058a5ea7fdf944e12cb1237a1487e83fbe9a2f1ce4c73521234e43632f921ad0333507737d81e1cb23ce8f SHA512 f97529b80a786e2e92443caabebd6d85a42641e10c3d2940b0f69bedf3b8a96c69c3247abddd059c4ddd6f78107ab7214222a4267a559fc2086c8edf5ea1afbc -DIST tg_owt-0_pre20211207.tar.gz 16780636 BLAKE2B bfa35a43b2085b897eb16986ecfb79ece5f8076d88572869580716014a564023dbc156b1d0885685bf04c57e34f26870dde497e8aae9889e5b2eed6d9a012d8e SHA512 7f8b1ae63371106cd59db6e2a290fd24554d31de4188d243ed6645468dad91c9653b7685add61291830e5309284a87512a73b63c3be76f01ea33701c72f48c90 DIST tg_owt-0_pre20220209.tar.gz 16501237 BLAKE2B fb04aca8803645cc107a7e7fbab8d6020ad91f487ece0445aba29dd1127270e8b3a33d51bb35cfc916168df78cbdc98987610b39fd2cf7b86821b4f9733783c9 SHA512 0a35ce3379887b115117188aa8dce44bf89e23ad6f9fab7320a1cd55cdd534bae4c240778a37cb9588cd6acea1e7a83c22c113d608f7bfd5272ee22bb2773af3 -EBUILD tg_owt-0_pre20211207.ebuild 3810 BLAKE2B b8922ae71f3ffc0d96c732c2fb9f7ebf18604fbdb3a1e3d2c56102a2be99e9da30a4ed859be1cef5917e1edf2dc1a3c15acba66a6407b8552ed104353c7b6445 SHA512 c32bf039c100cb47b8bddcb815272f8ccd6067c3adb79009c4b0fc15a2418467e03b4ae5eb68c041fcbcd1f363991d1b6b33fbebbe6beecb94f3eda048d6c1ba EBUILD tg_owt-0_pre20220209.ebuild 3385 BLAKE2B e92281e6da83c725b319e33d3a1c4aa9eaad8a9959cd11d8155a0d62d85e4eb08f51873807b3e24006ae8bb3e1ef93bd4dbc8bedd02b024ab0ca35b903ef50c8 SHA512 217d00d45983c28416e3549846cff8c07c0c33a39059b1634e0c67d700f11dc49dab6b9a46dbbc11ea0da47939df255220a7c94cc1d9120af89d8c0744291d68 MISC metadata.xml 546 BLAKE2B 10baf770f70a00730c78dee6661096db60de2fd04ddd1f36c54d0ad2423ad78127eb70c56e15dba9dbd15ded61d3a9ee0587987e2bf1d6420204dc1a67a6d6c7 SHA512 cbd8187c0c2e0c7824f82d15a6f2162871339350953ff9f09b42f74077c5d53c9456059437360a823739bd06622ac37b86bd5c5ef17ae284dfe71fccb5862760 diff --git a/media-libs/tg_owt/files/tg_owt-0_pre20210626-allow-disabling-pipewire.patch b/media-libs/tg_owt/files/tg_owt-0_pre20210626-allow-disabling-pipewire.patch deleted file mode 100644 index 9cc55585a561..000000000000 --- a/media-libs/tg_owt/files/tg_owt-0_pre20210626-allow-disabling-pipewire.patch +++ /dev/null @@ -1,36 +0,0 @@ -Fix an issue with -DTG_OWT_USE_PIPEWIRE=OFF - -Some files were erroneously being included despite the option being turned off - ---- tg_owt-91d836dc84a16584c6ac52b36c04c0de504d9c34.orig/CMakeLists.txt -+++ tg_owt-91d836dc84a16584c6ac52b36c04c0de504d9c34/CMakeLists.txt -@@ -88,6 +88,7 @@ - init_target(tg_owt) - - if (TG_OWT_USE_PIPEWIRE) -+ link_glib(tg_owt) - if (TG_OWT_DLOPEN_PIPEWIRE) - include(cmake/generate_stubs.cmake) - set(stubs_loc ${webrtc_loc}/modules/desktop_capture/linux) -@@ -169,7 +170,6 @@ - - if (UNIX AND NOT APPLE) - link_x11(tg_owt) -- link_glib(tg_owt) - endif() - - function(add_sublibrary postfix) -@@ -2161,6 +2161,13 @@ - ) - endif() - -+if (NOT TG_OWT_USE_PIPEWIRE) -+ remove_target_sources(tg_owt ${webrtc_loc} -+ modules/desktop_capture/linux/base_capturer_pipewire.cc -+ modules/desktop_capture/linux/base_capturer_pipewire.h -+ ) -+endif() -+ - if (NOT TG_OWT_BUILD_AUDIO_BACKENDS) - remove_target_sources(tg_owt ${webrtc_loc} - rtc_base/win/windows_version.cc diff --git a/media-libs/tg_owt/files/tg_owt-0_pre20210626-allow-disabling-pulseaudio.patch b/media-libs/tg_owt/files/tg_owt-0_pre20210626-allow-disabling-pulseaudio.patch deleted file mode 100644 index 0bddb5fd00f6..000000000000 --- a/media-libs/tg_owt/files/tg_owt-0_pre20210626-allow-disabling-pulseaudio.patch +++ /dev/null @@ -1,90 +0,0 @@ -Add support for -DTG_OWT_BUILD_PULSE_BACKEND - -This is based off of the rtc_include_pulse_audio option in: -* src/modules/audio_device/BUILD.gn - -ALSA must be enabled unless audio support is removed as a whole, see: -* src/modules/audio_device/audio_device_impl.cc - ---- tg_owt-91d836dc84a16584c6ac52b36c04c0de504d9c34.orig/CMakeLists.txt -+++ tg_owt-91d836dc84a16584c6ac52b36c04c0de504d9c34/CMakeLists.txt -@@ -25,12 +25,17 @@ - option(TG_OWT_USE_PIPEWIRE "Use pipewire for desktop capture on non-Apple Unix." ON) - option(TG_OWT_DLOPEN_PIPEWIRE "dlopen pipewire 0.3 for desktop capture on non-Apple Unix." ${not_packaged_build}) - option(TG_OWT_BUILD_AUDIO_BACKENDS "Build webrtc audio backends." ON) -+option(TG_OWT_BUILD_PULSE_BACKEND "Build pulseaudio audio backend on non-Apple Unix." ON) - - if (NOT UNIX OR APPLE) - set(TG_OWT_USE_X11 OFF) - set(TG_OWT_USE_PIPEWIRE OFF) - endif() - -+if (NOT TG_OWT_BUILD_AUDIO_BACKENDS) -+ set(TG_OWT_BUILD_PULSE_BACKEND OFF) -+endif() -+ - if (BUILD_SHARED_LIBS) - set(CMAKE_POSITION_INDEPENDENT_CODE ON) - endif() -@@ -162,9 +167,11 @@ - link_libvpx(tg_owt) - - if (TG_OWT_BUILD_AUDIO_BACKENDS AND (UNIX AND NOT APPLE)) -- link_libalsa(tg_owt) -- link_libpulse(tg_owt) - link_dl(tg_owt) -+ link_libalsa(tg_owt) -+ if (TG_OWT_BUILD_PULSE_BACKEND) -+ link_libpulse(tg_owt) -+ endif() - endif() - - if (NOT WIN32 AND NOT APPLE) -@@ -2218,12 +2225,6 @@ - modules/audio_device/linux/audio_mixer_manager_alsa_linux.h - modules/audio_device/linux/latebindingsymboltable_linux.cc - modules/audio_device/linux/latebindingsymboltable_linux.h -- modules/audio_device/linux/audio_device_pulse_linux.cc -- modules/audio_device/linux/audio_device_pulse_linux.h -- modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc -- modules/audio_device/linux/audio_mixer_manager_pulse_linux.h -- modules/audio_device/linux/pulseaudiosymboltable_linux.cc -- modules/audio_device/linux/pulseaudiosymboltable_linux.h - modules/audio_device/mac/audio_device_mac.cc - modules/audio_device/mac/audio_device_mac.h - modules/audio_device/mac/audio_mixer_manager_mac.cc -@@ -2243,6 +2244,17 @@ - ) - endif() - -+if (NOT TG_OWT_BUILD_PULSE_BACKEND) -+ remove_target_sources(tg_owt ${webrtc_loc} -+ modules/audio_device/linux/audio_device_pulse_linux.cc -+ modules/audio_device/linux/audio_device_pulse_linux.h -+ modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc -+ modules/audio_device/linux/audio_mixer_manager_pulse_linux.h -+ modules/audio_device/linux/pulseaudiosymboltable_linux.cc -+ modules/audio_device/linux/pulseaudiosymboltable_linux.h -+ ) -+endif() -+ - if (NOT WIN32) - remove_target_sources(tg_owt ${webrtc_loc} - rtc_base/win32.cc ---- tg_owt-91d836dc84a16584c6ac52b36c04c0de504d9c34.orig/cmake/libwebrtcbuild.cmake -+++ tg_owt-91d836dc84a16584c6ac52b36c04c0de504d9c34/cmake/libwebrtcbuild.cmake -@@ -50,8 +50,13 @@ - target_compile_definitions(libwebrtcbuild - INTERFACE - WEBRTC_ENABLE_LINUX_ALSA -- WEBRTC_ENABLE_LINUX_PULSE - ) -+ if (TG_OWT_BUILD_PULSE_BACKEND) -+ target_compile_definitions(libwebrtcbuild -+ INTERFACE -+ WEBRTC_ENABLE_LINUX_PULSE -+ ) -+ endif() - endif() - - if (WIN32) diff --git a/media-libs/tg_owt/files/tg_owt-0_pre20211207-allow-disabling-X11.patch b/media-libs/tg_owt/files/tg_owt-0_pre20211207-allow-disabling-X11.patch deleted file mode 100644 index 0abb3cfb4a37..000000000000 --- a/media-libs/tg_owt/files/tg_owt-0_pre20211207-allow-disabling-X11.patch +++ /dev/null @@ -1,115 +0,0 @@ -Add -DTG_OWT_USE_X11 - -Allows disabling X11 desktop capturing independently of pipewire support, for -the few people that run wayland without any X11 support whatsoever. - -This setup is untested, but supported by the GNI build system, see: -* src/modules/desktop_capture/BUILD.gn (option rtc_use_x11_extensions) - -Toggling the WEBRTC_USE_X11 define also affects some files under -src/modules/audio_device, but that falls under "X11 support", regardless... - ---- tg_owt-d5c3d43b959c7e9e7d8004b9b7fdadd12ce7d589.orig/CMakeLists.txt -+++ tg_owt-d5c3d43b959c7e9e7d8004b9b7fdadd12ce7d589/CMakeLists.txt -@@ -21,11 +21,13 @@ - - option(BUILD_SHARED_LIBS "Builds shared libraries instead of static." ${TG_OWT_PACKAGED_BUILD}) - option(TG_OWT_USE_PROTOBUF "Use protobuf to generate additional headers. Useful for packaged build." ${BUILD_SHARED_LIBS}) -+option(TG_OWT_USE_X11 "Use X11 for desktop capture on non-Apple Unix." ON) - option(TG_OWT_USE_PIPEWIRE "Use pipewire for desktop capture on non-Apple Unix." ON) - option(TG_OWT_DLOPEN_PIPEWIRE "dlopen pipewire 0.3 for desktop capture on non-Apple Unix." ${not_packaged_build}) - option(TG_OWT_BUILD_AUDIO_BACKENDS "Build webrtc audio backends." ON) - - if (NOT UNIX OR APPLE) -+ set(TG_OWT_USE_X11 OFF) - set(TG_OWT_USE_PIPEWIRE OFF) - endif() - -@@ -84,6 +86,10 @@ - add_library(tg_owt) - init_target(tg_owt) - -+if (TG_OWT_USE_X11) -+ link_x11(tg_owt) -+endif() -+ - if (TG_OWT_USE_PIPEWIRE) - link_glib(tg_owt) - if (TG_OWT_DLOPEN_PIPEWIRE) -@@ -161,10 +167,6 @@ - include(cmake/libwebrtcbuild.cmake) - target_link_libraries(tg_owt PUBLIC tg_owt::libwebrtcbuild) - --if (UNIX AND NOT APPLE) -- link_x11(tg_owt) --endif() -- - function(add_sublibrary postfix) - add_library(tg_owt_${postfix} OBJECT) - init_feature_target(tg_owt_${postfix} ${postfix}) -@@ -2204,6 +2206,37 @@ - ) - endif() - -+if (NOT TG_OWT_USE_X11) -+ remove_target_sources(tg_owt ${webrtc_loc} -+ modules/desktop_capture/linux/mouse_cursor_monitor_x11.cc -+ modules/desktop_capture/linux/mouse_cursor_monitor_x11.h -+ modules/desktop_capture/linux/screen_capturer_x11.cc -+ modules/desktop_capture/linux/screen_capturer_x11.h -+ modules/desktop_capture/linux/shared_x_display.cc -+ modules/desktop_capture/linux/shared_x_display.h -+ modules/desktop_capture/linux/window_capturer_x11.cc -+ modules/desktop_capture/linux/window_capturer_x11.h -+ modules/desktop_capture/linux/window_finder_x11.cc -+ modules/desktop_capture/linux/window_finder_x11.h -+ modules/desktop_capture/linux/window_list_utils.cc -+ modules/desktop_capture/linux/window_list_utils.h -+ modules/desktop_capture/linux/x_atom_cache.cc -+ modules/desktop_capture/linux/x_atom_cache.h -+ modules/desktop_capture/linux/x_error_trap.cc -+ modules/desktop_capture/linux/x_error_trap.h -+ modules/desktop_capture/linux/x_server_pixel_buffer.cc -+ modules/desktop_capture/linux/x_server_pixel_buffer.h -+ modules/desktop_capture/linux/x_window_property.cc -+ modules/desktop_capture/linux/x_window_property.h -+ -+ modules/desktop_capture/screen_drawer.cc -+ modules/desktop_capture/screen_drawer.h -+ modules/desktop_capture/screen_drawer_linux.cc -+ modules/desktop_capture/screen_drawer_lock_posix.cc -+ modules/desktop_capture/screen_drawer_lock_posix.h -+ ) -+endif() -+ - if (NOT TG_OWT_USE_PIPEWIRE) - remove_target_sources(tg_owt ${webrtc_loc} - modules/desktop_capture/linux/base_capturer_pipewire.cc ---- tg_owt-d5c3d43b959c7e9e7d8004b9b7fdadd12ce7d589.orig/cmake/libwebrtcbuild.cmake -+++ tg_owt-d5c3d43b959c7e9e7d8004b9b7fdadd12ce7d589/cmake/libwebrtcbuild.cmake -@@ -28,6 +28,13 @@ - BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0 - ) - -+if (TG_OWT_USE_X11) -+ target_compile_definitions(libwebrtcbuild -+ INTERFACE -+ WEBRTC_USE_X11 -+ ) -+endif() -+ - if (TG_OWT_USE_PIPEWIRE) - target_compile_definitions(libwebrtcbuild - INTERFACE -@@ -64,11 +71,6 @@ - INTERFACE - WEBRTC_MAC - ) -- else() -- target_compile_definitions(libwebrtcbuild -- INTERFACE -- WEBRTC_USE_X11 -- ) - endif() - - if (CMAKE_SYSTEM_NAME STREQUAL "Linux") diff --git a/media-libs/tg_owt/tg_owt-0_pre20211207.ebuild b/media-libs/tg_owt/tg_owt-0_pre20211207.ebuild deleted file mode 100644 index a1476f496136..000000000000 --- a/media-libs/tg_owt/tg_owt-0_pre20211207.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 2020-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic - -DESCRIPTION="WebRTC build for Telegram" -HOMEPAGE="https://github.com/desktop-app/tg_owt" - -TG_OWT_COMMIT="d5c3d43b959c7e9e7d8004b9b7fdadd12ce7d589" -LIBYUV_COMMIT="ad890067f661dc747a975bc55ba3767fe30d4452" -SRC_URI="https://github.com/desktop-app/tg_owt/archive/${TG_OWT_COMMIT}.tar.gz -> ${P}.tar.gz - https://archive.org/download/libyuv-${LIBYUV_COMMIT}.tar/libyuv-${LIBYUV_COMMIT}.tar.gz" -S="${WORKDIR}/${PN}-${TG_OWT_COMMIT}" -# Fetch libyuv archive from: https://chromium.googlesource.com/libyuv/libyuv/+archive/${LIBYUV_COMMIT}.tar.gz - -LICENSE="BSD" -SLOT="0/${PV##*pre}" -KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv" -IUSE="screencast +X" - -# This package's USE flags may change the ABI and require a rebuild of -# dependent pacakges. As such, one should make sure to depend on -# media-libs/tg_owt[x=,y=,z=] for any package that uses this. - -# Bundled libs: -# - libyuv (no stable versioning, www-client/chromium and media-libs/libvpx bundle it) -# - libsrtp (project uses private APIs) -# - pffft (no stable versioning, patched) -# media-libs/libjpeg-turbo is required for libyuv -DEPEND=" - dev-cpp/abseil-cpp:=[cxx17(+)] - dev-libs/libevent:= - dev-libs/openssl:= - dev-libs/protobuf:= - media-libs/libjpeg-turbo:= - >=media-libs/libvpx-1.10.0:= - media-libs/openh264:= - media-libs/opus - media-video/ffmpeg:= - net-libs/usrsctp - screencast? ( - dev-libs/glib:2 - media-video/pipewire:= - ) - X? ( - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXrender - x11-libs/libXrandr - x11-libs/libXtst - ) -" -RDEPEND="${DEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/tg_owt-0_pre20210626-allow-disabling-pipewire.patch" - "${FILESDIR}/tg_owt-0_pre20211207-allow-disabling-X11.patch" - "${FILESDIR}/tg_owt-0_pre20210626-allow-disabling-pulseaudio.patch" - "${FILESDIR}/tg_owt-0_pre20211207-fix-dcsctp-references.patch" -) - -src_unpack() { - unpack "${P}.tar.gz" - cd "${S}/src/third_party/libyuv" || die - unpack "libyuv-${LIBYUV_COMMIT}.tar.gz" -} - -src_prepare() { - # libvpx source files aren't included in the repository - sed -i '/include(cmake\/libvpx.cmake)/d' CMakeLists.txt || die - - # libopenh264 has GENERATED files with yasm that aren't excluded by - # EXCLUDE_FROM_ALL, and I have no clue how to avoid this. - # These source files aren't used with system-openh264, anyway. - sed -i '/include(cmake\/libopenh264.cmake)/d' CMakeLists.txt || die - - cmake_src_prepare -} - -src_configure() { - # Defined by -DCMAKE_BUILD_TYPE=Release, avoids crashes - # see https://bugs.gentoo.org/754012 - # EAPI 8 still wipes this flag. - append-cppflags '-DNDEBUG' - - local mycmakeargs=( - -DTG_OWT_USE_X11=$(usex X) - -DTG_OWT_USE_PIPEWIRE=$(usex screencast) - - # Not required by net-im/telegram-desktop right now, I'd rather avoid - # the (ABI compatibility) headache. - -DTG_OWT_BUILD_AUDIO_BACKENDS=OFF - #-DTG_OWT_BUILD_AUDIO_BACKENDS=$(usex alsa) - #-DTG_OWT_BUILD_PULSE_BACKEND=$(usex pulseaudio) - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - - # Save about 15MB of useless headers - rm -r "${ED}/usr/include/tg_owt/rtc_base/third_party" || die - rm -r "${ED}/usr/include/tg_owt/common_audio/third_party" || die - rm -r "${ED}/usr/include/tg_owt/modules/third_party" || die - rm -r "${ED}/usr/include/tg_owt/third_party" || die - - # Install a few headers anyway, as required by net-im/telegram-desktop... - local headers=( - third_party/libyuv/include - rtc_base/third_party/sigslot - rtc_base/third_party/base64 - ) - for dir in "${headers[@]}"; do - pushd "${S}/src/${dir}" > /dev/null || die - find -type f -name "*.h" -exec install -Dm644 '{}' "${ED}/usr/include/tg_owt/${dir}/{}" \; || die - popd > /dev/null || die - done -} |