From 88ddd376e398c996ff0ac7a17920f86962f423a6 Mon Sep 17 00:00:00 2001 From: Neena Busireddy Date: Mon, 18 Aug 2014 15:10:47 -0500 Subject: mesa: Update mesa and mesa-demos to support Sololite. SoloLite should use mesa software rendering GL since GPU for this machine does not have hardware accelerated GL. Signed-off-by: Neena Busireddy Signed-off-by: Otavio Salvador --- recipes-graphics/mesa/mesa-demos_%.bbappend | 1 + recipes-graphics/mesa/mesa_%.bbappend | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) 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..adcf201 100644 --- a/recipes-graphics/mesa/mesa_%.bbappend +++ b/recipes-graphics/mesa/mesa_%.bbappend @@ -2,9 +2,19 @@ PACKAGECONFIG_remove_mx5 = "egl gles" 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" + +# i.MX6SL uses mesa software rendering + +PROVIDES_remove_mx6 = "virtual/libgles1 virtual/libgles2 virtual/egl" +PROVIDES_remove_mx6q = "virtual/libgl" +PROVIDES_remove_mx6dl = "virtual/libgl" + +USE_VIV_LIBGL = "yes" +USE_VIV_LIBGL_mx6sl = "no" # FIXME: Dirty hack to allow use of Vivante GPU libGL binary do_install_append_mx6 () { - rm -f ${D}${libdir}/libGL.* + if [ "${USE_VIV_LIBGL}" = "yes" ]; then + rm -f ${D}${libdir}/libGL.* + fi } -- cgit v1.2.3-54-g00ecf