mesa-demos: Fix configuration for Wayland on i.MX

If distro features contains wayland, we assume a wayland backend
and configure the package accordingly.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

diff --git a/recipes-graphics/mesa/mesa-demos_%.bbappend b/recipes-graphics/mesa/mesa-demos_%.bbappend
index ac5bf65fedc100006fa828b44279f993118d05dc..722d53dd9861aa192f797be96a79451d5049ac78 100644 (file)
--- a/recipes-graphics/mesa/mesa-demos_%.bbappend
+++ b/recipes-graphics/mesa/mesa-demos_%.bbappend
@@ -6,11 +6,10 @@ SRC_URI_append_mx6 = " file://Replace-glWindowPos2iARB-calls-with-glWindowPos2i.
                     file://Add-OpenVG-demos-to-support-wayland.patch"
 
 PACKAGECONFIG_remove_mx6 = " \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', \
-         bb.utils.contains('DISTRO_FEATURES', 'wayland', 'glu', '', d), d)}"
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'glu x11', '', d)} \
+"
 PACKAGECONFIG_remove_mx6sl = "gles1 gles2"
 
 PACKAGECONFIG_append_mx6   = " \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', \
-       bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland vg', '', d), d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland vg', '', d)} \
 "