summaryrefslogtreecommitdiff
path: root/media-libs
diff options
context:
space:
mode:
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/Manifest.gzbin64654 -> 64644 bytes
-rw-r--r--media-libs/aubio/Manifest2
-rw-r--r--media-libs/aubio/aubio-0.4.9-r1.ebuild3
-rw-r--r--media-libs/chromaprint/Manifest4
-rw-r--r--media-libs/chromaprint/chromaprint-1.5.0.ebuild46
-rw-r--r--media-libs/chromaprint/chromaprint-1.5.1.ebuild4
-rw-r--r--media-libs/codec2/Manifest8
-rw-r--r--media-libs/codec2/codec2-1.0.0.ebuild26
-rw-r--r--media-libs/codec2/codec2-1.0.1-r1.ebuild31
-rw-r--r--media-libs/codec2/codec2-1.0.3.ebuild9
-rw-r--r--media-libs/codec2/files/codec2-1.0.1-fix-freedv-callback.patch48
-rw-r--r--media-libs/codec2/files/codec2-1.0.1-static-rx_filter_coh.patch13
-rw-r--r--media-libs/gmmlib/Manifest8
-rw-r--r--media-libs/gmmlib/gmmlib-21.3.5.ebuild4
-rw-r--r--media-libs/gmmlib/gmmlib-22.0.0.ebuild4
-rw-r--r--media-libs/gmmlib/gmmlib-22.0.1.ebuild33
-rw-r--r--media-libs/gmmlib/gmmlib-22.0.2.ebuild33
-rw-r--r--media-libs/grilo/Manifest4
-rw-r--r--media-libs/grilo/grilo-0.3.13.ebuild77
-rw-r--r--media-libs/grilo/grilo-0.3.14.ebuild4
-rw-r--r--media-libs/gsound/Manifest2
-rw-r--r--media-libs/gsound/gsound-1.0.2-r1.ebuild40
-rw-r--r--media-libs/gupnp-dlna/Manifest6
-rw-r--r--media-libs/gupnp-dlna/gupnp-dlna-0.10.5.ebuild60
-rw-r--r--media-libs/gupnp-dlna/gupnp-dlna-0.11.0.ebuild45
-rw-r--r--media-libs/gupnp-dlna/gupnp-dlna-0.12.0.ebuild4
-rw-r--r--media-libs/hamlib/Manifest2
-rw-r--r--media-libs/hamlib/hamlib-4.4.ebuild4
-rw-r--r--media-libs/harfbuzz/Manifest6
-rw-r--r--media-libs/harfbuzz/harfbuzz-3.1.2.ebuild4
-rw-r--r--media-libs/harfbuzz/harfbuzz-3.3.1.ebuild (renamed from media-libs/harfbuzz/harfbuzz-3.1.1.ebuild)4
-rw-r--r--media-libs/lcms/Manifest2
-rw-r--r--media-libs/lcms/lcms-2.13.ebuild51
-rw-r--r--media-libs/libglvnd/Manifest2
-rw-r--r--media-libs/libglvnd/libglvnd-1.4.0.ebuild2
-rw-r--r--media-libs/libsdl2/Manifest2
-rw-r--r--media-libs/libsdl2/libsdl2-2.0.20-r1.ebuild (renamed from media-libs/libsdl2/libsdl2-2.0.20.ebuild)3
-rw-r--r--media-libs/libsidplay/Manifest2
-rw-r--r--media-libs/libsidplay/metadata.xml4
-rw-r--r--media-libs/libwebp/Manifest2
-rw-r--r--media-libs/libwebp/libwebp-1.2.2.ebuild70
-rw-r--r--media-libs/libwmf/Manifest2
-rw-r--r--media-libs/libwmf/libwmf-0.2.8.4-r9.ebuild (renamed from media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild)1
-rw-r--r--media-libs/mesa/Manifest4
-rw-r--r--media-libs/mesa/mesa-21.3.4.ebuild2
-rw-r--r--media-libs/mesa/mesa-21.3.5.ebuild552
-rw-r--r--media-libs/mlt/Manifest4
-rw-r--r--media-libs/mlt/mlt-7.2.0-r1.ebuild156
-rw-r--r--media-libs/mlt/mlt-7.4.0.ebuild2
-rw-r--r--media-libs/netpbm/Manifest2
-rw-r--r--media-libs/netpbm/netpbm-10.86.30.ebuild224
-rw-r--r--media-libs/opencv/Manifest6
-rw-r--r--media-libs/opencv/opencv-4.5.0-r3.ebuild566
-rw-r--r--media-libs/opencv/opencv-4.5.1-r3.ebuild568
-rw-r--r--media-libs/openexr/Manifest2
-rw-r--r--media-libs/openexr/openexr-3.1.4.ebuild78
-rw-r--r--media-libs/openh264/Manifest2
-rw-r--r--media-libs/openh264/openh264-2.2.0.ebuild116
-rw-r--r--media-libs/pcaudiolib/Manifest2
-rw-r--r--media-libs/pcaudiolib/pcaudiolib-1.1.ebuild4
-rw-r--r--media-libs/portmidi/Manifest2
-rw-r--r--media-libs/portmidi/portmidi-234.ebuild3
-rw-r--r--media-libs/rubberband/Manifest5
-rw-r--r--media-libs/rubberband/files/rubberband-2.0.1-build.patch164
-rw-r--r--media-libs/rubberband/rubberband-2.0.2.ebuild (renamed from media-libs/rubberband/rubberband-1.9.2.ebuild)19
-rw-r--r--media-libs/sdl2-ttf/Manifest2
-rw-r--r--media-libs/sdl2-ttf/sdl2-ttf-2.0.18-r1.ebuild2
-rw-r--r--media-libs/stk/Manifest2
-rw-r--r--media-libs/stk/stk-4.6.2.ebuild4
-rw-r--r--media-libs/virglrenderer/Manifest2
-rw-r--r--media-libs/virglrenderer/virglrenderer-0.9.1.ebuild4
-rw-r--r--media-libs/vulkan-loader/Manifest2
-rw-r--r--media-libs/vulkan-loader/vulkan-loader-1.2.198-r1.ebuild67
-rw-r--r--media-libs/zita-alsa-pcmi/Manifest2
-rw-r--r--media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.4.0.ebuild2
75 files changed, 1484 insertions, 1769 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index a6333ee5b283..d7a4a41f79ac 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
Binary files differ
diff --git a/media-libs/aubio/Manifest b/media-libs/aubio/Manifest
index 52647843bcb3..f85e3826aa17 100644
--- a/media-libs/aubio/Manifest
+++ b/media-libs/aubio/Manifest
@@ -1,4 +1,4 @@
AUX aubio-0.4.9-docdir.patch 1192 BLAKE2B 617f5a63d51440eba157687b752822b3e14316781d3534c63194c9bef214574f195d3dfb949fc357862c7ddab01e0f9bb58ea54a75dac4c90f27a24f0c1cf477 SHA512 dffe872bd5c63eb874f00b1303e63f241d9b349d5f32fbf34b659b6211cc9cc828784bb3f5ddd2210c9e6b8459a73e842988bad4474b19e319145971de138526
DIST aubio-0.4.9.tar.bz2 397604 BLAKE2B b849d92678ea8fb20e17921b1a61fdc85a84d4a528acfefa3278169ab5f7fe935217ec37dd9f931202f0f0a1fd3a9518372afbce34cc2dd3ca30c6b4e5d9a301 SHA512 0cb81bb4b15051db3f3f4d160d500af56fdfb237e0a74e3f366f53c2870030aa0a7cee8469a611a9694c36b8866d3d42ffb48241c999de08f3fee43e6d903130
-EBUILD aubio-0.4.9-r1.ebuild 2889 BLAKE2B fe56be741202f0b276597d2deac892a43e3851b41fd6aed4501e9fe58000276f6974eada9e66ec4a5ad334e4ff5b8182ddfac6a0f2ebef409b9b9e7285a77f7d SHA512 5f6361a838acf21c30972331d5cc0b919bfa7742314ff23a5ee901f5130105494a87fe50bedde4f34984926116e894a466dfd8ec5c90f3224c6516e06ae5056a
+EBUILD aubio-0.4.9-r1.ebuild 2861 BLAKE2B 2371dd722efc7383dc40556a4ce329dd356aef10abcc5324f0a4a76e1cddebaeb986910e827a3e9d53453415d5cca497f38724fcfa3d80196578d8eb383af1b7 SHA512 514544fd7835413ebcda7b08ca1c6b3757042878810e96899b622c28d95dbb3122ce4a7fb78b34d5159315ab0984630849f9c99053d3218406ebbfcde48c782b
MISC metadata.xml 347 BLAKE2B f7d98421cac20a208edfa27aa0f7cf90749ae2ccf6db3b2504b7fef79f305e5b3d42adf63848ead968a47491f394ddd20c7c9eba78134e72f849d83636cf4fe6 SHA512 f4ca8b9029523bbcb1e4541033555eadf40fb61024f224545d41ce33b5647a213ffe6f15f7d1a088d192a9d240dd621fda3eb78a8b4c2a53d0f2b925673acd23
diff --git a/media-libs/aubio/aubio-0.4.9-r1.ebuild b/media-libs/aubio/aubio-0.4.9-r1.ebuild
index 33eae76c51c9..579361fe63c9 100644
--- a/media-libs/aubio/aubio-0.4.9-r1.ebuild
+++ b/media-libs/aubio/aubio-0.4.9-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_SETUPTOOLS=no
PYTHON_COMPAT=( python3_{7..9} )
PYTHON_REQ_USE='threads(+)'
inherit distutils-r1 waf-utils
diff --git a/media-libs/chromaprint/Manifest b/media-libs/chromaprint/Manifest
index 64ba06cd9814..ecf85b0710b7 100644
--- a/media-libs/chromaprint/Manifest
+++ b/media-libs/chromaprint/Manifest
@@ -1,6 +1,4 @@
-DIST chromaprint-1.5.0.tar.gz 615217 BLAKE2B 14bf219c23360028ac232e67b7eb36e3226bb6e19838ef239266a9d826e1bd50d798f69f961bcb78f36baf48630a93f53243f8f9ab6187c403382bab23042630 SHA512 25ab3f7834581a8204ac09614fef6036c801f5f8b7b72a864701ca0de8082b2458a2bd7c075d53451581d770898576411cdcfb23ce609bc82f9d9b395cc1a129
DIST chromaprint-1.5.1.tar.gz 1581159 BLAKE2B 9f7f030e97d3114cf679df298d313ea826c0fb05e7e7d8a10090d0a27ed0811b380b81b29fce973e0493826c478964367396311fd0484619cb2fc4c2d8e0d4c0 SHA512 ea16e4d2b879c15b1d9b9ec93878da8b893f1834c70942663e1d2d106c2e0a661094fe2dd3bae7a6c2a1f9d5d8fab5e0b0ba493561090cf57b2228606fad1e66
DIST gtest-1.10.0.tar.gz 904227 BLAKE2B 96b97b06730a9f55505a4d40bd4861560503a1437d29dadc6e8d3c743ccde020e61b3f96082fb9bda0666d739e69d3990bad06161e9c531c40021dc0826f5547 SHA512 7ebf5b4a80f364564066ccc7ce2e2092b12942a754c4854afd97380f19811e0fd45c300d423234cda0e05966ddbdaebcb1625e856ce55b0c81b0bae0dd971532
-EBUILD chromaprint-1.5.0.ebuild 1335 BLAKE2B 72e5ae920e50b84fc4397c43e3ed7d59fae119a431d3a49cd9ed768fa145193a5d1c160cda28c56861ddeeaf69d964c77ffa52adc32e2628d1fb54eb7fdb132f SHA512 50bc22f297910367e12efdd7a93a67e86e0dc06542ac219e2a400d4506e30601558b18c9987fa40ca913918f9e9d3c6f98a0bc521a20723d317d03ae660acb3f
-EBUILD chromaprint-1.5.1.ebuild 1307 BLAKE2B 8b946463fa94006e32282e27b8cb4c990d12f389a2e2dd463fe01fb7e9e6fd1bb8cebd2520d94bfcdef57e14b080ee1b9115c3fc83e75de53612374ef9d5e838 SHA512 df8b455d751a30725ea7d04f2d04dd8b5191cb28795b16c29799496b06bdaf23d667d57c1e95d685dc25c00fad83d4986a5784b775fb3278ef574a47171eb3b8
+EBUILD chromaprint-1.5.1.ebuild 1300 BLAKE2B ac5a54d0965f922f3b29e65b42a02eb47ed2707ed7cf2b338e37a3791596f7b67bd78b913fbee3613c9bf20be1180bb28da0210ad1a019216b972077113351d6 SHA512 deb96d762d15d06c584839806b1487b9088236d41e7e284ab2de4837e247053a1e6ce271b2a9c89eb2988d2cc7229eedd9515e0d90eae9c0a5732e4119e9e906
MISC metadata.xml 503 BLAKE2B badb1250c59d72306e528508fe7016028a5aec5f349ad050437ba4c818ed0fc9d63efcdab5774b5ad94956067fe4243f6f4aff5423e25a2ac9685e147590d976 SHA512 b10104402e9b04d904a9ef4e6876bb52764ccf4a0b38b1f5ef7b5b9534737e64b285bfafdb3e9f7582fc21d0204f52014cd7eea6e22c8097ac46f15c111971c3
diff --git a/media-libs/chromaprint/chromaprint-1.5.0.ebuild b/media-libs/chromaprint/chromaprint-1.5.0.ebuild
deleted file mode 100644
index 67c9ef1d4a79..000000000000
--- a/media-libs/chromaprint/chromaprint-1.5.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-GTEST_VERSION="1.10.0"
-GTEST_DIR_VERSION="1.10.x"
-inherit cmake-multilib
-
-DESCRIPTION="Library implementing a custom algorithm for extracting audio fingerprints"
-HOMEPAGE="https://acoustid.org/chromaprint"
-SRC_URI="https://github.com/acoustid/${PN}/releases/download/v${PV}/${P}.tar.gz
- test? ( https://github.com/google/googletest/archive/v$(ver_cut 1-2 ${GTEST_VERSION}).x.tar.gz -> gtest-${GTEST_VERSION}.tar.gz )
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="test tools"
-RESTRICT="!test? ( test )"
-
-# note: use ffmpeg instead of fftw because it's recommended and required for tools
-RDEPEND=">=media-video/ffmpeg-2.6:0=[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )"
-
-DOCS=( NEWS.txt README.md )
-
-S="${WORKDIR}/${PN}-v${PV}"
-
-multilib_src_configure() {
- export GTEST_ROOT="${WORKDIR}/googletest-${GTEST_DIR_VERSION}/googletest/"
- local mycmakeargs=(
- -DBUILD_TOOLS=$(multilib_native_usex tools ON OFF)
- -DBUILD_TESTS=$(usex test ON OFF)
- -DFFT_LIB=avfft
- -DAUDIO_PROCESSOR_LIB="swresample"
- )
- cmake_src_configure
-}
-
-multilib_src_test() {
- cd tests && (./all_tests || die "Tests failed")
-}
diff --git a/media-libs/chromaprint/chromaprint-1.5.1.ebuild b/media-libs/chromaprint/chromaprint-1.5.1.ebuild
index 8c85b0d8d008..77fd5792ba01 100644
--- a/media-libs/chromaprint/chromaprint-1.5.1.ebuild
+++ b/media-libs/chromaprint/chromaprint-1.5.1.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
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/acoustid/${PN}/releases/download/v${PV}/${P}.tar.gz
LICENSE="LGPL-2.1"
SLOT="0/1"
-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="test tools"
RESTRICT="!test? ( test )"
diff --git a/media-libs/codec2/Manifest b/media-libs/codec2/Manifest
index 5d41fc151f99..f669bbcb2824 100644
--- a/media-libs/codec2/Manifest
+++ b/media-libs/codec2/Manifest
@@ -1,9 +1,3 @@
-AUX codec2-1.0.1-fix-freedv-callback.patch 2395 BLAKE2B 1fc590ea00f7160b301abf80a842667b3ee4129354bfc26e3d1535cf10797a7c6c5d538a8a91e57900ddef1d1eb20fe3ebccff2892aa99ec80e2f3285dcd60c2 SHA512 bdd9ed7be6f221716d93fd57f84da903f9a703e98d976e10b2ff3d8d61be70c8fa1f4affc0c50a841ce148a789e39b0c608611aa2863193b08e5150e94d1ef9e
-AUX codec2-1.0.1-static-rx_filter_coh.patch 688 BLAKE2B 9e80bfeacd28591128c863b81b41b447866b6f1c0c2c20905459c623e4dcf428efbf28fabf4a53470f74e739b55281761a0162112c076ee0c959d2e067b8c0c7 SHA512 abbd495022db2d695708f552a63274cab769f14d787092ca55f9f7f710d3d225e662d510d982553f77d14c59c35be1d82853e7b339bd55c8defb36abe3411e36
-DIST codec2-1.0.0.tar.gz 15019266 BLAKE2B fa33a8c30a7472e5f5ab0aac070431579913248d9d27cbc82542b6d7071f7a9fee6bafe374300bf6e09d636b9ddaf85795aabf12cbfd3923efd0cac82f06b38c SHA512 bba8ccf915600b093252c85059c5472804e843f5a4e331cc6e01f31b4131d84362d8385d0a1d8703be36064ca498e58181c2b7fdedb76d0be58bf6f13ec929b3
-DIST codec2-1.0.1.tar.gz 15062219 BLAKE2B 81f2784d7aa7180fcc4345fd27e7dd0beda0eba3bbee43d8379a48dc854fe1c9e50038c90c9ae41daacb5aef0f337841fa64ce061e2831523a71d5d52d1b8211 SHA512 e32b6ebb5480b4a6ae15e835abc0da4fac7fb46a2b14bcc2a3c52df2da6c8d3f5acbcf83d8039f1ee402b4d2e1e7445841e3c9c415bfb70af3a251e74ab3f3b6
DIST codec2-1.0.3.tar.gz 15000670 BLAKE2B 784f3f522ff6de0f5d6622ca379e5b61081c999b1310e0f45891758c818005d12418907bc9627c1a177cb961f54d20e330e646426b4eb885a548af70014ab521 SHA512 1b59a0520d55b0f92b72a51dde0f58a0cd845056195734d23bf59bf44e7b5c7431bdc3cebe7c60aef7dadf3ec02f9edd62f041b4b283c05a4b50a0380f3ed67c
-EBUILD codec2-1.0.0.ebuild 713 BLAKE2B 2709cf1ee94f8f3341e054dfe6f0564a9223a64e9cc0896e3b4b32dcf7c86f7a2aac7c75669714da87db9e629ac23cb46b852296f7702911d470b8f7fa5141f4 SHA512 c4a8f31bc89f740d5d14e2fb63936b1a4c9bb15c9ef4aa56d36c9523ef4346ac0ef80848174600d9e7e6d5c745e6665f82ca4b9249f0b07f11d2929de0fe78a7
-EBUILD codec2-1.0.1-r1.ebuild 840 BLAKE2B ab3d64c7a78ce1d4066dcd8be945189cdde4a0cba11556e8b852257dcdc31544ad7a04934c8aa91cc7773802327fd83bfdede314de716dfd5c88678091bfee3d SHA512 562d7765935008a6ad17e5858c4d445b85c703e7a9ed136517016380d13e99888707a0271e9707a8cc82db69343c88b520ed800a8cde5f828e42998b6ef14789
-EBUILD codec2-1.0.3.ebuild 1025 BLAKE2B cbaaee831497ddfa53b7e3c0f95f301de31441805592f9fee71e628bc6369d8a2097a5c27cfbbac5099653d88043d6196e34ceb648dca82bf518f29852dc034e SHA512 a4b3e58d73fb4e0961987f2d79757864ea634d73ba0d2b32b8169ee9add653fae9b94f905abca121b8493529189005dd965108f1ac3ade5f8d554db14a5ad020
+EBUILD codec2-1.0.3.ebuild 1071 BLAKE2B 5915392ef5bcdc4c6f2b6f531ba7c5de5aa3a81c688a74fabafca43a3bdb0162f39130b59bc364ab3b15f0f22f6b8f40008da5ab25824f462db3b74471b0c852 SHA512 9838e593c31a283a23fdd3ebb82e8dcb0dc21cf5c689974a0fb6b2a7b02ff528d98c6cbf277eb604dc474d96ec2cb3af30b1286be2227e037e0130598a2f778f
MISC metadata.xml 326 BLAKE2B a7fc8408d6f6b58ad9d7019e858c703fd65ba38072dfefa381a5d00b500fe5d0ba024c2a3ed2d37e8e11da71f53bbfbeb80ead070935b9e83929d75d3a7852af SHA512 73c8e213262ac05ced95080d9e97a1e2abfdb2ad9e436ededda82de01feea321c3d499c8c2e8b3725a81b434e9efc4b12b321d738ab966d104e3344f4e29206b
diff --git a/media-libs/codec2/codec2-1.0.0.ebuild b/media-libs/codec2/codec2-1.0.0.ebuild
deleted file mode 100644
index f9d617bb6115..000000000000
--- a/media-libs/codec2/codec2-1.0.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib
-
-DESCRIPTION="Low bit rate speech codec"
-HOMEPAGE="https://freedv.org/ https://www.rowetel.com/?page_id=452 https://github.com/drowe67/codec2"
-SRC_URI="https://github.com/drowe67/codec2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/1.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
-IUSE="examples test"
-# Not yet passing, but infrastructure added to run
-RESTRICT="test"
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DUNITTEST=$(usex test)
- -DINSTALL_EXAMPLES=$(usex examples)
- )
- cmake_src_configure
-}
diff --git a/media-libs/codec2/codec2-1.0.1-r1.ebuild b/media-libs/codec2/codec2-1.0.1-r1.ebuild
deleted file mode 100644
index 07461c984992..000000000000
--- a/media-libs/codec2/codec2-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib
-
-DESCRIPTION="Low bit rate speech codec"
-HOMEPAGE="https://freedv.org/ https://www.rowetel.com/?page_id=452 https://github.com/drowe67/codec2"
-SRC_URI="https://github.com/drowe67/codec2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/1.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
-IUSE="examples test"
-# Not yet passing, but infrastructure added to run
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}/codec2-1.0.1-static-rx_filter_coh.patch"
- "${FILESDIR}/${P}-fix-freedv-callback.patch" # Bug 816453
-)
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DUNITTEST=$(usex test)
- -DINSTALL_EXAMPLES=$(usex examples)
- )
- cmake_src_configure
-}
diff --git a/media-libs/codec2/codec2-1.0.3.ebuild b/media-libs/codec2/codec2-1.0.3.ebuild
index 4f5d051d8134..3f50389d58e9 100644
--- a/media-libs/codec2/codec2-1.0.3.ebuild
+++ b/media-libs/codec2/codec2-1.0.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
CMAKE_ECLASS=cmake
-inherit cmake-multilib
+inherit cmake-multilib flag-o-matic
MY_PV="${PV%.*}${PV##*.}"
DESCRIPTION="Low bit rate speech codec"
@@ -14,7 +14,7 @@ S="${WORKDIR}"/${PN}-${MY_PV}
LICENSE="LGPL-2.1"
SLOT="0/1.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="examples test"
# Not yet passing, but infrastructure added to run
@@ -25,6 +25,9 @@ RESTRICT="test"
#BDEPEND="test? ( sci-mathematics/octave )"
multilib_src_configure() {
+ # bug #817437
+ replace-flags -Os -O2
+
local mycmakeargs=(
-DUNITTEST=$(usex test)
-DINSTALL_EXAMPLES=$(usex examples)
diff --git a/media-libs/codec2/files/codec2-1.0.1-fix-freedv-callback.patch b/media-libs/codec2/files/codec2-1.0.1-fix-freedv-callback.patch
deleted file mode 100644
index 595e71a139dc..000000000000
--- a/media-libs/codec2/files/codec2-1.0.1-fix-freedv-callback.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 7a554bad2f28a4cf19cddf43c619fe5921ddaea3 Mon Sep 17 00:00:00 2001
-From: drowe67 <david@rowetel.com>
-Date: Sat, 2 Oct 2021 15:48:09 +0930
-Subject: [PATCH] moved freedv_callback_rx_sym typedef and function into
- freedv_api_internal.h
-
-Project-Bug-URL: https://github.com/drowe67/codec2/pull/235
-Gentoo-Bug-URL: https://bugs.gentoo.org/816453
----
- src/freedv_api.h | 2 --
- src/freedv_api_internal.h | 4 ++++
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/freedv_api.h b/src/freedv_api.h
-index 23c5fef8..9393bd80 100644
---- a/src/freedv_api.h
-+++ b/src/freedv_api.h
-@@ -145,7 +145,6 @@ struct freedv_advanced {
-
- // Called when text message char is decoded
- typedef void (*freedv_callback_rx)(void *, char);
--typedef void (*freedv_callback_rx_sym)(void *, _Complex float, float);
- // Called when new text message char is needed
- typedef char (*freedv_callback_tx)(void *);
- typedef void (*freedv_calback_error_pattern)
-@@ -212,7 +211,6 @@ int freedv_check_crc16_unpacked(unsigned char *unpacked_bits, int nbits);
- // Set parameters ------------------------------------------------------------
-
- void freedv_set_callback_txt (struct freedv *freedv, freedv_callback_rx rx, freedv_callback_tx tx, void *callback_state);
--void freedv_set_callback_txt_sym (struct freedv *freedv, freedv_callback_rx_sym rx, void *callback_state);
- void freedv_set_callback_protocol (struct freedv *freedv, freedv_callback_protorx rx, freedv_callback_prototx tx, void *callback_state);
- void freedv_set_callback_data (struct freedv *freedv, freedv_callback_datarx datarx, freedv_callback_datatx datatx, void *callback_state);
- void freedv_set_test_frames (struct freedv *freedv, int test_frames);
-diff --git a/src/freedv_api_internal.h b/src/freedv_api_internal.h
-index 0197e184..e7a9526c 100644
---- a/src/freedv_api_internal.h
-+++ b/src/freedv_api_internal.h
-@@ -230,6 +230,10 @@ int freedv_rx_fsk_ldpc_data(struct freedv *f, COMP demod_in[]);
-
- int freedv_bits_to_speech(struct freedv *f, short speech_out[], short demod_in[], int rx_status);
-
-+// for the reliable text protocol we need to pass symbols back rather than text
-+typedef void (*freedv_callback_rx_sym)(void *, _Complex float, float);
-+void freedv_set_callback_txt_sym (struct freedv *freedv, freedv_callback_rx_sym rx, void *callback_state);
-+
- #ifdef __cplusplus
- }
- #endif
diff --git a/media-libs/codec2/files/codec2-1.0.1-static-rx_filter_coh.patch b/media-libs/codec2/files/codec2-1.0.1-static-rx_filter_coh.patch
deleted file mode 100644
index 9290ea9b2cfa..000000000000
--- a/media-libs/codec2/files/codec2-1.0.1-static-rx_filter_coh.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/cohpsk.c b/src/cohpsk.c
-index f4f8dcdc..0b0ead9c 100644
---- a/src/cohpsk.c
-+++ b/src/cohpsk.c
-@@ -809,7 +809,7 @@ typedef float float4 __attribute__ ((vector_size (16)));
-
- \*---------------------------------------------------------------------------*/
-
--inline void rx_filter_coh(COMP rx_filt[COHPSK_NC+1][P+1], int Nc, COMP rx_baseband[COHPSK_NC+1][COHPSK_M+COHPSK_M/P], COMP rx_filter_memory[COHPSK_NC+1][+COHPSK_NFILTER], int nin)
-+static inline void rx_filter_coh(COMP rx_filt[COHPSK_NC+1][P+1], int Nc, COMP rx_baseband[COHPSK_NC+1][COHPSK_M+COHPSK_M/P], COMP rx_filter_memory[COHPSK_NC+1][+COHPSK_NFILTER], int nin)
- {
- int c,i,j,k,l;
- int n=COHPSK_M/P;
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index b821f680ad0b..ce77b9586cd3 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -4,8 +4,12 @@ AUX gmmlib-20.4.1_custom_cflags.patch 2995 BLAKE2B 2e344bd4576c83490dc09e49c6d73
DIST intel-gmmlib-21.3.3.tar.gz 747305 BLAKE2B ef055bfdb6efccec5e2e7618677a97b38e314f44486c0d99e704281f2cb78acdf64a1737a8ae2c33b9dde6f60a284b83d9b5ca1949c5a5c7a34894cdbfbb9347 SHA512 9680b2c38f71467a7c4f2c1a6136d1de9c906355ca675ebbafc697daea15fe615aa45f3af3140330f1610946f9c55471038eeb815b1d677b64efb4896515d8fb
DIST intel-gmmlib-21.3.5.tar.gz 747289 BLAKE2B 288cc0e051389818fcd1025e5f9e650dea6e52df08020aec1c1127afa5e422410c825a45eb78fa8343b583c246501371143a1c8176232b81acf314af3b2513af SHA512 59922ced38983333a29c075cef5d28f02331c0e5a28ac556229e474e9a904a19d952d40daedfcca2365ab35212e0c14bf6db0087283ec5d0b932651c450178c4
DIST intel-gmmlib-22.0.0.tar.gz 755785 BLAKE2B 30d0e5fa87bbec35532b1934741bdbc1616e1af654d8e90f77b176c757207acf806e9f366d0bcd27b752df19373e0513eca462b39fd1eb6b434c4549b243963e SHA512 7d9a1c216ca5e3d15f53e780698303bb0ab580043a37d83b7b014cc4645e371ec66f49fb0c404fe1856350cc33fb9bf5e7006cb7fd065236086496d7270874aa
+DIST intel-gmmlib-22.0.1.tar.gz 756727 BLAKE2B 767802e5d25b79647af84c10cf2377e07530b61682e564f5d317e308e31090a9427322c4faba78eb072b4c3933968cb575dc24029c174388c6b9a04b3fdc8325 SHA512 a9ad41611ba8fb6b0bf1ab8769ba9d12dd4450728d268d2c099e959c5638593c1cea1eea5fc00a8d9f311881b267e6059b422045deaabf42b35bcd98e1dfc12e
+DIST intel-gmmlib-22.0.2.tar.gz 757146 BLAKE2B 1a1045fea6cb5f3b56732febccaa50b45a8d7019b7977a8edd99e3ebadd53449a70de23e28d1518a41b0e875bd9d879fde424bc7cd9760253084d518e2b29f0d SHA512 87c43a6f730ac13301f2ce0ec75dcd160bfa7a44d32480544f534519937744e618143831e207d3461a6a9dc7409adefd32c318bd8776939599d367a4c4bd9b4a
EBUILD gmmlib-21.3.3.ebuild 762 BLAKE2B 502ca6165fd0f155c30a0bab51e802ea8f748382694644d738b257d5ad8b77aaea101d805e9098cac6b5deba03c92f5cf03f7dcdb0ecc4c51f9803a2ba5a9e12 SHA512 5d2b77fb6f87f72805495665fe4b8c802429d4890c2d857a0d9e7f6b3676a8ba230f1c4a15ca44645ba5d0e6f92eb17e2e33457ac3dfa6492f7df4134ab6df9c
-EBUILD gmmlib-21.3.5.ebuild 765 BLAKE2B 8f2b0ca1f8991d1dff36eda35542ff8fdeab84d8003c474c5a86885bb19d7d2ebdc9008f3f754a946431f9e68a0128fb280d5847d76401f79bc125bf4c564273 SHA512 494904a861f7a3a8b5775fd261250664f430f9d52272feb64335eafa07daf7205da4d310f64d58119bcbc439b6efc61fb7f12840b17e68cea3788e9f0a62ba55
-EBUILD gmmlib-22.0.0.ebuild 766 BLAKE2B 2fe4baed5e106494905ce5e7963004c2a5507df6274542f7714a252ec034c8f486609aeb879fbe33e64493dfe8ca9360c26e7521396b2937b702f64d15731402 SHA512 648c29b2d47691806d603d63da3cf2f79f67764fa2b01815b77815179d0a4c4ea1c1c46895c7c85ed582d4b8c4eac1d09374545f2b9c88707e1a64166285c9ed
+EBUILD gmmlib-21.3.5.ebuild 764 BLAKE2B 024e984f0b1e86b4663e763004c5489033f098b21c3cc283b6aef0cec6e0b7bc21d5c419fc9505b0cd4350b36062b6a777c59c77b9dcb52e1e344963466edaa2 SHA512 fceeaf8ab5e739d484e6ce625ec3dd438fb31f6b9727b1b563de4128034bab1cf996e859410a054c1ca3f5201dca0bfd82a76c21534551e891cfd95b9ab36992
+EBUILD gmmlib-22.0.0.ebuild 765 BLAKE2B bf289e742c872cf9c69906a70a4fcf7678bcfd2cc80fc40a89e2e2958913c8505bc74d1a99111f30bf9bef31f15c1e8e5065c2648368327cc5ae8de261c64d10 SHA512 bcc09dace580e72b76eb253af9def8715ebf2c9490704b0234e0269e63f05edfce38d4ad060ccaba3808abdab2db33fcaf2a59c134b8f713d2691bb710259488
+EBUILD gmmlib-22.0.1.ebuild 766 BLAKE2B 094df50fe26a75d43e2d63cf6a755a241a8bf0962049ce52b00d10447f045fb69456dfafca1930e31c05c7901fabb273034e3d734c78e945b3bfd8412d9454c7 SHA512 8e6071e0beb788289297f5290f4bdb1f98e20b10d930fba84778cb7299ca34e5d041f5a3fbf77455aa4155ae24fb76dcd25e0de95ceee85903e67c3325d4a699
+EBUILD gmmlib-22.0.2.ebuild 766 BLAKE2B 094df50fe26a75d43e2d63cf6a755a241a8bf0962049ce52b00d10447f045fb69456dfafca1930e31c05c7901fabb273034e3d734c78e945b3bfd8412d9454c7 SHA512 8e6071e0beb788289297f5290f4bdb1f98e20b10d930fba84778cb7299ca34e5d041f5a3fbf77455aa4155ae24fb76dcd25e0de95ceee85903e67c3325d4a699
EBUILD gmmlib-9999.ebuild 845 BLAKE2B ffc7d65df6b699426cf51813f7dc425c4ac94ab09fc43974a811047820e7b228d5ca59653db89483b153d03fe2409853a4b4e2a7cc23f61ef2cb66736a745b03 SHA512 7353902c4f3b38c7305452077284a888e48bb1e7974be92b622c4000ae310bcd7509a2a70c122a729c2675b95a17aabc9befc557cdbf6e205fee61704229c828
MISC metadata.xml 602 BLAKE2B 3dd974d0293b434877d26265e65ff26cf3b024556b22614012e31169cf7230703f092310cbd4b7bdcf82da4f439e0590f49279e3adbd845de08e7320996032b1 SHA512 48b892b2ad978c1736f8487ea6c3020ba9b94fe0f77306c6c3c48c8d320d04fa513a28bfcb60b991870503fe6dcf7fbf7848e840fd6470c382b4a808bab5b159
diff --git a/media-libs/gmmlib/gmmlib-21.3.5.ebuild b/media-libs/gmmlib/gmmlib-21.3.5.ebuild
index 2bbab9907b5b..c6bc8d5f5c6a 100644
--- a/media-libs/gmmlib/gmmlib-21.3.5.ebuild
+++ b/media-libs/gmmlib/gmmlib-21.3.5.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
@@ -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"
SLOT="0/0"
IUSE="+custom-cflags test"
diff --git a/media-libs/gmmlib/gmmlib-22.0.0.ebuild b/media-libs/gmmlib/gmmlib-22.0.0.ebuild
index 49b1edad54de..2e977a3d2a9e 100644
--- a/media-libs/gmmlib/gmmlib-22.0.0.ebuild
+++ b/media-libs/gmmlib/gmmlib-22.0.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
@@ -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"
SLOT="0/12"
IUSE="+custom-cflags test"
diff --git a/media-libs/gmmlib/gmmlib-22.0.1.ebuild b/media-libs/gmmlib/gmmlib-22.0.1.ebuild
new file mode 100644
index 000000000000..1e2a71912bdd
--- /dev/null
+++ b/media-libs/gmmlib/gmmlib-22.0.1.ebuild
@@ -0,0 +1,33 @@
+# 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.2.ebuild b/media-libs/gmmlib/gmmlib-22.0.2.ebuild
new file mode 100644
index 000000000000..1e2a71912bdd
--- /dev/null
+++ b/media-libs/gmmlib/gmmlib-22.0.2.ebuild
@@ -0,0 +1,33 @@
+# 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/grilo/Manifest b/media-libs/grilo/Manifest
index 0c519056a5f1..fcb42b989b05 100644
--- a/media-libs/grilo/Manifest
+++ b/media-libs/grilo/Manifest
@@ -1,5 +1,3 @@
-DIST grilo-0.3.13.tar.xz 236420 BLAKE2B 8f891507edce92bccbc12aa9ecce78e8bd0804e548deec9a3651a656a27e9e87156e8cd7e1959a662c23e16fe958ff09f95755f825116f785784271883579dfc SHA512 b229b9b7524c1be63ed8891a9438844ebb87013074b394330f25316feb015040b304cd98bf3c89dc3248e6898c587a5e51666776a5b4ba5026a80ee8ad3e6d01
DIST grilo-0.3.14.tar.xz 236620 BLAKE2B 25c81fb9b4ebce456f24aea19518d0a9c3b98a216e50fe9cbe9fa8b7e089535b5d695fb915497e8f812a0fc964b1f2b591fb0c0e382771af88318d94dd659fe8 SHA512 128464e51040ea121b19640c708fa996743a18e047ab11d4c3047db7d24732eac6da65393c16f987e834cb301385ef0c349eb0fabd7d67b2d10a230c8f03492a
-EBUILD grilo-0.3.13.ebuild 2168 BLAKE2B 4aaa2f680c2a96ac26e929e8537b280fb535682a12632f7bdf969e645de2140941cbca3cfc669b6d479b15a6e062271f3473725ec82ea846397a41689d144d74 SHA512 ab6bcb97eafbc188f10efc234e809444322203d2f4a6645af430a119af597d55b02fbaa6cbf8b85bc01bd2b8a83f7d2f2454e65886523cc027e9a85140e78d70
-EBUILD grilo-0.3.14.ebuild 2172 BLAKE2B 60c1d6248ac93c8772f702ea5ce34cf8bb017242e10fe183af6ddd6b7ab9759e64fe30390d3302d4cd4b2dbc81028377dbdd6169b0540c1e5b5c8ac4cc1428d1 SHA512 624eac2fa5b6cf8a98226e6e6c93c8dd152f072dd5276ae019642edbc382debdb8d249e12b7536ec91ba743387b2cb2b00a496db8daf65d26cbac773b13127f5
+EBUILD grilo-0.3.14.ebuild 2169 BLAKE2B 3b93a248d911c19a83546185f10d75a1a0ca093c693bb99613834429080b8cea15bce40f843558ed579d7ec57ae17bad4a7c54c0da769a6765365828c10d51a1 SHA512 7452084985ed85209675d3d19ff1cf390e3f35a6f6634777af7cea9ade5ebe1fd82ff495020486af85d161a66269a9b4f779db79ced0ef1c3ca64fe44e4a3478
MISC metadata.xml 620 BLAKE2B e4868ed8fa4d41404a3ef8681bcd864c8baa047bcc612e57e1225007caa97de0455ff78810e8a46d68bd30415ed03172738a4b941f46a99024becf58d089b4a2 SHA512 5198d7b6f3730971a2ef0da47963699376750f9a0d66ac0ba29170313e455e1d05b85e34419c889a8f35fff389e9c074a602db96cff82834493b39e35565650d
diff --git a/media-libs/grilo/grilo-0.3.13.ebuild b/media-libs/grilo/grilo-0.3.13.ebuild
deleted file mode 100644
index 8f94f4a5cd45..000000000000
--- a/media-libs/grilo/grilo-0.3.13.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org meson python-any-r1 vala xdg
-
-DESCRIPTION="A framework for easy media discovery and browsing"
-HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
-
-LICENSE="LGPL-2.1+"
-SLOT="0.3/0" # subslot is libgrilo-0.3 soname suffix
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-IUSE="gtk gtk-doc +introspection +playlist test vala"
-REQUIRED_USE="vala? ( introspection )"
-RESTRICT="!test? ( test )"
-
-# oauth could be optional if meson is patched - used for flickr oauth in grilo-test-ui tool
-RDEPEND="
- >=dev-libs/glib-2.58:2
- dev-libs/libxml2:2
- >=net-libs/libsoup-2.41.3:2.4[introspection?]
- playlist? ( >=dev-libs/totem-pl-parser-3.4.1 )
- introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-
- gtk? (
- net-libs/liboauth
- >=x11-libs/gtk+-3.14:3
- )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-util/glib-utils
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- gtk-doc? (
- >=dev-util/gtk-doc-1.10
- app-text/docbook-xml-dtd:4.3
- )
- ${PYTHON_DEPS}
- test? ( sys-apps/dbus )
- vala? ( $(vala_depend) )
-"
-
-src_prepare() {
- sed -i -e "s:'GETTEXT_PACKAGE', meson.project_name():'GETTEXT_PACKAGE', 'grilo-${SLOT%/*}':" meson.build || die
- sed -i -e "s:meson.project_name():'grilo-${SLOT%/*}':" po/meson.build || die
- sed -i -e "s:'grilo':'grilo-${SLOT%/*}':" doc/grilo/meson.build || die
-
- # Drop explicit unversioned vapigen check
- sed -i -e "/find_program.*vapigen/d" meson.build || die
-
- # Don't build examples; they get embedded in gtk-doc, thus we don't install the sources with USE=examples either
- sed -i -e "/subdir('examples')/d" meson.build || die
-
- xdg_src_prepare
- use vala && vala_src_prepare
-}
-
-src_configure() {
- local emesonargs=(
- -Denable-grl-net=true # Fails to build
- $(meson_use playlist enable-grl-pls)
- $(meson_use gtk-doc enable-gtk-doc)
- $(meson_use introspection enable-introspection)
- $(meson_use gtk enable-test-ui)
- $(meson_use vala enable-vala)
- )
- meson_src_configure
-}
-
-src_test() {
- dbus-run-session meson test -C "${BUILD_DIR}" || die
-}
diff --git a/media-libs/grilo/grilo-0.3.14.ebuild b/media-libs/grilo/grilo-0.3.14.ebuild
index d8c385b4b579..53e6714a22d0 100644
--- a/media-libs/grilo/grilo-0.3.14.ebuild
+++ b/media-libs/grilo/grilo-0.3.14.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
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
LICENSE="LGPL-2.1+"
SLOT="0.3/0" # subslot is libgrilo-0.3 soname suffix
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
IUSE="gtk gtk-doc +introspection +playlist test vala"
REQUIRED_USE="vala? ( introspection )"
diff --git a/media-libs/gsound/Manifest b/media-libs/gsound/Manifest
index 3d3c2db2a790..97dbaa82aa7c 100644
--- a/media-libs/gsound/Manifest
+++ b/media-libs/gsound/Manifest
@@ -1,5 +1,3 @@
-DIST gsound-1.0.2.tar.xz 282068 BLAKE2B b85aa42c82c346b4541b38c971be46a35f0276d6cc34420cfc1a0e0ab0b4e25aa02829c17e8cb1d4258acc32d1d9c70a51dfac576046820f84e9ce9821c203ce SHA512 3525598aade28129d605e745cd6e8ef292220c446d59b34129056fa2aba7b4aa808c3efd29f4916056e20d5e4046b0edf2a6c9b97c272c95e59af7f8ef62e6b0
DIST gsound-1.0.3.tar.xz 22592 BLAKE2B 01c61e859aa6b726ba6f49a4791b22d769b495d589d6d8b1c15c92d217433e6dc9a1e17ee2741f451b3ef32b4252677b47d46e149635ad4a58a5b323639c4ecb SHA512 5d7c4f17154b840abb94b432c33ba950929ddc5aba8c2795b54834d6c6b0280d3d8846acebb1e4e02688045bfb44cfac7dbb96fef44af5a73a12a70f3ece84eb
-EBUILD gsound-1.0.2-r1.ebuild 864 BLAKE2B 45e478569ec31fb1db30dc9b159b7a3de4d38cadc0ab1258f4f746b8a1461f3ee158d635fabc1fa0df70611b9a005d9a9e7cc7b3cdba71ac0e0b6b218a85be5d SHA512 6150dba82397aee436c6277f490185ccfd12bf4c2648f590372b2906e9eab5559d5fd6b574523c55d29179b5de8346954ed2ff1ceeeb3d0c5fa6c1d28c199c75
EBUILD gsound-1.0.3.ebuild 942 BLAKE2B adbbfba0a8156f57e238f2530fd703637aa86b01758f5b1f61d91abcdba920e154ae1dc3bc8cfb1c4c2029bd62e77b4344b97cf3375142da396f44d68ba69554 SHA512 acd25e87e744de8cd3e0d6dcb85694655437b91f2cac1a30b9ec0298523e526e8d0a4cee089f9f8fa57155896d1fb81bb4da1f1a9a4f656d9f95f8fcb1c41c29
MISC metadata.xml 260 BLAKE2B 74a7980ab34785ba7920342b0a2708af439bed09b7ffdc1ae3ca6cbbaba8b7dbd7a6894375c6d5adf00819685f44f58b1e069dcd1062a70e99f0dbcfe39dc3d3 SHA512 f4c15c784194c80663c49692140afcfef3450b722254b99b2bd7fd0d7a08c57b463afcfa3b5609e799d0b2d6ff6451172eace91e93b886856d2591d491585c0c
diff --git a/media-libs/gsound/gsound-1.0.2-r1.ebuild b/media-libs/gsound/gsound-1.0.2-r1.ebuild
deleted file mode 100644
index 3813c899e904..000000000000
--- a/media-libs/gsound/gsound-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="Thin GObject wrapper around the libcanberra sound event library"
-HOMEPAGE="https://wiki.gnome.org/Projects/GSound"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv x86"
-IUSE="+introspection +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
- >=dev-libs/glib-2.36:2
- media-libs/libcanberra
- introspection? ( >=dev-libs/gobject-introspection-1.2.9:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- >=dev-util/gtk-doc-am-1.20
- virtual/pkgconfig
- vala? ( $(vala_depend) )
-"
-
-src_prepare() {
- use vala && vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- $(use_enable introspection) \
- $(use_enable vala)
-}
diff --git a/media-libs/gupnp-dlna/Manifest b/media-libs/gupnp-dlna/Manifest
index 47704d5bfc29..a35ca04994c8 100644
--- a/media-libs/gupnp-dlna/Manifest
+++ b/media-libs/gupnp-dlna/Manifest
@@ -1,7 +1,3 @@
-DIST gupnp-dlna-0.10.5.tar.xz 329468 BLAKE2B 045c890bc05e7a8e8321c46b333b27ec112b470f484961b24dad5652c0d065db52187c4ac19ed392319e12d2cf7b835b43304edf1307ffc3bb5f2c5c7baded4c SHA512 060e997dc85d840722bc31c8eb2c7f986151220ac6f3de9e073f4dd62fdd57ffa049b628080832d6b96c1988f49eacc29d539f738ed61797019264f68ebf7680
-DIST gupnp-dlna-0.11.0.tar.xz 87920 BLAKE2B 8391503c66da267d936563b1b39b1f390bdeb2d4511a900fb99faf968307026e857b66d2f43dd14309e9e4e9790801538947f6c8506391c0da39db6a7b854a6b SHA512 26aad6eb3f7705fa586552a1e4d6931b3ff28b6dbcfd7a626dea297ffd90e67f02957b68e0bb6c80e4fd445dbba1bd47dc47bcf8ac389ff2bb0622cd9ca7f3d1
DIST gupnp-dlna-0.12.0.tar.xz 89480 BLAKE2B 1e281fa2d8f80bcad146c37ab91c3036ced91b2eae8d7cf29bd34551e38b599f4551a7317f58851b8f3a85ad65313558608f15d42e6d6bccec580be7aa3b19a1 SHA512 a626fe77426b607325bb8cacb6af5c434d451c1aa550272f0cbe59f84103f7ec8d2be5ebc79a9ea4e56b755ad9cadabdcbd059c49b1c0df143ba15a52fcd0ce0
-EBUILD gupnp-dlna-0.10.5.ebuild 1522 BLAKE2B 24ddc3af27cf3342545772827ba1f17844c14f0c2ab9cf7564e5d8d8988163d7582bb5e8d7872ac16443e58356d9bddde3ecfa19ccb2729ebc5c6ba689815937 SHA512 c738ba044bff0cac84ac42b29b4470118ddb69e7006d4f362f684058864a1223df9f3e4b18e5f8739c3ff0a2886c0ba3032e01658a7b4e93ddf55dd8fa096fa0
-EBUILD gupnp-dlna-0.11.0.ebuild 1099 BLAKE2B 336768e59765aa328a28c696e28646880b4d95e2d7ea3bd1e197d11ece1e99ce9b060f1e5c8465213e34c986c3f716686f1da6908d78ef48720bf7d0edd85c27 SHA512 e58311a89a27b83bb9a2618b7c541cba43bbfca6ffa76e6dab74fc016fcff8d239fda8f8090bb5f6bd9c9faee88770cd02ab338071466e2b61d920c5935649ad
-EBUILD gupnp-dlna-0.12.0.ebuild 1099 BLAKE2B 336768e59765aa328a28c696e28646880b4d95e2d7ea3bd1e197d11ece1e99ce9b060f1e5c8465213e34c986c3f716686f1da6908d78ef48720bf7d0edd85c27 SHA512 e58311a89a27b83bb9a2618b7c541cba43bbfca6ffa76e6dab74fc016fcff8d239fda8f8090bb5f6bd9c9faee88770cd02ab338071466e2b61d920c5935649ad
+EBUILD gupnp-dlna-0.12.0.ebuild 1097 BLAKE2B c282f5d9551722ccd59f203e7a2ba792de34411b36e383e2c0065246af81d9ee7d1c92d06d249caffe020b44c00474053b02ef76b297601eb9a4699142458c83 SHA512 20a80d97d745b44619ae0697901c685290030d047864faa5fb0075bd9a43b0543c3dce0712ebc3ee3e988de4b73a7a8077bf893ef23e4db4574ad38b0d611ed1
MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/media-libs/gupnp-dlna/gupnp-dlna-0.10.5.ebuild b/media-libs/gupnp-dlna/gupnp-dlna-0.10.5.ebuild
deleted file mode 100644
index 8ab1d92eced5..000000000000
--- a/media-libs/gupnp-dlna/gupnp-dlna-0.10.5.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="Library providing DLNA-related functionality for MediaServers"
-HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
-
-LICENSE="LGPL-2"
-SLOT="2.0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+introspection"
-
-RDEPEND="
- >=dev-libs/glib-2.34:2
- >=dev-libs/libxml2-2.5:2
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0[introspection?]
- introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.11
- virtual/pkgconfig
- introspection? ( $(vala_depend) )
-"
-
-src_prepare() {
- # Make doc parallel installable
- cd "${S}"/doc/gupnp-dlna
- sed -e "s/\(DOC_MODULE.*=\).*/\1${PN}-${SLOT}/" \
- -e "s/\(DOC_MAIN_SGML_FILE.*=\).*/\1${PN}-docs-${SLOT}.sgml/" \
- -i Makefile.am Makefile.in || die
- sed -e "s/\(<book.*name=\"\)${PN}/\1${PN}-${SLOT}/" \
- -i html/${PN}.devhelp2 || die
- mv ${PN}-docs{,-${SLOT}}.sgml || die
- mv ${PN}-overrides{,-${SLOT}}.txt || die
- mv ${PN}-sections{,-${SLOT}}.txt || die
- mv ${PN}{,-${SLOT}}.types || die
- mv html/${PN}{,-${SLOT}}.devhelp2
-
- cd "${S}"
-
- use introspection && vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- $(use_enable introspection)
-}
-
-src_install() {
- # https://bugzilla.gnome.org/show_bug.cgi?id=720053
- MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
-}
diff --git a/media-libs/gupnp-dlna/gupnp-dlna-0.11.0.ebuild b/media-libs/gupnp-dlna/gupnp-dlna-0.11.0.ebuild
deleted file mode 100644
index 47221219da9c..000000000000
--- a/media-libs/gupnp-dlna/gupnp-dlna-0.11.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org meson vala
-
-DESCRIPTION="Library providing DLNA-related functionality for MediaServers"
-HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/gupnp-dlna"
-
-LICENSE="LGPL-2"
-SLOT="2.0/4" # subslot: soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="gtk-doc +introspection"
-
-RDEPEND="
- >=dev-libs/glib-2.34:2
- >=dev-libs/libxml2-2.5:2
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0[introspection?]
- introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- virtual/pkgconfig
- gtk-doc? ( dev-util/gtk-doc )
- introspection? ( $(vala_depend) )
-"
-
-src_prepare() {
- use introspection && vala_src_prepare
- default
-}
-
-src_configure() {
- local emesonargs=(
- -Dgstreamer_backend=enabled
- -Ddefault_backend=gstreamer
- $(meson_use introspection)
- $(meson_use introspection vapi)
- $(meson_use gtk-doc gtk_doc)
- )
- meson_src_configure
-}
diff --git a/media-libs/gupnp-dlna/gupnp-dlna-0.12.0.ebuild b/media-libs/gupnp-dlna/gupnp-dlna-0.12.0.ebuild
index 47221219da9c..ad288a0f8a53 100644
--- a/media-libs/gupnp-dlna/gupnp-dlna-0.12.0.ebuild
+++ b/media-libs/gupnp-dlna/gupnp-dlna-0.12.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=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/g
LICENSE="LGPL-2"
SLOT="2.0/4" # subslot: soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
IUSE="gtk-doc +introspection"
RDEPEND="
diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest
index ecc0831d4422..0f438381e05c 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 2089 BLAKE2B d4ef76d3358a875118c9bd3f9cd53e7f752ee00b0852ade92e7d2ac41fdd8baf5eb2307abe78912d9ec6b72bad0d80eb9b42696995c7685b33fa7504e3b9bc06 SHA512 404b570ff55fcd7ba41cf34a7a429354519dd847c43cfa72cc5b581ffbbd0fb76b4605959242f3d82c500ea8707601a71e45553d07512cf6c8bae7c90d02823f
+EBUILD hamlib-4.4.ebuild 2087 BLAKE2B 74b18da8565cc98e296ebb99a6cca515683c10dfd04d14bf04ac23222e778063564887c7efa2d274f2f159dbfc0be5195845f214caad0aef025b130b3494b60c SHA512 d4c74d3b840cbdad6590faca12e1ca0cbd0dba24a1377b6b4ee8a9c1da571d5eea646f18f30d2150d7a97f6a307b5886ce1dcd9769d8978dfb85fa73af410a65
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 b741ce89b037..1cc6e90cd16f 100644
--- a/media-libs/hamlib/hamlib-4.4.ebuild
+++ b/media-libs/hamlib/hamlib-4.4.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
@@ -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 x86"
IUSE="doc perl python tcl"
RESTRICT="test"
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 05e03fa8059f..67bfe5405cab 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,8 +1,8 @@
-DIST harfbuzz-3.1.1.tar.gz 24966288 BLAKE2B f655d6a175dc495c00a76838d101705a32270668b7d989b8e82b9c34d2c16a5c10d210c0ed99a334515f73f7cad5c22e35c97f3a2c3f40f686380dd0559d0d7f SHA512 ccb1c840d07e28871893c40b2bb687cc78dfd25992ee20192f1faf8cae4356f401abd5947d7480a268edea10dd9f1d1d7e113b29b6e2d958220bf53799ae01b0
DIST harfbuzz-3.1.2.tar.gz 26678706 BLAKE2B 231687fa77983217cf60eda2b4796431c15a9efa79e8925363e6d8374ea2710d167eb1bcf5e14a7c738a98f6be06e24ee6b038ea5697b380b81425c9d4244dad SHA512 4d1093904bd450c6d65130b3d7198c07cfc5cce9a5d234fcb14bae1101b28e697ba42cb455217f863d8d5c83830784f716ae59a2dbb38e88156677213bdb4799
DIST harfbuzz-3.2.0.tar.gz 28221148 BLAKE2B 55ff832d3f740e2d3819f66ddfadd10312533addc975a8871e549ad33f27f4a6da33cc190e3de17bd12c9716258bd0cb165c4c04da5057f92cc53e8673d4c10a SHA512 5d8c629416c0bc557b83e8d9d731d41b9e8ee3abc74590e65ed6ca67d74d3a440d038134313f17a7b1b14ef0fc1ecf8bb87113fdcf5f0c8d3dc3d2eeb9b08c18
-EBUILD harfbuzz-3.1.1.ebuild 2562 BLAKE2B 850d12ca96d06beb855e02816d5d4fb68e76a70004e4cfee848115ec77045171cd042872b8c7fd5083dce0809d298ebd887ce745b0cda8befd2bc68cc00ff58d SHA512 ac6d67696f14848dc2ae0ab25938a970142ab2009b519ac55e83e0e0fcfdea2d4478a752ef4e2836588db9db1fa9725226b80885ef248509849a0c33b679f23d
-EBUILD harfbuzz-3.1.2.ebuild 2570 BLAKE2B 5df3f3bec5fdc10f651804c0fba6cb2b0c0e88045585edee823d58f3ba8473b81e2788274cf4739b36b92f0bcdf7b0079b38038787014ce32e441adade6496a3 SHA512 1deb1e8dd62a12965d391e094e8bd363ea5c1cfc5305eaed275439dd3073e44f2b44606c9969c5475352d2034ce9b2339cf1a7ba6dd0310a6bb5ff7484c16470
+DIST harfbuzz-3.3.1.tar.gz 29039964 BLAKE2B 55034a83d63369fe6b8a010cbab35615c60d03e052f2f49a6ed176222f2623beaa11e32a3872a0f2128d10b4e7240fcf198d8445b8b80ae0134ff2bf9a51ece4 SHA512 05a5fd52e0eac9eb1288c4d5e49154a29c1dd98032b5afd49cbb563520865ead0fd756651e46374b016fac0d1a584fb89aef5835758b5970266a3c926676da95
+EBUILD harfbuzz-3.1.2.ebuild 2562 BLAKE2B a990a70b030b29da047c19c6d06800412c2b80286431981bd24d856f2498506268c205a229792fb13618b37a19743dc2c76b090639835df18f8a5c0533ba39b9 SHA512 d3efd205a3e94aa5bbf4d96766e272a08c89d26535cc00d57f51b14a31e8dc3b4e9309c431e99eb49ee2e9d87d7da902bb178cbb65baee4794aba34c869770f8
EBUILD harfbuzz-3.2.0.ebuild 2570 BLAKE2B 5df3f3bec5fdc10f651804c0fba6cb2b0c0e88045585edee823d58f3ba8473b81e2788274cf4739b36b92f0bcdf7b0079b38038787014ce32e441adade6496a3 SHA512 1deb1e8dd62a12965d391e094e8bd363ea5c1cfc5305eaed275439dd3073e44f2b44606c9969c5475352d2034ce9b2339cf1a7ba6dd0310a6bb5ff7484c16470
+EBUILD harfbuzz-3.3.1.ebuild 2570 BLAKE2B 942e4d6d00de538db5253cb2fac48ddc6d0b2c52475067451d6b130ea71429ffb99b2172a724183786ebd69ae2953629175e651e6354ef70f984d015c2ab3fcb SHA512 8f3c1001af7b91538d38969686d168b4246e1dbc058de9450eba764b15bdba6fb145b11f2c21fea13e88547f1225d420f37acbf5b91541b55f474a1e52d6b8ec
EBUILD harfbuzz-9999.ebuild 2570 BLAKE2B 5df3f3bec5fdc10f651804c0fba6cb2b0c0e88045585edee823d58f3ba8473b81e2788274cf4739b36b92f0bcdf7b0079b38038787014ce32e441adade6496a3 SHA512 1deb1e8dd62a12965d391e094e8bd363ea5c1cfc5305eaed275439dd3073e44f2b44606c9969c5475352d2034ce9b2339cf1a7ba6dd0310a6bb5ff7484c16470
MISC metadata.xml 818 BLAKE2B 6165990c46a33076cbcb991aa9417b1b1725886c03748d1fbb3f299408d6b56895b66cd723be06f0c72ded731698ca8d16d00cbf7247fafd1291b031aa784cf6 SHA512 141b1399bb3bdb6a5ade1bef685f99e60195edac718b93ec2350ab9e2dad3cc138a3d599c3a2b662a76579309a4f4cff259ef12a194d6a8dfffc4ef74c9102b6
diff --git a/media-libs/harfbuzz/harfbuzz-3.1.2.ebuild b/media-libs/harfbuzz/harfbuzz-3.1.2.ebuild
index f6617befe9b3..a40771678b2b 100644
--- a/media-libs/harfbuzz/harfbuzz-3.1.2.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-3.1.2.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
@@ -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/harfbuzz/harfbuzz-3.1.1.ebuild b/media-libs/harfbuzz/harfbuzz-3.3.1.ebuild
index c342b2dfe8f7..9322b2928b1c 100644
--- a/media-libs/harfbuzz/harfbuzz-3.1.1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-3.3.1.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
@@ -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/lcms/Manifest b/media-libs/lcms/Manifest
index d106fb7761fc..f831e319f6f2 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -1,5 +1,7 @@
DIST lcms2-2.11.tar.gz 6574121 BLAKE2B c729b4dad8326675c73d1752b23b4b55be130441e9dc8754e41f4cbb9b547c7f657f204e8c9a142035a54c60d3a43f36209f5511270675ad6b98b03e9db869fb SHA512 96643da4770c86eb56f454e605d7661024afb33f4e621c23c590307c31a0eec02100eca4f4ac6718639d99d750ed4834a9b2523e910469da717c3ddd78b4b50e
DIST lcms2-2.12.tar.gz 7419126 BLAKE2B ee75b1ec902b61683d0f157277fb7732ce2ec6aa8fa0b87d52f03029758ed11c2369db322f98d6ce06f62e8bf6235b8b96db9067ef448b87eab236b80c5d175c SHA512 967e8ac9a1d1aa3be45dc82362b9bc71c555e8577441efda57dc12d0bf84ed9188460c52eb8542d399ce9ab43bd4191988ed22b254ef34c6c1877bbb935952ed
+DIST lcms2-2.13.tar.gz 7259337 BLAKE2B 243e45852a31fb980c80f4468da14eaf1a2b6824cfa4ca0d6260064945faf0ededfa3b69fa8b041cbad49be1ddb7c6099d3b25873ec0d6e31beecea014808c8f SHA512 28cc5310b54b6254447c04ec8072878eb59e539095c400c05a15975b636f2f49daa2e5fa9021a3f9886a1b50e6c85bd950cefa8f171e3f4ee3be269a8dadc4d2
EBUILD lcms-2.11.ebuild 1161 BLAKE2B 6544d7c87de96c0bb45bc117c190419149322d86d5169af3d2da67d5764cec68b7adea5e13b28109c8ee33b19ca696bc205140e56f21c6d9654732466a803797 SHA512 67668031db5c0b28115fa4c94bbfd7229bd0e901d1fc03138b741bf04002b794f1bfac019b3d936ba5d70cf4688ffee03d394ef3b86af27704dbb3d6fa6a6178
EBUILD lcms-2.12.ebuild 1283 BLAKE2B 4491db59f78ff4242cb145e0013a08d004cdacfeb16d382869f26696649adca511cd6979914b6e56948352dca7811983161136c1bfad99ae6e592f7c9713a003 SHA512 93052efb79a9102e2558a83c289aecf88c519a233cf6c7cc436aed8e2055b5e8fd858403244691293e778f892458e9e475ca5bcabc8531856c56edad391b96f3
+EBUILD lcms-2.13.ebuild 1291 BLAKE2B 38a2bbe39eab23763a8bf27ece4eb90d30b5e033921c8a13cd28517b94b29638621aa9879358e0607eee29361716224760e0e224303614d118c1dc21d0aaaf2b SHA512 41d18dcd572448d8651c4d845f88d754dcf6e308a029bab2ba3a7b99a11f96d3678b2f84bf38a724bb5f6c339fbcba5fd40e2bc50682fc92c9dad147fa74cb83
MISC metadata.xml 465 BLAKE2B eac440b8a48c75faaa51b0333582740e7e33b0b6222bf5376383764c9395cfa7a7936e19ec2dd22a043e3251ed4e40161c7a594f7f3157b8b809c620dd551430 SHA512 dabeaecc2fed3c2e63f2bb0219711961c51f7da710a5e90629df694c5c89deb9fd26c2329ed5ac577edbf60b51a8efd34f65fdd7e6759912c2513e4d8efa6f35
diff --git a/media-libs/lcms/lcms-2.13.ebuild b/media-libs/lcms/lcms-2.13.ebuild
new file mode 100644
index 000000000000..592a2703d159
--- /dev/null
+++ b/media-libs/lcms/lcms-2.13.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit libtool multilib-minimal
+
+DESCRIPTION="A lightweight, speed optimized color management engine"
+HOMEPAGE="http://www.littlecms.com/"
+SRC_URI="https://github.com/mm2/Little-CMS/releases/download/lcms${PV}/${PN}2-${PV}.tar.gz"
+S="${WORKDIR}/lcms2-${PV}"
+
+LICENSE="MIT"
+SLOT="2"
+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 jpeg static-libs test +threads tiff zlib"
+REQUIRED_USE="tiff? ( zlib )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+ tiff? ( >=media-libs/tiff-4.0.3-r6:0=[${MULTILIB_USEDEP}] )
+ zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ default
+
+ # for Prefix/Solaris
+ elibtoolize
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ $(use_with jpeg)
+ $(use_enable static-libs static)
+ $(use_with threads)
+ $(use_with tiff)
+ $(use_with zlib)
+ )
+
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+ find "${ED}" -type f -name "*.la" -delete || die
+
+ use doc && dodoc doc/*.pdf
+}
diff --git a/media-libs/libglvnd/Manifest b/media-libs/libglvnd/Manifest
index 5149add776f1..6381190172dd 100644
--- a/media-libs/libglvnd/Manifest
+++ b/media-libs/libglvnd/Manifest
@@ -1,6 +1,6 @@
DIST libglvnd-1.3.4.tar.bz2 715616 BLAKE2B 77866bcd80b80dc27accbe960d63f45b5052ad110590890ed4707db0c2d7efd6882755f7258fc007b3b11bed9cee02477103ed65003185f9d7d2f6e82bef7df8 SHA512 3132bf2a547d5b7ffe12c6f1574b62c666cce8708d0311dccdbdb82063e5b6efd6f889ff1829d550af903305cd7c5bd2f7c5e0253234b25e0ea98234769e7ccf
DIST libglvnd-1.4.0.tar.bz2 563441 BLAKE2B 079b37571da7f1eb3cf8f87ea727aeec04a27158f015889552787ff269cc779f33c10a426a7113d4e45b13008b6540c2a2eec2ac69cb1cb5c551ac82e11475e5 SHA512 a887044b6b3b8bb2dae74f28a9b92ffa0ab7b65adc74d788e28c292b99ed618f93deb1ddc041b9a9460cf46eba5f63a4ba1c20f120dea868659a022428689287
EBUILD libglvnd-1.3.4.ebuild 1421 BLAKE2B b22257530cbf32ff9e61f9abeb5990a376e839caf28491d6ab5b99c149ce51a812cb9b6a7d8e43cf5f56bbf6dc21a969635270843556e407aa85b18a0977feca SHA512 35aec220b9ce9596cc668cefc40d6977282396f3c381bf6a633278186782cb336a9bccd4a335e4898c27b8c05bc5c175d033f1374259431fd900185e442ec321
-EBUILD libglvnd-1.4.0.ebuild 1432 BLAKE2B b6e1c25384af447964f8e9c89e699bee59d8c6432b7e6707e8336a5a9397f01951baf5d86f27db8bf98a9f5a4a907b5b25c361a7cdbcc0840b3a37c9b0146760 SHA512 2ed2725b8c789a5faaa76b689b591653e838d05226d9ef0556943bd34ca2645d7854c870a73d45a58477bfa5917a0f455035c7aa6c7c65bf965079c5e463e509
+EBUILD libglvnd-1.4.0.ebuild 1425 BLAKE2B 1e37e15d239526714907d332bf5bc7bfb8e4ea04fd6692a55b0eba9626e2f99f0113e510da9fe1bef39d9a7a4d9233bec91194853786b731798bd67737721b7b SHA512 b00f4798b362ba466ea35444739fb1c28aaaf6b0cb87f56c387ee99c34e712ca5d7fb47b1384c82ba5f71b0a3c3b014be26031415d135e872c2d9f60bf428484
EBUILD libglvnd-9999.ebuild 1426 BLAKE2B 3ea571c65e40145ea193dcd978cee912e367b82ff84f27861e82ca1cb5ef073f2c6326975bea77ac344751173f1a48f8f2d8460041e0e4370de5929a728ca1c5 SHA512 c8af8a78d63eb8f65c96b5a4e031a5667eb5272ced4ab3837f17a3d5d9253bef2810cb499bd24f94c084a284fafceaeaa34ec17314a2b27831c7f4af1553a5e4
MISC metadata.xml 315 BLAKE2B 138fe0ad285ae16426c77740c19a0740a9b882a421fd6a0dc39489ce5bfcd21254e3de2fcd315386e4cf10f6caff39ccfa4c3df0491ed4165d5a6a768e5f454c SHA512 958019318d542e273a11b6ab57d4dad10b375f85bda613279ddb2b5cc834c1a023b1f1b3d14e9450d5b48ee579506a8a904ecc540276138c1d5350a27d34e14a
diff --git a/media-libs/libglvnd/libglvnd-1.4.0.ebuild b/media-libs/libglvnd/libglvnd-1.4.0.ebuild
index ae64e11b1123..bf7eccde03d4 100644
--- a/media-libs/libglvnd/libglvnd-1.4.0.ebuild
+++ b/media-libs/libglvnd/libglvnd-1.4.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://gitlab.freedesktop.org/glvnd/libglvnd"
if [[ ${PV} = 9999* ]]; then
SRC_URI=""
else
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86"
SRC_URI="https://gitlab.freedesktop.org/glvnd/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
S=${WORKDIR}/${PN}-v${PV}
fi
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 7f79e586e8ef..fab5bfe7d7fc 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -2,5 +2,5 @@ AUX libsdl2-2.0.16-static-libs.patch 2076 BLAKE2B fc2fd18ef413216d2992863adb839c
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.ebuild 6472 BLAKE2B 8ef3fa15ce9c6b4c45ab86475563a10ec597541ca0e8a690b43ad17e1c7823a4ccbb7b3ae6a1704fcafaf9316433468edb33a238b863105d1410089047163d87 SHA512 1f366d8ffb54ccaca0ee08356a5c59530356555c59b231b05fe0fa546669ddc131ad387f50976d2776f57eaa1e714c0f948322eafc063042188c563bc021b321
+EBUILD libsdl2-2.0.20-r1.ebuild 6517 BLAKE2B da8cf99ba06841efe11c3f88c74a935a462644d2b4aec44656468ed0dfe3989652f25a3367e0d74bd14b1424bdee7dc74dd298aeb27143abb56830ba13dab08f SHA512 dc8b9d90ff79c3c2ba9338560c1a5d9d59111f6418cdd4e2069817b5fcd6f2be016b15f1cdcba9bec3aa40c46f8e4c0c2cee5c7c13901bd81481aba1ab32baf1
MISC metadata.xml 1975 BLAKE2B 7ebb6f5306b8d525ff7564f19e86d11ba36579e376b9b691f421fc47f2ac887cda3baa3ad0cac3ab5d761b7df5ee50ce0c6636ed77287eb86a7fd7e587c70dfb SHA512 e163aaa04637301da96ac9fca8c68582227b24fac1ca929f2ff1f2db8b0e0f7c84914b3a4ccb54367d41082d2e24c761228b2110bf099afed9599a5cb3014db7
diff --git a/media-libs/libsdl2/libsdl2-2.0.20.ebuild b/media-libs/libsdl2/libsdl2-2.0.20-r1.ebuild
index 0e22bf102de2..ac70239d8ce4 100644
--- a/media-libs/libsdl2/libsdl2-2.0.20.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.20-r1.ebuild
@@ -58,7 +58,7 @@ CDEPEND="
sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] )
udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
wayland? (
- >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}]
+ >=dev-libs/wayland-1.20[${MULTILIB_USEDEP}]
>=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl(+),gles2,wayland]
>=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}]
)
@@ -85,6 +85,7 @@ BDEPEND="
app-doc/doxygen
media-gfx/graphviz
)
+ wayland? ( >=dev-util/wayland-scanner-1.20 )
"
MULTILIB_WRAPPED_HEADERS=(
diff --git a/media-libs/libsidplay/Manifest b/media-libs/libsidplay/Manifest
index bac044586f7e..606cb88827dd 100644
--- a/media-libs/libsidplay/Manifest
+++ b/media-libs/libsidplay/Manifest
@@ -10,4 +10,4 @@ DIST libsidplay-1.36.59.tgz 390097 BLAKE2B bcb7e9eab4884270c8047af7f61e0afb2cf6b
DIST sidplay-libs-2.1.1.tar.gz 1900252 BLAKE2B f04e34f4cfc641a8222e5d53575108bd52deb2de2dc0b0d58e91581ade7128ac87f320f16e044baa23b54de6b5b6b833e9f6c0d37a1885341a329e778c0a0228 SHA512 754cd41f3d2d76754049522c395022bc090f99ea838e6d1ffb8d7689f3aedad9b3879be0312d0af49ba108563296c1176d1e533d1151d5b33368bfda0a1910e3
EBUILD libsidplay-1.36.59-r2.ebuild 766 BLAKE2B 33fb576676adfe11e1eb49fec9072fcbbb1200d6d1a084ce9332178529f798e74a37a16d2a47b15e18cb738af0d03830c865f00f7b583936357b8dbea92cd87a SHA512 54426f91c6bf5753f523e8a73154773396ddfb040315e91476e2dda2aa32641c1cf09258ed4777638f42779ac3e8732b8551e9ff9c582479201fa5e6a70885e9
EBUILD libsidplay-2.1.1-r5.ebuild 1233 BLAKE2B cfb102036b715eabf1ad4b28c27be0d56e01c5403ed8a6a26d271d12b3a03a3162aa53a0771ad7634262630f6292ea3887ba5f164be2e2793b3729eaee06ef69 SHA512 da1a7fdbda9b46a6133de346d756d295d674ba1e1bb5a646fcd897384e0d3fd83e17934ec862f90ce99630d904e2904d2fde6120f9474f6f202003d4497787b8
-MISC metadata.xml 295 BLAKE2B 53bfc026844dc05f46ebec253703f10615f82d577cfcd3aee2a5c2c867043c533774ab91321696d15cb18a87ee26b919c7608fc570c2b93b4be6fc9e8e5f551a SHA512 22196f0359e9f62b315bad680e31fea784e9f7c2faf5d11092d939ebd4baf97de439f1c7eb101cc201d1a2c90fd7e56b520d04e6506b0eb0bfb159dd735dc0fa
+MISC metadata.xml 246 BLAKE2B 5791eec1fea2211cdfa2d13a89732df17195754dddcb9122157536f9f398f783de194f304cc545db22ae0506f69cb13cb1b9e03449959edc96097b2f0eac2d13 SHA512 8f5558a12be53599ddda50ec08e80a33b37ee1f4c73048b4a02983121e22c149dca53abda7985c840aedc506a9945a66ef94e034f168d868b9933b8c5c2c9fdb
diff --git a/media-libs/libsidplay/metadata.xml b/media-libs/libsidplay/metadata.xml
index c366a499e115..3b0f616ab403 100644
--- a/media-libs/libsidplay/metadata.xml
+++ b/media-libs/libsidplay/metadata.xml
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>hanno@gentoo.org</email>
- </maintainer>
+ <!-- maintainer-needed -->
<upstream>
<remote-id type="sourceforge">sidplay2</remote-id>
</upstream>
diff --git a/media-libs/libwebp/Manifest b/media-libs/libwebp/Manifest
index c8484cf4c08c..2a6a6cf1be67 100644
--- a/media-libs/libwebp/Manifest
+++ b/media-libs/libwebp/Manifest
@@ -1,7 +1,9 @@
DIST libwebp-1.1.0.tar.gz 4033877 BLAKE2B ac6c2267f43ba42079975938c8fecb75237a494ab8a4ca71b68a49c3d219afa92079fd94431ccbcc363a1e6aef890642a658f429b8d75cd90dd5d735fa37dcef SHA512 c8440059a985587d4876a5e7fc2d07523bc7f582a04ee5dab0ef07df32b9635b907224de2cc15246c831dd5d9215569770196626badccc3171fe2832d7cb4549
DIST libwebp-1.2.0.tar.gz 4092120 BLAKE2B 213b2385f646dd0fbaa7c9103b0d33a9cb5e7285d9df91107db722f514428ab8cc896704d71a3913ca1aedffeb706fcda4c7a59a3960ebc21c74ca9422632605 SHA512 c46b41899a543cc80914c89646dd607dbb5d025a9727dd83ef70994b9310eedc697666bd812141a90aa16632a9a354a031d9360a9ee1112295c7e154e69f0b74
DIST libwebp-1.2.1.tar.gz 4100806 BLAKE2B 6bbc6dd1a3ec094a6ad0045fd483bcce055c5f3dd15022595de090c4719e5b7bfec60818a8c88886ab2546325a515526d750c9fd31017278ac6d747218570f5e SHA512 5208ac9532c89ea9fec01122cb307afacdbf5c501ed1c6056e9ffc98e2a3386e637224e0301da88ae3a32aa0c210364e1e4eac79487e465ef9e54eb9b1af80aa
+DIST libwebp-1.2.2.tar.gz 4117468 BLAKE2B 8bdb5a82317f06c39458b04580fa674399bc02f15a8e28f8a17456e1e26af74d87a63ecfda9f2760822ba318e8bd42a9c84f87cc2a3c63bad4fbdc00d212010e SHA512 0dd0a721352b513a218d55383bcd0cc45b786df8089f70f87257b5dcc0c4e2f1798e20f1ca98b8fe51710abb667f9c4c14f20f980a11c484c8832f0dc66e3bff
EBUILD libwebp-1.1.0.ebuild 1854 BLAKE2B 8b7c661b253198816a6987d2e0d5b42572211f0bd7ab9317501871e73faf3c74d4e29c61a4b1ecf1182de1ce37e67d2d51a6b87ee98c098d665863d8797a2578 SHA512 630a2f2af3d7572a8c7b526521dc444ee90efdc65f12152606fffd7446d6d8b0ea244d5be57c5f990cf82087a684d485c2d336f28a74505e9be944277e4b9dfe
EBUILD libwebp-1.2.0.ebuild 1868 BLAKE2B 0887de53bb12d90b72f844c2716d7e3613ef3e96aac44a68ccaab1c6c5d581ab7767003e79bf5cc6ecc9cf3ec74ec5afc9d93f2792b00abb2ce56958e877dea1 SHA512 e97316bc68a5b593c4c8c098ad5790d7929adca010d776151d94492ccf2be6db1ae5726988af93d4e7d2f843bd8461cb1261f4179e939eb5670cd7f5f077557e
EBUILD libwebp-1.2.1.ebuild 1868 BLAKE2B 0887de53bb12d90b72f844c2716d7e3613ef3e96aac44a68ccaab1c6c5d581ab7767003e79bf5cc6ecc9cf3ec74ec5afc9d93f2792b00abb2ce56958e877dea1 SHA512 e97316bc68a5b593c4c8c098ad5790d7929adca010d776151d94492ccf2be6db1ae5726988af93d4e7d2f843bd8461cb1261f4179e939eb5670cd7f5f077557e
+EBUILD libwebp-1.2.2.ebuild 1868 BLAKE2B 0a09ef0dc5fda022bc07e6718f92e51870b552205ba0981b0950076895d84165cc093061636d218fa3fa99ac67671d5d8d744f68f094f5bf5f18a807a071e3b4 SHA512 f99da617d3fd2e378962cd6ceeb95b6d2864e78726a17a6a5932c264fa9013161660c1443c16d85a1e1326930cf6871f6151adb5db5da892042b162ad90f9be7
MISC metadata.xml 442 BLAKE2B 3700315ba8872e208756f663236158c42f967eab7bec9b440b238b14f76357fe7721e571b7c11d79fff0f8df90f9ad35504cef3f6dc2803b8e5394ac0e3ea437 SHA512 5fceda7410ea654e3d9297f3adcad43b99c298b436ec5d77a9396259b61a0c9dd2945b98f7fa7d0b7d38622e14bf82bcfbbbdc18f011f0b949ae61a9a8794800
diff --git a/media-libs/libwebp/libwebp-1.2.2.ebuild b/media-libs/libwebp/libwebp-1.2.2.ebuild
new file mode 100644
index 000000000000..2ca960e6475f
--- /dev/null
+++ b/media-libs/libwebp/libwebp-1.2.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools multilib-minimal
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="A lossy image compression format"
+HOMEPAGE="https://developers.google.com/speed/webp/download"
+SRC_URI="https://storage.googleapis.com/downloads.webmproject.org/releases/webp/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/7" # subslot = libwebp soname version
+[[ "${PV}" = *_rc* ]] || \
+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="cpu_flags_arm_neon cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 gif +jpeg opengl +png static-libs swap-16bit-csp tiff"
+
+# TODO: dev-lang/swig bindings in swig/ subdirectory
+RDEPEND="gif? ( media-libs/giflib:= )
+ jpeg? ( virtual/jpeg:0= )
+ opengl? (
+ media-libs/freeglut
+ virtual/opengl
+ )
+ png? ( media-libs/libpng:0= )
+ tiff? ( media-libs/tiff:0= )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ default
+
+ # Fix libtool relinking, bug 499270.
+ #elibtoolize
+ eautoreconf
+}
+
+multilib_src_configure() {
+ local args=(
+ --enable-libwebpmux
+ --enable-libwebpdemux
+ --enable-libwebpdecoder
+ $(use_enable static-libs static)
+ $(use_enable swap-16bit-csp)
+ $(use_enable jpeg)
+ $(use_enable png)
+ $(use_enable opengl gl)
+ $(use_enable tiff)
+
+ $(use_enable cpu_flags_x86_sse2 sse2)
+ $(use_enable cpu_flags_x86_sse4_1 sse4.1)
+ $(use_enable cpu_flags_arm_neon neon)
+
+ # Only used for gif2webp binary wrt #486646
+ $(multilib_native_use_enable gif)
+ )
+
+ ECONF_SOURCE="${S}" econf "${args[@]}"
+}
+
+multilib_src_install() {
+ emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+ find "${ED}" -type f -name "*.la" -delete || die
+ dodoc AUTHORS ChangeLog doc/*.txt NEWS README{,.mux}
+}
diff --git a/media-libs/libwmf/Manifest b/media-libs/libwmf/Manifest
index 24b72cbb3326..ff2aebd80828 100644
--- a/media-libs/libwmf/Manifest
+++ b/media-libs/libwmf/Manifest
@@ -9,5 +9,5 @@ AUX libwmf-0.2.8.4-pngfix.patch 582 BLAKE2B 942d02776eb50d71222224f5c11fe2457fae
AUX libwmf-0.2.8.4-use-freetype2-pkg-config.patch 2050 BLAKE2B 1ea7515753b2f3153c78d80573f219279e76021549ac85131ad9e139a5dd787c107cf83af18529429c4d250b77300a8b553d24ba9030735bac6acd68af833734 SHA512 311189d58d8bca7d91967bda84c6475ccec59fa4e11b535ff6919664cdeaa4b668ea688a021911dd7ea77393189c762c3800214acbed9f09d8591c70efa6b058
AUX libwmf-0.2.8.4-use-system-fonts.patch 840 BLAKE2B b81b973aeb8b1e59c0fdf8a4dfbbad05285dcb3e4fe9f61002a6997c8988fc8e931dda1c2c3d6f250e287bd084f96c6ada464686ccbc22f6224edaa5fb461196 SHA512 0b5536cf6ac5812f88cada38afa94a7c51044aff44c4fa4a74b8fabd41c001aed7acf7911cebe967ad9764525aef8cbc048796b60db7b60b12bee3cfc846c50c
DIST libwmf-0.2.8.4.tar.gz 2169375 BLAKE2B d86de4483201a07639779e024752d5c00a3dbc7399be353879b828850b74612651bbcf1851f322d62352259b73647038790580a9a4aeb43b7aeb4c1affedcabe SHA512 d98df8e76a52245487b13e5ab3d2fbba9d246f97ee04a7344c0e5861bb2d0f990fc6d662dbd849ce621768b06eaebd4270fb34bec4ee004334a98b14ba6044a5
-EBUILD libwmf-0.2.8.4-r8.ebuild 2564 BLAKE2B b4149974b77a473beb9a5c4c129810c646bab3c44129c421324ac0f6b0228996229e86e7854857cabc73ecda90c26be9673581a82fe105fa265cb140e5f4a635 SHA512 3082806b551e31cf0cb0588f8c94ec59d7e4eefa7a16106cae1e995aa36dab9b8e1831bf6603585df57999cf8f74d5158a6153610d8cfd771fa5a18289bbcc91
+EBUILD libwmf-0.2.8.4-r9.ebuild 2605 BLAKE2B 99dc3cb1e06b1e39a6f3787cdb85aec2c9e7a714bdfe057723569ec88f4afc7c4afc2791bd696aa94051e010606c85f7ca57f90b0e061adcc97346f5879519d7 SHA512 ceade294022abf3cc327f1d710fb54ccc1c9fcdc32cd48278265383ab0287a82fa190ac4c6f93d48fe4f305dfda61798fea7a8ec2b6564496eecd83b47ec0f2a
MISC metadata.xml 304 BLAKE2B 309f7a8ad3556a6f229c6f3568319de9f62387c6dc32e385dbb8524f519c9144b8b4f9e651214f2c74ac3d510686af8b6c786453620b249a399ce1e984523cd1 SHA512 529f336dde78c9d1fe518f1bfd2a34f28887f6070be82373ad051458550d31f5f73a9240bdff2f47a43ddca49f5c5bc88d3df826f8fea52bfd8354c841e1ee8f
diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild b/media-libs/libwmf/libwmf-0.2.8.4-r9.ebuild
index 55b213bf3b8a..77cf073f7a5f 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r9.ebuild
@@ -89,6 +89,7 @@ src_install() {
MAKEOPTS=-j1
default
+ find "${D}" -name '*.la' -delete || die
}
pkg_preinst() {
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 8835c8c0aaf8..6ad92e7fcaec 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -2,9 +2,11 @@ DIST mesa-21.2.6.tar.xz 15868208 BLAKE2B aaa6447a2f5a472c2ee2b7d6b12effb79d02804
DIST mesa-21.3.2.tar.xz 16466760 BLAKE2B 549d37d365b477b3f991ef0602c94b6df826e32dfac8bf76c19157e01ffca84ce1f0fd8311a04bbdc1a6804f562a075945e2662083a3a663ba78fae0d4853ef6 SHA512 35c510cbab70be43bc207720a12fe85b0c010fafa147238f2c22dd873967278f187ee7675a662882ead3598305f1f37804567deb93022a692ca259f563abfdac
DIST mesa-21.3.3.tar.xz 16476044 BLAKE2B 04ae7983c82fbd6dafb405ee717df2406607e4fb1f95996abe5390cb1cbdb6385fb8b00ac9982d1bc7dd10fc18eeb1bc08d7147dc00969bd3bcb347a53ca77ec SHA512 0263d75435f8c16d40eba3eae29bf372e8994816718deec153c582a17c4dd6ef1c67b3236ed31e63f98bf4e1089fac5cfafae9fb84d3e1fa919b274f43e7e673
DIST mesa-21.3.4.tar.xz 16497248 BLAKE2B 3fe2543bb6286a0d84a247785dbb4b5dd6df905eab748a89854589008d9db5aae6c52e473c58cff8d03694d46d3ce2a2680fddc8c978f898dc9bcdec02ca9b6b SHA512 7aeea3dba0d39f4ac9f23c54aa0e6853d48000f50c4dd484618c28debe705cdd765ae8fafb5ddea0773976f7189849d9128be3f2282fea74394b59019cb786b9
+DIST mesa-21.3.5.tar.xz 16521664 BLAKE2B 4dcf2e40103233332724289434998149c41a86fdaef622c2fc92065d1708a0635ed5a179e5fc8e51d82efe794f4f99c7de734ed61a8804b5e94aecb071656795 SHA512 417d1787f8177567f0c547dde3e24212f7497f2fe7cdaa945fe998cd61ec0e9eb9388feb444e377c4fd8794b056af02aac28d1bbfb9527844391ba49e6893933
EBUILD mesa-21.2.6.ebuild 15212 BLAKE2B b4153c461e270495b87b56ccd708522216cafcf18635a5d488b011b85db0cd5ead8c908f3e7bc33a5ca21177b634c8adc0bd9da84ae3bee5c76a78b85188c481 SHA512 ae7ff35b6dd713950464d2d501b0ca136be7e3e0900dd3136c3181cf733523543edf87642ddba2e1175c5c6cc2906970f5da82c125b029a22c754031e85fa63f
EBUILD mesa-21.3.2.ebuild 15028 BLAKE2B dd3fbfebece8087f7ef76c0009c17df6742c2b2c22cf121425379ce04bbd2bb9737cad8d2bb3fca9835fd23f20649090d3eabb84bd131b6f66683048fe2c8dc8 SHA512 ac865266d0d8cb0e89a3d8c108cc3b6ec9a24846bb138f61e80117f87264da3b1309b582cd1d754ce296aab8cf6b20cbc25ab94caef2865d468b0211174e0723
EBUILD mesa-21.3.3.ebuild 15028 BLAKE2B dd3fbfebece8087f7ef76c0009c17df6742c2b2c22cf121425379ce04bbd2bb9737cad8d2bb3fca9835fd23f20649090d3eabb84bd131b6f66683048fe2c8dc8 SHA512 ac865266d0d8cb0e89a3d8c108cc3b6ec9a24846bb138f61e80117f87264da3b1309b582cd1d754ce296aab8cf6b20cbc25ab94caef2865d468b0211174e0723
-EBUILD mesa-21.3.4.ebuild 15028 BLAKE2B 277b5a33cde6adead9e304d995f608ed05cfa58148687bc653c9d651996ccc860511b45ff70b2d490e3f903334dacb7ca93af492628e9ea0c7a6e783f08d1acf SHA512 e9d51672757062b6e4a6ce6674711bd6efee004b95a43123a663d276a5e61d540cfedee6074455e7ed94451b8fe046c26a7fe116262e287b60c850d4566778dd
+EBUILD mesa-21.3.4.ebuild 15021 BLAKE2B 743e616fa4a41dffde7c2bbcbb482c211a02b67e6c802eda52bef3f83c1ee42f3e71b4d28d34279adeb946ed1ac61c3a19be729fdda9b5bdc90ab99eef3aebc7 SHA512 36b6e3a749a9e1aae1f5029be3dee3340064b7555b8df8b25d1316ebe2eea7f2ef39fa7c7a79ef371bab3285c3000e422ad42d20c08adc8a217d24cea2452316
+EBUILD mesa-21.3.5.ebuild 15028 BLAKE2B 277b5a33cde6adead9e304d995f608ed05cfa58148687bc653c9d651996ccc860511b45ff70b2d490e3f903334dacb7ca93af492628e9ea0c7a6e783f08d1acf SHA512 e9d51672757062b6e4a6ce6674711bd6efee004b95a43123a663d276a5e61d540cfedee6074455e7ed94451b8fe046c26a7fe116262e287b60c850d4566778dd
EBUILD mesa-9999.ebuild 12066 BLAKE2B 9aca896f15ef00fecd3e6ac8ec844e4ab1f5fa831872effd07909f8d8729273a51a91d1156683fc83ccc0efc574435ec07b8f85db8a6a162a66e89a2a6c0e176 SHA512 e9f217a1481790be4e81c741965c502e430d4a8acdf5f479a7a2f819a4b7e936281e0401dd33e4d9632ff3b03a011e830877bb431d6ed98e50c84fdd60307ba6
MISC metadata.xml 1848 BLAKE2B d08b83f9a7b14353998d07602583ed2f8c4208b03562a0b1c45fc0d4e1ef40787ed2b37b512557af48f00b08e7ea8db65091cd6c01bdfc6c3e1f497e44268cdb SHA512 2076fd824999959ec819bf7aad9a33fe00419e8ae9f91b9ea70440538f8f2c30d9e934973c80883515479dddd038443257dcf960c566d66421f86898c79fbe94
diff --git a/media-libs/mesa/mesa-21.3.4.ebuild b/media-libs/mesa/mesa-21.3.4.ebuild
index 7b064418bfbd..a5334667f07e 100644
--- a/media-libs/mesa/mesa-21.3.4.ebuild
+++ b/media-libs/mesa/mesa-21.3.4.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="MIT"
diff --git a/media-libs/mesa/mesa-21.3.5.ebuild b/media-libs/mesa/mesa-21.3.5.ebuild
new file mode 100644
index 000000000000..7b064418bfbd
--- /dev/null
+++ b/media-libs/mesa/mesa-21.3.5.ebuild
@@ -0,0 +1,552 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit llvm meson-multilib python-any-r1 linux-info
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+ inherit git-r3
+else
+ SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+ !test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} crocus freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+ IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+ +classic cpu_flags_x86_sse2 d3d9 debug +gallium gles1 +gles2 +llvm
+ lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
+ vulkan-overlay wayland +X xa xvmc zink +zstd"
+
+REQUIRED_USE="
+ d3d9? ( || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+ osmesa? ( gallium )
+ vulkan? ( video_cards_radeonsi? ( llvm ) )
+ vulkan-overlay? ( vulkan )
+ video_cards_crocus? ( gallium )
+ video_cards_freedreno? ( gallium )
+ video_cards_intel? ( classic )
+ video_cards_i915? ( || ( classic gallium ) )
+ video_cards_i965? ( classic )
+ video_cards_iris? ( gallium )
+ video_cards_lima? ( gallium )
+ video_cards_nouveau? ( || ( classic gallium ) )
+ video_cards_panfrost? ( gallium )
+ video_cards_radeon? ( || ( classic gallium )
+ gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+ video_cards_r100? ( classic )
+ video_cards_r200? ( classic )
+ video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) )
+ video_cards_r600? ( gallium )
+ video_cards_radeonsi? ( gallium llvm )
+ video_cards_v3d? ( gallium )
+ video_cards_vc4? ( gallium )
+ video_cards_virgl? ( gallium )
+ video_cards_vivante? ( gallium )
+ video_cards_vmware? ( gallium )
+ xa? ( X )
+ xvmc? ( X )
+ zink? ( gallium vulkan )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.107"
+RDEPEND="
+ >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+ >=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+ gallium? (
+ unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+ llvm? (
+ video_cards_radeonsi? (
+ virtual/libelf:0=[${MULTILIB_USEDEP}]
+ )
+ video_cards_r600? (
+ virtual/libelf:0=[${MULTILIB_USEDEP}]
+ )
+ video_cards_radeon? (
+ virtual/libelf:0=[${MULTILIB_USEDEP}]
+ )
+ )
+ lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
+ opencl? (
+ >=virtual/opencl-3[${MULTILIB_USEDEP}]
+ dev-libs/libclc
+ virtual/libelf:0=[${MULTILIB_USEDEP}]
+ )
+ vaapi? (
+ >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+ )
+ vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+ xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+ )
+ selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
+ wayland? (
+ >=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
+ >=dev-libs/wayland-protocols-1.8
+ )
+ ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+ video_cards_intel? (
+ !video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+ )
+ video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+ vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
+ X? (
+ >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+ >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+ >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+ >=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+ x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+ )
+ zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
+ zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+for card in ${RADEON_CARDS}; do
+ RDEPEND="${RDEPEND}
+ video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+ "
+done
+RDEPEND="${RDEPEND}
+ video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="13"
+LLVM_DEPSTR="
+ || (
+ sys-devel/llvm:13[${MULTILIB_USEDEP}]
+ sys-devel/llvm:12[${MULTILIB_USEDEP}]
+ sys-devel/llvm:11[${MULTILIB_USEDEP}]
+ )
+ <sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+ gallium? (
+ llvm? (
+ opencl? (
+ video_cards_r600? (
+ ${CLANG_DEPSTR_AMDGPU}
+ )
+ !video_cards_r600? (
+ video_cards_radeonsi? (
+ ${CLANG_DEPSTR_AMDGPU}
+ )
+ )
+ !video_cards_r600? (
+ !video_cards_radeonsi? (
+ video_cards_radeon? (
+ ${CLANG_DEPSTR_AMDGPU}
+ )
+ )
+ )
+ !video_cards_r600? (
+ !video_cards_radeon? (
+ !video_cards_radeonsi? (
+ ${CLANG_DEPSTR}
+ )
+ )
+ )
+ )
+ !opencl? (
+ video_cards_r600? (
+ ${LLVM_DEPSTR_AMDGPU}
+ )
+ !video_cards_r600? (
+ video_cards_radeonsi? (
+ ${LLVM_DEPSTR_AMDGPU}
+ )
+ )
+ !video_cards_r600? (
+ !video_cards_radeonsi? (
+ video_cards_radeon? (
+ ${LLVM_DEPSTR_AMDGPU}
+ )
+ )
+ )
+ !video_cards_r600? (
+ !video_cards_radeon? (
+ !video_cards_radeonsi? (
+ ${LLVM_DEPSTR}
+ )
+ )
+ )
+ )
+ )
+ )
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+ valgrind? ( dev-util/valgrind )
+ X? (
+ x11-libs/libXrandr[${MULTILIB_USEDEP}]
+ x11-base/xorg-proto
+ )
+"
+BDEPEND="
+ ${PYTHON_DEPS}
+ opencl? (
+ >=sys-devel/gcc-4.6
+ )
+ sys-devel/bison
+ sys-devel/flex
+ virtual/pkgconfig
+ $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+ wayland? ( dev-util/wayland-scanner )
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+ usr/lib*/libglapi.so.0.0.0
+ usr/lib*/libGLESv1_CM.so.1.1.0
+ usr/lib*/libGLESv2.so.2.0.0
+ usr/lib*/libGL.so.1.2.0
+ usr/lib*/libOSMesa.so.8.0.0
+ usr/lib/libGLX_mesa.so.0.0.0
+)"
+
+llvm_check_deps() {
+ local flags=${MULTILIB_USEDEP}
+ if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+ then
+ flags+=",llvm_targets_AMDGPU(-)"
+ fi
+
+ if use opencl; then
+ has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
+ fi
+ has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
+}
+
+pkg_pretend() {
+ if use vulkan; then
+ if ! use video_cards_freedreno &&
+ ! use video_cards_i965 &&
+ ! use video_cards_iris &&
+ ! use video_cards_radeonsi &&
+ ! use video_cards_v3d; then
+ ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain freedreno, i965, iris, radeonsi, or v3d"
+ fi
+ fi
+
+ if use opencl; then
+ if ! use video_cards_r600 &&
+ ! use video_cards_radeonsi; then
+ ewarn "Ignoring USE=opencl since VIDEO_CARDS does not contain r600 or radeonsi"
+ fi
+ fi
+
+ if use vaapi; then
+ if ! use video_cards_r600 &&
+ ! use video_cards_radeonsi &&
+ ! use video_cards_nouveau; then
+ ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+ fi
+ fi
+
+ if use vdpau; then
+ if ! use video_cards_r300 &&
+ ! use video_cards_r600 &&
+ ! use video_cards_radeonsi &&
+ ! use video_cards_nouveau; then
+ ewarn "Ignoring USE=vdpau since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+ fi
+ fi
+
+ if use xa; then
+ if ! use video_cards_freedreno &&
+ ! use video_cards_nouveau &&
+ ! use video_cards_vmware; then
+ ewarn "Ignoring USE=xa since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+ fi
+ fi
+
+ if use xvmc; then
+ if ! use video_cards_r600 &&
+ ! use video_cards_nouveau; then
+ ewarn "Ignoring USE=xvmc since VIDEO_CARDS does not contain r600 or nouveau"
+ fi
+ fi
+
+ if ! use gallium; then
+ use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
+ use llvm && ewarn "Ignoring USE=llvm since USE does not contain gallium"
+ use opencl && ewarn "Ignoring USE=opencl since USE does not contain gallium"
+ use vaapi && ewarn "Ignoring USE=vaapi since USE does not contain gallium"
+ use vdpau && ewarn "Ignoring USE=vdpau since USE does not contain gallium"
+ use unwind && ewarn "Ignoring USE=unwind since USE does not contain gallium"
+ use xa && ewarn "Ignoring USE=xa since USE does not contain gallium"
+ use xvmc && ewarn "Ignoring USE=xvmc since USE does not contain gallium"
+ fi
+
+ if ! use llvm; then
+ use opencl && ewarn "Ignoring USE=opencl since USE does not contain llvm"
+ fi
+
+ if use osmesa && ! use llvm; then
+ ewarn "OSMesa will be slow without enabling USE=llvm"
+ fi
+}
+
+python_check_deps() {
+ has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ # warning message for bug 459306
+ if use llvm && has_version sys-devel/llvm[!debug=]; then
+ ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+ ewarn "detected! This can cause problems. For details, see bug 459306."
+ fi
+
+ if use video_cards_i965 ||
+ use video_cards_iris ||
+ use video_cards_radeonsi; then
+ if kernel_is -ge 5 11 3; then
+ CONFIG_CHECK="~KCMP"
+ elif kernel_is -ge 5 11; then
+ CONFIG_CHECK="~CHECKPOINT_RESTORE"
+ elif kernel_is -ge 5 10 20; then
+ CONFIG_CHECK="~KCMP"
+ else
+ CONFIG_CHECK="~CHECKPOINT_RESTORE"
+ fi
+ linux-info_pkg_setup
+ fi
+
+ if use gallium && use llvm; then
+ llvm_pkg_setup
+ fi
+ python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+ local emesonargs=()
+
+ if use classic; then
+ # Intel code
+ dri_driver_enable video_cards_i915 i915
+ dri_driver_enable video_cards_i965 i965
+ if ! use video_cards_i915 && \
+ ! use video_cards_i965; then
+ dri_driver_enable video_cards_intel i915 i965
+ fi
+
+ # Nouveau code
+ dri_driver_enable video_cards_nouveau nouveau
+
+ # ATI code
+ dri_driver_enable video_cards_r100 r100
+ dri_driver_enable video_cards_r200 r200
+ if ! use video_cards_r100 && \
+ ! use video_cards_r200; then
+ dri_driver_enable video_cards_radeon r100 r200
+ fi
+ fi
+
+ local platforms
+ use X && platforms+="x11"
+ use wayland && platforms+=",wayland"
+ emesonargs+=(-Dplatforms=${platforms#,})
+
+ if use gallium; then
+ emesonargs+=(
+ $(meson_feature llvm)
+ $(meson_feature lm-sensors lmsensors)
+ $(meson_feature unwind libunwind)
+ )
+
+ if use video_cards_iris ||
+ use video_cards_r300 ||
+ use video_cards_r600 ||
+ use video_cards_radeonsi ||
+ use video_cards_nouveau ||
+ use video_cards_vmware; then
+ emesonargs+=($(meson_use d3d9 gallium-nine))
+ else
+ emesonargs+=(-Dgallium-nine=false)
+ fi
+
+ if use video_cards_r600 ||
+ use video_cards_radeonsi ||
+ use video_cards_nouveau; then
+ emesonargs+=($(meson_feature vaapi gallium-va))
+ use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+ else
+ emesonargs+=(-Dgallium-va=disabled)
+ fi
+
+ if use video_cards_r300 ||
+ use video_cards_r600 ||
+ use video_cards_radeonsi ||
+ use video_cards_nouveau; then
+ emesonargs+=($(meson_feature vdpau gallium-vdpau))
+ else
+ emesonargs+=(-Dgallium-vdpau=disabled)
+ fi
+
+ if use video_cards_freedreno ||
+ use video_cards_nouveau ||
+ use video_cards_vmware; then
+ emesonargs+=($(meson_feature xa gallium-xa))
+ else
+ emesonargs+=(-Dgallium-xa=disabled)
+ fi
+
+ if use video_cards_r600 ||
+ use video_cards_nouveau; then
+ emesonargs+=($(meson_feature xvmc gallium-xvmc))
+ else
+ emesonargs+=(-Dgallium-xvmc=disabled)
+ fi
+
+ if use video_cards_freedreno ||
+ use video_cards_lima ||
+ use video_cards_panfrost ||
+ use video_cards_v3d ||
+ use video_cards_vc4 ||
+ use video_cards_vivante; then
+ gallium_enable -- kmsro
+ fi
+
+ gallium_enable -- swrast
+ gallium_enable video_cards_lima lima
+ gallium_enable video_cards_panfrost panfrost
+ gallium_enable video_cards_v3d v3d
+ gallium_enable video_cards_vc4 vc4
+ gallium_enable video_cards_vivante etnaviv
+ gallium_enable video_cards_vmware svga
+ gallium_enable video_cards_nouveau nouveau
+ gallium_enable zink zink
+
+ # Only one i915 driver (classic vs gallium). Default to classic.
+ if ! use classic; then
+ gallium_enable video_cards_i915 i915
+ if ! use video_cards_i915 && \
+ ! use video_cards_i965; then
+ gallium_enable video_cards_intel i915
+ fi
+ fi
+
+ gallium_enable video_cards_crocus crocus
+ gallium_enable video_cards_iris iris
+
+ gallium_enable video_cards_r300 r300
+ gallium_enable video_cards_r600 r600
+ gallium_enable video_cards_radeonsi radeonsi
+ if ! use video_cards_r300 && \
+ ! use video_cards_r600; then
+ gallium_enable video_cards_radeon r300 r600
+ fi
+
+ gallium_enable video_cards_freedreno freedreno
+ gallium_enable video_cards_virgl virgl
+
+ # opencl stuff
+ emesonargs+=(
+ -Dgallium-opencl="$(usex opencl icd disabled)"
+ )
+ fi
+
+ if use vulkan; then
+ vulkan_enable video_cards_freedreno freedreno
+ vulkan_enable video_cards_i965 intel
+ vulkan_enable video_cards_iris intel
+ vulkan_enable video_cards_radeonsi amd
+ vulkan_enable video_cards_v3d broadcom
+ fi
+
+ driver_list() {
+ local drivers="$(sort -u <<< "${1// /$'\n'}")"
+ echo "${drivers//$'\n'/,}"
+ }
+
+ local vulkan_layers
+ use vulkan && vulkan_layers+="device-select"
+ use vulkan-overlay && vulkan_layers+=",overlay"
+ emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
+
+ emesonargs+=(
+ $(meson_use test build-tests)
+ -Dglx=$(usex X dri disabled)
+ -Dshared-glapi=enabled
+ -Ddri3=enabled
+ -Degl=true
+ -Dgbm=true
+ -Dglvnd=true
+ $(meson_feature gles1)
+ $(meson_feature gles2)
+ $(meson_use osmesa)
+ $(meson_use selinux)
+ $(meson_feature zstd)
+ $(meson_use video_cards_crocus prefer-crocus)
+ $(meson_use video_cards_iris prefer-iris)
+ $(meson_use cpu_flags_x86_sse2 sse2)
+ -Dvalgrind=$(usex valgrind auto disabled)
+ -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+ -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+ -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+ --buildtype $(usex debug debug plain)
+ -Db_ndebug=$(usex debug false true)
+ )
+ meson_src_configure
+}
+
+multilib_src_test() {
+ meson_src_test -t 100
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+ if [[ $1 == -- ]] || use $1; then
+ shift
+ DRI_DRIVERS+=("$@")
+ fi
+}
+
+gallium_enable() {
+ if [[ $1 == -- ]] || use $1; then
+ shift
+ GALLIUM_DRIVERS+=("$@")
+ fi
+}
+
+vulkan_enable() {
+ if [[ $1 == -- ]] || use $1; then
+ shift
+ VULKAN_DRIVERS+=("$@")
+ fi
+}
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index bbfe92ab6653..72a5f0b7407f 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -1,8 +1,6 @@
AUX mlt-6.10.0-swig-underlinking.patch 596 BLAKE2B b51670d051ae2bd016da65f560ed861518845d11e46aa5b4971a68f196452b86af3e00cb9af02bf23b32028731eb5352214aa63a047ebe12386c9f749df1236c SHA512 95cf9339b88979eb19cda3698474fc386c0c2d01333435e95b5a7662dbc5c359f5c78e05a0d78836023191c07a97e0dbf20c354e10cf6d1ad59d64fa9a203160
AUX mlt-6.22.1-no_lua_bdepend.patch 153 BLAKE2B 3ea31c570e7bef81bda0905549baedee8b9eed2bc14c535abff02985d573e4606f4f8f42213bcbc86fa68af905ba6c39dddcbf63efa20172c608659153d79073 SHA512 b382ee68f2815b4aa62ce7708a7452536f2bc0287dc4d59f557c08fbf51d6bef7607f63e11e991b4f52eb7e06afbde06d53aac3d42b4a0c96f59332ec17d48cd
AUX mlt-7.0.1-cmake-symlink.patch 569 BLAKE2B 06f7c8e7ec78206bb1344bab98f1d9ec816b16c458300964fe31ff30f8f2cc64d8f25a795773fd64db7249b031a164c350b55b6326c4d07d73ffd27f8786a911 SHA512 6deb458c3a89f800b4770460330c1e545c22d3a7304f0713b7ae214145d1413a3061c7c026ab2f6fc44801d1d7505352f03c0da7034e817b684e0ebb25d9a94f
-DIST mlt-7.2.0.tar.gz 1203489 BLAKE2B 2b53a813146f4868469c945208b4e7b509f67667357df615954a7d0f02ebe809dba0c15acd302f9a8609978929d00dd1e20fb03fc5d29a7dd5196253f37f70b7 SHA512 cee8d6cef2db5aae5747a80a292eca29d25adedd7754ea88a1857b429c0ccd35f689bcd9381c069c0e9e04b9eae5b7301e7c9548c536b43e4a9d54af664d629f
DIST mlt-7.4.0.tar.gz 1206316 BLAKE2B 56e6ea7a5545b80de45cffd206e555a577ada8e59f9b63c6487491e130ba7e4fdca5dc1b3836fcff22d49b6dcb048779dc8db1e9888b1137653c80196bdb81e2 SHA512 e9a65e76ca0a2464fb923d19d6f21bd49f13d637b0a974eeeb1e123ab753914d742e373f9fdcfe07cdeb9f39ebd2f0dde75a7299c0b6cd4807ee48ec710b3fd4
-EBUILD mlt-7.2.0-r1.ebuild 3589 BLAKE2B dbc1dae71c00468d4f5ee76cea52099b9e32037dfd50909fa50fb803ca19a3b424e6060f53e09967e0a0b9ef8d85ac388bd05ed25aa2d026cd6c5bc71b6f1bca SHA512 d45459c61394da80d9a14cfa89465301e95a12d6ed2009b7e175c5c964c5d4592d981838d9617860c122a396eaca58e82d86fefaf9edd38ae7ade82ba3ac5912
-EBUILD mlt-7.4.0.ebuild 3592 BLAKE2B 341c4407113572cf1d20dc0fb14c104347d45296ed5fcd2a18d12c1ed843e9140ada6221b856521f257d75132318741c7c3b5ed7d371c84363bb7c16c52e35ce SHA512 9f6ad84ddfe8cd2185ed72e54a3ccfc5b20ede5797602e9ea954b5fba45c9d3230b13f9a91fe6ae7e8f658cf6331af9d675bb5a14de923043fd01dd1080d9571
+EBUILD mlt-7.4.0.ebuild 3589 BLAKE2B dbc1dae71c00468d4f5ee76cea52099b9e32037dfd50909fa50fb803ca19a3b424e6060f53e09967e0a0b9ef8d85ac388bd05ed25aa2d026cd6c5bc71b6f1bca SHA512 d45459c61394da80d9a14cfa89465301e95a12d6ed2009b7e175c5c964c5d4592d981838d9617860c122a396eaca58e82d86fefaf9edd38ae7ade82ba3ac5912
MISC metadata.xml 1412 BLAKE2B 8d4eed394f1d1e95e5559466ef1840978966e8f1f7b89fdfd2549b2a35b6ce8f114c9373374fdaefe320cc34a4dc8cbd9f6c4433740d1ae9680de54484b5e3d1 SHA512 b19c711dc3798f952e0223dc0628b25aa3c9a296d66ee2f2b7f46a55b82e71c0c583ee64517be88dcc55eb1e9c31aa782b9043eb7630a853077afb1bf8b4dedd
diff --git a/media-libs/mlt/mlt-7.2.0-r1.ebuild b/media-libs/mlt/mlt-7.2.0-r1.ebuild
deleted file mode 100644
index e0c70f26c65e..000000000000
--- a/media-libs/mlt/mlt-7.2.0-r1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-inherit python-single-r1 cmake
-
-DESCRIPTION="Open source multimedia framework for television broadcasting"
-HOMEPAGE="https://www.mltframework.org/"
-SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/7"
-KEYWORDS="amd64 arm64 ~ppc64 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} )"
-
-# Needs unpackaged 'kwalify'
-RESTRICT="test"
-
-# rtaudio will use OSS on non linux OSes
-# Qt already needs FFTW/PLUS so let's just always have it on to ensure
-# MLT is useful: bug #603168.
-DEPEND="
- >=media-libs/libebur128-1.2.2:=
- sci-libs/fftw:3.0=
- ffmpeg? ( media-video/ffmpeg:0=[vdpau?,-flite] )
- frei0r? ( media-plugins/frei0r-plugins )
- gtk? (
- media-libs/libexif
- x11-libs/pango
- )
- jack? (
- >=dev-libs/libxml2-2.5
- media-libs/ladspa-sdk
- virtual/jack
- )
- libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
- opencv? ( >=media-libs/opencv-4.5.1:=[contrib] )
- opengl? (
- media-libs/libglvnd
- media-video/movit
- )
- python? ( ${PYTHON_DEPS} )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- media-libs/libexif
- x11-libs/libX11
- )
- rtaudio? (
- >=media-libs/rtaudio-4.1.2
- kernel_linux? ( media-libs/alsa-lib )
- )
- rubberband? ( media-libs/rubberband )
- sdl? (
- media-libs/libsdl2[X,opengl,video]
- media-libs/sdl2-image
- )
- vidstab? ( media-libs/vidstab )
- xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
- xml? ( >=dev-libs/libxml2-2.5 )
-"
-# java? ( >=virtual/jre-1.8:* )
-# perl? ( dev-lang/perl )
-# php? ( dev-lang/php )
-# ruby? ( ${RUBY_DEPS} )
-# sox? ( media-sound/sox )
-# tcl? ( dev-lang/tcl:0= )
-RDEPEND="${DEPEND}"
-BDEPEND="
- virtual/pkgconfig
- python? ( >=dev-lang/swig-2.0 )
-"
-
-DOCS=( AUTHORS NEWS README.md )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch
- "${FILESDIR}"/${PN}-6.22.1-no_lua_bdepend.patch
- "${FILESDIR}"/${PN}-7.0.1-cmake-symlink.patch
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # respect CFLAGS LDFLAGS when building shared libraries. Bug #308873
- if use python; then
- sed -i "/mlt.so/s/ -lmlt++ /& ${CFLAGS} ${LDFLAGS} /" src/swig/python/build || die
- python_fix_shebang src/swig/python
- fi
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_SKIP_RPATH=ON
- -DGPL=ON
- -DGPL3=ON
- -DBUILD_TESTING=$(usex test)
- -DMOD_KDENLIVE=ON
- -DMOD_SDL1=OFF
- -DMOD_SDL2=$(usex sdl)
- -DMOD_AVFORMAT=$(usex ffmpeg)
- -DMOD_PLUS=ON
- -DMOD_FREI0R=$(usex frei0r)
- -DMOD_GDK=$(usex gtk)
- -DMOD_JACKRACK=$(usex jack)
- -DMOD_RESAMPLE=$(usex libsamplerate)
- -DMOD_OPENCV=$(usex opencv)
- -DMOD_MOVIT=$(usex opengl)
- -DMOD_QT=$(usex qt5)
- -DMOD_RTAUDIO=$(usex rtaudio)
- -DMOD_RUBBERBAND=$(usex rubberband)
- -DMOD_VIDSTAB=$(usex vidstab)
- -DMOD_XINE=$(usex xine)
- -DMOD_XML=$(usex xml)
- -DMOD_SOX=OFF
- )
-
- # TODO: rework upstream CMake to allow controlling MMX/SSE/SSE2
- # TODO: add swig language bindings?
- # see also https://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover
-
- if use python; then
- mycmakeargs+=( -DSWIG_PYTHON=ON )
- fi
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- insinto /usr/share/${PN}
- doins -r demo
-
- #
- # Install SWIG bindings
- #
-
- docinto swig
-
- if use python; then
- dodoc "${S}"/src/swig/python/play.py
- python_optimize
- fi
-}
diff --git a/media-libs/mlt/mlt-7.4.0.ebuild b/media-libs/mlt/mlt-7.4.0.ebuild
index 1da22f42a8b5..e0c70f26c65e 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 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/netpbm/Manifest b/media-libs/netpbm/Manifest
index 4ed1d445b6c5..ad7eca0b86ed 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -6,6 +6,8 @@ AUX netpbm-10.86.22-fix-ps-test.patch 15448 BLAKE2B cfe77600197fc39ef0be0ed793f5
AUX netpbm-10.86.24-fix-test-ppc64.patch 634 BLAKE2B 41f42436d5f77a37a1e8cb9200cb470d894953f85a3ee3d0b754cb32960f1f60c28d7e2c4ac3578220f7f5f5b4eb68d98b3c0e8e5d5ac7a91a5851859c0ea555 SHA512 5f79bd90ea9ea8d1577a71ba9aebfb24d8c02f845b26b81a9403e411e284f4213af931769dfa367be6c5f4e0453771e480df684a64dedacc858f1e3171a39fd2
DIST netpbm-10.86.24.tar.xz 3698448 BLAKE2B 189fbaeb91db15e317c62758c64d1165d3cb32fa0221b2dcdefb0425577d4af9a13e66c35774149a44727c99fc18263123fd3c2b71f6409344bcf458341a4470 SHA512 50ad5a726c4219e1d87c7a46868b8f7bdb2d676903f049816b58e00addb416e4684a6c669188beebc5cc3c3961d2b0e35cd663215196d9925e3a23a989e14be3
DIST netpbm-10.86.27.tar.xz 3699900 BLAKE2B cf1e2742b343100081d53cdccfca5d41ce46ad57adb72c10c2e8ea94547e8d097e657c50554dae79b47c5c2e8d8146d15ef372b9e031152411b3379a0998a8d8 SHA512 b809b05647b4f4509db04a937a5c0b03301ccf93a56d773d6ddfe11a1cdc254befeb311e20306e5329db75fce9697b823c351a32ba0a771f4545793a55cb646c
+DIST netpbm-10.86.30.tar.xz 3692036 BLAKE2B 2529adfe7f93cf2400547c107cf04b03478aef95bce6573195a6a9e20767b04371bcff13744aa547885ffa3137d948076de01ad0a979f4464c13e3fdeeb37bf7 SHA512 7643b279c59717b30130e7178be82638085d2ae28c0cea8c7595f5ff3a1cd3c5dd0201a051bed8997f8a8354b5eeb08949d4e8587d3e807df7859a4cb1a44534
EBUILD netpbm-10.86.24-r1.ebuild 5853 BLAKE2B 8ab739e81bee65f04f0f3468468c8193136781326bfff3efaadcb335d529fef3761d61e43ac8e7815700080568e097e0f61529d80363f2c404d77d6bd31c0920 SHA512 365e21e054dac809d2590d60700d8425e611fcaae2e73d07b084a7254b2f05911514fbbbbaadeb0ee05ac7a3fc2e7a7f2b845b62fb1fd569b0d7b435e4ba34ea
EBUILD netpbm-10.86.27.ebuild 5980 BLAKE2B 4d7ce3a06f36b2b2f9ae01609c9cb260047911f59eb0ddcdb01696c9f5d689850df3206472724c916001e5b26e50666d336e417a52be069c852c4781e98b4e87 SHA512 1638dd2207a544f7ccc1ad54473f0ca19ca057a1f88f14183c875fd52414e16244f49d7ecd4d8a89f4e88c0148576992181ae4a9ee7c4b36b56538f1de4798c8
+EBUILD netpbm-10.86.30.ebuild 5866 BLAKE2B ff6660d6b3708122c09e56400d6ff95777ad100f5fded745e867092f3425a6bbd62efe14b52e8f0771b449f1979fc47f751f918ee017cdb8e04cced8e449f3fa SHA512 9987a1100498b5c74ad6b61c4e48eed9432f017ca50a3d15fb70cf2bf430f4cdbd85b899409edbde6f8593393f0efaf4103b55d339beb968783072bb00cce75a
MISC metadata.xml 578 BLAKE2B 44f5899feee3b35c43e1b21f631fc53acc615003a5ed21c3461b5946882f1b67b9de9ac0b3d5d24f9faf291bbc9d3410841ccbba15f4981fb5ec050195bf93d7 SHA512 a9ef7432d1404a5dfc2458761867fbdcb9be368f20ea3290bb0a2aac10a82c968d3d97c4dbbf65f4840f0a60e9266d63c577e33c27d3b8b45b70349cb211478d
diff --git a/media-libs/netpbm/netpbm-10.86.30.ebuild b/media-libs/netpbm/netpbm-10.86.30.ebuild
new file mode 100644
index 000000000000..5800e9cbc6ef
--- /dev/null
+++ b/media-libs/netpbm/netpbm-10.86.30.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
+HOMEPAGE="http://netpbm.sourceforge.net/"
+SRC_URI="https://github.com/ceamac/netpbm-make-dist/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml"
+
+BDEPEND="
+ app-arch/xz-utils
+ sys-devel/flex
+ virtual/pkgconfig
+"
+# app-text/ghostscript-gpl is really needed for postscript
+# some utilities execute /usr/bin/gs
+RDEPEND="jbig? ( media-libs/jbigkit:= )
+ jpeg? ( virtual/jpeg:0 )
+ png? (
+ >=media-libs/libpng-1.4:0=
+ sys-libs/zlib
+ )
+ postscript? (
+ app-text/ghostscript-gpl
+ sys-libs/zlib
+ )
+ rle? ( media-libs/urt:= )
+ svga? ( media-libs/svgalib )
+ tiff? ( >=media-libs/tiff-3.5.5:0 )
+ xml? ( dev-libs/libxml2 )
+ X? ( x11-libs/libX11 )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/netpbm-10.86.21-build.patch
+ "${FILESDIR}"/netpbm-10.86.21-test.patch #450530
+ "${FILESDIR}"/netpbm-10.86.21-misc-deps.patch
+ "${FILESDIR}"/netpbm-10.86.22-fix-ps-test.patch #670362
+)
+
+netpbm_libtype() {
+ case ${CHOST} in
+ *-darwin*) echo dylib;;
+ *) echo unixshared;;
+ esac
+}
+
+netpbm_libsuffix() {
+ local suffix=$(get_libname)
+ echo ${suffix//\.}
+}
+
+netpbm_ldshlib() {
+ case ${CHOST} in
+ *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';;
+ *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';;
+ esac
+}
+netpbm_config() {
+ if use ${1} ; then
+ [[ ${2} != "!" ]] && echo -l${2:-$1}
+ else
+ echo NONE
+ fi
+}
+
+# for bug #828127
+netpbm_cflags_for_build() {
+ if is-flagq -fPIC; then
+ echo -fPIC
+ fi
+}
+
+src_prepare() {
+ default
+
+ # make sure we use system libs
+ sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die
+ rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || die
+
+ # take care of the importinc stuff ourselves by only doing it once
+ # at the top level and having all subdirs use that one set #149843
+ sed -i \
+ -e '/^importinc:/s|^|importinc:\nmanual_|' \
+ -e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\
+ common.mk || die
+ sed -i \
+ -e '/%.c/s: importinc$::' \
+ common.mk lib/Makefile lib/util/Makefile || die
+ sed -i \
+ -e 's:pkg-config:$(PKG_CONFIG):' \
+ GNUmakefile converter/other/Makefile other/pamx/Makefile || die
+
+ # The postscript knob is currently bound up with a fork test.
+ if ! use postscript ; then
+ sed -i \
+ -e 's:$(DONT_HAVE_PROCESS_MGMT):Y:' \
+ converter/other/Makefile generator/Makefile || die
+ sed -i -r \
+ -e 's:(pbmtextps|pnmtops|pstopnm).*::' \
+ test/all-in-place.{ok,test} || die
+ sed -i -e 's:lps-roundtrip.*::' test/Test-Order || die
+ sed -i -e '/^$/d' test/all-in-place.ok || die
+ sed -i '2iexit 80' test/ps-{alt-,flate-,}roundtrip.test || die
+ fi
+
+ # the new postscript test needs +x
+ chmod +x test/lps-roundtrip.test
+
+ # Do not test png if not built
+ if ! use png ; then
+ sed -i -r \
+ -e 's:(pamtopng|pngtopam|pnmtopng).*::' \
+ test/all-in-place.{ok,test} || die
+ sed -i -e '/^$/d' test/all-in-place.ok || die
+
+ sed -i -r \
+ -e 's:(pamrgbatopng|pngtopnm).*::' \
+ test/legacy-names.{ok,test} || die
+ sed -i -e '/^$/d' test/legacy-names.ok || die
+ sed -i -e 's:png-roundtrip.*::' test/Test-Order || die
+ fi
+}
+
+src_configure() {
+ # cannot chain the die with the heredoc
+ # repoman tries to parse the heredoc and fails
+ cat config.mk.in - >> config.mk <<-EOF
+ # Misc crap
+ BUILD_FIASCO = N
+ SYMLINK = ln -sf
+
+ # These vars let src_test work by default
+ PKGDIR_DEFAULT = ${T}/netpbm
+ RESULTDIR_DEFAULT = ${T}/netpbm-test
+
+ # Toolchain options
+ CC = $(tc-getCC) -Wall
+ LD = \$(CC)
+ CC_FOR_BUILD = $(tc-getBUILD_CC)
+ LD_FOR_BUILD = \$(CC_FOR_BUILD)
+ AR = $(tc-getAR)
+ RANLIB = $(tc-getRANLIB)
+ PKG_CONFIG = $(tc-getPKG_CONFIG)
+
+ STRIPFLAG =
+ CFLAGS_SHLIB = -fPIC
+ CFLAGS_FOR_BUILD += $(netpbm_cflags_for_build)
+
+ LDRELOC = \$(LD) -r
+ LDSHLIB = $(netpbm_ldshlib)
+ LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to
+ LINKERISCOMPILER = Y
+ NETPBMLIBSUFFIX = $(netpbm_libsuffix)
+ NETPBMLIBTYPE = $(netpbm_libtype)
+ STATICLIB_TOO = $(usex static-libs Y N)
+
+ # The var is called SSE, but the code is actually SSE2.
+ WANT_SSE = $(usex cpu_flags_x86_sse2 Y N)
+
+ # Gentoo build options
+ TIFFLIB = $(netpbm_config tiff)
+ # Let tiff worry about its own dependencies #395753
+ TIFFLIB_NEEDS_JPEG = N
+ TIFFLIB_NEEDS_Z = N
+ JPEGLIB = $(netpbm_config jpeg)
+ PNGLIB = $(netpbm_config png)
+ ZLIB = $($(tc-getPKG_CONFIG) --libs zlib)
+ LINUXSVGALIB = $(netpbm_config svga vga)
+ XML2_LIBS = $(netpbm_config xml xml2)
+ JBIGLIB = $(netpbm_config jbig)
+ JBIGHDR_DIR =
+ JASPERLIB = NONE
+ JASPERHDR_DIR =
+ URTLIB = $(netpbm_config rle)
+ URTHDR_DIR =
+ X11LIB = $(netpbm_config X X11)
+ X11HDR_DIR =
+ EOF
+ [[ $? -eq 0 ]] || die "writing config.mk failed"
+}
+
+src_compile() {
+ emake -j1 pm_config.h version.h manual_importinc #149843
+ emake
+}
+
+src_test() {
+ # The code wants to install everything first and then test the result.
+ emake install.{bin,lib,data}
+ emake check
+}
+
+src_install() {
+ # Subdir make targets like to use `mkdir` all over the place
+ # without any actual dependencies, thus the -j1.
+ emake -j1 package pkgdir="${ED}"/usr
+
+ if [[ $(get_libdir) != "lib" ]] ; then
+ mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die
+ fi
+
+ # Remove cruft that we don't need, and move around stuff we want
+ rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die
+
+ dodir /usr/share
+ mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die
+
+ doman userguide/*.[0-9]
+ dodoc README
+
+ cd doc || die
+ dodoc HISTORY Netpbm.programming USERDOC
+ docinto html
+ dodoc -r *.html
+ dodoc -r ../userguide/*.html
+}
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 80e783914042..15decaa50684 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -7,10 +7,6 @@ AUX opencv-4.5.2-lapack-3.10.patch 6646 BLAKE2B e4e379b638fff6779fc9baae9f17a43d
DIST opencv-3.4.0-face_landmark_model.tar.gz 63299830 BLAKE2B 58f08cd8c030ee1c8b66e76a561fd625e112face427d001185f8d7c0eaace55adbd8474663021841a1382bfe393a210e64c51223441713cdb9156fac866a845c SHA512 2cd29ce42c08b2966db3ef4a2bc217ab3d07051819757ec6de8f3deea29e28f60abab39f101dba03f766f17018598e411bd687a7eaab0c681c113e10a2de2b23
DIST opencv-3.4.0-res10_300x300-caffeemodel.tar.gz 10036604 BLAKE2B 2a2de48fc420f13e7be146ac88f311901c5b4e409c30e466152e33cae1f8afd87dcb6d758af447c268d90bd67989c8798cd80cab172b10499a6ad5224509dbdf SHA512 96fee9f447d5739bc01a5cab37c453cf7237457dfb5d2bf93ac37f8e5aa557ac222316f449cd58e37e856abe4d8e9d4a7820daaba32f0b22cbcde8e340287d4b
DIST opencv-4.4.0_extdep.tar.gz 65334871 BLAKE2B 89fa0083da428e986bb4287295bdbff626d0f84866377413649c1d7ca77338288141f22d2a3c0b64d6d0fc1db98f918c8b33a665274cee4c4aefb44359e4333d SHA512 7b758099ce4abef151051e3e9e1e45b73e4054669d3aa53051e4d4c5f43d9373c9bda5ecbce51f6b024562cb566bd1117505af29ab5f3c36a493f185111a3b4e
-DIST opencv-4.5.0.tar.gz 90116240 BLAKE2B bcd6ccc4ff0cb1b66923c17c9d9e4ced711527b5d92abd2a5330f791fb07ff93dafa7a3f3095e6d96cb6cea877ac170bb2533f563fa843f284501019263daff3 SHA512 c34100f3f3fe45f2115975350d23288a3badb32864ba0cbd32512387416d1cf10d16d3ef5f3d089d6a1c2be587d788d33997513fc015dbf7d774a622f2d3811f
-DIST opencv-4.5.0_contrib.tar.gz 60115063 BLAKE2B 4068905c9f5f308f30f15ad383ae459cbb421d1871344c3548a6c11647ac9da7af8c46798e860bdd1fcbacccda0fb03f6c1cf07b458ddfa5a0c311511627af52 SHA512 b2ae72e920c78472fd677281b8dd6f25872399d8ade97b0d3b0fc50bbabea8c00ea849d87bfb311ac148cef663481d0c89c0f6875578c052c1cc7ddcd70e6e17
-DIST opencv-4.5.1.tar.gz 88245766 BLAKE2B 219403844b459fcce012b942920a7a8264fb85dbf01e694528383a74c667f293e4da6ab87d2a4abf8d062c70445f29d86ad07aa3fb23a0fecb491c9f53d05148 SHA512 d74ae3bc340639cbc8b5db41a1fec710acabf8ec828dd28ce3bacf7029d1afd23aeaf47a2273a42995de285daa8aef33a7f90d5c57ef096e2cb872e0845e92b0
-DIST opencv-4.5.1_contrib.tar.gz 60602431 BLAKE2B 629e820e74147f442f8264c610228892e88c1e84575fb4efa612c8568df40a2e533f90ed2727ba7416e2ff08d9a655400b326841bf090fec79cd31f39334966e SHA512 1ebb9fec53b74039ffa2dc9f00899ab83af615f01156c0454ea7c53161256b6c9fd4548387fbfd197182c2d03db4de8c7170e2877b4648ce92531f821e81fdd7
DIST opencv-4.5.2.tar.gz 88925795 BLAKE2B 625d3e1d98d4438ebfa165e595fc661658ae1f218d3c50c0b8dfedf936019093c1e61ead86b19c643205f0d77e40c69ea15c3d95454129a23a2c4e17885b65f3 SHA512 07788ec49801bdab963a057871e81fc2b081149c75764810197766d987e54db0d6fd142d2397bbbacefcea6a8be100235ea886ee7e5d5c07ed1156e76249dfec
DIST opencv-4.5.2_contrib.tar.gz 60800680 BLAKE2B d96b3c440090d3ab26f99a3822d1d85581e370dc0fde7cf3a0ff89e79cd598942be7d9bc9f892510f2d66474ceb59c645483a94131ccbbe09f1cf4eeaaa44879 SHA512 72ce91dfefc1c3e12cc8e965d90392cfed6c236daafb512aafc14cdad83242bfa0fc1adea308cd07a5483e010633e2996c3b239b2ce12cea47e6e21c36ed398b
DIST opencv-4.5.4.tar.gz 89724634 BLAKE2B 76ce5ab8182c87e5f9e18faf62f2ee0eb629e4997877c59aa0f6ac334c27d737cf5205f4b85f64cabfdd587a57096fa3241ae6e48cebbd963ec8ad3ebe07ad35 SHA512 39a7af95bc30d427c6df5e5d481469ab1ceea7878a93ae5c119991333e877a88d0a644e17dc6bd316e64b2840e48411a97f1b2397a8000719c5cec32751fa954
@@ -18,8 +14,6 @@ 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.0-r3.ebuild 20527 BLAKE2B c268b0a0e8c7e47a5b14af5dad3757c9df07096e285d23feb6c6b3af15138037c45f4bd7da104fa4a643b6329faa13e733bf76098b45a2db2efb60f96016746b SHA512 322e98d5a2ad73397880f27b03b9f3717d8387be382973d6ec4059ce7b87b7740e4c91f3180038651517800ad2d6868b90ab7df085d450d43f253aef9b4aadfb
-EBUILD opencv-4.5.1-r3.ebuild 20614 BLAKE2B 5377f4c1af0957ec9bc6f5d0ca83fa14977c4bbf5d0e2e2982c32bd9d3ea1f42ce5c9faec398010858109eaa3a04303141207573c5672ac749467e3f5b0c3fea SHA512 33a3028a698ddbeebd91afc006949cb4f1837df8fec4b20c6f5570dc3f65fac05bfa8109325bba8d26fa7faeece0b79974b7b9c6fd111a5e5a4189dfc0c58ba1
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
diff --git a/media-libs/opencv/opencv-4.5.0-r3.ebuild b/media-libs/opencv/opencv-4.5.0-r3.ebuild
deleted file mode 100644
index 60d935951196..000000000000
--- a/media-libs/opencv/opencv-4.5.0-r3.ebuild
+++ /dev/null
@@ -1,566 +0,0 @@
-# Copyright 1999-2021 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
-
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
-HOMEPAGE="https://opencv.org"
-TINY_DNN_PV="1.0.0a3"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
- dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
- download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> ${PN}-4.4.0_extdep.tar.gz )
- contrib? (
- https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
- contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
- contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
- )"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
-
-# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
-ARM_CPU_FEATURES=(
- cpu_flags_arm_neon:NEON
- cpu_flags_arm_vfpv3:VFPV3
-)
-PPC_CPU_FEATURES=(
- cpu_flags_ppc_vsx:VSX
- cpu_flags_ppc_vsx3:VSX3
-)
-X86_CPU_FEATURES_RAW=(
- avx:AVX
- avx2:AVX2
- avx512f:AVX_512F
- f16c:FP16
- fma3:FMA3
- popcnt:POPCNT
- sse:SSE
- sse2:SSE2
- sse3:SSE3
- ssse3:SSSE3
- sse4_1:SSE4_1
- sse4_2:SSE4_2
-)
-X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
-CPU_FEATURES_MAP=(
- ${ARM_CPU_FEATURES[@]}
- ${PPC_CPU_FEATURES[@]}
- ${X86_CPU_FEATURES[@]}
-)
-IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}"
-
-# OpenGL needs gtk or Qt installed to activate, otherwise build system
-# will silently disable it Wwithout the user knowing, which defeats the
-# purpose of the opengl use flag.
-REQUIRED_USE="
- cuda? ( tesseract? ( opencl ) )
- dnnsamples? ( examples )
- gflags? ( contrib )
- glog? ( contrib )
- contribcvv? ( contrib qt5 )
- contribdnn? ( contrib )
- contribfreetype? ( contrib )
- contribhdf? ( contrib )
- contribovis? ( contrib )
- contribsfm? ( contrib eigen gflags glog )
- contribxfeatures2d? ( contrib download )
- examples? ( contribdnn )
- java? ( python )
- opengl? ( qt5 )
- python? ( ${PYTHON_REQUIRED_USE} )
- tesseract? ( contrib )
- ?? ( gtk3 qt5 )"
-
-# The following logic is intrinsic in the build system, but we do not enforce
-# it on the useflags since this just blocks emerging pointlessly:
-# openmp? ( !threads )
-
-RDEPEND="
- app-arch/bzip2[${MULTILIB_USEDEP}]
- <dev-libs/protobuf-3.19:=[${MULTILIB_USEDEP}]
- sys-libs/zlib[${MULTILIB_USEDEP}]
- cuda? ( dev-util/nvidia-cuda-toolkit:0= )
- contribhdf? ( sci-libs/hdf5:= )
- contribfreetype? (
- media-libs/freetype:2[${MULTILIB_USEDEP}]
- media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
- )
- contribovis? ( dev-games/ogre:0/1.12 )
- ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
- gdal? ( sci-libs/gdal:= )
- gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )
- glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] )
- gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
- gstreamer? (
- media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
- media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
- )
- gtk3? (
- dev-libs/glib:2[${MULTILIB_USEDEP}]
- x11-libs/gtk+:3[${MULTILIB_USEDEP}]
- )
- ieee1394? (
- media-libs/libdc1394:=[${MULTILIB_USEDEP}]
- sys-libs/libraw1394[${MULTILIB_USEDEP}]
- )
- java? ( >=virtual/jre-1.6:* )
- jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
- jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
- lapack? (
- virtual/cblas
- virtual/lapack
- )
- opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
- openexr? ( <media-libs/openexr-3.0.0:0=[${MULTILIB_USEDEP}] )
- opengl? (
- virtual/opengl[${MULTILIB_USEDEP}]
- virtual/glu[${MULTILIB_USEDEP}]
- )
- png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
- python? (
- ${PYTHON_DEPS}
- dev-python/numpy[${PYTHON_USEDEP}]
- )
- qt5? (
- dev-qt/qtgui:5=
- dev-qt/qtwidgets:5=
- dev-qt/qttest:5=
- dev-qt/qtconcurrent:5=
- opengl? ( dev-qt/qtopengl:5= )
- )
- tesseract? ( app-text/tesseract[opencl=,${MULTILIB_USEDEP}] )
- threads? ( dev-cpp/tbb:=[${MULTILIB_USEDEP}] )
- tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
- v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
- vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
- vtk? ( sci-libs/vtk[rendering] )
- webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
- xine? ( media-libs/xine-lib )"
-# bug #747949 for eigen (eigen-3.3.8 was broken upstream)
-DEPEND="${RDEPEND}
- eigen? (
- || (
- >=dev-cpp/eigen-3.3.8-r1:3
- <dev-cpp/eigen-3.3.8:3
- )
- )
- java? ( >=virtual/jdk-1.6 )"
-BDEPEND="virtual/pkgconfig"
-
-MULTILIB_WRAPPED_HEADERS=(
- # [opencv4]
- /usr/include/opencv4/opencv2/cvconfig.h
- /usr/include/opencv4/opencv2/opencv_modules.hpp
- # [cudev]
- /usr/include/opencv4/opencv2/cudaarithm.hpp
- /usr/include/opencv4/opencv2/cudabgsegm.hpp
- /usr/include/opencv4/opencv2/cudacodec.hpp
- /usr/include/opencv4/opencv2/cudafeatures2d.hpp
- /usr/include/opencv4/opencv2/cudafilters.hpp
- /usr/include/opencv4/opencv2/cudaimgproc.hpp
- /usr/include/opencv4/opencv2/cudalegacy.hpp
- /usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
- /usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
- /usr/include/opencv4/opencv2/cudalegacy/NCV.hpp
- /usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp
- /usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp
- /usr/include/opencv4/opencv2/cudaobjdetect.hpp
- /usr/include/opencv4/opencv2/cudaoptflow.hpp
- /usr/include/opencv4/opencv2/cudastereo.hpp
- /usr/include/opencv4/opencv2/cudawarping.hpp
- /usr/include/opencv4/opencv2/cudev/block/block.hpp
- /usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp
- /usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp
- /usr/include/opencv4/opencv2/cudev/block/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/block/scan.hpp
- /usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp
- /usr/include/opencv4/opencv2/cudev/common.hpp
- /usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp
- /usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp
- /usr/include/opencv4/opencv2/cudev/expr/color.hpp
- /usr/include/opencv4/opencv2/cudev/expr/deriv.hpp
- /usr/include/opencv4/opencv2/cudev/expr/expr.hpp
- /usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp
- /usr/include/opencv4/opencv2/cudev/expr/reduction.hpp
- /usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp
- /usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp
- /usr/include/opencv4/opencv2/cudev/expr/warping.hpp
- /usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp
- /usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp
- /usr/include/opencv4/opencv2/cudev/functional/functional.hpp
- /usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp
- /usr/include/opencv4/opencv2/cudev/grid/copy.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp
- /usr/include/opencv4/opencv2/cudev/grid/histogram.hpp
- /usr/include/opencv4/opencv2/cudev/grid/integral.hpp
- /usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp
- /usr/include/opencv4/opencv2/cudev/grid/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp
- /usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp
- /usr/include/opencv4/opencv2/cudev/grid/transform.hpp
- /usr/include/opencv4/opencv2/cudev/grid/transpose.hpp
- /usr/include/opencv4/opencv2/cudev.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp
- /usr/include/opencv4/opencv2/cudev/util/atomic.hpp
- /usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp
- /usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp
- /usr/include/opencv4/opencv2/cudev/util/limits.hpp
- /usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp
- /usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp
- /usr/include/opencv4/opencv2/cudev/util/tuple.hpp
- /usr/include/opencv4/opencv2/cudev/util/type_traits.hpp
- /usr/include/opencv4/opencv2/cudev/util/vec_math.hpp
- /usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp
- /usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp
- /usr/include/opencv4/opencv2/cudev/warp/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/warp/scan.hpp
- /usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp
- /usr/include/opencv4/opencv2/cudev/warp/warp.hpp
- # [contrib_cvv]
- /usr/include/opencv4/opencv2/cvv/call_meta_data.hpp
- /usr/include/opencv4/opencv2/cvv/cvv.hpp
- /usr/include/opencv4/opencv2/cvv/debug_mode.hpp
- /usr/include/opencv4/opencv2/cvv/dmatch.hpp
- /usr/include/opencv4/opencv2/cvv/filter.hpp
- /usr/include/opencv4/opencv2/cvv/final_show.hpp
- /usr/include/opencv4/opencv2/cvv.hpp
- /usr/include/opencv4/opencv2/cvv/show_image.hpp
- # [contrib_hdf]
- /usr/include/opencv4/opencv2/hdf/hdf5.hpp
- /usr/include/opencv4/opencv2/hdf.hpp
- # [contrib_ovis]
- /usr/include/opencv4/opencv2/ovis.hpp
- # [vtk]
- /usr/include/opencv4/opencv2/viz.hpp
- /usr/include/opencv4/opencv2/viz/types.hpp
- /usr/include/opencv4/opencv2/viz/viz3d.hpp
- /usr/include/opencv4/opencv2/viz/vizcore.hpp
- /usr/include/opencv4/opencv2/viz/widget_accessor.hpp
- /usr/include/opencv4/opencv2/viz/widgets.hpp
-)
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.4.0-disable-download.patch
- "${FILESDIR}"/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch
- "${FILESDIR}"/${PN}-4.1.2-opencl-license.patch
- "${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch
- "${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.patch
-)
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
-
- # remove bundled stuff
- rm -r 3rdparty || die "Removing 3rd party components failed"
- sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
- -i CMakeLists.txt cmake/*cmake || die
-
- if use dnnsamples; then
- mv "${WORKDIR}/res10_300x300_ssd_iter_140000.caffemodel" "${WORKDIR}/${P}/samples/dnn/" || die
- fi
-
- if use contrib; then
- cd "${WORKDIR}/${PN}_contrib-${PV}" || die
- if use contribxfeatures2d; then
- mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
- fi
- fi
-
- if use download; then
- mv "${WORKDIR}/${PN}-extdep-4.4.0" "${WORKDIR}/${P}/.cache/" || die
- fi
-
- java-pkg-opt-2_src_prepare
-
- # this really belongs in src_prepare() too
- JAVA_ANT_ENCODING="iso-8859-1"
- # set encoding so even this cmake build will pick it up.
- export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
- java-ant-2_src_configure
-}
-
-multilib_src_configure() {
- # please dont sort here, order is the same as in CMakeLists.txt
- GLOBALCMAKEARGS=(
- # Optional 3rd party components
- # ===================================================
- -DENABLE_DOWNLOAD=$(usex download)
- -DWITH_QUIRC=OFF # Do not have dependencies
- -DWITH_1394=$(usex ieee1394)
- # -DWITH_AVFOUNDATION=OFF # IOS
- -DWITH_VTK=$(multilib_native_usex vtk)
- -DWITH_EIGEN=$(usex eigen)
- -DWITH_VFW=OFF # Video windows support
- -DWITH_FFMPEG=$(usex ffmpeg)
- -DWITH_GSTREAMER=$(usex gstreamer)
- -DWITH_GSTREAMER_0_10=OFF # Don't want this
- -DWITH_GTK=$(usex gtk3)
- -DWITH_GTK_2_X=OFF # only want gtk3 nowadays
- -DWITH_IPP=OFF
- # Jasper was removed from tree because of security problems.
- # Upstream were/are making progress. We use openjpeg instead.
- # bug 734284
- -DWITH_JASPER=OFF
- -DWITH_JPEG=$(usex jpeg)
- -DWITH_OPENJPEG=$(usex jpeg2k)
- -DWITH_WEBP=$(usex webp)
- -DWITH_OPENEXR=$(usex openexr)
- -DWITH_OPENGL=$(usex opengl)
- -DWITH_OPENVX=OFF
- -DWITH_OPENNI=OFF # Not packaged
- -DWITH_OPENNI2=OFF # Not packaged
- -DWITH_PNG=$(usex png)
- -DWITH_GDCM=OFF
- -DWITH_PVAPI=OFF
- -DWITH_GIGEAPI=OFF
- -DWITH_ARAVIS=OFF
- -DWITH_QT=$(multilib_native_usex qt5 5 OFF)
- -DWITH_WIN32UI=OFF # Windows only
- # -DWITH_QUICKTIME=OFF
- # -DWITH_QTKIT=OFF
- -DWITH_TBB=$(usex threads)
- -DWITH_OPENMP=$(usex openmp)
- -DWITH_CSTRIPES=OFF
- -DWITH_PTHREADS_PF=ON
- -DWITH_TIFF=$(usex tiff)
- -DWITH_UNICAP=OFF # Not packaged
- -DWITH_V4L=$(usex v4l)
- -DWITH_LIBV4L=$(usex v4l)
- # -DWITH_DSHOW=ON # direct show supp
- -DWITH_MSMF=OFF
- -DWITH_XIMEA=OFF # Windows only
- -DWITH_XINE=$(multilib_native_usex xine)
- -DWITH_CLP=OFF
- -DWITH_OPENCL=$(usex opencl)
- -DWITH_OPENCL_SVM=OFF
- -DWITH_OPENCLAMDFFT=$(usex opencl)
- -DWITH_OPENCLAMDBLAS=$(usex opencl)
- -DWITH_DIRECTX=OFF
- -DWITH_INTELPERC=OFF
- -DWITH_IPP_A=OFF
- -DWITH_MATLAB=OFF
- -DWITH_VA=$(usex vaapi)
- -DWITH_VA_INTEL=$(usex vaapi)
- -DWITH_GDAL=$(multilib_native_usex gdal)
- -DWITH_GPHOTO2=$(usex gphoto2)
- -DWITH_LAPACK=$(multilib_native_usex lapack)
- -DWITH_ITT=OFF # 3dparty libs itt_notify
- # ===================================================
- # CUDA build components: nvidia-cuda-toolkit takes care of GCC version
- # ===================================================
- -DWITH_CUDA=$(multilib_native_usex cuda)
- -DWITH_CUBLAS=$(multilib_native_usex cuda)
- -DWITH_CUFFT=$(multilib_native_usex cuda)
- -DWITH_NVCUVID=OFF
- # -DWITH_NVCUVID=$(usex cuda)
- -DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "")
- # ===================================================
- # OpenCV build components
- # ===================================================
- -DBUILD_SHARED_LIBS=ON
- -DBUILD_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag
- -DBUILD_ANDROID_EXAMPLES=OFF
- -DBUILD_opencv_apps=$(usex opencvapps ON OFF)
- -DBUILD_DOCS=OFF # Doesn't install anyways.
- -DBUILD_EXAMPLES=$(multilib_native_usex examples)
- -DBUILD_PERF_TESTS=OFF
- -DBUILD_TESTS=$(multilib_native_usex testprograms)
- -DBUILD_WITH_DEBUG_INFO=$(usex debug)
- # -DBUILD_WITH_STATIC_CRT=OFF
- -DBUILD_WITH_DYNAMIC_IPP=OFF
- -DBUILD_FAT_JAVA_LIB=OFF
- # -DBUILD_ANDROID_SERVICE=OFF
- -DBUILD_CUDA_STUBS=$(multilib_native_usex cuda)
- -DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${PV}/modules" "")
- # ===================================================
- # OpenCV installation options
- # ===================================================
- -DINSTALL_CREATE_DISTRIB=OFF
- -DINSTALL_C_EXAMPLES=$(multilib_native_usex examples)
- -DINSTALL_TESTS=$(multilib_native_usex testprograms)
- -DINSTALL_PYTHON_EXAMPLES=$(multilib_native_usex examples)
- # -DINSTALL_ANDROID_EXAMPLES=OFF
- -DINSTALL_TO_MANGLED_PATHS=OFF
- -DOPENCV_GENERATE_PKGCONFIG=ON
- # opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
- # to set its destination libdir
- -DLIB_SUFFIX=
- # ===================================================
- # OpenCV build options
- # ===================================================
- -DENABLE_CCACHE=OFF
- # bug 733796, but PCH is a risky game in CMake anyway
- -DENABLE_PRECOMPILED_HEADERS=OFF
- -DENABLE_SOLUTION_FOLDERS=OFF
- -DENABLE_PROFILING=OFF
- -DENABLE_COVERAGE=OFF
-
- -DHAVE_opencv_java=$(multilib_native_usex java YES NO)
- -DENABLE_NOISY_WARNINGS=OFF
- -DOPENCV_WARNINGS_ARE_ERRORS=OFF
- -DENABLE_IMPL_COLLECTION=OFF
- -DENABLE_INSTRUMENTATION=OFF
- -DGENERATE_ABI_DESCRIPTOR=OFF
- -DDOWNLOAD_EXTERNAL_TEST_DATA=OFF
- -DENABLE_LTO=$(usex lto)
- # ===================================================
- # things we want to be hard off or not yet figured out
- # ===================================================
- -DBUILD_PACKAGE=OFF
- # ===================================================
- # Not building protobuf but update files bug #631418
- # ===================================================
- -DBUILD_PROTOBUF=OFF
- -DPROTOBUF_UPDATE_FILES=ON
- # ===================================================
- # things we want to be hard enabled not worth useflag
- # ===================================================
- -DCMAKE_SKIP_RPATH=ON
- -DOPENCV_DOC_INSTALL_PATH=
- -DBUILD_opencv_features2d=$(usex features2d ON OFF)
- )
-
- # ==================================================
- # cpu flags, should solve 633900
- #===================================================
- local CPU_BASELINE=""
- for i in "${CPU_FEATURES_MAP[@]}" ; do
- if [[ ${ABI} != x86 || ${i%:*} != "cpu_flags_x86_avx2" ]]; then # workaround for Bug 747163
- use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};"
- fi
- done
-
- GLOBALCMAKEARGS+=(
- -DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
- -DCPU_BASELINE=${CPU_BASELINE}
- -DCPU_DISPATCH=
- )
-
- # ===================================================
- # OpenCV Contrib Modules
- # ===================================================
- if use contrib; then
- GLOBALCMAKEARGS+=(
- -DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
- -DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
- -DBUILD_opencv_dnns_easily_fooled=OFF
- -DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
- -DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
- -DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
- -DBUILD_opencv_sfm=$(usex contribsfm ON OFF)
- -DBUILD_opencv_freetype=$(usex contribfreetype ON OFF)
- -DBUILD_opencv_ovis=$(usex contribovis ON OFF)
- )
-
- if multilib_is_native_abi; then
- GLOBALCMAKEARGS+=(
- -DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=$(usex !tesseract)
- )
- else
- GLOBALCMAKEARGS+=(
- -DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=ON
- )
- fi
- fi
-
- # workaround for bug 413429
- tc-export CC CXX
-
- local mycmakeargs=(
- ${GLOBALCMAKEARGS[@]}
- -DPYTHON_EXECUTABLE=OFF
- -DINSTALL_PYTHON_EXAMPLES=OFF
- -DBUILD_opencv_python2=OFF
- -DBUILD_opencv_python3=OFF
- )
-
- cmake_src_configure
-
- # Copy face_land_model to ${CMAKE_BINARY_DIR}/${OPENCV_TEST_DATA_INSTALL_PATH}
- # TODO patch ocv_download to copy files into destination dirs
- if use contribdnn; then
- mkdir -p "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
- cp "${WORKDIR}"/face_landmark_model.dat "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
- fi
-
-}
-
-python_module_compile() {
- local BUILD_DIR="${orig_BUILD_DIR}"
- local mycmakeargs=( ${GLOBALCMAKEARGS[@]} )
-
- # Set all python variables to load the correct Gentoo paths
- mycmakeargs+=(
- # python_setup alters PATH and sets this as wrapper
- # to the correct interpreter we are building for
- -DPYTHON_DEFAULT_EXECUTABLE=${EPYTHON}
- -DINSTALL_PYTHON_EXAMPLES=$(usex examples)
- )
-
- # Regenerate cache file. Can't use rebuild_cache as it won't
- # have the Gentoo specific options.
- rm CMakeCache.txt || die "rm failed"
- cmake_src_configure
- cmake_src_compile
- cmake_src_install
-
- # Remove compiled binary so new version compiles
- # Avoid conflicts with new module builds as build system doesn't
- # really support it.
- rm -r modules/python3 || die "rm failed"
-
- python_optimize "${ED}"/$(python_get_sitedir)
-}
-
-multilib_src_install() {
- cmake_src_install
-
- # Build and install the python modules for all targets
- if multilib_is_native_abi && use python; then
- local orig_BUILD_DIR="${BUILD_DIR}"
- python_foreach_impl python_module_compile
- fi
-}
diff --git a/media-libs/opencv/opencv-4.5.1-r3.ebuild b/media-libs/opencv/opencv-4.5.1-r3.ebuild
deleted file mode 100644
index 4c0223aebb80..000000000000
--- a/media-libs/opencv/opencv-4.5.1-r3.ebuild
+++ /dev/null
@@ -1,568 +0,0 @@
-# Copyright 1999-2021 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
-
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
-HOMEPAGE="https://opencv.org"
-TINY_DNN_PV="1.0.0a3"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
- dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
- download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> ${PN}-4.4.0_extdep.tar.gz )
- contrib? (
- https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
- contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
- contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
- )"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
-
-# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
-ARM_CPU_FEATURES=(
- cpu_flags_arm_neon:NEON
- cpu_flags_arm_vfpv3:VFPV3
-)
-PPC_CPU_FEATURES=(
- cpu_flags_ppc_vsx:VSX
- cpu_flags_ppc_vsx3:VSX3
-)
-X86_CPU_FEATURES_RAW=(
- avx:AVX
- avx2:AVX2
- avx512f:AVX_512F
- f16c:FP16
- fma3:FMA3
- popcnt:POPCNT
- sse:SSE
- sse2:SSE2
- sse3:SSE3
- ssse3:SSSE3
- sse4_1:SSE4_1
- sse4_2:SSE4_2
-)
-X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
-CPU_FEATURES_MAP=(
- ${ARM_CPU_FEATURES[@]}
- ${PPC_CPU_FEATURES[@]}
- ${X86_CPU_FEATURES[@]}
-)
-IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}"
-
-# OpenGL needs gtk or Qt installed to activate, otherwise build system
-# will silently disable it Wwithout the user knowing, which defeats the
-# purpose of the opengl use flag.
-REQUIRED_USE="
- cpu_flags_x86_avx2? ( cpu_flags_x86_f16c )
- cpu_flags_x86_f16c? ( cpu_flags_x86_avx )
- cuda? ( tesseract? ( opencl ) )
- dnnsamples? ( examples )
- gflags? ( contrib )
- glog? ( contrib )
- contribcvv? ( contrib qt5 )
- contribdnn? ( contrib )
- contribfreetype? ( contrib )
- contribhdf? ( contrib )
- contribovis? ( contrib )
- contribsfm? ( contrib eigen gflags glog )
- contribxfeatures2d? ( contrib download )
- examples? ( contribdnn )
- java? ( python )
- opengl? ( qt5 )
- python? ( ${PYTHON_REQUIRED_USE} )
- tesseract? ( contrib )
- ?? ( gtk3 qt5 )"
-
-# The following logic is intrinsic in the build system, but we do not enforce
-# it on the useflags since this just blocks emerging pointlessly:
-# openmp? ( !threads )
-
-RDEPEND="
- app-arch/bzip2[${MULTILIB_USEDEP}]
- <dev-libs/protobuf-3.19:=[${MULTILIB_USEDEP}]
- sys-libs/zlib[${MULTILIB_USEDEP}]
- cuda? ( dev-util/nvidia-cuda-toolkit:0= )
- contribhdf? ( sci-libs/hdf5:= )
- contribfreetype? (
- media-libs/freetype:2[${MULTILIB_USEDEP}]
- media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
- )
- contribovis? ( dev-games/ogre:0/1.12 )
- ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
- gdal? ( sci-libs/gdal:= )
- gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )
- glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] )
- gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
- gstreamer? (
- media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
- media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
- )
- gtk3? (
- dev-libs/glib:2[${MULTILIB_USEDEP}]
- x11-libs/gtk+:3[${MULTILIB_USEDEP}]
- )
- ieee1394? (
- media-libs/libdc1394:=[${MULTILIB_USEDEP}]
- sys-libs/libraw1394[${MULTILIB_USEDEP}]
- )
- java? ( >=virtual/jre-1.6:* )
- jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
- jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
- lapack? (
- virtual/cblas
- virtual/lapack
- )
- opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
- openexr? ( <media-libs/openexr-3.0.0:0=[${MULTILIB_USEDEP}] )
- opengl? (
- virtual/opengl[${MULTILIB_USEDEP}]
- virtual/glu[${MULTILIB_USEDEP}]
- )
- png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
- python? (
- ${PYTHON_DEPS}
- dev-python/numpy[${PYTHON_USEDEP}]
- )
- qt5? (
- dev-qt/qtgui:5=
- dev-qt/qtwidgets:5=
- dev-qt/qttest:5=
- dev-qt/qtconcurrent:5=
- opengl? ( dev-qt/qtopengl:5= )
- )
- tesseract? ( app-text/tesseract[opencl=,${MULTILIB_USEDEP}] )
- threads? ( dev-cpp/tbb:=[${MULTILIB_USEDEP}] )
- tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
- v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
- vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
- vtk? ( sci-libs/vtk[rendering] )
- webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
- xine? ( media-libs/xine-lib )"
-# bug #747949 for eigen (eigen-3.3.8 was broken upstream)
-DEPEND="${RDEPEND}
- eigen? (
- || (
- >=dev-cpp/eigen-3.3.8-r1:3
- <dev-cpp/eigen-3.3.8:3
- )
- )
- java? ( >=virtual/jdk-1.6 )"
-BDEPEND="virtual/pkgconfig"
-
-MULTILIB_WRAPPED_HEADERS=(
- # [opencv4]
- /usr/include/opencv4/opencv2/cvconfig.h
- /usr/include/opencv4/opencv2/opencv_modules.hpp
- # [cudev]
- /usr/include/opencv4/opencv2/cudaarithm.hpp
- /usr/include/opencv4/opencv2/cudabgsegm.hpp
- /usr/include/opencv4/opencv2/cudacodec.hpp
- /usr/include/opencv4/opencv2/cudafeatures2d.hpp
- /usr/include/opencv4/opencv2/cudafilters.hpp
- /usr/include/opencv4/opencv2/cudaimgproc.hpp
- /usr/include/opencv4/opencv2/cudalegacy.hpp
- /usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
- /usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
- /usr/include/opencv4/opencv2/cudalegacy/NCV.hpp
- /usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp
- /usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp
- /usr/include/opencv4/opencv2/cudaobjdetect.hpp
- /usr/include/opencv4/opencv2/cudaoptflow.hpp
- /usr/include/opencv4/opencv2/cudastereo.hpp
- /usr/include/opencv4/opencv2/cudawarping.hpp
- /usr/include/opencv4/opencv2/cudev/block/block.hpp
- /usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp
- /usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp
- /usr/include/opencv4/opencv2/cudev/block/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/block/scan.hpp
- /usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp
- /usr/include/opencv4/opencv2/cudev/common.hpp
- /usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp
- /usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp
- /usr/include/opencv4/opencv2/cudev/expr/color.hpp
- /usr/include/opencv4/opencv2/cudev/expr/deriv.hpp
- /usr/include/opencv4/opencv2/cudev/expr/expr.hpp
- /usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp
- /usr/include/opencv4/opencv2/cudev/expr/reduction.hpp
- /usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp
- /usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp
- /usr/include/opencv4/opencv2/cudev/expr/warping.hpp
- /usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp
- /usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp
- /usr/include/opencv4/opencv2/cudev/functional/functional.hpp
- /usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp
- /usr/include/opencv4/opencv2/cudev/grid/copy.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp
- /usr/include/opencv4/opencv2/cudev/grid/histogram.hpp
- /usr/include/opencv4/opencv2/cudev/grid/integral.hpp
- /usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp
- /usr/include/opencv4/opencv2/cudev/grid/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp
- /usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp
- /usr/include/opencv4/opencv2/cudev/grid/transform.hpp
- /usr/include/opencv4/opencv2/cudev/grid/transpose.hpp
- /usr/include/opencv4/opencv2/cudev.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp
- /usr/include/opencv4/opencv2/cudev/util/atomic.hpp
- /usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp
- /usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp
- /usr/include/opencv4/opencv2/cudev/util/limits.hpp
- /usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp
- /usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp
- /usr/include/opencv4/opencv2/cudev/util/tuple.hpp
- /usr/include/opencv4/opencv2/cudev/util/type_traits.hpp
- /usr/include/opencv4/opencv2/cudev/util/vec_math.hpp
- /usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp
- /usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp
- /usr/include/opencv4/opencv2/cudev/warp/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/warp/scan.hpp
- /usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp
- /usr/include/opencv4/opencv2/cudev/warp/warp.hpp
- # [contrib_cvv]
- /usr/include/opencv4/opencv2/cvv/call_meta_data.hpp
- /usr/include/opencv4/opencv2/cvv/cvv.hpp
- /usr/include/opencv4/opencv2/cvv/debug_mode.hpp
- /usr/include/opencv4/opencv2/cvv/dmatch.hpp
- /usr/include/opencv4/opencv2/cvv/filter.hpp
- /usr/include/opencv4/opencv2/cvv/final_show.hpp
- /usr/include/opencv4/opencv2/cvv.hpp
- /usr/include/opencv4/opencv2/cvv/show_image.hpp
- # [contrib_hdf]
- /usr/include/opencv4/opencv2/hdf/hdf5.hpp
- /usr/include/opencv4/opencv2/hdf.hpp
- # [contrib_ovis]
- /usr/include/opencv4/opencv2/ovis.hpp
- # [vtk]
- /usr/include/opencv4/opencv2/viz.hpp
- /usr/include/opencv4/opencv2/viz/types.hpp
- /usr/include/opencv4/opencv2/viz/viz3d.hpp
- /usr/include/opencv4/opencv2/viz/vizcore.hpp
- /usr/include/opencv4/opencv2/viz/widget_accessor.hpp
- /usr/include/opencv4/opencv2/viz/widgets.hpp
-)
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.4.0-disable-download.patch
- "${FILESDIR}"/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch
- "${FILESDIR}"/${PN}-4.1.2-opencl-license.patch
- "${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch
- "${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.patch
-)
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
-
- # remove bundled stuff
- rm -r 3rdparty || die "Removing 3rd party components failed"
- sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
- -i CMakeLists.txt cmake/*cmake || die
-
- if use dnnsamples; then
- mv "${WORKDIR}/res10_300x300_ssd_iter_140000.caffemodel" "${WORKDIR}/${P}/samples/dnn/" || die
- fi
-
- if use contrib; then
- cd "${WORKDIR}/${PN}_contrib-${PV}" || die
- if use contribxfeatures2d; then
- mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
- fi
- fi
-
- if use download; then
- mv "${WORKDIR}/${PN}-extdep-4.4.0" "${WORKDIR}/${P}/.cache/" || die
- fi
-
- java-pkg-opt-2_src_prepare
-
- # this really belongs in src_prepare() too
- JAVA_ANT_ENCODING="iso-8859-1"
- # set encoding so even this cmake build will pick it up.
- export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
- java-ant-2_src_configure
-}
-
-multilib_src_configure() {
- # please dont sort here, order is the same as in CMakeLists.txt
- GLOBALCMAKEARGS=(
- # Optional 3rd party components
- # ===================================================
- -DENABLE_DOWNLOAD=$(usex download)
- -DWITH_QUIRC=OFF # Do not have dependencies
- -DWITH_1394=$(usex ieee1394)
- # -DWITH_AVFOUNDATION=OFF # IOS
- -DWITH_VTK=$(multilib_native_usex vtk)
- -DWITH_EIGEN=$(usex eigen)
- -DWITH_VFW=OFF # Video windows support
- -DWITH_FFMPEG=$(usex ffmpeg)
- -DWITH_GSTREAMER=$(usex gstreamer)
- -DWITH_GSTREAMER_0_10=OFF # Don't want this
- -DWITH_GTK=$(usex gtk3)
- -DWITH_GTK_2_X=OFF # only want gtk3 nowadays
- -DWITH_IPP=OFF
- # Jasper was removed from tree because of security problems.
- # Upstream were/are making progress. We use openjpeg instead.
- # bug 734284
- -DWITH_JASPER=OFF
- -DWITH_JPEG=$(usex jpeg)
- -DWITH_OPENJPEG=$(usex jpeg2k)
- -DWITH_WEBP=$(usex webp)
- -DWITH_OPENEXR=$(usex openexr)
- -DWITH_OPENGL=$(usex opengl)
- -DWITH_OPENVX=OFF
- -DWITH_OPENNI=OFF # Not packaged
- -DWITH_OPENNI2=OFF # Not packaged
- -DWITH_PNG=$(usex png)
- -DWITH_GDCM=OFF
- -DWITH_PVAPI=OFF
- -DWITH_GIGEAPI=OFF
- -DWITH_ARAVIS=OFF
- -DWITH_QT=$(multilib_native_usex qt5 5 OFF)
- -DWITH_WIN32UI=OFF # Windows only
- # -DWITH_QUICKTIME=OFF
- # -DWITH_QTKIT=OFF
- -DWITH_TBB=$(usex threads)
- -DWITH_OPENMP=$(usex openmp)
- -DWITH_CSTRIPES=OFF
- -DWITH_PTHREADS_PF=ON
- -DWITH_TIFF=$(usex tiff)
- -DWITH_UNICAP=OFF # Not packaged
- -DWITH_V4L=$(usex v4l)
- -DWITH_LIBV4L=$(usex v4l)
- # -DWITH_DSHOW=ON # direct show supp
- -DWITH_MSMF=OFF
- -DWITH_XIMEA=OFF # Windows only
- -DWITH_XINE=$(multilib_native_usex xine)
- -DWITH_CLP=OFF
- -DWITH_OPENCL=$(usex opencl)
- -DWITH_OPENCL_SVM=OFF
- -DWITH_OPENCLAMDFFT=$(usex opencl)
- -DWITH_OPENCLAMDBLAS=$(usex opencl)
- -DWITH_DIRECTX=OFF
- -DWITH_INTELPERC=OFF
- -DWITH_IPP_A=OFF
- -DWITH_MATLAB=OFF
- -DWITH_VA=$(usex vaapi)
- -DWITH_VA_INTEL=$(usex vaapi)
- -DWITH_GDAL=$(multilib_native_usex gdal)
- -DWITH_GPHOTO2=$(usex gphoto2)
- -DWITH_LAPACK=$(multilib_native_usex lapack)
- -DWITH_ITT=OFF # 3dparty libs itt_notify
- # ===================================================
- # CUDA build components: nvidia-cuda-toolkit takes care of GCC version
- # ===================================================
- -DWITH_CUDA=$(multilib_native_usex cuda)
- -DWITH_CUBLAS=$(multilib_native_usex cuda)
- -DWITH_CUFFT=$(multilib_native_usex cuda)
- -DWITH_NVCUVID=OFF
- # -DWITH_NVCUVID=$(usex cuda)
- -DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "")
- # ===================================================
- # OpenCV build components
- # ===================================================
- -DBUILD_SHARED_LIBS=ON
- -DBUILD_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag
- -DBUILD_ANDROID_EXAMPLES=OFF
- -DBUILD_opencv_apps=$(usex opencvapps ON OFF)
- -DBUILD_DOCS=OFF # Doesn't install anyways.
- -DBUILD_EXAMPLES=$(multilib_native_usex examples)
- -DBUILD_PERF_TESTS=OFF
- -DBUILD_TESTS=$(multilib_native_usex testprograms)
- -DBUILD_WITH_DEBUG_INFO=$(usex debug)
- # -DBUILD_WITH_STATIC_CRT=OFF
- -DBUILD_WITH_DYNAMIC_IPP=OFF
- -DBUILD_FAT_JAVA_LIB=OFF
- # -DBUILD_ANDROID_SERVICE=OFF
- -DBUILD_CUDA_STUBS=$(multilib_native_usex cuda)
- -DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${PV}/modules" "")
- # ===================================================
- # OpenCV installation options
- # ===================================================
- -DINSTALL_CREATE_DISTRIB=OFF
- -DINSTALL_C_EXAMPLES=$(multilib_native_usex examples)
- -DINSTALL_TESTS=$(multilib_native_usex testprograms)
- -DINSTALL_PYTHON_EXAMPLES=$(multilib_native_usex examples)
- # -DINSTALL_ANDROID_EXAMPLES=OFF
- -DINSTALL_TO_MANGLED_PATHS=OFF
- -DOPENCV_GENERATE_PKGCONFIG=ON
- # opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
- # to set its destination libdir
- -DLIB_SUFFIX=
- # ===================================================
- # OpenCV build options
- # ===================================================
- -DENABLE_CCACHE=OFF
- # bug 733796, but PCH is a risky game in CMake anyway
- -DENABLE_PRECOMPILED_HEADERS=OFF
- -DENABLE_SOLUTION_FOLDERS=OFF
- -DENABLE_PROFILING=OFF
- -DENABLE_COVERAGE=OFF
-
- -DHAVE_opencv_java=$(multilib_native_usex java YES NO)
- -DENABLE_NOISY_WARNINGS=OFF
- -DOPENCV_WARNINGS_ARE_ERRORS=OFF
- -DENABLE_IMPL_COLLECTION=OFF
- -DENABLE_INSTRUMENTATION=OFF
- -DGENERATE_ABI_DESCRIPTOR=OFF
- -DDOWNLOAD_EXTERNAL_TEST_DATA=OFF
- -DENABLE_LTO=$(usex lto)
- # ===================================================
- # things we want to be hard off or not yet figured out
- # ===================================================
- -DBUILD_PACKAGE=OFF
- # ===================================================
- # Not building protobuf but update files bug #631418
- # ===================================================
- -DBUILD_PROTOBUF=OFF
- -DPROTOBUF_UPDATE_FILES=ON
- # ===================================================
- # things we want to be hard enabled not worth useflag
- # ===================================================
- -DCMAKE_SKIP_RPATH=ON
- -DOPENCV_DOC_INSTALL_PATH=
- -DBUILD_opencv_features2d=$(usex features2d ON OFF)
- )
-
- # ==================================================
- # cpu flags, should solve 633900
- #===================================================
- local CPU_BASELINE=""
- for i in "${CPU_FEATURES_MAP[@]}" ; do
- if [[ ${ABI} != x86 || ${i%:*} != "cpu_flags_x86_avx2" ]]; then # workaround for Bug 747163
- use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};"
- fi
- done
-
- GLOBALCMAKEARGS+=(
- -DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
- -DCPU_BASELINE=${CPU_BASELINE}
- -DCPU_DISPATCH=
- )
-
- # ===================================================
- # OpenCV Contrib Modules
- # ===================================================
- if use contrib; then
- GLOBALCMAKEARGS+=(
- -DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
- -DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
- -DBUILD_opencv_dnns_easily_fooled=OFF
- -DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
- -DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
- -DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
- -DBUILD_opencv_sfm=$(usex contribsfm ON OFF)
- -DBUILD_opencv_freetype=$(usex contribfreetype ON OFF)
- -DBUILD_opencv_ovis=$(usex contribovis ON OFF)
- )
-
- if multilib_is_native_abi; then
- GLOBALCMAKEARGS+=(
- -DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=$(usex !tesseract)
- )
- else
- GLOBALCMAKEARGS+=(
- -DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=ON
- )
- fi
- fi
-
- # workaround for bug 413429
- tc-export CC CXX
-
- local mycmakeargs=(
- ${GLOBALCMAKEARGS[@]}
- -DPYTHON_EXECUTABLE=OFF
- -DINSTALL_PYTHON_EXAMPLES=OFF
- -DBUILD_opencv_python2=OFF
- -DBUILD_opencv_python3=OFF
- )
-
- cmake_src_configure
-
- # Copy face_land_model to ${CMAKE_BINARY_DIR}/${OPENCV_TEST_DATA_INSTALL_PATH}
- # TODO patch ocv_download to copy files into destination dirs
- if use contribdnn; then
- mkdir -p "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
- cp "${WORKDIR}"/face_landmark_model.dat "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
- fi
-
-}
-
-python_module_compile() {
- local BUILD_DIR="${orig_BUILD_DIR}"
- local mycmakeargs=( ${GLOBALCMAKEARGS[@]} )
-
- # Set all python variables to load the correct Gentoo paths
- mycmakeargs+=(
- # python_setup alters PATH and sets this as wrapper
- # to the correct interpreter we are building for
- -DPYTHON_DEFAULT_EXECUTABLE=${EPYTHON}
- -DINSTALL_PYTHON_EXAMPLES=$(usex examples)
- )
-
- # Regenerate cache file. Can't use rebuild_cache as it won't
- # have the Gentoo specific options.
- rm CMakeCache.txt || die "rm failed"
- cmake_src_configure
- cmake_src_compile
- cmake_src_install
-
- # Remove compiled binary so new version compiles
- # Avoid conflicts with new module builds as build system doesn't
- # really support it.
- rm -r modules/python3 || die "rm failed"
-
- python_optimize "${ED}"/$(python_get_sitedir)
-}
-
-multilib_src_install() {
- cmake_src_install
-
- # Build and install the python modules for all targets
- if multilib_is_native_abi && use python; then
- local orig_BUILD_DIR="${BUILD_DIR}"
- python_foreach_impl python_module_compile
- fi
-}
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index 2663fe4c871c..f0e220cd74d3 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -7,7 +7,9 @@ AUX openexr-3.1.1-0003-disable-failing-test.patch 1193 BLAKE2B d4a40151e2c0b2278
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-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 2164 BLAKE2B 0854070dc3718954071b167178050914b8ef463deb7a64312cf03d5ce05929e4dd3064b2cf9952b74332b12f95eac5cd4db5e355e6a2a1f282b0506fcb1c78f6 SHA512 b5ac054271964dfa4509d27d0b3fb4bbae35b2619ba84879d828b4bf4b0f6dfe33eaa144717e70aee861acc29260769376877473c405bc19d84b57efc0706f6e
EBUILD openexr-3.1.3.ebuild 2173 BLAKE2B 08e48ceac80017c6fdcf10bffc832cf6b2d5249b78a156c551ac14336a9c06cd8f950a3d6d3689d1babc8b9641a86641d0486a421da34ccf074aba945067eb8e SHA512 76908e459cd81c57d678f52b6d3cceb6da8a2b2c1748af20bc2fcbddd9d3483fd0b90804ecc447d818c6cbd8bdf6b99daa842904f033413d80109ef71fe6b193
+EBUILD openexr-3.1.4.ebuild 2173 BLAKE2B 08e48ceac80017c6fdcf10bffc832cf6b2d5249b78a156c551ac14336a9c06cd8f950a3d6d3689d1babc8b9641a86641d0486a421da34ccf074aba945067eb8e SHA512 76908e459cd81c57d678f52b6d3cceb6da8a2b2c1748af20bc2fcbddd9d3483fd0b90804ecc447d818c6cbd8bdf6b99daa842904f033413d80109ef71fe6b193
MISC metadata.xml 797 BLAKE2B e9d8032b4c63b24e2e7b1874d46bbbcf4f31342c4540279d1ba243e69090c320e6d9caed29e15dee87f7fbfb4b806de3a1665b7a4385baa4107ea41a2ae74d32 SHA512 12f7cce7d5cee0a88e4c3f8babfa10f890d5b38c0131becafa46423dc642c2df03ac78b2e3bbcdb4846b929eeb7138e9b3d12cddbf1da984ac5446b6cc792dee
diff --git a/media-libs/openexr/openexr-3.1.4.ebuild b/media-libs/openexr/openexr-3.1.4.ebuild
new file mode 100644
index 000000000000..afd43341887c
--- /dev/null
+++ b/media-libs/openexr/openexr-3.1.4.ebuild
@@ -0,0 +1,78 @@
+# 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/openh264/Manifest b/media-libs/openh264/Manifest
index 68a002fcf2e1..5e19352c1580 100644
--- a/media-libs/openh264/Manifest
+++ b/media-libs/openh264/Manifest
@@ -1,5 +1,7 @@
AUX openh264-2.1.0-pkgconfig-pathfix.patch 1949 BLAKE2B a3894b7cb65fcdb444d389ccf6644e404bb8375a910bd51bbe5e1b6b773e4d6890a17d2f1a09400d6d0cadc41be9321d86a09b93f861812f2d72a6c1c5e39fde SHA512 00c59bd1d6fe6355ce81ead4ba898f1f602e9f9c93e382c2ead3c353d5fd1f2bf3c46a30f3b248896c9a74d347a24e200644387ce3c70e886d941c115bb42088
DIST gmp-api-Firefox39-e3935759360861812d33cbd3b713e25f1de1ecb5.tar.gz 10440 BLAKE2B 92379258f2664778baee50b99573dbeae50e723a3f7605c62a4ca3aedd9129fbd1991d7b3ead1b8a3689e71f783ded0b15dca5e6d910345c95a6f28898bbdda3 SHA512 85e4b58cc66072fad2b6dbaa65a955a8931f73eb3664f05ddca65157ac5c2547225910c36b4507d88179a95cfb35a5aff6edadd3c0fa5418529c80ae6d736f44
DIST openh264-2.1.1.tar.gz 60239654 BLAKE2B d541fa686b1eb8352dbb4088fc4ef508f947660815c86b2bb7db841c927b7b9f763d7fe793f0fa1511620dbdc506c20cd5ad52740140337aa12b8c31b857a8e6 SHA512 f9c2925fa902c6278da40f68b967d25e62db7ce3541e8f5e7a0ee174204b6ecc7026b5853885c361f48ca01d71bacd585fb5b91f01f0c054ece80943f1afcf79
+DIST openh264-2.2.0.tar.gz 60275282 BLAKE2B 69e44396de229c65cf7a87d6f9ce8e2ef67fbdad6740f6aa64825b71fc00af945dca3e4726b9f0b4f4b83e363f3f7aadadabbab291c612b0fb61b42478a8cacf SHA512 637e2bfa45ad586c10fc8990cad4d824ada07e277fd965c3a6cdd19bc7836b2d7082574037a3ff2ee631207dd8cb0ec4f68abafdc19646b433de561c47ce8d38
EBUILD openh264-2.1.1_p20190331.ebuild 3457 BLAKE2B 15c0bb913b6e97f0f3a3a08f44dff9bea5026d8f936573c0aeab2c7e077691d7be2123e2cf599c4de9a61c08323fa1cb9f2af2d1a2834c97b6f3e1e06dd3614a SHA512 4505c55440f1ae4f28aeee38e6ec02ab7537f1e997a45964a36eb3474a27c8306e590dd38b345834d6feba7dc73b2e6df8b82d8af78c32d99985b1eaa3109e80
+EBUILD openh264-2.2.0.ebuild 3486 BLAKE2B 4a2ddfad4af22f2151c4df3e6d53ef41feae3e95fa07d127cf802cef2a0945f2f18e23724237981125eefd8693071b23e2e7c8893c8093c255d89825e4229035 SHA512 d741e37d9f6bd919af3ab1d25fe479b905cb7dcc75bbd5d768f20640f39b0c9367a3fc26f9d86b79bcd3db5534e3d1f938ce97bce0534b2299e927c3592c98b0
MISC metadata.xml 569 BLAKE2B 14a021fba978f0156bab46178d05a6b9f8f67fdeba784d587759207fe60ea1d74a383eec3fc40662c39d33fcecb71d8cafe7eb6354383c253e0a3f7f1e94feae SHA512 ceb77117c6a50f16640b329368c86db26127b8e501475dbaca4c53ba41315b0fc7161f6d9268cb86d1f6dbf2cf867e2bb0e6b5f45240ab3227b99b734c344efd
diff --git a/media-libs/openh264/openh264-2.2.0.ebuild b/media-libs/openh264/openh264-2.2.0.ebuild
new file mode 100644
index 000000000000..a99a1a7fb6aa
--- /dev/null
+++ b/media-libs/openh264/openh264-2.2.0.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs multilib-minimal
+
+MOZVER=39
+MY_GMP_COMMIT="e3935759360861812d33cbd3b713e25f1de1ecb5"
+DESCRIPTION="Cisco OpenH264 library and Gecko Media Plugin for Mozilla packages"
+HOMEPAGE="https://www.openh264.org/ https://github.com/cisco/openh264"
+SRC_URI="https://github.com/cisco/openh264/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+ https://github.com/mozilla/gmp-api/archive/${MY_GMP_COMMIT}.tar.gz -> gmp-api-Firefox${MOZVER}-${MY_GMP_COMMIT}.tar.gz"
+LICENSE="BSD"
+SLOT="0/6.1" # subslot = openh264 soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="cpu_flags_arm_neon cpu_flags_x86_avx2 +plugin utils"
+
+RESTRICT="bindist test"
+
+BDEPEND="
+ abi_x86_32? ( dev-lang/nasm )
+ abi_x86_64? ( dev-lang/nasm )"
+
+DOCS=( LICENSE CONTRIBUTORS README.md )
+
+PATCHES=( "${FILESDIR}/${PN}-2.1.0-pkgconfig-pathfix.patch" )
+
+src_prepare() {
+ default
+
+ sed -i -e 's/ | generate-version//g' Makefile || die
+ sed -e 's|$FULL_VERSION|""|g' codec/common/inc/version_gen.h.template > \
+ codec/common/inc/version_gen.h
+
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ ln -s "${WORKDIR}"/gmp-api-${MY_GMP_COMMIT} gmp-api || die
+}
+
+emakecmd() {
+ CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
+ emake V=Yes CFLAGS_M32="" CFLAGS_M64="" CFLAGS_OPT="" \
+ PREFIX="${EPREFIX}/usr" \
+ LIBDIR_NAME="$(get_libdir)" \
+ SHAREDLIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
+ INCLUDES_DIR="${EPREFIX}/usr/include/${PN}" \
+ HAVE_AVX2=$(usex cpu_flags_x86_avx2 Yes No) \
+ ARCH="$(tc-arch)" \
+ $@
+}
+
+multilib_src_compile() {
+ local myopts="ENABLE64BIT=No"
+ case "${ABI}" in
+ s390x|alpha|*64) myopts="ENABLE64BIT=Yes";;
+ esac
+
+ if use arm; then
+ myopts+=" USE_ASM=$(usex cpu_flags_arm_neon Yes No)"
+ fi
+
+ emakecmd ${myopts}
+ use plugin && emakecmd ${myopts} plugin
+}
+
+multilib_src_install() {
+ emakecmd DESTDIR="${D}" install-shared
+
+ if use utils; then
+ newbin h264enc openh264enc
+ newbin h264dec openh264dec
+ fi
+
+ if use plugin; then
+ local plugpath="${ROOT}/usr/$(get_libdir)/nsbrowser/plugins/gmp-gmp${PN}/system-installed"
+ insinto "${plugpath}"
+ doins libgmpopenh264.so* gmpopenh264.info
+ echo "MOZ_GMP_PATH=\"${plugpath}\"" >"${T}"/98-moz-gmp-${PN}
+ doenvd "${T}"/98-moz-gmp-${PN}
+
+ cat <<PREFEOF >"${T}"/${P}.js
+pref("media.gmp-gmp${PN}.autoupdate", false);
+pref("media.gmp-gmp${PN}.version", "system-installed");
+PREFEOF
+
+ insinto /usr/$(get_libdir)/firefox/defaults/pref
+ newins "${T}"/${P}.js ${PN}-${PV/_p*/}.js
+
+ insinto /usr/$(get_libdir)/seamonkey/defaults/pref
+ newins "${T}"/${P}.js ${PN}-${PV/_p*/}.js
+ fi
+}
+
+pkg_postinst() {
+ if use plugin; then
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ elog "Please restart your login session, in order for the session's environment"
+ elog "to include the new MOZ_GMP_PATH variable."
+ elog ""
+ fi
+ elog "This package attempts to override the Mozilla GMPInstaller auto-update process,"
+ elog "however even if it is not successful in doing so the profile-installed plugin"
+ elog "will not be used unless this package is removed. This package will take precedence"
+ elog "over any gmp-gmpopenh264 that may be installed in a user's profile."
+ elog ""
+ fi
+
+ if use utils; then
+ elog "Utilities h264enc and h264dec are installed as openh264enc and openh264dec"
+ elog "to avoid file collisions with media-video/h264enc"
+ elog ""
+ fi
+}
diff --git a/media-libs/pcaudiolib/Manifest b/media-libs/pcaudiolib/Manifest
index 859b78a7710e..ba7c9c0627e5 100644
--- a/media-libs/pcaudiolib/Manifest
+++ b/media-libs/pcaudiolib/Manifest
@@ -1,3 +1,3 @@
DIST pcaudiolib-1.1.tar.gz 34049 BLAKE2B 7c6ce1532c47db30db2b80be690453257148be9a7115cd24dabda3dfcaca667d5c3a8278276f278556406144461cda48905ce581f0fde2f8429b3f829a948a36 SHA512 d503c11b355601e1e05f0f438a0cd9ce277d19fd53d3f7edf26f6e17f1f8184e8b2112a282e8ed74db8646bb5534d2a9a3c707b1742ce02ef13fd89669785007
-EBUILD pcaudiolib-1.1.ebuild 865 BLAKE2B 7e24aef18c2e114fa6aaf39cdc69bfafc27c35ae8a5fe7f57da007ca9987ea58bb48b52ca0ac112b28f1a010fce414bf64b9883692a2700098ba790e90a70556 SHA512 5a98851e56892cbc5ea71dff316fb6c34d3ca6ad95750138648a75ce9d99a348f5864883322b948a61e2e066346a6e200a5d6a70e06f36047bf83b1384485b33
+EBUILD pcaudiolib-1.1.ebuild 884 BLAKE2B 28a0c1daefce88df6131a2a7fe447cda85632004d1a46acfa05b8b34d770cd2e8728aa3ee94ec85838ca39b33b53e51ff26fef546395bce13b1c7f36b1d03465 SHA512 a95bc54466d014113bb318d792738c8a155a61726c98c10a27839c36d41dc079aace22f6f711ef10cc12a7a84643265568b786f18cfb6bc77aa2919c2ccb1852
MISC metadata.xml 588 BLAKE2B e148577ddfbf9688495e1a620708903f0bbe126ea9bff194e6b0f75a0e2a36ec52567f4d7a86381f89fb6c2e828ae372217e983d30810bb62dc60c0692420fed SHA512 d5de3f26535c7b147515cd9952951ed16be99345d309c7110c36a93fcd3f44f43373293d082c60170dfe5e05956d22b4c2cc1dd7343b3c28188f935ba8feaadf
diff --git a/media-libs/pcaudiolib/pcaudiolib-1.1.ebuild b/media-libs/pcaudiolib/pcaudiolib-1.1.ebuild
index 738c49d0d4c1..fdd01b25ad72 100644
--- a/media-libs/pcaudiolib/pcaudiolib-1.1.ebuild
+++ b/media-libs/pcaudiolib/pcaudiolib-1.1.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="https://github.com/espeak-ng/pcaudiolib/archive/${PV}.tar.gz -> ${P}.ta
LICENSE="GPL-3+ ZLIB"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE="+alsa oss pulseaudio"
REQUIRED_USE="|| ( alsa oss pulseaudio )"
diff --git a/media-libs/portmidi/Manifest b/media-libs/portmidi/Manifest
index 1ee40edb155a..f99a67cbab9a 100644
--- a/media-libs/portmidi/Manifest
+++ b/media-libs/portmidi/Manifest
@@ -1,5 +1,5 @@
AUX portmidi-217-r4-python.patch 1540 BLAKE2B a5fe8c48e8d312cead822fc8893f8a610bf5cf280dd2445da04ab42ed13a5a121174afa2e8874dcf3f7a7b89cd60894a819404438c6d5cb2b99a8e2ae6f3aba8 SHA512 d7ded737346f9756450ff3eaf35daf33da941a109d7db07598ea57593ef3272213b889a9ab33bed71bead4583cb080439813bf7fc4a6d1a6cbb84ed4cd25b51f
AUX portmidi-234-cmake.patch 13979 BLAKE2B cc6b4193e9008899c89545e2e416c75779d08a6ef100e7a37c21a7c745ac3416c31b044664ba439368c8bb0f3a7fde119343a86d31efe3482c4a88718affdd6d SHA512 b07cd643699084f8e02ffc53d3721a53dd17b421d8ff5b2889a14ab99ff709c14f68b30adc2e7db818cbe7884f93cab8290ff9466ac8616d0db58b3e7aab1f75
DIST portmedia-code-r234.zip 1342298 BLAKE2B 3c3686b79ca0c8cbfaa6c44ae8c4f294630e1c5940576709ff1ca5854bfcfba1af7b067471656f2b39ae28cecea9b6c4403f72d5a2552355760c795eff123243 SHA512 cbc332d89bc465450b38245a83cc300dfd2e1e6de7c62284edf754ff4d8a9aa3dc49a395dcee535ed9688befb019186fa87fd6d8a3698898c2acbf3e6b7a0794
-EBUILD portmidi-234.ebuild 3318 BLAKE2B 1bf3ca9a6fe6a080f57c2cf1c62ca8b6da3fd4a195613ac9945d2ee5d6b63242951192bb2083a5fc3ef0cacbbedf2de173a7ed754c8e82acc9db83d6287e61e9 SHA512 491629c99bb489b7ed966d136a013f5108bc0113b81665cf4bfb214b5e63238e9d42dca4bdb5fccd817cc9c76aa8a7afa9bcce77b753ae185f351d259ce247dd
+EBUILD portmidi-234.ebuild 3290 BLAKE2B 8b8300bf7287b13b020c501fcd3f268a9717e6aed30f27a75e9be26483f6f26ea54dd1fc76040bb2a83e64edad596050b1c277c288daf958d1a1ff8d8bdd1302 SHA512 85d6f546c7d1cf6f7f1fd8e8a95c03753b7a6cdaa41c1ff2913bba5c83905236451c5bd9108d1741897cca44e0d0e98241d71f611d0e49169fcfc98c1fc34cb1
MISC metadata.xml 437 BLAKE2B 8560766f0e6d8f0484374ed827f14ffddc01cd7ee4df2b75ccf62f6b0f4b804eac1dad8f06931328aac3910b0382c0125ea1bd71aa786bcb674531d88ed85de1 SHA512 a932e03068f3971eb8e40c1f18646652f0fe04a898cb10e9b7156cfe2b712285cf83c247a19cb887aaa2e575bc95ffad58d5fcfbb44d9e8d39f3d7b2d0cadd76
diff --git a/media-libs/portmidi/portmidi-234.ebuild b/media-libs/portmidi/portmidi-234.ebuild
index 7ba9b89652ce..5d72e4ab709c 100644
--- a/media-libs/portmidi/portmidi-234.ebuild
+++ b/media-libs/portmidi/portmidi-234.ebuild
@@ -1,11 +1,10 @@
-# 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} )
DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_SETUPTOOLS=no
# ninja: error: build.ninja:521: multiple rules generate pm_java/pmdefaults.jar [-w dupbuild=err]
CMAKE_MAKEFILE_GENERATOR="emake"
inherit cmake desktop xdg distutils-r1 java-pkg-opt-2 flag-o-matic
diff --git a/media-libs/rubberband/Manifest b/media-libs/rubberband/Manifest
index 110b800d6354..aea1c22e14f1 100644
--- a/media-libs/rubberband/Manifest
+++ b/media-libs/rubberband/Manifest
@@ -1,6 +1,7 @@
AUX rubberband-1.9.2-build.patch 6707 BLAKE2B a88eb8a5c647f4d8006f51fc627dca0ab02d1712b920a3c6c41b8981aa13ac5d7155bfd11e33577cb7b1e49a079ca5ea9840d37aaf477deffa0dea609b03fed7 SHA512 035f5549c902c1517ad5e09ee472eca578eed7d7f87f7ee20166dc46f495d5abaebc32902472b9ac6a3a367176c130bfa6fc743159b9efa3227873a16d8b4877
-DIST rubberband-1.9.2.tar.bz2 164178 BLAKE2B dc8e5b4c773dbb5c556331fa56e6cf4a5dd3f8a0fc7dcfed1fbe53d1a7635f12db6a884e775fbff8022e252d98b4e14a46a2395a5d4cb7645522ddf3e6b5482f SHA512 b1c763ab2a428aa2f1f8e5d0be6e9eb669808059ee5389e94f12de25f1a05cd89022656d98906c90b616773da11ab1f596ae2c5a9d300118e88049e1443121f2
+AUX rubberband-2.0.1-build.patch 6021 BLAKE2B f9e745c1eda3dc8d4f603df144a41143f3f7ee3691a09f97f069f469378d9541a057aefd1e23c7c00dbc276e13eb510dce63579f2334d2384433ce60b41231f6 SHA512 4e20aa9722f2995ad2959cfabd3eca24b6d72eb1d1e59bf2f4b283e4cbc60025ae0ee754bacfac3042214f96900f4bac100c3c1918da1a256ea7f42f0befe912
DIST rubberband-2.0.0.tar.bz2 175527 BLAKE2B 5b4b8c98ade57f8b7776902166e8aa33e8f89d4de3fe659425a7ef14c1cf3c8a48ad474d2fe0f13483844b4f931ca8128ca57bb7e6dbf6e9d96deadac8856ee0 SHA512 a915a3eea75f0345e83010cc3ffd3c5e0c68a0c1d88da11b11a5fd5010196167c81db611a38c2c2b8d5c5a1f828f2c74a134e6ca8bb3a543af3ef70ce8d56101
-EBUILD rubberband-1.9.2.ebuild 1327 BLAKE2B 664b970e19dfcd36c601c6f42fe0f8fdb9ac35cd6666c52e60cca2f9c45889297f502edf5aa2c1bbcd347a9c88ee96ac42f3e9c7bf59e28291759cb22baf124c SHA512 78686227e171bdea6b3056dc6d96739c5010dc62d06dfbbbdce11a46f9b3bbba503e0cc7d9ecbf64d32586209d8683c8e882d3ad3ad9aa4997e5b8df4d6e29d1
+DIST rubberband-2.0.2.tar.bz2 178974 BLAKE2B 602d7eb76791d431a65bd5ef0d53ea0c2672e67aaa566594b3b2bb026cdf1b8879380818c3626a2c6d51cd6366bd47a52c69c110da566aa234fb7b37b19f027b SHA512 87dc5d59995bf949c35b885bb2eced067d84775bab76692da1202ae7554cb1b8404ca7371c264363e6d55c8978762ed32b446535746061f09e90cfc599adc0a0
EBUILD rubberband-2.0.0.ebuild 1543 BLAKE2B 03eedcdc50b08bb3a16c57afd30ab53a5242e058d7c5c673dff773b4c3ababa4a1ac3a10e345c74188ebbff36971d18949d8c2efcb1564215f652f87013fb8f9 SHA512 126bc35ee1920bdaeaf0e8bc2ae2fe36fd54cde303ade9d24e858b46a07cfd2f71a8bfc4eaf95fa5d01b1f4224b53a01cf3817afc3f8463196fd11cd88a0ac11
+EBUILD rubberband-2.0.2.ebuild 1586 BLAKE2B d161bbbee0e49c2a95d48c5d21cfca513a06c5e499ced26c54df6a0112992eaf35e0337bb20b615466a4049e73087dd0c2bd4a09d4dd6fe161ccf6a541116d79 SHA512 ae912021dfe95b60276987e94d6c0ae192775e72c0b602aca1eedc2331581c1844f641df76e5a256c1cd311ed4a79da6dcf0f9929ec97d37e28de7f89661932b
MISC metadata.xml 491 BLAKE2B bda0db771d95de138274eb35f4c135f3bd9fb3a1b75ce60a8c57ad71e0c0a894924bb52060c8ca87e689f2a0f581213639de2ca5615a134dfecfa4f008698b2a SHA512 c549bcf465808927153a79f145b222379270d2813e150606382dcb1c15980a37a89d7f0178d3fee2fd3eb7216dd6ad989efe0a24e398f67af95872f6c92d570a
diff --git a/media-libs/rubberband/files/rubberband-2.0.1-build.patch b/media-libs/rubberband/files/rubberband-2.0.1-build.patch
new file mode 100644
index 000000000000..5e7e023b4d8e
--- /dev/null
+++ b/media-libs/rubberband/files/rubberband-2.0.1-build.patch
@@ -0,0 +1,164 @@
+diff --git a/meson.build b/meson.build
+index 753d1df..005e638 100644
+--- a/meson.build
++++ b/meson.build
+@@ -99,18 +99,26 @@ endforeach
+
+ fftw3_dep = dependency('fftw3', version: '>= 3.0.0', required: false)
+ samplerate_dep = dependency('samplerate', version: '>= 0.1.8', required: false)
+-sndfile_dep = dependency('sndfile', version: '>= 1.0.16', required: false)
+-vamp_dep = dependency('vamp-sdk', version: '>= 2.9', required: false)
++if get_option('programs')
++ sndfile_dep = dependency('sndfile', version: '>= 1.0.16', required: false)
++endif
++if get_option('vamp')
++ vamp_dep = dependency('vamp-sdk', version: '>= 2.9', required: false)
++endif
+ thread_dep = dependency('threads')
+-have_ladspa = cpp.has_header('ladspa.h', args: extra_include_args)
++if get_option('ladspa')
++ have_ladspa = cpp.has_header('ladspa.h', args: extra_include_args)
++endif
+ have_lv2 = cpp.has_header('lv2.h', args: extra_include_args)
+ have_sincos = cpp.has_function('sincos',
+ prefix: '#define _GNU_SOURCE\n#include <math.h>',
+ args: '-lm')
+-have_jni = cpp.has_header('jni.h', args: extra_include_args)
++if get_option('jni')
++ have_jni = cpp.has_header('jni.h', args: extra_include_args)
+
+-javac = find_program('javac', required: false)
+-jar = find_program('jar', required: false)
++ javac = find_program('javac', required: false)
++ jar = find_program('jar', required: false)
++endif
+
+
+ # Check FFT and resampler options and set up dependencies and paths
+@@ -281,37 +289,41 @@ if ipp_needed
+ endif
+ endif # ipp_needed
+
+-if not vamp_dep.found()
+- vamp_dep = cpp.find_library('VampPluginSDK',
+- dirs: get_option('extra_lib_dirs'),
+- has_headers: ['vamp-sdk.h'],
+- header_args: extra_include_args,
+- required: false)
++if get_option('vamp')
+ if not vamp_dep.found()
+- vamp_dep = cpp.find_library('vamp-sdk',
++ vamp_dep = cpp.find_library('VampPluginSDK',
+ dirs: get_option('extra_lib_dirs'),
+ has_headers: ['vamp-sdk.h'],
+ header_args: extra_include_args,
+ required: false)
++ if not vamp_dep.found()
++ vamp_dep = cpp.find_library('vamp-sdk',
++ dirs: get_option('extra_lib_dirs'),
++ has_headers: ['vamp-sdk.h'],
++ header_args: extra_include_args,
++ required: false)
++ endif
+ endif
++ have_vamp = true
+ endif
+-have_vamp = vamp_dep.found()
+-
+-if not sndfile_dep.found()
+- sndfile_dep = cpp.find_library('sndfile',
+- dirs: get_option('extra_lib_dirs'),
+- has_headers: ['sndfile.h'],
+- header_args: extra_include_args,
+- required: false)
++
++if get_option('programs')
+ if not sndfile_dep.found()
+- sndfile_dep = cpp.find_library('sndfile-1',
++ sndfile_dep = cpp.find_library('sndfile',
+ dirs: get_option('extra_lib_dirs'),
+ has_headers: ['sndfile.h'],
+ header_args: extra_include_args,
+ required: false)
++ if not sndfile_dep.found()
++ sndfile_dep = cpp.find_library('sndfile-1',
++ dirs: get_option('extra_lib_dirs'),
++ has_headers: ['sndfile.h'],
++ header_args: extra_include_args,
++ required: false)
++ endif
+ endif
++ have_sndfile = true
+ endif
+-have_sndfile = sndfile_dep.found()
+
+
+ # General platform and compiler expectations
+@@ -514,7 +526,7 @@ if get_option('default_library') != 'shared' and rubberband_additional_static_li
+ )
+ endif
+
+-if have_jni and javac.found() and jar.found()
++if get_option('jni')
+ target_summary += { 'JNI library': [ true, 'Name: ' + rubberband_jni_name ] }
+ message('Will build Java Native Interface')
+ rubberband_jni = shared_library(
+@@ -549,7 +561,7 @@ if have_jni and javac.found() and jar.found()
+ )
+ else
+ target_summary += { 'JNI library': false }
+- if not have_jni
++ if not get_option('jni')
+ message('Not building Java Native Interface: jni.h header not found')
+ else
+ message('Not building Java Native Interface: Java compiler not found')
+@@ -563,7 +575,7 @@ install_headers(
+ subdir: 'rubberband'
+ )
+
+-if have_ladspa
++if get_option('ladspa')
+ target_summary += { 'LADSPA plugin': [ true, 'Name: ' + rubberband_ladspa_name ] }
+ message('Will build LADSPA plugin')
+ rubberband_ladspa = shared_library(
+@@ -630,7 +642,7 @@ else
+ message('Not building LV2 plugin: lv2.h header not found')
+ endif
+
+-if have_vamp
++if get_option('vamp')
+ target_summary += { 'Vamp plugin': [ true, 'Name: ' + rubberband_vamp_name ] }
+ message('Will build Vamp plugin')
+ rubberband_vamp = shared_library(
+@@ -662,7 +674,7 @@ else
+ message('Not building Vamp plugin: Vamp dependency not found')
+ endif
+
+-if have_sndfile
++if get_option('programs')
+ target_summary += { 'Command-line utility': [ true, 'Name: ' + rubberband_program_name ] }
+ message('Will build command-line utility')
+ rubberband_program = executable(
+diff --git a/meson_options.txt b/meson_options.txt
+index c820c20..81710de 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -26,3 +26,18 @@ option('extra_lib_dirs',
+ value: [],
+ description: 'Additional local library directories to search for dependencies.')
+
++option('jni',
++ type: 'boolean',
++ value: 'false')
++
++option('ladspa',
++ type: 'boolean',
++ value: 'false')
++
++option('programs',
++ type: 'boolean',
++ value: 'false')
++
++option('vamp',
++ type: 'boolean',
++ value: 'false')
diff --git a/media-libs/rubberband/rubberband-1.9.2.ebuild b/media-libs/rubberband/rubberband-2.0.2.ebuild
index f7f615276046..3a9d2a39197f 100644
--- a/media-libs/rubberband/rubberband-1.9.2.ebuild
+++ b/media-libs/rubberband/rubberband-2.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit meson-multilib
+inherit meson-multilib flag-o-matic
DESCRIPTION="An audio time-stretching and pitch-shifting library and utility program"
HOMEPAGE="https://www.breakfastquay.com/rubberband/"
@@ -11,7 +11,7 @@ SRC_URI="https://breakfastquay.com/files/releases/${P}.tar.bz2"
LICENSE="GPL-2"
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="ladspa jni static-libs +programs vamp"
BDEPEND="
@@ -29,15 +29,22 @@ RDEPEND="${CDEPEND}"
DEPEND="${CDEPEND}"
PATCHES=(
- "${FILESDIR}/${P}-build.patch"
+ "${FILESDIR}/${PN}-2.0.1-build.patch"
)
multilib_src_configure() {
+ if use ppc ; then
+ # bug #827203
+ # meson doesn't respect/use LIBS but mangles LDFLAGS with libs
+ # correctly. Use this until we get a Meson test for libatomic.
+ append-ldflags -latomic
+ fi
+
local emesonargs=(
--buildtype=release
-Dfft=fftw
-Dresampler=libsamplerate
- $(meson_use static-libs static)
+ -Ddefault_library=$(use static-libs && echo "both" || echo "shared")
$(meson_use ladspa)
$(meson_use jni)
$(meson_use programs)
diff --git a/media-libs/sdl2-ttf/Manifest b/media-libs/sdl2-ttf/Manifest
index af0c50b29f73..0ad84c6d58cb 100644
--- a/media-libs/sdl2-ttf/Manifest
+++ b/media-libs/sdl2-ttf/Manifest
@@ -1,5 +1,5 @@
DIST SDL2_ttf-2.0.15.tar.gz 4479718 BLAKE2B 8401ed4979dade5affa86be4463958d0c90f72d3b2874540cf868e460c5d6773a2b11eaf6d13792d23193085050970ebf877b707b0febaba9be29c4329be9d7c SHA512 30d685932c3dd6f2c94e2778357a5c502f0421374293d7102a64d92f9c7861229bf36bedf51c1a698b296a58c858ca442d97afb908b7df1592fc8d4f8ae8ddfd
DIST SDL2_ttf-2.0.18.tar.gz 14896353 BLAKE2B d1409353b06a1ca33e053ffabf1b05222705ba7df0cdf95b12724218649981a1d7b6f895c82b90d6da26bb34561760d6d37b62c0f64ea8672319cb6d7d0ce882 SHA512 9a211c07d4180fe3fb2f7614e907d1002ddf3bb77b57f62116f22dc29a6043f091deb6a8113656d26a44d2f06b9abcc372aa3e0761500fcf47b455406973a1c7
EBUILD sdl2-ttf-2.0.15.ebuild 1012 BLAKE2B bf74f411dec169458fc2d3bbd4ef6767dd71dfdcb864a0ced60dafa9d66c1336ada53285218304c935389d1d8e76362bb0560a796302ea982a2030a96747f5d1 SHA512 7c4aea39529b338e10a3d005ea3563f49f8b38481fcfb47546112c7900ab59696f7b9c0591291b0528c3e24e4f0b4c7e7d3140a735688fb6021c267792e820ab
-EBUILD sdl2-ttf-2.0.18-r1.ebuild 1262 BLAKE2B 7a86f60a198167aebbdec295bc686f97d68d8a20ec34e15d9515de5eb86d91e465c78ec37ddd2fde377b13ec441bcc27c2ae8ffc2eead76eb166aceae3a02660 SHA512 30329c1d4a1e95d18a9aea72083d2b3ffd8848c4d6a59c87001e7251a03850626fa5f87abf2621ce65251c0b31bc02c8acd73cec088a28141d414e68ffc76ba1
+EBUILD sdl2-ttf-2.0.18-r1.ebuild 1263 BLAKE2B d269da1117ec58cf58adaa977c1e169da57b8be96f24ff3f616adeb633e719fbd6f8315ed194d98d49fa07b395796724512b1e710e4efedada2fa5f717c33024 SHA512 ba3422de6719f35811bfd1fb510256b6747cdc1168bcf1bc968c7d68e956a0e6b6b7348f3c0f572a8a5c6a8617ac8b9f217d2fedeb1b6e0c7b513783ed9d1561
MISC metadata.xml 611 BLAKE2B 1333ebf75ae6e7474d28165d0943096e028b8dba76862963a7683b7600c59c3c33eaf1c81a9607da030ee78ac236808d06f95d753da7d06effbbb227deff98bb SHA512 b6c76a4af0eefcbcf61c7ff8d459264bfb12bce63dadce1ff039bd2538e9fc51540ca019bd7edbe48537d0851080444810d012c1d205aa44d4137560e75d64a6
diff --git a/media-libs/sdl2-ttf/sdl2-ttf-2.0.18-r1.ebuild b/media-libs/sdl2-ttf/sdl2-ttf-2.0.18-r1.ebuild
index 03b5545aa54b..6094378764b6 100644
--- a/media-libs/sdl2-ttf/sdl2-ttf-2.0.18-r1.ebuild
+++ b/media-libs/sdl2-ttf/sdl2-ttf-2.0.18-r1.ebuild
@@ -7,7 +7,7 @@ inherit multilib-minimal
MY_P="SDL2_ttf-${PV}"
DESCRIPTION="Library that allows you to use TrueType fonts in SDL applications"
-HOMEPAGE="https//www.libsdl.org/projects/SDL_ttf/"
+HOMEPAGE="https://www.libsdl.org/projects/SDL_ttf/"
SRC_URI="https://www.libsdl.org/projects/SDL_ttf/release/${MY_P}.tar.gz"
S="${WORKDIR}/${MY_P}"
diff --git a/media-libs/stk/Manifest b/media-libs/stk/Manifest
index a128cc5017cc..90451464e123 100644
--- a/media-libs/stk/Manifest
+++ b/media-libs/stk/Manifest
@@ -4,5 +4,5 @@ AUX stk-4.5.1/050_all_cxxflags.patch 306 BLAKE2B 58708b9f0aded3069be8150407d877c
DIST stk-4.6.1.tar.gz 2593348 BLAKE2B 2cb269b8fb5732d55a394d5b8842c380b6a3e82e7338e972c6d22baf5ba1edee3f03ed699b9950d4a92a7ae3102bbb54f844ffd728c6478ebfb36328a1b89f2a SHA512 2a22078cdb630f7c014a5ab38070fd6a6d1e9aa719401e3190a040cb06b61003cd3095fe1a8890eff59e4fc42594fe893b4c0a8327175e1701c75de7537e1830
DIST stk-4.6.2.tar.gz 2618125 BLAKE2B 8673cabbc57c5b520af62def967bf3923a91c7b619bd29faaebaa4e3fa6aabcd9dc43e605663d8062650b105ae60ebefc44a3fa420ef711119861ce03e77f130 SHA512 35a7f559cca5c9b5998528a566ae27bace3cac56cefda7ae54c06179f5002d2906c6ede6274bf06100dd6aa9dc0d1459bb8fca4a2072c686c2abfd493b6f2f3c
EBUILD stk-4.6.1.ebuild 1362 BLAKE2B 09add9614f9da7e45b8bc6850069ab55d70c7578824ab786ce6e6b84a6698ada3870de4b1af28bf9e2edeb555853bf67bddab480f54de1cf8ad9df35f9c53bc8 SHA512 6d040c30472a90c5f54c6b250a622d25da5d5abbfa99a6c3156181857dc4e66dd842df49a9337ee33374e506cfbc740541ddefa9d5219f178e0648e8ba78b7bd
-EBUILD stk-4.6.2.ebuild 1400 BLAKE2B 296fdb2e64ae7e72974ab282b2fa0254eef2670d456d78a69ca4bd2b69cc6411fec22bd27ff5b17ad530dd27b32d882687583a316e6ec65511c3b534ecbf67fd SHA512 fe3e9e744a3a969994bdcb59d8ae4cde01ff1d590da33a7a929df3a233b22ca4f2276fa194faf032b38259e84d185f701a836dd74a9b818e94ae1ebc332fcd96
+EBUILD stk-4.6.2.ebuild 1399 BLAKE2B ff00d9fad3d1ee62ada4ce85e7cb715ed615d1392f4aee34bee467726e08e7d9acc71c12cde971a79818d3858cf0b2d99f7caff5d965289798b7c4f42a068333 SHA512 0b36f4aa61e5869f178204439ebf29d56aa4a7e37f564853de8faff0f46c4fc55901de4c6352466bfc318d427cbe1e53aba9228f60773e3f65029d59289b90b5
MISC metadata.xml 366 BLAKE2B eac66d7663dd4db0dba433e2e6a2715f6e5a41f111ae812ef32f661d03d04379eb8d5c47476ccdfff552d0722df65fd575d749411f7016dd575e17b05072e290 SHA512 0fb8de1d946df0c5e38e81e1a168fea0fdd80f5499b446e21bb68f7ec27046d3d3fae802cfbf3f1d59f8aa93495e742feae04587dabad9fe2ac393ad80bee9ab
diff --git a/media-libs/stk/stk-4.6.2.ebuild b/media-libs/stk/stk-4.6.2.ebuild
index 5191c27f4f3d..c8993c4329bb 100644
--- a/media-libs/stk/stk-4.6.2.ebuild
+++ b/media-libs/stk/stk-4.6.2.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://ccrma.stanford.edu/software/stk/release/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE="alsa debug doc jack oss static-libs"
REQUIRED_USE="|| ( alsa jack oss )"
diff --git a/media-libs/virglrenderer/Manifest b/media-libs/virglrenderer/Manifest
index e55e14162645..390ed467b9a4 100644
--- a/media-libs/virglrenderer/Manifest
+++ b/media-libs/virglrenderer/Manifest
@@ -1,6 +1,6 @@
DIST virglrenderer-0.8.2.tar.gz 2697672 BLAKE2B 2c5b14fcca8ed778a674c35f3a88213d017f0cb30afcd5c28a13f8ea8d9d2fcb052150451cf0c9e7b48f0619fa93c9cc9036b59677fdae09ec97517984af43c1 SHA512 a64069bf6a28e5b77da53b5226a447decc3fe07a5c28bc49c2c15413b7651605170c5644a24f6a0ce9216a0f55afcee0246c3e4d9bc8f32dad771be3115e0f2a
DIST virglrenderer-0.9.1.tar.gz 2945799 BLAKE2B 86740155a824263b8ecb3a917db59996650e90a095e64be3cb6119eb2b6c5a64b6b3f5d40354fdf9d5bb4dae7d247749a8ddcfb33031aa2607057d18cedc319c SHA512 4edba82c83a6183871f74f365d55af88935edf9abad97c1617c569f21a16b008481364f50491dfbc7ed89832a6b618fce98d182f84cc1cbab9d2c7443a2ae936
EBUILD virglrenderer-0.8.2.ebuild 965 BLAKE2B 80a530f2799085f5dd234dac0bc3dadcf01b02d2dc928729dcd618efe58619c16f70616fa695a64d5abdd72832c561cb728e20caaf3550ab0350a6de54bc2a30 SHA512 71eb7c0f75ac412376297e20605f344bf639f41eeef7bce0405876dd01dc9203e7df7517922fb4198a413009e4c10ad1e7fa30d318fd709639cfde7d30546ac7
-EBUILD virglrenderer-0.9.1.ebuild 967 BLAKE2B ca1dffd8d749c9ac0cf82d1debd8c8a58c23f2cff098f785780bd9955609ddd83b6fa342f7d2cfb241c696398bf929587a6255bca61556671789f5c9f28ceca9 SHA512 8df7540a7baf02c86f8b8f01235dfe2564e07516c7ceb8639be47de1c1b7bc7725ad1cdb77bdcfcf3c32732ae3be03977d245d58497e88b89bb1eb793b0fa67f
+EBUILD virglrenderer-0.9.1.ebuild 974 BLAKE2B 79aeafb523ab4166a52f5d2452589a4ad8f9fd2aa56a2aa8b5aa0707e0f862d47236daf28b2a765b4619cb2f480c2a25367c3a05e6e0d52f465d11e8c67038f7 SHA512 aa7a80f7c0c750f51283705ad28df536733320d8f3822bedc6bd53f8219425e41d5e2daa4d15314a5044399844c753dba99c7b79c49bd224cc279c75211a274f
EBUILD virglrenderer-9999.ebuild 942 BLAKE2B a17fbff964ec6e6a664738d37437e786a8505cc74283a36133dbfa1dd98a19ef19c4de7c3fbe7ae0fcc4c92067394df0224fc0882b92486bd6ceb1cd8a07b0de SHA512 2380fdec62258309db09746db46ce47a2a14b29e03e5e666e5722a651414bb8432a41844f563f9081b5879f6f54add3e7282447a26c6ea4a487b2a8325cedc7b
MISC metadata.xml 372 BLAKE2B 7e2ddba025cf632ef33943c764b5537909f3620b85aa7b8c2ccc555bc46b51009831b69bfcf0da365b5b67495eaa25e562688beda797abc5ce01450c6c381e7d SHA512 ed657a14c44f3ae9e6ce95200a5ef48bafb2625143d50f5156f5d92daebd6a26d23e9481a7d3aebe20ccfacfaca0b0c0520f20ece47331c8b6f50a71a4880aed
diff --git a/media-libs/virglrenderer/virglrenderer-0.9.1.ebuild b/media-libs/virglrenderer/virglrenderer-0.9.1.ebuild
index 5f4fcc2eef17..06c7403906ec 100644
--- a/media-libs/virglrenderer/virglrenderer-0.9.1.ebuild
+++ b/media-libs/virglrenderer/virglrenderer-0.9.1.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"
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="https://gitlab.freedesktop.org/virgl/${PN}/-/archive/${P}/${PN}-${P}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
fi
DESCRIPTION="library used implement a virtual 3D GPU used by qemu"
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index eb752125e445..4b41988840a6 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,4 +1,6 @@
+DIST vulkan-loader-1.2.198.1.tar.gz 1441540 BLAKE2B c34fe5c0b97ee01038749754eb76b0fa7f1e4b9ad5ee78fa63ed9bf27e49362b215b39fd9fadcc5592097db80f3e655d109d6c92ae97829bdc75f5a28085d234 SHA512 dff0d8d9f6ffe4da6b94d491133c79d8fdbc724577387ae6f1522d7e557e39067ba66de60cc075bc469ad755dbe77d6e6728238a7ab4c07c36cf16964936e641
DIST vulkan-loader-1.2.198.tar.gz 1440922 BLAKE2B 5048a85155f94cd13f36fae48414ae3a0ea5f120a22f8b199fd43a2813b7168a9c5310ac6298ec2dee6488012d17d06043cf37dee38de265924e408f36498ed7 SHA512 92fc0cfa872e286abe4aa26a68a2bb90683b68425abbe001a62ac511c76850ad08102634e64ac06a88cf8ab225e60ddaf5bc80aa2c4bf68c25c0c47e5782f4fc
+EBUILD vulkan-loader-1.2.198-r1.ebuild 1768 BLAKE2B 0b0369e7612be07e579dfdf9827d43c3c03251be8f0aef04ca6f79f260c89ec645fef83186aa573f830cbb898e58df3a778dc5a7da42c74d3195ce2dd2d24ce8 SHA512 362dcaedd4423ed385e6e03420f11570611abffbb413366ec9aca326783218693f8c9a378b722394f2f00a36196b87e173341f22b3ad6a70390a58c40ce42606
EBUILD vulkan-loader-1.2.198.ebuild 1760 BLAKE2B 0744e4e484ed2b0c1161e5941f5f0c4ac2f9fa6edfa6ac692ce0935c92cb1d71c5183035fde85abc22b57c3088b74410487a93f0a82ac5441ca0b53f6f47c6b1 SHA512 905a76ff689729fc9f40778d0a007c5729ec2ae54e4d146b14c5f69e00a8df6ffeeaceb307fdde441eff9702b4cfeeccb0f6e8c9ed049f15423ec2164d184fdb
EBUILD vulkan-loader-9999.ebuild 1766 BLAKE2B 49c51cbe49671126cb244fc0b91d7c44b431817462ba7a4ac7d36110308fa002fe83f3b26058c88407b812ab2404f8b392fcd88dcf6119686ae5835312c6a147 SHA512 133dec0c07c43dad42e5719171c54939b6850249321a994c67891f6797e0adc6f78ad434bb31b8004789a971c1fe2cea844983663915eaa4dc23a63d4c64b888
MISC metadata.xml 520 BLAKE2B 5f5add8ab6dcec0fec9ffd20f5dbfababeff0a441855c641e1791727c4dd1c9eb17cebee79b9c4c325c355b1efc91b25f0c6246d11b010dde2109e38d9df6178 SHA512 4274ba14bdeddfe766c7394cbbb44c52aa4726f096ef2567e427fff6a710fe3de23466cb742f40162f4c2890f3a3a62e326364e45680ac1b8a0bca47db0e6e34
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.198-r1.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.198-r1.ebuild
new file mode 100644
index 000000000000..27a02a896e09
--- /dev/null
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.198-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Vulkan-Loader
+CMAKE_ECLASS="cmake"
+inherit flag-o-matic cmake-multilib toolchain-funcs
+
+if [[ ${PV} == *9999* ]]; then
+ EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+ EGIT_SUBMODULES=()
+ inherit git-r3
+else
+ SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.1.tar.gz -> ${P}.1.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+ S="${WORKDIR}"/${MY_PN}-sdk-${PV}.1
+fi
+
+DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="layers wayland X"
+
+BDEPEND=">=dev-util/cmake-3.10.2"
+DEPEND="
+ ~dev-util/vulkan-headers-${PV}
+ wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+ X? (
+ x11-libs/libX11:=[${MULTILIB_USEDEP}]
+ x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+ )
+"
+PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
+
+multilib_src_configure() {
+ # Integrated clang assembler doesn't work with x86 - Bug #698164
+ if tc-is-clang && [[ ${ABI} == x86 ]]; then
+ append-cflags -fno-integrated-as
+ fi
+
+ local mycmakeargs=(
+ -DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
+ -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
+ -DCMAKE_SKIP_RPATH=ON
+ -DBUILD_TESTS=OFF
+ -DBUILD_LOADER=ON
+ -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+ -DBUILD_WSI_XCB_SUPPORT=$(usex X)
+ -DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+ -DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
+ )
+ cmake_src_configure
+}
+
+multilib_src_install() {
+ keepdir /etc/vulkan/icd.d
+
+ cmake_src_install
+}
+
+pkg_postinst() {
+ einfo "USE=demos has been dropped as per upstream packaging"
+ einfo "vulkaninfo is now available in the dev-util/vulkan-tools package"
+}
diff --git a/media-libs/zita-alsa-pcmi/Manifest b/media-libs/zita-alsa-pcmi/Manifest
index 93a4ccd43673..356fc252faf8 100644
--- a/media-libs/zita-alsa-pcmi/Manifest
+++ b/media-libs/zita-alsa-pcmi/Manifest
@@ -2,5 +2,5 @@ AUX zita-alsa-pcmi-0.3.2-Makefile.patch 789 BLAKE2B b6105b972818ed184ef1e3d49638
DIST zita-alsa-pcmi-0.3.2.tar.bz2 21480 BLAKE2B dfd37f3cee647b7100ff1cb9f696ba7968bec4e6f11165955de67f38f48838f17c2efc0936780ce30ca0e2d7438b78ddd8a27960f6c54e7a8a5e87b1f9b50044 SHA512 9d6040d0ec636ebcf02a033cdc017105bbed8e0ddb99584890d8e027402a85791e0983a1a9cd677dc6f1da0ced530afb5e65a8e863329a5e785ef09e0b7124f0
DIST zita-alsa-pcmi-0.4.0.tar.bz2 21673 BLAKE2B 16e4adb9e531e70528b6128997a2b899036e21bd00aed24ad257c1247c08b59f6a33c30b1d3ae22c29893fadb31af84fc3b336b405dc50c39b9ef6c9b2a90beb SHA512 e06ae18e657d75b354c7269fcf1a4ae56241e3efbb182c7a64611855a49e086028d4f9bd91a6bbe8da2a64357ab7190d6e0dc5ae38dc9c3457fc8ce256930a50
EBUILD zita-alsa-pcmi-0.3.2.ebuild 909 BLAKE2B a1c3c8876270c146a9b09e53d57c2656b295bb1f8123acd84568b0f3e0922c921944bfc17c90f2971b7a0cd28c9ee7d92ee146897f37ebc76dbac13323e29580 SHA512 cc4d32ab5e75f1d51b1d157623e2da1cf89c33039fa381f4872cf1bd15370782d62380662961ce832d46ba41a603a0e9fb2294693d5430ddd201d8e191cd1de1
-EBUILD zita-alsa-pcmi-0.4.0.ebuild 914 BLAKE2B fcd134b596c77a706ba200d6e73cfae7d6067e47cbbd1aa90d19a1bd685cbfc7bf147bda0144771226aef254020eb832ee5bffba9054fa3b0ae5d019f2f3fb76 SHA512 5942268405258c344c76e5f845f4b0c28518c1e7d7b8d3fdcf20b36e1b95f97ce99e4ef2457c3f0a3b2dcf82e3806189575a0f0e057f705fe0ae0d2b48791b66
+EBUILD zita-alsa-pcmi-0.4.0.ebuild 913 BLAKE2B abe5836c85549816c1608dd3afdbc804e1a1ff13ce8772932f0dfe793a472aa92338aea6453090e8edae5950072a1618041b6a6815f5f203aa362c2b6855c733 SHA512 4faa80c938baf16e5bb94615133cee37d611576e5a4a5931231aac98fde4481fd58bfb52352053ace5607c5246e368d99667b73fb6ab7e400fd366a143e81de8
MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.4.0.ebuild b/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.4.0.ebuild
index 16433bb0bc29..0fc784a9b3b8 100644
--- a/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.4.0.ebuild
+++ b/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE=""
CDEPEND="media-libs/alsa-lib"