Merge pull request #1453 from YoeDistro/yoe/mut

xdg-desktop-portal-wlr: Disable build when using imx gpu driver

3 files changed, 12 insertions, 0 deletions

diff --git a/dynamic-layers/multimedia-layer/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr_%.bbappend b/dynamic-layers/multimedia-layer/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr_%.bbappend
new file mode 100644
index 00000000..f279dcb2
--- /dev/null
+++ b/dynamic-layers/multimedia-layer/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr_%.bbappend
@@ -0,0 +1,3 @@
+# Needs gbm_bo_create_with_modifiers2() API which is not
+# implemented in imx GL driver implementation
+COMPATIBLE_HOST:imxgpu = "(null)"
diff --git a/recipes-graphics/piglit/piglit_%.bbappend b/recipes-graphics/piglit/piglit_%.bbappend
index 2b7561d1..882d4ddf 100644
--- a/recipes-graphics/piglit/piglit_%.bbappend
+++ b/recipes-graphics/piglit/piglit_%.bbappend
@@ -1,4 +1,5 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
+CFLAGS:append:imxgpu:toolchain-clang = " -Wno-error=int-conversion"
 PACKAGECONFIG:remove:imxgpu = "x11 glx"
 PACKAGECONFIG:append:mx8-nxp-bsp = " opencl"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.3.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.3.imx.bb
index d338f986..0ef9daea 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.3.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.3.imx.bb
@@ -85,6 +85,14 @@ EXTRA_OEMESON += " \
     ${@get_opengl_cmdline_list('gl_winsys', d.getVar('OPENGL_WINSYS'), d)} \
 "
 
+# Remove this meta package when moving to gstreamer 1.22+, this is for making
+# gst packagegroups from master work with gstreamer 1.20.3.imx
+PACKAGES += "${PN}-videoconvertscale"
+
+ALLOW_EMPTY:${PN}-videoconvertscale = "1"
+
+RDEPENDS:${PN}-videoconvertscale = "${PN}-videoconvert ${PN}-videoscale"
+
 FILES:${PN}-dev += "${libdir}/gstreamer-1.0/include/gst/gl/gstglconfig.h"
 FILES:${MLPREFIX}libgsttag-1.0 += "${datadir}/gst-plugins-base/1.0/license-translations.dict"