From a71b76f68ea46519194da55fdb2c3b8e8fe16cc6 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Tue, 27 Aug 2024 14:32:43 -0400 Subject: meta-agl-bsp: fixes for meta-rcar-gen3 changes The scarthgap-dev branch in meta-renesas now contains a complete set of gstreamer 1.20.3 components that are set as the preferred versions by default when the "multimedia" machine feature is set, which AGL does for the rcar-gen3 machines. To accommodate this, remove our BBMASKing of meta-rcar-gen3 gstreamer recipes, and add back the rcar-gen3 version of the patch to gstreamer1.0-plugins-bad. Bug-AGL: SPEC-5239 Change-Id: I55aecbf6d9a32519ec5f6f2e1b895fb6f5087b71 Signed-off-by: Scott Murray Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/30232 Reviewed-by: Jan-Simon Moeller Tested-by: Jan-Simon Moeller --- meta-agl-bsp/conf/include/agl_rcar-nogfx.inc | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'meta-agl-bsp') diff --git a/meta-agl-bsp/conf/include/agl_rcar-nogfx.inc b/meta-agl-bsp/conf/include/agl_rcar-nogfx.inc index 64e13642e..fb67fd976 100644 --- a/meta-agl-bsp/conf/include/agl_rcar-nogfx.inc +++ b/meta-agl-bsp/conf/include/agl_rcar-nogfx.inc @@ -58,13 +58,3 @@ BBMASK += "meta-renesas/meta-rcar-gen3/recipes-graphics/cogl/cogl-1.0_1.%.bbappe # packagegroup bbclass is inherited. This can be removed when upstream # is fixed to add the required PACKAGE_ARCH = "${MACHINE_ARCH}". PACKAGE_ARCH:pn-packagegroup-multimedia-libs = "${MACHINE_ARCH}" - -# Mask out BSP layer gstreamer* 1.22.x bbappends for now, as the BSP -# effectively is building 1.20.x plugins and packaging them as 1.22, -# which breaks building various things. The whole directory is not -# commented out because we still want the vspfilter plugin. -# The BBMASKs need to be here instead of agl_rcar.ing since without -# them there are issues with the gstreamer1.0-plugins-bad patches in -# meta-agl-core not applying. -BBMASK += "meta-renesas/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx" -BBMASK += "meta-renesas/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-" -- cgit 1.2.3-korg