mesa: Avoid Vivante GPU headers conflict for gl.h and glext.h

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.

Fixes [Yocto: #5098].

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend
index 6cc7de70a3dccdc45fea4cab96c9cc52e32b8286..5030e7a377f34179d85a742106d77ca6ce0ac7c3 100644 (file)
--- a/recipes-graphics/mesa/mesa_%.bbappend
+++ b/recipes-graphics/mesa/mesa_%.bbappend
@@ -21,7 +21,9 @@ 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 -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')}"