commit: ca1f8d5c3471e110dfa4bcc955b5b4dbc497f34d Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Jan 6 00:46:40 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Jan 6 00:46:40 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca1f8d5c
media-plugins/gst-plugins-opencv: update system-libs patch Closes: https://bugs.gentoo.org/947557 Signed-off-by: Sam James <sam <AT> gentoo.org> ...lugins-bad-1.24.10-use-system-libs-opencv.patch | 91 ++++++++++++++++++++++ .../gst-plugins-opencv-1.24.10.ebuild | 4 +- 2 files changed, 93 insertions(+), 2 deletions(-) diff --git a/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.24.10-use-system-libs-opencv.patch b/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.24.10-use-system-libs-opencv.patch new file mode 100644 index 000000000000..3c54e3f2f43b --- /dev/null +++ b/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.24.10-use-system-libs-opencv.patch @@ -0,0 +1,91 @@ +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 +@@ -68,9 +68,6 @@ subdir('ttml') + subdir('voaacenc') + subdir('voamrwbenc') + subdir('vulkan') +-subdir('wayland') +-subdir('webrtc') +-subdir('webrtcdsp') + subdir('webp') + subdir('wildmidi') + subdir('wpe') +--- a/gst-libs/gst/meson.build ++++ b/gst-libs/gst/meson.build +@@ -1,27 +1 @@ +-subdir('uridownloader') +- +-subdir('adaptivedemux') +-subdir('audio') +-subdir('basecamerabinsrc') +-subdir('codecparsers') +-subdir('codecs') +-subdir('d3d11') +-# cuda can depend on d3d11 +-subdir('cuda') +-subdir('dxva') +-subdir('insertbin') +-subdir('interfaces') +-subdir('isoff') +-subdir('mpegts') +-subdir('mse') + subdir('opencv') +-subdir('play') +-subdir('player') +-subdir('sctp') +-subdir('transcoder') +-subdir('va') +-subdir('vulkan') +-subdir('wayland') +-subdir('webrtc') +-subdir('winrt') +-subdir('analytics') +--- a/meson.build ++++ b/meson.build +@@ -556,23 +556,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 +@@ -21,7 +21,6 @@ subdir('msdk') + subdir('nvcodec') + subdir('opensles') + subdir('qsv') +-subdir('shm') + subdir('tinyalsa') + subdir('uvch264') + subdir('v4l2codecs') diff --git a/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.24.10.ebuild b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.24.10.ebuild index 82c867f9bc10..be0f4e10574f 100644 --- a/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.24.10.ebuild +++ b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.24.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,7 +12,7 @@ RDEPEND=">=media-libs/opencv-4.1.2-r3:=[contrib,contribdnn,${MULTILIB_USEDEP}]" DEPEND="${RDEPEND}" PATCHES=( - "${FILESDIR}"/gst-plugins-bad-1.22.3-use-system-libs-opencv.patch + "${FILESDIR}"/gst-plugins-bad-1.24.10-use-system-libs-opencv.patch ) multilib_src_configure() {
