[gentoo-commits] repo/gentoo:master commit in: media-plugins/gst-plugins-opencv/files/, media-plugins/gst-plugins-opencv/

[Sam James]

commit:     ad3561183cf74ce0756879ad474e5bcc2fc926a1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May 12 22:53:40 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May 12 22:53:44 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad356118

media-plugins/gst-plugins-opencv: fix DuplicateFiles

Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...plugins-bad-1.20.2-use-system-libs-opencv.patch | 95 ----------------------
 .../gst-plugins-opencv-1.20.2.ebuild               |  2 +-
 2 files changed, 1 insertion(+), 96 deletions(-)

diff --git a/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.20.2-use-system-libs-opencv.patch b/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.20.2-use-system-libs-opencv.patch
deleted file mode 100644
index 57ee0cffc824..000000000000
--- a/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.20.2-use-system-libs-opencv.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-commit 245245841d3117d81cff1b560b7ac4b1aad1aa78
-Author: Igor V. Kovalenko <igor.v.kovalenko@×××××.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@×××××.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,22 +1 @@
--subdir('uridownloader')
--
--subdir('adaptivedemux')
--subdir('audio')
--subdir('basecamerabinsrc')
--subdir('codecparsers')
--subdir('codecs')
--subdir('d3d11')
--subdir('insertbin')
--subdir('interfaces')
--subdir('isoff')
--subdir('mpegts')
- subdir('opencv')
--subdir('play')
--subdir('player')
--subdir('sctp')
--subdir('transcoder')
--subdir('va')
--subdir('vulkan')
--subdir('wayland')
--subdir('webrtc')
--subdir('winrt')
-diff --git a/meson.build b/meson.build
-index e456c32da..cfa265061 100644
---- a/meson.build
-+++ b/meson.build
-@@ -484,23 +484,10 @@ pkgconfig_variables = ['exec_prefix=${prefix}',
- 
- pkgconfig_subdirs = ['gstreamer-1.0']
-
--pkgconfig.generate(
--  libraries : [gst_dep],
--  variables : pkgconfig_variables,
--  subdirs : pkgconfig_subdirs,
--  name : 'gstreamer-plugins-bad-1.0',
--  description : 'Streaming media framework, bad plugins libraries',
--)
--
- gpl_allowed = get_option('gpl').allowed()
- 
- subdir('gst-libs')
--subdir('gst')
--subdir('sys')
- subdir('ext')
--subdir('tests')
--subdir('data')
--subdir('tools')
- 
- if have_orcc
-   update_orc_dist_files = find_program('scripts/update-orc-dist-files.py')
-@@ -528,7 +524,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.20.2.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.2.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() {