From b72816c815207d0024db21381c0f4e2a3b177785 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Mon, 1 Mar 2021 18:06:25 -0500 Subject: [PATCH] gstreamer1.0-plugins-bad: remove bbappend Remove gstreamer1.0-plugins-bad bbappend and the patch it was applying, since a version of the patch has been applied upstream. Bug-AGL: SPEC-3819 Signed-off-by: Scott Murray Change-Id: I8e8922c22937a7dacb26f26a4a5bba8910f854e4 --- ...-Install-wayland-header-from-gstwayland-l.patch | 28 ---------------------- .../gstreamer1.0-plugins-bad_1.16.%.bbappend | 1 - .../gstreamer1.0-plugins-bad_agldemo.inc | 2 -- 3 files changed, 31 deletions(-) delete mode 100644 recipes-multimedia/gstreamer1.0-plugins-bad/gstreamer1.0-plugins-bad/0001-gst-wayland-Install-wayland-header-from-gstwayland-l.patch delete mode 100644 recipes-multimedia/gstreamer1.0-plugins-bad/gstreamer1.0-plugins-bad_1.16.%.bbappend delete mode 100644 recipes-multimedia/gstreamer1.0-plugins-bad/gstreamer1.0-plugins-bad_agldemo.inc diff --git a/recipes-multimedia/gstreamer1.0-plugins-bad/gstreamer1.0-plugins-bad/0001-gst-wayland-Install-wayland-header-from-gstwayland-l.patch b/recipes-multimedia/gstreamer1.0-plugins-bad/gstreamer1.0-plugins-bad/0001-gst-wayland-Install-wayland-header-from-gstwayland-l.patch deleted file mode 100644 index 443e7db8b..000000000 --- a/recipes-multimedia/gstreamer1.0-plugins-bad/gstreamer1.0-plugins-bad/0001-gst-wayland-Install-wayland-header-from-gstwayland-l.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 03e502084633838badfcc2b91a1aca1651c18544 Mon Sep 17 00:00:00 2001 -From: Marius Vlad -Date: Wed, 24 Jun 2020 19:44:35 +0300 -Subject: [PATCH] gst/wayland/: Install wayland header from gstwayland library - -Necessary for cluster-receiver to pass out the wl_surface. - -Bug-AGL: SPEC-3382 - -Signed-off-by: Marius Vlad ---- - gst-libs/gst/wayland/meson.build | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/gst-libs/gst/wayland/meson.build b/gst-libs/gst/wayland/meson.build -index b1ede41f1..8957381d2 100644 ---- a/gst-libs/gst/wayland/meson.build -+++ b/gst-libs/gst/wayland/meson.build -@@ -21,4 +21,6 @@ if use_wayland - gstwayland_dep = declare_dependency(link_with : gstwayland, - include_directories : [libsinc], - dependencies : [gst_dep, gstvideo_dep]) -+ -+ install_headers('wayland.h', subdir: 'gst/wayland') - endif --- -2.26.2 - diff --git a/recipes-multimedia/gstreamer1.0-plugins-bad/gstreamer1.0-plugins-bad_1.16.%.bbappend b/recipes-multimedia/gstreamer1.0-plugins-bad/gstreamer1.0-plugins-bad_1.16.%.bbappend deleted file mode 100644 index 7f389dab7..000000000 --- a/recipes-multimedia/gstreamer1.0-plugins-bad/gstreamer1.0-plugins-bad_1.16.%.bbappend +++ /dev/null @@ -1 +0,0 @@ -require ${@bb.utils.contains('AGL_FEATURES', 'agldemo', 'gstreamer1.0-plugins-bad_agldemo.inc', '', d)} diff --git a/recipes-multimedia/gstreamer1.0-plugins-bad/gstreamer1.0-plugins-bad_agldemo.inc b/recipes-multimedia/gstreamer1.0-plugins-bad/gstreamer1.0-plugins-bad_agldemo.inc deleted file mode 100644 index cb45fdbf4..000000000 --- a/recipes-multimedia/gstreamer1.0-plugins-bad/gstreamer1.0-plugins-bad_agldemo.inc +++ /dev/null @@ -1,2 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/gstreamer1.0-plugins-bad:" -SRC_URI:append = " file://0001-gst-wayland-Install-wayland-header-from-gstwayland-l.patch" -- 2.16.6