1 files changed, 8 insertions, 1 deletions

diff --git a/recipes-graphics/mesa/mesa-demos_%.bbappend b/recipes-graphics/mesa/mesa-demos_%.bbappend
index 65f3d53ba..c8d1667a2 100644
--- a/recipes-graphics/mesa/mesa-demos_%.bbappend
+++ b/recipes-graphics/mesa/mesa-demos_%.bbappend
@@ -9,4 +9,11 @@ SRC_URI_append_mx6dl = " ${MESA-DEMO-PATCH}"
 SRC_URI_append_mx6sx = " ${MESA-DEMO-PATCH}"
 SRC_URI_append_mx6sl = " ${MESA-DEMO-PATCH}"
 
-PACKAGECONFIG_remove_mx6sl = "gles1 gles2"
+REMOVE_GLU = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', \
+                 bb.utils.contains('DISTRO_FEATURES', 'wayland', 'glu', '', d), d)}"
+
+# only remove GLU on mx6 thave have a GPU
+PACKAGECONFIG_remove_mx6q = "${REMOVE_GLU}"
+PACKAGECONFIG_remove_mx6dl = "${REMOVE_GLU}"
+PACKAGECONFIG_remove_mx6sx = "${REMOVE_GLU}"
+PACKAGECONFIG_remove_mx6sl = "gles1 gles2 ${REMOVE_GLU}"