From 41591d4f8c586aa801220fac0924556f406c58bd Mon Sep 17 00:00:00 2001 From: Jan-Simon Moeller Date: Tue, 8 Dec 2020 11:15:02 +0100 Subject: SPEC-3723: restructure meta-agl-demo All demo related components should be in here now. We keep the packagegroups on purpose for now to stay backward-compatible. v2: layer does pass yocto-check-layer, dependencies adapted v3: remove the dynamic-layer setup, use all-in-one approach v4: Fixed comments from Paul Barker. Tnx! v5: Removed wayland/weston/agl-compositor additions, except for demo specific weston-init bbappend Follow-up changes required later: - massaging packagegroups - scrub of recipes Bug-AGL: SPEC-3723 Signed-off-by: Jan-Simon Moeller Signed-off-by: Scott Murray Change-Id: I47cefd8c23d46b2cdd063470e3f7d97d5ad952d8 --- ...-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 insertions(+) create mode 100644 recipes-multimedia/gstreamer1.0-plugins-bad/gstreamer1.0-plugins-bad/0001-gst-wayland-Install-wayland-header-from-gstwayland-l.patch create mode 100644 recipes-multimedia/gstreamer1.0-plugins-bad/gstreamer1.0-plugins-bad_1.16.%.bbappend create mode 100644 recipes-multimedia/gstreamer1.0-plugins-bad/gstreamer1.0-plugins-bad_agldemo.inc (limited to 'recipes-multimedia/gstreamer1.0-plugins-bad') 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 new file mode 100644 index 000000000..443e7db8b --- /dev/null +++ b/recipes-multimedia/gstreamer1.0-plugins-bad/gstreamer1.0-plugins-bad/0001-gst-wayland-Install-wayland-header-from-gstwayland-l.patch @@ -0,0 +1,28 @@ +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 new file mode 100644 index 000000000..7f389dab7 --- /dev/null +++ b/recipes-multimedia/gstreamer1.0-plugins-bad/gstreamer1.0-plugins-bad_1.16.%.bbappend @@ -0,0 +1 @@ +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 new file mode 100644 index 000000000..fcfda531b --- /dev/null +++ b/recipes-multimedia/gstreamer1.0-plugins-bad/gstreamer1.0-plugins-bad_agldemo.inc @@ -0,0 +1,2 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/gstreamer1.0-plugins-bad:" +SRC_URI_append = " file://0001-gst-wayland-Install-wayland-header-from-gstwayland-l.patch" -- cgit 1.2.3-korg