[meta-freescale] [meta-fsl-arm][PATCH] mesa: Update mesa and mesa-demos to support SoloLite.

[Neena Busireddy]

Since imx6slevk does not support full GPU, for sololite only
disable the full GPU enablement in mesa and mesa-demos.
SoloLite should use GL from mesa since its GPU does not have
hardware accelerated GL.

Signed-off-by: Neena Busireddy <neena.busireddy at freescale.com>
---
 recipes-graphics/mesa/mesa-demos_%.bbappend |    1 +
 recipes-graphics/mesa/mesa_%.bbappend       |    6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/recipes-graphics/mesa/mesa-demos_%.bbappend b/recipes-graphics/mesa/mesa-demos_%.bbappend
index 989577d..221a3c0 100644
--- a/recipes-graphics/mesa/mesa-demos_%.bbappend
+++ b/recipes-graphics/mesa/mesa-demos_%.bbappend
@@ -2,3 +2,4 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 SRC_URI_append_mx6 = " file://Replace-glWindowPos2iARB-calls-with-glWindowPos2i.patch"
 
+PACKAGECONFIG_remove_mx6sl = "gles1 gles2"
diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend
index 8e0a36b..112d58b 100644
--- a/recipes-graphics/mesa/mesa_%.bbappend
+++ b/recipes-graphics/mesa/mesa_%.bbappend
@@ -4,7 +4,11 @@ PROVIDES_remove_mx5 = "virtual/libgles1 virtual/libgles2 virtual/egl"
 PACKAGECONFIG_remove_mx6 = "egl gles"
 PROVIDES_remove_mx6 = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl"
 
+PROVIDES_append_mx6sl = " virtual/libgl"
+
 # FIXME: Dirty hack to allow use of Vivante GPU libGL binary
+# Do not use this for SoloLite.
+
 do_install_append_mx6 () {
-    rm -f ${D}${libdir}/libGL.*
+${@base_contains('MACHINE','imx6slevk','','rm -f ${D}${libdir}/libGL.*', d)} 
 }
-- 
1.7.9.5