From 69ff63db4d9d162247c974641a53787ba9ed6931 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Thu, 18 Apr 2024 16:46:07 -0400 Subject: Work around rcar-gen3 gstreamer issues The scarthgap-dev branch of meta-rcar-gen3 has bbappends for the gstreamer1.0-plugins-* and gstreamer1.0-omx recipes that effectively build the Renesas 1.20.3 forks and package them as 1.22.x. This breaks building gstreamer users since there are mismatches between the main gstreamer package contents and the plugins. To fix this for now: - BBMASK out the bbappends - Update our gstreamer1.0-plugins-bad bbappend to enable the KMS plugin to avoid breaking the BSP gstreamer plugins packagegroup. This can be removed once we no longer need to BBMASK the upstream bbappends. - Remove the rcar-gen3 version of our local patch against gstreamer1.0-plugins-bad, as it no longer applies (since rcar-gen3 will be using the upstream version for now). This can be revisited when meta-rcar-gen3 is updated to resolve the mismatch. As a bonus, the now unnecessary network flag overrides we were doing for the gstreamer plugin recipes have been removed, as they are no longer required. Bug-AGL: SPEC-4578 Change-Id: I4e6f1646c93d981744e65dddf6753c3dc005426e Signed-off-by: Scott Murray --- .../recipes-multimedia/gstreamer/gstreamer1.0-omx_1.22.%.bbappend | 1 - .../gstreamer/gstreamer1.0-plugins-bad_1.22.%.bbappend | 6 +++++- .../gstreamer/gstreamer1.0-plugins-good_1.22.%.bbappend | 1 - 3 files changed, 5 insertions(+), 3 deletions(-) delete mode 100644 meta-agl-bsp/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.22.%.bbappend delete mode 100644 meta-agl-bsp/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.%.bbappend (limited to 'meta-agl-bsp/meta-rcar-gen3/recipes-multimedia') diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.22.%.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.22.%.bbappend deleted file mode 100644 index d91281c18..000000000 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.22.%.bbappend +++ /dev/null @@ -1 +0,0 @@ -do_unpack[network] = "1" diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.%.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.%.bbappend index d91281c18..eee123cf4 100644 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.%.bbappend +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.%.bbappend @@ -1 +1,5 @@ -do_unpack[network] = "1" +# Enable here for now due to meta-rcar-gen3 bbappends being masked +# out, can be removed once gstreamer 1.22.x is properly supported +# there. +EXTRA_OECONF += "--enable-kms" +PACKAGECONFIG:append = " kms" diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.%.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.%.bbappend deleted file mode 100644 index d91281c18..000000000 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.%.bbappend +++ /dev/null @@ -1 +0,0 @@ -do_unpack[network] = "1" -- cgit 1.2.3-korg