diff options
author | Ming Liu <ming.liu@toradex.com> | 2020-10-22 09:20:09 +0200 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2020-10-23 16:13:16 +0200 |
commit | d3f45159233e892b56ed25f92924331b4b78de67 (patch) | |
tree | 8789d98768a1e52426c675d49ac988d4a3652d34 /recipes-multimedia | |
parent | 3c0354829a352e544cbe2f225c705c34e3392391 (diff) |
gstreamer1.0-plugins-bad: drop bbappend recipe
Exact same version has been added in meta-freescale layer, let's drop
our bbappend recipe and some deprecated patches.
Related-to: ELB-3081
Signed-off-by: Ming Liu <ming.liu@toradex.com>
(cherry picked from commit 45c65c3e690645afef53a30bc8ddf5326ec0d880)
Diffstat (limited to 'recipes-multimedia')
3 files changed, 0 insertions, 100 deletions
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-ext-wayland-fix-meson-build-in-nxp-fork.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-ext-wayland-fix-meson-build-in-nxp-fork.patch deleted file mode 100644 index 7ce7d12..0000000 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-ext-wayland-fix-meson-build-in-nxp-fork.patch +++ /dev/null @@ -1,60 +0,0 @@ -From b54bb00e2bf3344ff740b5a642dc1a7c70b3d76f Mon Sep 17 00:00:00 2001 -From: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> -Date: Sun, 26 Jan 2020 10:45:28 +0000 -Subject: [PATCH] ext/wayland: fix meson build in nxp fork - -- Add Wayland protocols, which are not enabled in upstream -- Add missing compilation unit, which in NXP-specific - -Upstream-Status: Pending - -Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> ---- - ext/wayland/meson.build | 24 ++++++++++++++++++++++++ - 1 file changed, 24 insertions(+) - -diff --git a/ext/wayland/meson.build b/ext/wayland/meson.build -index 3c377eefb..5ef082dac 100644 ---- a/ext/wayland/meson.build -+++ b/ext/wayland/meson.build -@@ -8,6 +8,11 @@ wl_sources = [ - 'wllinuxdmabuf.c' - ] - -+imx_wl_sources = [ -+ 'wlutils.c', -+] -+wl_sources += imx_wl_sources -+ - libdrm_dep = dependency('libdrm', version: '>= 2.4.55', required:get_option('wayland')) - - if use_wayland -@@ -21,6 +26,25 @@ if use_wayland - 'fullscreen-shell-unstable-v1-protocol.c', 'fullscreen-shell-unstable-v1-client-protocol.h'], - ['/stable/xdg-shell/xdg-shell.xml', 'xdg-shell-protocol.c', 'xdg-shell-client-protocol.h'], - ] -+ -+ imx_protocol_defs = [ -+ [ -+ '/unstable/alpha-compositing/alpha-compositing-unstable-v1.xml', -+ 'alpha-compositing-unstable-v1-protocol.c', -+ 'alpha-compositing-unstable-v1-client-protocol.h' -+ ], -+ ['/unstable/hdr10-metadata/hdr10-metadata-unstable-v1.xml', -+ 'hdr10-metadata-unstable-v1-protocol.c', -+ 'hdr10-metadata-unstable-v1-client-protocol.h' -+ ], -+ [ -+ '/unstable/linux-explicit-synchronization/linux-explicit-synchronization-unstable-v1.xml', -+ 'linux-explicit-synchronization-unstable-v1-protocol.c', -+ 'linux-explicit-synchronization-unstable-v1-client-protocol.h' -+ ], -+ ] -+ protocol_defs += imx_protocol_defs -+ - protocols_files = [] - - foreach protodef: protocol_defs --- -2.20.1 - diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-opencv-allow-compilation-against-4.3.x.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-opencv-allow-compilation-against-4.3.x.patch deleted file mode 100644 index df54c4d..0000000 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-opencv-allow-compilation-against-4.3.x.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 8f8204b21edbecec159af2a97e247da9326ae9b7 Mon Sep 17 00:00:00 2001 -From: Andrey Zhizhikin <andrey.z@gmail.com> -Date: Sat, 9 May 2020 19:56:51 +0000 -Subject: [PATCH] opencv: allow compilation against 4.3.x - -Backport upstream commit 4cf362e2df0fb809ea0f21dd4a6fbb8b46ca54ef to NXP -fork of gstreamer1.0-plugins-bad. - -Original commit link: -https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/commit/4cf362e2df0fb809ea0f21dd4a6fbb8b46ca54ef - -Upstream-Status: Backport [4cf362e2df0fb809ea0f21dd4a6fbb8b46ca54ef] - -Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com> ---- - ext/opencv/meson.build | 2 +- - 1 file changed, 1insertions(+), 1 deletions(-) - -diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build -index f38b55dfe..6a7836094 100644 ---- a/ext/opencv/meson.build -+++ b/ext/opencv/meson.build -@@ -65,7 +65,7 @@ if opencv_found - endif - endforeach - else -- opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.2.0'], required : false) -+ opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.4.0'], required : false) - opencv_found = opencv_dep.found() - if opencv_found - foreach h : libopencv4_headers --- -2.20.1 - diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bbappend deleted file mode 100644 index 53d13c1..0000000 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bbappend +++ /dev/null @@ -1,6 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/gstreamer1.0-plugins-bad:" -SRCBRANCH = "MM_04.05.05_2005_L5.4.24" -SRCREV = "2fdaef1839ebfef7ea3bc8c1c59463a9ef0ae19a" -SRC_URI_remove = " \ - file://0001-meson-fix-build-with-opencv-enabled-and-opencv4.-Fix.patch \ -"
\ No newline at end of file |