Work around rcar-gen3 gstreamer issues

[AGL/meta-agl.git] / meta-agl-bsp / conf / include / agl_rcar.inc

diff --git a/meta-agl-bsp/conf/include/agl_rcar.inc b/meta-agl-bsp/conf/include/agl_rcar.inc
index da0819d..01314f8 100644 (file)
--- a/meta-agl-bsp/conf/include/agl_rcar.inc
+++ b/meta-agl-bsp/conf/include/agl_rcar.inc
@@ -18,7 +18,6 @@ PREFERRED_PROVIDER_libgbm:rcar-gen3 = "libgbm"
 PREFERRED_PROVIDER_virtual/libgbm:rcar-gen3 = "libgbm"
 PREFERRED_RPROVIDER_libgbm-dev:rcar-gen3 = "libgbm"
 
-
 PREFERRED_RPROVIDER_libomxil:rcar-gen3 = "omx-user-module"
 PREFERRED_PROVIDER_virtual/libomxil:rcar-gen3 = "omx-user-module"
 VIRTUAL-RUNTIME_libomxil:rcar-gen3 = "omx-user-module"
@@ -42,7 +41,7 @@ DISTRO_FEATURES:append:rcar-gen3 = " h264dec_lib h264enc_lib aaclcdec_lib aaclcd
 # getting weston started.  There is no clear rationale expressed in the
 # meta-renesas-rcar-gen3 commit history for the extra dependencies, and
 # testing shows no issues on H3ULCB when not having them.
-BBMASK += "meta-rcar-gen3/recipes-graphics/wayland/weston-init.bbappend"
+BBMASK += "meta-renesas/meta-rcar-gen3/recipes-graphics/wayland/weston-init.bbappend"
 
 # Add graphics and decoder drivers to packagegroup-machine-base
 # recommendation.
@@ -53,3 +52,10 @@ 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-"