gentoo resync : 04.01.2022

12 files changed, 30 insertions, 13 deletions

diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 8bb5a2f213fe..dfb92e823497 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/g2reverb/Manifest b/media-plugins/g2reverb/Manifest
index df01ba1167e0..14d7c5cba763 100644
--- a/media-plugins/g2reverb/Manifest
+++ b/media-plugins/g2reverb/Manifest
@@ -1,3 +1,3 @@
 DIST g2reverb-0.7.1.tar.bz2 18521 BLAKE2B 37a201f473cbeb96b0f358d27f46558d5fafd9271d1d2605d7c8e3c105b7e97e84303481e839e3c32b1bf46daecfe5aff5823380a9896459d134320f91225c86 SHA512 ff6f8de5f41e031e0841acb0e60a0ee9c7be9b7c4375ccda4c0f406b4e789ab84e2b2d52c31ec1bf2be75309a2068d5a167c94568346c7251df9c513b4c6c189
-EBUILD g2reverb-0.7.1.ebuild 631 BLAKE2B 6ed63422b5a52bc101b5d94e44533dc08a3fb133c08608f4d9a52bdda19498d6ce4651ca4adc1887da10cfafe5ad233e5558fcb96b41b5211b40b6f00b9d3ce3 SHA512 f6910527bc13e50dbf53239b73145c763a2329da788e747a1393ceaf1ef6c8148ad1cf4f68c5c3936d2f8b655e3afafcc8bed6bb6d10a8810f128828473e77d4
+EBUILD g2reverb-0.7.1.ebuild 630 BLAKE2B cec59a540a8336eafd244a6586cf74318a11cabefe5a3db9df30b7c339beaf06ab10fffe00e9cf47a06a534b2162e4fd51f44bc60f15b2ea623bfe83dc8b9930 SHA512 cb699bdad2eb15cac2843a092735b5f669e097256888a8c44e318df469ee581bf086bb4b236ff7e40f472744ed6104aeacfbb99ae110b0b55845c66ac46e2051
 MISC metadata.xml 256 BLAKE2B 211ca90d8f704be5ca8a1994f0e8f1adbe1fd4937a10a301ced0b9be171dfdabb223661d168535cd7f5edfe0c8edca4620945e13dc3c43b5832ac183913188f0 SHA512 fde3b658512fa6742886d7dd84efc906331b43f5b0f8fdca353fe2280653381716d7143473c9237b9fe58b9df5889b38b008da34f6ce4b64336f38642d78e3dd
diff --git a/media-plugins/g2reverb/g2reverb-0.7.1.ebuild b/media-plugins/g2reverb/g2reverb-0.7.1.ebuild
index 75ae1cefc143..cd0e2a036849 100644
--- a/media-plugins/g2reverb/g2reverb-0.7.1.ebuild
+++ b/media-plugins/g2reverb/g2reverb-0.7.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit toolchain-funcs
 
-DESCRIPTION="Stereo reverb LADSPA plugin."
+DESCRIPTION="Stereo reverb LADSPA plugin"
 HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/"
 SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
 
diff --git a/media-plugins/gst-plugins-faad/Manifest b/media-plugins/gst-plugins-faad/Manifest
index adb296f0918c..6edd3a14f0c3 100644
--- a/media-plugins/gst-plugins-faad/Manifest
+++ b/media-plugins/gst-plugins-faad/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.16.3.tar.xz 4900188 BLAKE2B 7d8280a434adb1cb65b065dcdabdb37aad000802c011bb27779c109978d8b75aa4e2fa47043dde95464bb0c34a0d7466dc1f6216f29f0f4911f7a6fe1fb04b25 SHA512 378d8813ba2fd61ea2cab512d5c1fa81e0a4ac4f4ca756547d9b8742e56024c1bc5d6cd332798de66ecfe2b69485c860e181a6c2090398b0e2ad8c4b3fe95d04
 DIST gst-plugins-bad-1.18.4.tar.xz 5640292 BLAKE2B 5385abe635a35f61c6780e6cfa1189835877b8c0a12145de6890708a097fc453b1abfb14a3497cae4e6961f71fc2c6e01759fe19386cd30a64c4069704ddf77a SHA512 02123e054419f5ce6ca2ebe0bdf23572269ea4120bf463b4d672efbe5d9e5d417d4d711cc80094be974c4569f754d8b2ad93f59b827e3b018d450582834cb125
