diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2024-04-29 10:09:13 -0400 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2024-04-29 14:38:44 +0000 |
| commit | ae05f86cb03c47a6a68e0f7ef644319155435d6e (patch) | |
| tree | 59b6fab7c44270292140eb99acc3463ae10c8806 | |
| parent | e75097775de65116feb463bcb2256875fadb8ad8 (diff) | |
Update rcar-gen3 gstreamer workaround
The BBMASKs of the gstreamer bbappends from meta-rcar-gen3 need
to actually be in the base agl_rcar-nogfx.inc include file, as
otherwise the "nogfx" machine configurations will suffer from
the gstreamer plugin build and version mismatch issues.
Bug-AGL: SPEC-4578
Change-Id: Ief2624dfdec8df995cea9c9cc3c337eadd172074
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29853
Tested-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
| -rw-r--r-- | meta-agl-bsp/conf/include/agl_rcar-nogfx.inc | 10 | ||||
| -rw-r--r-- | meta-agl-bsp/conf/include/agl_rcar.inc | 7 |
2 files changed, 10 insertions, 7 deletions
diff --git a/meta-agl-bsp/conf/include/agl_rcar-nogfx.inc b/meta-agl-bsp/conf/include/agl_rcar-nogfx.inc index fb67fd976..64e13642e 100644 --- a/meta-agl-bsp/conf/include/agl_rcar-nogfx.inc +++ b/meta-agl-bsp/conf/include/agl_rcar-nogfx.inc @@ -58,3 +58,13 @@ 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-" diff --git a/meta-agl-bsp/conf/include/agl_rcar.inc b/meta-agl-bsp/conf/include/agl_rcar.inc index 01314f8c9..ce3b8a8f9 100644 --- a/meta-agl-bsp/conf/include/agl_rcar.inc +++ b/meta-agl-bsp/conf/include/agl_rcar.inc @@ -52,10 +52,3 @@ MACHINE_EXTRA_RRECOMMENDS:append:rcar-gen3 = " \ kernel-module-vspm-if \ omx-user-module \ " - -# 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. -BBMASK += "meta-renesas/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx" -BBMASK += "meta-renesas/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-" |