[gentoo-commits] repo/gentoo:master commit in: media-plugins/gst-plugins-opencv/files/, media-plugins/gst-plugins-opencv/
commit: b4ddd3554b1f7b5a40976557fc136553a9731bd8
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Jan 3 20:58:27 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Jan 3 21:28:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4ddd355
media-plugins/gst-plugins-opencv: drop 1.20.5, 1.20.6
Bug: https://bugs.gentoo.org/906106
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-plugins/gst-plugins-opencv/Manifest | 2 -
...plugins-bad-1.20.1-use-system-libs-opencv.patch | 95 --
.../gst-plugins-opencv-1.20.5.ebuild | 31 ---
.../gst-plugins-opencv-1.20.6.ebuild | 31 ---
4 files changed, 159 deletions(-)
diff --git a/media-plugins/gst-plugins-opencv/Manifest
b/media-plugins/gst-plugins-opencv/Manifest
index 8cd577be7efd..2a4c680aa0b1 100644
--- a/media-plugins/gst-plugins-opencv/Manifest
+++ b/media-plugins/gst-plugins-opencv/Manifest
@@ -1,3 +1 @@
-DIST gst-plugins-bad-1.20.5.tar.xz 6237720 BLAKE2B
bf379da420d1f7f148cf51373f6f2d0800685487c8bdb7a768e79e0a2e4f1721053922be9321958b4ce318de12ea390de4cd89c345329ac41dd0425815e0e7f6
SHA512
4b4603d755d17a0fa072d771521bdcbf554fc9abdc8105b9d9189062e5725ae2989f430e1de77363a69d8c969ecbf15e73e9c478fabe8efac83b2d9b1b0a4a0a
-DIST gst-plugins-bad-1.20.6.tar.xz 6244344 BLAKE2B
50c8d62b486541c0ee71d69f1debb18c7dcd02afe562f6d337f8648cf69a492ac47dcf250e4e6b1c6a7d518237431639c25601f9935996724cb9f73beffa27e8
SHA512
c1f2be9351dc12d9290f715ac529dc03572617fb65c50755927e01cb9307b9e806b6204b5b2f85c29a8fc3d8ca7695767a316fb387eac465e9e93bcae5d39ff5
DIST gst-plugins-bad-1.22.3.tar.xz 5523924 BLAKE2B
8015098ac2d19546de58cebdbe29fd7fbb2c7f076bf775564d7b862ed99a59968a2f751ff1137534d178fea5cf1c2022e53e4159ca2e5d3bf71c9fa4663be4f5
SHA512
1512e2674ea4a9da26203a635e7ec7673ea5b6ca8dae8aaa8a20ffae36c9b68904d669344a8efc31f751093a00e22d2a1f1affcdd037f162493441c77628
diff --git
a/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.20.1-use-system-libs-opencv.patch
b/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.20.1-use-system-libs-opencv.patch
deleted file mode 100644
index 57ee0cffc824..
---
a/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.20.1-use-system-libs-opencv.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-commit 245245841d3117d81cff1b560b7ac4b1aad1aa78
-Author: Igor V. Kovalenko
-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
-
-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.5.ebuild
b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.20.5.ebuild
deleted file mode 100644
index 3988c1ee8330..
---
[gentoo-commits] repo/gentoo:master commit in: media-plugins/gst-plugins-opencv/files/, media-plugins/gst-plugins-opencv/
commit: 92103eee9acba549fd4d4708015d7405989b96bc
Author: Sam James gentoo org>
AuthorDate: Tue May 30 21:55:29 2023 +
Commit: Sam James gentoo org>
CommitDate: Tue May 30 21:55:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92103eee
media-plugins/gst-plugins-opencv: wire up opencv patch for 1.22.x and add
commentary
Thanks to leio for explaining it.
Signed-off-by: Sam James gentoo.org>
...plugins-bad-1.22.3-use-system-libs-opencv.patch | 99 ++
ebuild => gst-plugins-opencv-1.22.3-r1.ebuild} | 8 +-
2 files changed, 103 insertions(+), 4 deletions(-)
diff --git
a/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.22.3-use-system-libs-opencv.patch
b/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.22.3-use-system-libs-opencv.patch
new file mode 100644
index ..cb05c45c2c31
--- /dev/null
+++
b/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.22.3-use-system-libs-opencv.patch
@@ -0,0 +1,99 @@
+libgstopencv.so is "normally" installed by gst-plugins-bad, but we want it to
+be part of our gst-plugins-opencv package (installing it as part of
gst-plugins-bad
+would at least be confusing, and also not ideal given it'd have to depend on
opencv,
+even though we have gst-plugins-opencv).
+
+bad currently doesn't have a way to allow disabling everything but the opencv
+plugin bit, so that's what this patch does as a hack. It only keeps the bare
+minimum to build the opencv helper (i.e. disable everything that
gst-plugins-bad
+does to not collide, but keep opencv).
+
+TODO: replace this with something more maintainable, e.g. possible hacks
+with submodules or creating a drop-in meson.build in the ebuild to just build
+the plugin & helper libs.
+--- a/ext/meson.build
b/ext/meson.build
+@@ -64,7 +64,6 @@ subdir('ttml')
+ subdir('voaacenc')
+ subdir('voamrwbenc')
+ subdir('vulkan')
+-subdir('wayland')
+ subdir('webrtc')
+ subdir('webrtcdsp')
+ subdir('webp')
+--- a/gst-libs/gst/meson.build
b/gst-libs/gst/meson.build
+@@ -1,24 +1 @@
+-subdir('uridownloader')
+-
+-subdir('adaptivedemux')
+-subdir('audio')
+-subdir('basecamerabinsrc')
+-subdir('codecparsers')
+-subdir('codecs')
+-subdir('d3d11')
+-# cuda can depend on d3d11
+-subdir('cuda')
+-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')
+--- a/meson.build
b/meson.build
+@@ -530,23 +530,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')
+--- a/sys/meson.build
b/sys/meson.build
+@@ -18,7 +18,6 @@ subdir('msdk')
+ subdir('nvcodec')
+ subdir('opensles')
+ subdir('qsv')
+-subdir('shm')
+ subdir('tinyalsa')
+ subdir('uvch264')
+ subdir('v4l2codecs')
+diff --git a/ext/meson.build b/ext/meson.build
+index ebf7e3b..4124917 100644
+--- a/ext/meson.build
b/ext/meson.build
+@@ -64,8 +64,6 @@ subdir('ttml')
+ subdir('voaacenc')
+ subdir('voamrwbenc')
+ subdir('vulkan')
+-subdir('webrtc')
+-subdir('webrtcdsp')
+ subdir('webp')
+ subdir('wildmidi')
+ subdir('wpe')
diff --git a/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.22.3.ebuild
b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.22.3-r1.ebuild
similarity index 82%
rename from media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.22.3.ebuild
rename to media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.22.3-r1.ebuild
index 1356163c0ab0..dd4e9c41a067 100644
--- a/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.22.3.ebuild
+++ b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.22.3-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
GST_ORG_MODULE=gst-plugins-bad
-PYTHON_COMPAT=( python3_{8,9,10,11} )
+PYTHON_COMPAT=( python3_{10..11} )
inherit gstreamer-meson python-any-r1
DESCRIPTION="OpenCV elements for GStreamer"
@@ -16,9 +16,9 @@ RDEPEND="
DEPEND="${RDEPEND}"
BDEPEND="${PYTHON_DEPS}"
-#PATCHES=(
-# "${FILESDIR}"/gst-plugins-bad-1.20.1-use-system-libs-opencv.patch
-#)
+PATCHES=(
+ "${FILESDIR}"/gst-plugins-bad-1.22.3-use-system-libs-opencv.patch
+)
src_prepare() {
default
[gentoo-commits] repo/gentoo:master commit in: media-plugins/gst-plugins-opencv/files/, media-plugins/gst-plugins-opencv/
commit: ad3561183cf74ce0756879ad474e5bcc2fc926a1
Author: Sam James gentoo org>
AuthorDate: Thu May 12 22:53:40 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu May 12 22:53:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad356118
media-plugins/gst-plugins-opencv: fix DuplicateFiles
Signed-off-by: Sam James 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..
---
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
-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
-
-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() {
[gentoo-commits] repo/gentoo:master commit in: media-plugins/gst-plugins-opencv/files/, media-plugins/gst-plugins-opencv/
commit: edca5671f7d273933e36627c1e031cf7ff689b16
Author: Igor V. Kovalenko gmail com>
AuthorDate: Sat Jul 3 17:55:52 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Jul 10 17:28:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edca5671
media-plugins/gst-plugins-opencv: Build with installed deps, 1.18.4
Signed-off-by: Igor V. Kovalenko gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/21541
Signed-off-by: Sam James gentoo.org>
...plugins-bad-1.18.4-use-system-libs-opencv.patch | 81 ++
.../gst-plugins-opencv-1.18.4.ebuild | 13
2 files changed, 94 insertions(+)
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 000..721ea383093
--- /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
+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
+
+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.ebuild
index fcda9c53d9c..6c695a3ddf6 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.ebuild
@@ -16,3 +16,16 @@ RDEPEND="
