diff options
Diffstat (limited to 'media-plugins/gst-plugins-opencv')
6 files changed, 131 insertions, 143 deletions
diff --git a/media-plugins/gst-plugins-opencv/Manifest b/media-plugins/gst-plugins-opencv/Manifest index 410a851ca65d..94ba53d60500 100644 --- a/media-plugins/gst-plugins-opencv/Manifest +++ b/media-plugins/gst-plugins-opencv/Manifest @@ -1,2 +1 @@ -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 +DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70 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 deleted file mode 100644 index 721ea3830932..000000000000 --- a/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.18.4-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/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 000000000000..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.16.3.ebuild b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.16.3.ebuild deleted file mode 100644 index 901fd970f149..000000000000 --- a/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.16.3.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GST_ORG_MODULE=gst-plugins-bad - -inherit gstreamer - -DESCRIPTION="OpenCV elements for GStreamer" -KEYWORDS="~amd64 ~x86" -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 -" -DEPEND="${RDEPEND}" - -# Ships the opencv separate helper library as part of gst-plugins-opencv as it depends on OpenCV -multilib_src_compile() { - emake -C gst-libs/gst/opencv - gstreamer_multilib_src_compile -} - -multilib_src_install() { - emake -C gst-libs/gst/opencv DESTDIR="${D}" install - gstreamer_multilib_src_install -} diff --git a/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.18.4-r2.ebuild b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.18.4-r2.ebuild deleted file mode 100644 index f1e18c62e1e4..000000000000 --- a/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.18.4-r2.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -GST_ORG_MODULE=gst-plugins-bad - -inherit gstreamer-meson - -DESCRIPTION="OpenCV elements for GStreamer" -KEYWORDS="~amd64 ~x86" -IUSE="" - -# >=opencv-4.1.2-r3 to help testing removal of older being fine -RDEPEND=" - >=media-libs/opencv-4.1.2-r3:=[contrib,contribdnn,${MULTILIB_USEDEP}] - <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 -} diff --git a/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.22.11.ebuild b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.22.11.ebuild new file mode 100644 index 000000000000..82c867f9bc10 --- /dev/null +++ b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.22.11.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +GST_ORG_MODULE=gst-plugins-bad +inherit gstreamer-meson + +DESCRIPTION="OpenCV elements for GStreamer" +KEYWORDS="~amd64 ~arm64 ~x86" + +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 +) + +multilib_src_configure() { + local emesonargs=( + # We need to disable here to avoid colliding w/ gst-plugins-bad + # on translations, because we currently do a "full" install in + # multilib_src_install in this package. See bug #907480. + -Dnls=disabled + ) + + gstreamer_multilib_src_configure +} + +multilib_src_install() { + DESTDIR="${D}" eninja install +} |