gentoo resync : 29.12.2022

7 files changed, 3 insertions, 200 deletions

diff --git a/media-plugins/gst-plugins-opencv/Manifest b/media-plugins/gst-plugins-opencv/Manifest
index a15d127282fe..748a16b50c55 100644
--- a/media-plugins/gst-plugins-opencv/Manifest
+++ b/media-plugins/gst-plugins-opencv/Manifest
@@ -1,12 +1,4 @@
-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
 AUX gst-plugins-bad-1.20.1-use-system-libs-opencv.patch 2383 BLAKE2B 351d9a5b8060fb2dd5fe94237f5bddb14a217d88af5c95db8badb71c7d816453850946f11cf6435d5fb8c2a318aa2b853b06cba78fc016d1ccf68fe6f23383b6 SHA512 36b2810e1e58feb490f249040eed1d10b1e8395551c427628e2a3b3de28b1a8ec523b7c3cde675423be34c31f7cb5e2e986bf36b252bd5e07385e6801b22177c
-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
-DIST gst-plugins-bad-1.18.6.tar.xz 5652788 BLAKE2B d877c8b6d39b67de957f180fbcc942fc658631dfc75b90f342f088e58c4655b1591651fbcd2a98259c95f0a7e830bb0ec67f65eb87d4b13c9f2adc733da7f12f SHA512 78731e0db04afd3dcdd5c5ea84df4e096a5db121fd9cb6eb79197844482a3b36b2764a664f171f80c809e6182ceae2350113d47f3f7c684d2d88f752bc092baf
-DIST gst-plugins-bad-1.20.1.tar.xz 6212148 BLAKE2B e88f6553668329abb7b787c5efb89d760e60009fb9bd23884aa54e5a8de94f50b9fc9cd74cb2d303d43511207574f447bf616d8f9836df5dcde767c4ee5bff4d SHA512 3113fc93bba59716e7a506cf00f88cb05ccfe3406515ecf7e377dcfd3a8f4e555ff45126c048dc736ae6a28acf430c96422be4a120889fbe04ed69c5acb1cad6
-EBUILD gst-plugins-opencv-1.16.3.ebuild 719 BLAKE2B a4e976bec3993a280be39f01ebbc3f638c30ea480c5b2f8b2a30db8a5737524ebbafd7c52d6978210d89b4c4623c844a239f2148e82d900d87894f106b6adb21 SHA512 e8177d5e96db887ece39786677a92733096ee0c17c0452e621331a5c01187275b1a4a77896f81e24befe7f4ed6bf2d8db55dedaa5a0cabd167616a6a6b4cd7a1
-EBUILD gst-plugins-opencv-1.18.4-r2.ebuild 786 BLAKE2B f37b38dda3c2e7eae57a946175be78d2086d16c167e399c916cae102f469cff229b5b83500cda217766cedf91f344298e43776d0f291478ee9742ef2881eb0a0 SHA512 b1e3cdc9d0bf229151728f3349fc391522c5d77f5df946771b2abac129195abaaca81610a574fcdf80e8d458ff8db1be71e23f41bf88e8deb0889bb6f5e6aa74
-EBUILD gst-plugins-opencv-1.18.6.ebuild 730 BLAKE2B 62a30fa3750c332dd0ba165449f95c15c0099cdf2beb1675964729a65c4abad1defc22ddb77130d5d90bdb508572077fc3de206227aa818ebdd3e44c4a4b8891 SHA512 ee4a63cb7376fc4ca0c22a3cfaa04ceff748b720c3890141728f5386d82e11981493498fa57224c0c2e42178e27faabd47581ee34f1be1d94674865c5d9be0c4
-EBUILD gst-plugins-opencv-1.20.1.ebuild 721 BLAKE2B b99ce6532adf638ac293a0beff55ea5d4066bd65c4acfa535ec37bf7a786cc414290fe3a839db958ad168ed6fb2e5eb6a6773eb92b0a71fccffa9890125d37f1 SHA512 b5356384a98d7cac274d5b723785df7e3d71723531d4b725f98e398570e7d4caf88fa7a18a631346752b94034e78d49702ceac51c61f6dbe2720e76ceff8ea37
+DIST gst-plugins-bad-1.20.2.tar.xz 6216208 BLAKE2B bbbe77a1255991a2f96696996fb0c99f14f6d63fef455feb1ce90ae518bb9f80fd61bcfb223c20407b8d6240faaa93478495f8e9fda16fab36a311d167e88e25 SHA512 3f98973dc07ead745418e0a30f9f6b5c8d328e3d126f54d92c10ab5da04271768a5c5dffc36ea24ccf8fb516b1e3733be9fb18dc0db419dea4d37d17018f8a70
+EBUILD gst-plugins-opencv-1.20.2.ebuild 722 BLAKE2B 5c551ed96744fdc53e9ba9ddb6d8fd216dc1d9da8017266782033401e20b8ec27fdf9ab9c08f3754ac7a7376cf3be3d502acf1811e25dd198e48700c6a735fba SHA512 98f53eda93a849ece80b0c1141eaaee20a3d7d603c1d458192b13cf47b89d61194ecae246ccca1093aa100326490a9c3871f92f2ff98d217d1c23438487d40ed
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.18.4-use-system-libs-opencv.patch b/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.18.4-use-system-libs-opencv.patch
deleted file mode 100644
index 721ea3830932..000000000000
--- a/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.18.4-use-system-libs-opencv.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-commit 245245841d3117d81cff1b560b7ac4b1aad1aa78
-Author: Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
-Date:   Sat Jul 3 19:29:01 2021 +0300
-
-    Patch gst-plugins-bad 1.18.4 to also install opencv integration libs
-    
-    Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
-
-diff --git a/ext/meson.build b/ext/meson.build
-index 2cbddbf82..c70a07bbe 100644
---- a/ext/meson.build
-+++ b/ext/meson.build
-@@ -58,7 +58,6 @@ subdir('ttml')
- subdir('voaacenc')
- subdir('voamrwbenc')
- subdir('vulkan')
--subdir('wayland')
- subdir('webrtc')
- subdir('webrtcdsp')
- subdir('webp')
-diff --git a/gst-libs/gst/meson.build b/gst-libs/gst/meson.build
-index 6cbed6c6c..d44943189 100644
---- a/gst-libs/gst/meson.build
-+++ b/gst-libs/gst/meson.build
-@@ -1,18 +1 @@
--subdir('uridownloader')
--
--subdir('adaptivedemux')
--subdir('audio')
--subdir('basecamerabinsrc')
--subdir('codecparsers')
--subdir('codecs')
--subdir('insertbin')
--subdir('interfaces')
--subdir('isoff')
--subdir('mpegts')
- subdir('opencv')
--subdir('player')
--subdir('sctp')
--subdir('transcoder')
--subdir('vulkan')
--subdir('wayland')
--subdir('webrtc')
-diff --git a/meson.build b/meson.build
-index e456c32da..cfa265061 100644
---- a/meson.build
-+++ b/meson.build
-@@ -462,13 +462,8 @@ if get_option('default_library') == 'shared'
- endif
- 
- subdir('gst-libs')
--subdir('gst')
- subdir('sys')
- subdir('ext')
--subdir('tests')
--subdir('data')
--subdir('tools')
--subdir('pkgconfig')
- 
- if have_orcc
-   update_orc_dist_files = find_program('scripts/update-orc-dist-files.py')
-@@ -496,7 +491,6 @@ endif
- # xgettext is optional (on Windows for instance)
- if find_program('xgettext', required : get_option('nls')).found()
-   cdata.set('ENABLE_NLS', 1)
--  subdir('po')
- endif
- 
- subdir('scripts')
-diff --git a/sys/meson.build b/sys/meson.build
-index cf39e5770..31d943d4b 100644
---- a/sys/meson.build
-+++ b/sys/meson.build
-@@ -17,7 +17,6 @@ subdir('mediafoundation')
- subdir('msdk')
- subdir('nvcodec')
- subdir('opensles')
--subdir('shm')
- subdir('tinyalsa')
- subdir('uvch264')
- subdir('v4l2codecs')
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
deleted file mode 100644
index 63e26eaa5cdb..000000000000
--- a/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.18.4-volatile-glib.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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.16.3.ebuild b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.16.3.ebuild
deleted file mode 100644
index 901fd970f149..000000000000
--- a/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.16.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-bad
-
-inherit gstreamer
-
-DESCRIPTION="OpenCV elements for GStreamer"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# >=opencv-4.1.2-r3 to help testing removal of older being fine
-RDEPEND="
-	>=media-libs/opencv-4.1.2-r3:=[contrib,${MULTILIB_USEDEP}]
-	<media-libs/opencv-4.2
-"
-DEPEND="${RDEPEND}"
-
-# Ships the opencv separate helper library as part of gst-plugins-opencv as it depends on OpenCV
-multilib_src_compile() {
-	emake -C gst-libs/gst/opencv
-	gstreamer_multilib_src_compile
-}
-
-multilib_src_install() {
-	emake -C gst-libs/gst/opencv DESTDIR="${D}" install
-	gstreamer_multilib_src_install
-}
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
deleted file mode 100644
index 4f2765d79b8d..000000000000
--- a/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.18.4-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GST_ORG_MODULE=gst-plugins-bad
-PYTHON_COMPAT=( python3_{8,9,10} )
-inherit gstreamer-meson python-any-r1
-
-DESCRIPTION="OpenCV elements for GStreamer"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# >=opencv-4.1.2-r3 to help testing removal of older being fine
-RDEPEND="
-	>=media-libs/opencv-4.1.2-r3:=[contrib,contribdnn,${MULTILIB_USEDEP}]
-	<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() {
-	default
-	gstreamer_system_package video_dep:gstreamer-video
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" eninja install
-}
diff --git a/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.18.6.ebuild b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.18.6.ebuild
deleted file mode 100644
index 771ca9bca0a2..000000000000
--- a/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.18.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GST_ORG_MODULE=gst-plugins-bad
-PYTHON_COMPAT=( python3_{8,9,10} )
-inherit gstreamer-meson python-any-r1
-
-DESCRIPTION="OpenCV elements for GStreamer"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# >=opencv-4.1.2-r3 to help testing removal of older being fine
-RDEPEND="
-	>=media-libs/opencv-4.1.2-r3:=[contrib,contribdnn,${MULTILIB_USEDEP}]
-	<media-libs/opencv-4.6.0
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}"/gst-plugins-bad-1.18.4-use-system-libs-opencv.patch
-)
-
-src_prepare() {
-	default
-	gstreamer_system_package video_dep:gstreamer-video
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" eninja install
-}
diff --git a/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.20.1.ebuild b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.20.2.ebuild
index 0797207d7422..8097759f43d4 100644
--- a/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.20.1.ebuild
+++ b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.20.2.ebuild
@@ -18,7 +18,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="${PYTHON_DEPS}"
 
 PATCHES=(
-	"${FILESDIR}"/gst-plugins-bad-${PV}-use-system-libs-opencv.patch
+	"${FILESDIR}"/gst-plugins-bad-1.20.1-use-system-libs-opencv.patch
 )
 
 src_prepare() {