1 files changed, 17 insertions, 3 deletions

diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend
index a89184ec6..74396ae80 100644
--- a/recipes-graphics/mesa/mesa_%.bbappend
+++ b/recipes-graphics/mesa/mesa_%.bbappend
@@ -1,6 +1,6 @@
-PACKAGECONFIG_remove_imxgpu2d = "egl gles"
+PACKAGECONFIG_remove_imxgpu2d = "egl gles gbm"
 
-PROVIDES_remove_imxgpu2d = "virtual/libgles1 virtual/libgles2 virtual/libopenvg virtual/egl"
+PROVIDES_remove_imxgpu2d = "virtual/libgles1 virtual/libgles2 virtual/libopenvg virtual/egl gbm"
 PROVIDES_remove_imxgpu3d = "virtual/libgl"
 
 # FIXME: mesa should support 'x11-no-tls' option
@@ -17,11 +17,25 @@ python () {
 PACKAGECONFIG_append_use-mainline-bsp = " gallium"
 GALLIUMDRIVERS_append_use-mainline-bsp = ",etnaviv,imx"
 
+BACKEND = \
+    "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \
+        bb.utils.contains('DISTRO_FEATURES',     'x11',     'x11', \
+                                                             'fb', d), d)}"
+
 # FIXME: Dirty hack to allow use of Vivante GPU libGL binary
 do_install_append_imxgpu3d () {
     rm -f ${D}${libdir}/libGL.* \
           ${D}${includedir}/GL/gl.h \
-          ${D}${includedir}/GL/glext.h
+          ${D}${includedir}/GL/glext.h \
+          ${D}${includedir}/GL/glx.h \
+          ${D}${includedir}/GL/glxext.h
+    if [ "${BACKEND}" = "x11" ]; then
+        rm -f ${D}${libdir}/pkgconfig/gl.pc
+    fi
+}
+
+do_install_append_imxgpu2d () {
+    rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc
 }
 
 do_install_append_imxgpu2d () {