[meta-freescale] [meta-fsl-arm][PATCH v2 20/32] mesa: Support for mx6 without GPUs

[Lauren Post]

Fix to support future mx6 i.MX 6UltraLite which does not have a
GPU.  This SoC will use mesa so mesa changes before should be more
SoC specific to allow future mx6 SoC without GPU to use mesa.

Signed-off-by: Lauren Post <lauren.post at freescale.com>
---
 recipes-graphics/mesa/mesa_%.bbappend |   29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend
index ec11097..efecc98 100644
--- a/recipes-graphics/mesa/mesa_%.bbappend
+++ b/recipes-graphics/mesa/mesa_%.bbappend
@@ -1,22 +1,33 @@
 PACKAGECONFIG_remove_mx5 = "egl gles"
 PROVIDES_remove_mx5 = "virtual/libgles1 virtual/libgles2 virtual/egl"
 
-PACKAGECONFIG_remove_mx6 = "egl gles"
+PACKAGECONFIG_remove_mx6q  = "egl gles"
+PACKAGECONFIG_remove_mx6dl = "egl gles"
+PACKAGECONFIG_remove_mx6sx = "egl gles"
+PACKAGECONFIG_remove_mx6sl = "egl gles"
 
 # i.MX6SL uses mesa software rendering
+PROVIDES_remove_mx6q = "virtual/libgles1 virtual/libgles2 virtual/egl virtual/libgl"
+PROVIDES_remove_mx6dl = "virtual/libgles1 virtual/libgles2 virtual/egl virtual/libgl"
+PROVIDES_remove_mx6sx = "virtual/libgles1 virtual/libgles2 virtual/egl virtual/libgl"
+PROVIDES_remove_mx6sl = "virtual/libgles1 virtual/libgles2 virtual/egl"
 
-PROVIDES_remove_mx6 = "virtual/libgles1 virtual/libgles2 virtual/egl"
-PROVIDES_remove_mx6q = "virtual/libgl"
-PROVIDES_remove_mx6dl = "virtual/libgl"
-PROVIDES_remove_mx6sx = "virtual/libgl"
-
-USE_VIV_LIBGL = "yes"
-USE_VIV_LIBGL_mx6sl = "no"
+USE_VIV_LIBGL = "no"
+USE_VIV_LIBGL_mx6q = "yes"
+USE_VIV_LIBGL_mx6dl = "yes"
+USE_VIV_LIBGL_mx6sx = "yes"
 
 # FIXME: Dirty hack to allow use of Vivante GPU libGL binary
 do_install_append_mx6 () {
     if [ "${USE_VIV_LIBGL}" = "yes" ]; then
         rm -f ${D}${libdir}/libGL.*
+        rm -rf ${D}${includedir}/GL/gl.h
+        rm -rf ${D}${includedir}/GL/glext.h
     fi
 }
-EXTRA_OECONF_mx6 := "${@'${EXTRA_OECONF}'.replace('--enable-glx-tls','--enable-glx')}"
+EXTRA_OECONF_mx6q := "${@'${EXTRA_OECONF}'.replace('--enable-glx-tls','--enable-glx')}"
+EXTRA_OECONF_mx6dl := "${@'${EXTRA_OECONF}'.replace('--enable-glx-tls','--enable-glx')}"
+EXTRA_OECONF_mx6sx := "${@'${EXTRA_OECONF}'.replace('--enable-glx-tls','--enable-glx')}"
+EXTRA_OECONF_mx6sl := "${@'${EXTRA_OECONF}'.replace('--enable-glx-tls','--enable-glx')}"
+
+PACKAGECONFIG[x11] = "--enable-glx,--disable-glx,${X11_DEPS}"
-- 
1.7.9.5