From 29e0a27fb852b5f939b8b84d9ad600f5b3f6d097 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 5 Jul 2018 13:18:39 -0500 Subject: [PATCH] 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 Signed-off-by: Otavio Salvador (cherry picked from commit 681d596e5cbf78cc27d1cdfccd329022242d2c14) --- recipes-graphics/mesa/mesa-demos_%.bbappend | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/recipes-graphics/mesa/mesa-demos_%.bbappend b/recipes-graphics/mesa/mesa-demos_%.bbappend index 2ee7c2b9..94db4157 100644 --- 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}" -- 2.40.1