gentoo resync : 12.07.2021

3 files changed, 97 insertions, 2 deletions

diff --git a/media-plugins/gst-plugins-opencv/Manifest b/media-plugins/gst-plugins-opencv/Manifest
index 092f8f2bdf30..c5684915a3e7 100644
--- a/media-plugins/gst-plugins-opencv/Manifest
+++ b/media-plugins/gst-plugins-opencv/Manifest
@@ -1,5 +1,6 @@
+AUX gst-plugins-bad-1.18.4-use-system-libs-opencv.patch 2030 BLAKE2B 16b83f0a34878a523e65ebe862e9100be969a318a9dfcac64b742eca68c017cdab3d6e44b3091c683842da79384f23a320bf777711818f63688b293c8521b38f SHA512 58cfb2dc849ec18f413f642b5125a920ec8c98c628bcf1b568b73a7f2681e921dd9a77832b4186f9abb4a60c689f17d249339cf82fd38f78d626b4b4cef9f8c7
 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.ebuild 425 BLAKE2B 714ecde4d63a2902cd8a9daa397df53734430a49e8425d25f3469dd25db3412dc853bdfd4729032db26ea83f826603e532f99dee8432a4515a659bdeeb51b19a SHA512 2c1c6516e3e5c9e63e71280778c252e9a9d548009f26918ddab5ac2dff4484ab72212e6977593653b0d611299cac7eff773591d4b5b48bb4aa0667ab8fb4c153
+EBUILD gst-plugins-opencv-1.18.4-r1.ebuild 645 BLAKE2B 4e24ee84062d3c7595860ae766a9b52b8c726c1c3d93a514b971cf3ff3b8359b9a6bd595cbeb3372ff29fd82d70e1b338978de70db08f2f78c11d8d7345db081 SHA512 0c99cd471d2052331121b543e4a2fc022ae6dc0dbf60545dd146f532b8dccb35ac72dba35ceaa57de7fdc8dc58075bfd2f5993baaba49d7bf68cd4db446bd9fd
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
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
new file mode 100644
index 000000000000..721ea3830932
--- /dev/null
+++ b/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.18.4-use-system-libs-opencv.patch
@@ -0,0 +1,81 @@
+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/gst-plugins-opencv-1.18.4.ebuild b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.18.4-r1.ebuild
index fcda9c53d9c7..3b2c04d59fab 100644
--- a/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.18.4.ebuild
+++ b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.18.4-r1.ebuild
@@ -13,6 +13,19 @@ 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
+	<media-libs/opencv-4.6.0
 "
 DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/gst-plugins-bad-${PV}-use-system-libs-opencv.patch
+)
+
+src_prepare() {
+	default
+	gstreamer_system_package video_dep:gstreamer-video
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" eninja install
+}