[meta-freescale] [PATCH v3 07/19] mesa-demos: Fix i.MX 8M configuration

[Otavio Salvador]

From: Tom Hochstein <tom.hochstein at nxp.com>

Use imxgpu override for GPU 2D or 3D condition

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

Changes in v3: None
Changes in v2:
- new patch

 recipes-graphics/mesa/mesa-demos_%.bbappend | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/recipes-graphics/mesa/mesa-demos_%.bbappend b/recipes-graphics/mesa/mesa-demos_%.bbappend
index a1c5b63d..90197424 100644
--- a/recipes-graphics/mesa/mesa-demos_%.bbappend
+++ b/recipes-graphics/mesa/mesa-demos_%.bbappend
@@ -1,24 +1,18 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-SRC_URI_append_imxgpu2d = " file://Replace-glWindowPos2iARB-calls-with-glWindowPos2i.patch \
+SRC_URI_append_imxgpu = " file://Replace-glWindowPos2iARB-calls-with-glWindowPos2i.patch \
                     file://fix-clear-build-break.patch \
                     file://Additional-eglSwapBuffer-calling-makes-wrong-throttl.patch \
                     file://Add-OpenVG-demos-to-support-wayland.patch"
 
-PACKAGECONFIG_IMX_TO_REMOVE = ""
-PACKAGECONFIG_IMX_TO_REMOVE_imxgpu2d = " \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'glu x11', '', d)} \
-    gles1 \
-    gles2 \
-"
-PACKAGECONFIG_IMX_TO_REMOVE_imxgpu3d = " \
+PACKAGECONFIG_IMX_TO_REMOVE          = ""
+PACKAGECONFIG_IMX_TO_REMOVE_imxgpu2d = "gles1 gles2"
+PACKAGECONFIG_IMX_TO_REMOVE_imxgpu3d = ""
+PACKAGECONFIG_remove        = " ${PACKAGECONFIG_IMX_TO_REMOVE}"
+PACKAGECONFIG_remove_imxgpu = " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'glu x11', '', d)} \
 "
 
-PACKAGECONFIG_IMX_TO_APPEND = ""
-PACKAGECONFIG_IMX_TO_APPEND_imxgpu2d = " \
+PACKAGECONFIG_append_imxgpu = " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland vg', '', d)} \
 "
-
-PACKAGECONFIG_remove = " ${PACKAGECONFIG_IMX_TO_REMOVE}"
-PACKAGECONFIG_append = " ${PACKAGECONFIG_IMX_TO_APPEND}"
-- 
2.18.0