-EBUILD gst-plugins-faad-1.16.3.ebuild 363 BLAKE2B 35c7345c6d8861add7cef8baf0485c267a24c27ea6fa47bebd4a7704d33f11f0286b41efcf43a7c76b9223a644d0d57d411e99db872cbc7d13e7f1771e4c334d SHA512 af57b76564c90c8898598fc7e55cd91bf381fcac19b38c828d48bf53505b128b1f885bced54cc8894c313ec338c0d10a7e44f827249bc608fa18510d67d63535
-EBUILD gst-plugins-faad-1.18.4.ebuild 376 BLAKE2B 223c463856b36dc198c52db56c4533974bfbcd0e9c74a14284b1a309f3c264d89a6d6be410fcda7055d5f8b2ee0e7f1b0da59855f569c77c4a2f8c9629edcfe9 SHA512 9d6283f79379bf3b430c5039ba36b4b142fe4cfd885241265608a22b2023994195a2f654e377771d57c3835ad3224a72e15a012f0054c6eac59a9758337f00fe
+EBUILD gst-plugins-faad-1.16.3.ebuild 362 BLAKE2B e60f7548090c127380ff594abdc07c486730cf9082738d5b841181b318d2d5907a70181714f7fc4aef24bdec0005106426b2d5e68c02e0c47233c092a447c4f5 SHA512 1a6a9066a8168426ff5c4c81d5ff936b4c9af64f2e76f9052f77b8c7dabeb0317dba9093627077b13bb04522742e169e842a7eb250b5e1c69a40945042891614
+EBUILD gst-plugins-faad-1.18.4.ebuild 375 BLAKE2B f37dc1fabaa0f8b98870c38ae37670502aefd325523a93ba551ea3ca3da3f0666c112978aa96e575f81131c8d64eeda62d55860dc052e310d36709067c43c070 SHA512 d4c23034e12571f324e8d639a4ffdf6059625d2bf4370a3483e95577e84074ceb81c65a8551b5aa3b2e186ccae0ef041a9b4d85fc00465fc8a2080dbedd2c635
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.16.3.ebuild b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.16.3.ebuild
index 6d7e1de6a726..c6eb9b278f68 100644
--- a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.16.3.ebuild
+++ b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.16.3.ebuild
@@ -6,7 +6,7 @@ GST_ORG_MODULE=gst-plugins-bad
 
 inherit gstreamer
 
-DESCRIPTION="AAC audio decoder plugin."
+DESCRIPTION="AAC audio decoder plugin"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
diff --git a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.18.4.ebuild b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.18.4.ebuild
index 01cb21e71576..5d408551e687 100644
--- a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.18.4.ebuild
+++ b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.18.4.ebuild
@@ -6,7 +6,7 @@ GST_ORG_MODULE=gst-plugins-bad
 
 inherit gstreamer-meson
 
-DESCRIPTION="AAC audio decoder plugin."
+DESCRIPTION="AAC audio decoder plugin"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE=""
 
diff --git a/media-plugins/gst-plugins-opencv/Manifest b/media-plugins/gst-plugins-opencv/Manifest
index 94b7bcdbf897..93c8b7c8f850 100644
--- a/media-plugins/gst-plugins-opencv/Manifest
+++ b/media-plugins/gst-plugins-opencv/Manifest
@@ -1,6 +1,7 @@
 AUX gst-plugins-bad-1.18.4-use-system-libs-opencv.patch 2030 BLAKE2B 16b83f0a34878a523e65ebe862e9100be969a318a9dfcac64b742eca68c017cdab3d6e44b3091c683842da79384f23a320bf777711818f63688b293c8521b38f SHA512 58cfb2dc849ec18f413f642b5125a920ec8c98c628bcf1b568b73a7f2681e921dd9a77832b4186f9abb4a60c689f17d249339cf82fd38f78d626b4b4cef9f8c7
