[meta-freescale] [meta-fsl-arm][PATCH 5/7] mesa: Avoid Vivante GPU headers conflict for gl.h and glext.h

[Daiane Angolini]

On Tue, Jul 21, 2015 at 11:53 AM, Otavio Salvador
<otavio at ossystems.com.br> wrote:
> The new GPU release include new GL headers which conflict with the
> ones provided by mesa. The build fails with:
>
> ,----
> | ERROR: The recipe imx-gpu-viv is trying to install files into a shared
> | area when those files already exist. Those files and their manifest
> | location are:
> |
> |  .../build-framebuffer/tmp/sysroots/imx6qsabresd/usr/include/GL/gl.h
> | Matched in manifest-imx6qsabresd-mesa.populate_sysroot
> |
> | .../build-framebuffer/tmp/sysroots/imx6qsabresd/usr/include/GL/glext.h
> | Matched in manifest-imx6qsabresd-mesa.populate_sysroot
> `----
>
> This removes of the mesa's headers so the ones provided by Vivante are
> used instead.

Would this new Vivante release fix the following bug:
https://bugzilla.yoctoproject.org/show_bug.cgi?id=5098


Daiane
>
> Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
> ---
>  recipes-graphics/mesa/mesa_%.bbappend | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend
> index ec11097..bfec001 100644
> --- a/recipes-graphics/mesa/mesa_%.bbappend
> +++ b/recipes-graphics/mesa/mesa_%.bbappend
> @@ -16,7 +16,9 @@ USE_VIV_LIBGL_mx6sl = "no"
>  # 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 -f ${D}${libdir}/libGL.* \
> +              ${D}${includedir}/GL/gl.h \
> +              ${D}${includedir}/GL/glext.h
>      fi
>  }
>  EXTRA_OECONF_mx6 := "${@'${EXTRA_OECONF}'.replace('--enable-glx-tls','--enable-glx')}"
> --
> 2.4.6
>
> --
> _______________________________________________
> meta-freescale mailing list
> meta-freescale at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-freescale