diff options
author | Igor V. Kovalenko <igor.v.kovalenko@gmail.com> | 2022-02-19 12:49:30 +0300 |
---|---|---|
committer | Sam James <sam@gentoo.org> | 2022-03-08 13:32:19 +0000 |
commit | 93b6417f1b55aefc05b91fec7b67eadd32b1f733 (patch) | |
tree | 2aa4e2a88378a5d76295ee10fc7b91f2ac40c259 /media-plugins/gst-plugins-opencv | |
parent | media-libs/libfreeaptx: Change to multilib build (diff) | |
download | gentoo-93b6417f1b55aefc05b91fec7b67eadd32b1f733.tar.gz gentoo-93b6417f1b55aefc05b91fec7b67eadd32b1f733.tar.bz2 gentoo-93b6417f1b55aefc05b91fec7b67eadd32b1f733.zip |
media-libs/gstreamer: Bump to 1.20.0
Gstreamer 1.20.0 version bump, includes
- all existing 1.18.4 plugins except for two dropped upstream
(gst-plugins-libmms and gst-plugins-ofa)
- libnice-0.1.18 version bump required by gst-plugins-webrtc in 1.20.0
- required multilib change for libldac for new plugin gst-plugins-ldac
- required multilib change for libopenaptx and libfreeaptx for new plugin
gst-plugins-openaptx
As discussed, this change adds a LICENSE to each of gstreamer modules which
now require explicit opt-in for (A)GPL plugins for (A)GPL plugins we will not
perform explicit license acceptance for affected gstreamer plugin, instead we
will rely on a user accepting the license of dependency:
- gstreamer change added explicit opt-in https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1084
- I looked at affected gstreamer plugins and looks like all are correctly
license-compatible according to compatibility matrix https://www.gnu.org/licenses/gpl-faq.html#AllCompatibility
- if a user is not willing to accept the license of corresponding (A)GPL
dependency, such dependency will not be available and affected gstreamer
plugin will not be built
- Upstream gstreamer team will look into updating/fixing plugin license display
available via gst-inspect-1.0 <plugin name> | grep License as currently it is
just "GPL" which is not specific enough (should be GPL-2, GPL-2+, GPL-3 etc.)
Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-plugins/gst-plugins-opencv')
3 files changed, 128 insertions, 0 deletions
diff --git a/media-plugins/gst-plugins-opencv/Manifest b/media-plugins/gst-plugins-opencv/Manifest index 410a851ca65d..0c764d67765f 100644 --- a/media-plugins/gst-plugins-opencv/Manifest +++ b/media-plugins/gst-plugins-opencv/Manifest @@ -1,2 +1,3 @@ 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.20.0.tar.xz 6203880 BLAKE2B 3c2bcbd5e3af56497415ac9e32b91bf0f9ed0668d6992c8d14b2b56c86be2178ea93409e505d438b56fe87bf75a4c96554fd3cbf9ea5b204b2a520fccb6894fe SHA512 d79fedba96517c25d2ba3925405933671fa05e350b8e133277a7c1d509e08a49ceeb50c016e23e798667fa0b09783105914f06538bdcaae969fdba8ac385a51b diff --git a/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.20.0-use-system-libs-opencv.patch b/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.20.0-use-system-libs-opencv.patch new file mode 100644 index 000000000000..b8d9f9643734 --- /dev/null +++ b/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.20.0-use-system-libs-opencv.patch @@ -0,0 +1,95 @@ +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,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,11 @@ 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.0.ebuild b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.20.0.ebuild new file mode 100644 index 000000000000..904148f98a98 --- /dev/null +++ b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.20.0.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +GST_ORG_MODULE=gst-plugins-bad +PYTHON_COMPAT=( python3_{8,9,10} ) +inherit gstreamer-meson python-any-r1 + +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}" +BDEPEND="${PYTHON_DEPS}" + +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 +} |