+AUX gst-plugins-bad-1.18.4-volatile-glib.patch 594 BLAKE2B 87a72ca19869d2a46a33a3d866763943e58f1bece5f2b0495e9a2f808e8c0b92d2415014f9739de4aa995c946922fbd1cac4a5669d4b403876500d1028b342fe SHA512 4672e774c2ed721ecc068e40cab63c8ff31df117025939b59ceb46a8e7998c1aa857e339902f86f2ad6fa690ee2ce23419ff5fde508d6e3d4972ee6feb4c076f
 DIST gst-plugins-bad-1.16.3.tar.xz 4900188 BLAKE2B 7d8280a434adb1cb65b065dcdabdb37aad000802c011bb27779c109978d8b75aa4e2fa47043dde95464bb0c34a0d7466dc1f6216f29f0f4911f7a6fe1fb04b25 SHA512 378d8813ba2fd61ea2cab512d5c1fa81e0a4ac4f4ca756547d9b8742e56024c1bc5d6cd332798de66ecfe2b69485c860e181a6c2090398b0e2ad8c4b3fe95d04
 DIST gst-plugins-bad-1.18.4.tar.xz 5640292 BLAKE2B 5385abe635a35f61c6780e6cfa1189835877b8c0a12145de6890708a097fc453b1abfb14a3497cae4e6961f71fc2c6e01759fe19386cd30a64c4069704ddf77a SHA512 02123e054419f5ce6ca2ebe0bdf23572269ea4120bf463b4d672efbe5d9e5d417d4d711cc80094be974c4569f754d8b2ad93f59b827e3b018d450582834cb125
 EBUILD gst-plugins-opencv-1.16.3.ebuild 719 BLAKE2B a4e976bec3993a280be39f01ebbc3f638c30ea480c5b2f8b2a30db8a5737524ebbafd7c52d6978210d89b4c4623c844a239f2148e82d900d87894f106b6adb21 SHA512 e8177d5e96db887ece39786677a92733096ee0c17c0452e621331a5c01187275b1a4a77896f81e24befe7f4ed6bf2d8db55dedaa5a0cabd167616a6a6b4cd7a1
