3 files changed, 8 insertions, 7 deletions

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 9b7cae974..44fed8b2e 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -140,7 +140,7 @@ MACHINE_SOCARCH_FILTER_append_imxgpu = " \
     virtual/libopenvg \
     libdrm \
     cairo \
-    gstreamer1.0-plugins-bad \
+    gstreamer1.0 \
     libgal-imx \
     pango \
 "
diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend
index 8541ed7ca..9f183db92 100644
--- a/recipes-graphics/mesa/mesa_%.bbappend
+++ b/recipes-graphics/mesa/mesa_%.bbappend
@@ -16,7 +16,8 @@ python () {
 
 # Enable Etnaviv support
 PACKAGECONFIG_append_use-mainline-bsp = " gallium"
-GALLIUMDRIVERS_append_use-mainline-bsp = ",etnaviv,imx"
+GALLIUMDRIVERS_append_use-mainline-bsp_armv7a = ",etnaviv,kmsro,vc4"
+GALLIUMDRIVERS_append_use-mainline-bsp_armv7ve = ",etnaviv,kmsro,vc4"
 
 BACKEND = \
     "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \
diff --git a/recipes-multimedia/imx-codec/imx-codec_4.4.2.bb b/recipes-multimedia/imx-codec/imx-codec_4.4.2.bb
index 39860c862..971fded00 100644
--- a/recipes-multimedia/imx-codec/imx-codec_4.4.2.bb
+++ b/recipes-multimedia/imx-codec/imx-codec_4.4.2.bb
@@ -23,20 +23,20 @@ EXTRA_OECONF = "${@bb.utils.contains('TUNE_FEATURES', 'aarch64', '--enable-armv8
 PACKAGECONFIG ?= ""
 PACKAGECONFIG_imxvpu = "vpu"
 
+# We need to ensure we don't have '-src' package overrided
+PACKAGE_DEBUG_SPLIT_STYLE = 'debug-without-src'
+
 PACKAGECONFIG[vpu] = "--enable-vpu,--disable-vpu,virtual/imxvpu"
 
 do_install_append() {
-    # FIXME: This link points to nowhere
-    if [ -e ${D}${libdir}/imx-mm/audio-codec/lib_src_ppp_arm11_elinux.so ]; then
-        rm ${D}${libdir}/imx-mm/audio-codec/lib_src_ppp_arm11_elinux.so
-    fi
-
     # LTIB move the files around or gst-fsl-plugin won't find them
     for p in $(find ${D}${libdir}/imx-mm -mindepth 2 -maxdepth 2 -not -type d); do
             mv $p ${D}${libdir}
     done
     rmdir ${D}${libdir}/imx-mm/video-codec
 
+    # Fixup ownership of files
+    chown -R root:root ${D}
 }
 
 python __set_insane_skip() {