summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-03-18 00:56:57 +0000
committerSam James <sam@gentoo.org>2022-03-18 00:56:57 +0000
commitba4c6afadf9a9bf5a3e404d9e2c1a22120d6c8ac (patch)
tree99a639c7922beabcb3a65e7c7006f509a34d6c2d /media-plugins/gst-plugins-opencv
parentmedia-libs/gstreamer: Version bump, 1.18.6 (diff)
downloadgentoo-ba4c6afadf9a9bf5a3e404d9e2c1a22120d6c8ac.tar.gz
gentoo-ba4c6afadf9a9bf5a3e404d9e2c1a22120d6c8ac.tar.bz2
gentoo-ba4c6afadf9a9bf5a3e404d9e2c1a22120d6c8ac.zip
media-plugins/gst-plugins-opencv: fix DuplicateFiles
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-plugins/gst-plugins-opencv')
-rw-r--r--media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.18.6-use-system-libs-opencv.patch81
-rw-r--r--media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.18.6.ebuild2
2 files changed, 1 insertions, 82 deletions
diff --git a/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.18.6-use-system-libs-opencv.patch b/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.18.6-use-system-libs-opencv.patch
deleted file mode 100644
index 721ea3830932..000000000000
--- a/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.18.6-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/gst-plugins-opencv-1.18.6.ebuild b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.18.6.ebuild
index 904148f98a98..771ca9bca0a2 100644
--- 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
@@ -19,7 +19,7 @@ DEPEND="${RDEPEND}"
BDEPEND="${PYTHON_DEPS}"
PATCHES=(
- "${FILESDIR}"/gst-plugins-bad-${PV}-use-system-libs-opencv.patch
+ "${FILESDIR}"/gst-plugins-bad-1.18.4-use-system-libs-opencv.patch
)
src_prepare() {