-EBUILD gst-plugins-opencv-1.18.4-r2.ebuild 656 BLAKE2B 34e9279139f834c186859d6a5a32861d5afc4807bed5c6c6e008d0970134880c398923bf5b0cfb5842147004e57e36256fc7f34e27fa5f93ccd81c55a671d1b8 SHA512 652a2239cd1032c0208c084694e56767c2c5dbd65b1744c7fa38e2a04fdf3877b41e581b45fdd1d580f3f673bd773b039e7dd1bc07984f3bb3d17e4aaf0408d2
+EBUILD gst-plugins-opencv-1.18.4-r2.ebuild 786 BLAKE2B f37b38dda3c2e7eae57a946175be78d2086d16c167e399c916cae102f469cff229b5b83500cda217766cedf91f344298e43776d0f291478ee9742ef2881eb0a0 SHA512 b1e3cdc9d0bf229151728f3349fc391522c5d77f5df946771b2abac129195abaaca81610a574fcdf80e8d458ff8db1be71e23f41bf88e8deb0889bb6f5e6aa74
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.18.4-volatile-glib.patch b/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.18.4-volatile-glib.patch
new file mode 100644
index 000000000000..63e26eaa5cdb
--- /dev/null
+++ b/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.18.4-volatile-glib.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/826702
+https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2155/diffs?commit_id=68858358544dd3b7e20663f731db22fd74a78a45 (cherry-picked relevant part)
+
+--- a/ext/opencv/gstcvdilateerode.cpp
++++ b/ext/opencv/gstcvdilateerode.cpp
+@@ -87,7 +87,7 @@ static void gst_cv_dilate_erode_get_property (GObject * object, guint prop_id,
+ GType
+ gst_cv_dilate_erode_get_type (void)
+ {
+-  static volatile gsize opencv_dilate_erode_type = 0;
++  static gsize opencv_dilate_erode_type = 0;
+
+   if (g_once_init_enter (&opencv_dilate_erode_type)) {
+     GType _type;
diff --git a/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.18.4-r2.ebuild b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.18.4-r2.ebuild
index f1e18c62e1e4..4f2765d79b8d 100644
--- a/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.18.4-r2.ebuild
+++ b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.18.4-r2.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 GST_ORG_MODULE=gst-plugins-bad
-
-inherit gstreamer-meson
+PYTHON_COMPAT=( python3_{8,9,10} )
+inherit gstreamer-meson python-any-r1
 
 DESCRIPTION="OpenCV elements for GStreamer"
 KEYWORDS="~amd64 ~x86"
@@ -16,9 +16,11 @@ RDEPEND="
 	<media-libs/opencv-4.6.0
 "
 DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}"
 
 PATCHES=(
 	"${FILESDIR}"/gst-plugins-bad-${PV}-use-system-libs-opencv.patch
+	"${FILESDIR}"/gst-plugins-bad-${PV}-volatile-glib.patch
 )
 
 src_prepare() {
diff --git a/media-plugins/gst-plugins-openh264/Manifest b/media-plugins/gst-plugins-openh264/Manifest
index c28d17f7c8a8..2e194ae33672 100644
--- a/media-plugins/gst-plugins-openh264/Manifest
+++ b/media-plugins/gst-plugins-openh264/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.16.3.tar.xz 4900188 BLAKE2B 7d8280a434adb1cb65b065dcdabdb37aad000802c011bb27779c109978d8b75aa4e2fa47043dde95464bb0c34a0d7466dc1f6216f29f0f4911f7a6fe1fb04b25 SHA512 378d8813ba2fd61ea2cab512d5c1fa81e0a4ac4f4ca756547d9b8742e56024c1bc5d6cd332798de66ecfe2b69485c860e181a6c2090398b0e2ad8c4b3fe95d04
 DIST gst-plugins-bad-1.18.4.tar.xz 5640292 BLAKE2B 5385abe635a35f61c6780e6cfa1189835877b8c0a12145de6890708a097fc453b1abfb14a3497cae4e6961f71fc2c6e01759fe19386cd30a64c4069704ddf77a SHA512 02123e054419f5ce6ca2ebe0bdf23572269ea4120bf463b4d672efbe5d9e5d417d4d711cc80094be974c4569f754d8b2ad93f59b827e3b018d450582834cb125
-EBUILD gst-plugins-openh264-1.16.3.ebuild 332 BLAKE2B 7762f5841f1054300f958e9a25ccecac61294552bbbd3843bd2dd8606acced4cc7094d48717f4f263411a6d95f21508e4a4f4c17997683c9bf07d6387009fce1 SHA512 cf14c906a424c06a72a39ca45be5d22af14455183c3ad31606be496a5b9035966b3a29906a711421d50f3ebe17b42b2e714a2703047eab5dc098a9df5897d133
-EBUILD gst-plugins-openh264-1.18.4.ebuild 338 BLAKE2B 754d78a0d480e35f4155673daeff09d89af7bef9c37166aa675fdca17009ea445fff823bd88103de2e36035378a90d3895541db64d8bec5acc14afa0dba54d8e SHA512 e88642f3e3b01792b27fbd2b2563ae678025073c06239fb3e7e2df4f8b45d0244597a00f5972ca0e49606b52ec84dfd82c552abf34c0b9618f0ab4489826e6ae
+EBUILD gst-plugins-openh264-1.16.3.ebuild 331 BLAKE2B d640b3458f26ea5ccf6277cd83f6ffa5f60e59dc8df885e0d6a42a4968bf9c2360d948dcfdc87498adbd630db407d53a197b8827eee7b617655b41177f1262d3 SHA512 d796723f23ccc8d7c65f1eb163222c5c5a8c1cda7b1cd38cb4edfdee5149cddfb5bc1f9dc44b0264e43651e89f9afe67b4bbf1cd8f74cd7a3a8cb4cad858ae00
+EBUILD gst-plugins-openh264-1.18.4.ebuild 337 BLAKE2B 7cea8c32b91fa76cbca01b83dc853f147d116d4f6496c31983e653207c7ee5fcfab38bf4cc8fd2ccf9ff54a641728f34f3420413db00a6ab0f72bc4fe9aabd7b SHA512 a15afbf9e7a53f1924a3a6dafbe15b7d224cb275f212753eeb594ab331039eaea9ed29b2fcb9a59a4bd958b2b3740564f96bff30311fd5e2f71b165117a50693
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.16.3.ebuild b/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.16.3.ebuild
index a1397d1b305f..32e7a5705f17 100644
--- a/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.16.3.ebuild
+++ b/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.16.3.ebuild
@@ -6,7 +6,7 @@ GST_ORG_MODULE=gst-plugins-bad
 
 inherit gstreamer
 
-DESCRIPTION="H.264 encoder/decoder plugin for GStreamer."
+DESCRIPTION="H.264 encoder/decoder plugin for GStreamer"
 KEYWORDS="amd64 x86"
 IUSE=""
 
diff --git a/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.18.4.ebuild b/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.18.4.ebuild
index 35b064f47fa6..cca7f5061512 100644
--- a/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.18.4.ebuild
+++ b/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.18.4.ebuild
@@ -6,7 +6,7 @@ GST_ORG_MODULE=gst-plugins-bad
 
 inherit gstreamer-meson
 
-DESCRIPTION="H.264 encoder/decoder plugin for GStreamer."
+DESCRIPTION="H.264 encoder/decoder plugin for GStreamer"
 KEYWORDS="amd64 x86"
 IUSE=""