From: Neena Busireddy Date: Mon, 18 Aug 2014 20:10:47 +0000 (-0500) Subject: mesa: Update mesa and mesa-demos to support Sololite. X-Git-Tag: 2.1~875 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=9cd5c03b3448b2763ef1f4331be2643aaa08f5d4;p=meta-freescale.git 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 --- diff --git a/meta-fsl-arm/recipes-graphics/mesa/mesa-demos_%.bbappend b/meta-fsl-arm/recipes-graphics/mesa/mesa-demos_%.bbappend index 989577d4..221a3c08 100644 --- a/meta-fsl-arm/recipes-graphics/mesa/mesa-demos_%.bbappend +++ b/meta-fsl-arm/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/meta-fsl-arm/recipes-graphics/mesa/mesa_%.bbappend b/meta-fsl-arm/recipes-graphics/mesa/mesa_%.bbappend index 8e0a36b7..adcf2018 100644 --- a/meta-fsl-arm/recipes-graphics/mesa/mesa_%.bbappend +++ b/meta-fsl-arm/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 }