mesa-demos: Fix condition for GLES support

The condition for GLES support was incorrect and would
remove GLES for parts with both 2D and 3D. Fix the condition
so GLES is removed only for parts with 2D and no 3D.

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 2ee7c2b999ebf8a62c54cedc953705100f84b142..94db4157ead43778fd5f90189746ec206873f702 100644 (file)
--- a/recipes-graphics/mesa/mesa-demos_%.bbappend
+++ b/recipes-graphics/mesa/mesa-demos_%.bbappend
@@ -5,9 +5,11 @@ SRC_URI_append_imxgpu = " file://Replace-glWindowPos2iARB-calls-with-glWindowPos
                     file://Additional-eglSwapBuffer-calling-makes-wrong-throttl.patch \
                     file://Add-OpenVG-demos-to-support-wayland.patch"
 
-PACKAGECONFIG_IMX_TO_REMOVE                 = ""
-PACKAGECONFIG_IMX_TO_REMOVE_append_imxgpu2d = "gles1 gles2"
-PACKAGECONFIG_IMX_TO_REMOVE_append_imxgpu   = " \
+PACKAGECONFIG_IMX_TO_REMOVE_GLES          = ""
+PACKAGECONFIG_IMX_TO_REMOVE_GLES_imxgpu2d = "gles1 gles2"
+PACKAGECONFIG_IMX_TO_REMOVE_GLES_imxgpu3d = ""
+PACKAGECONFIG_IMX_TO_REMOVE               = "${PACKAGECONFIG_IMX_TO_REMOVE_GLES}"
+PACKAGECONFIG_IMX_TO_REMOVE_append_imxgpu = " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'glu x11', '', d)} \
 "
 PACKAGECONFIG_remove        = "${PACKAGECONFIG_IMX_TO_REMOVE}"