From: Mihai Lindner <mihai.lindner@nxp.com>
Date: Thu, 19 Dec 2019 16:13:24 +0000 (+0200)
Subject: mesa: Fix glcorearb.h collision with imx-gpu-viv
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=8ad4ad24fa48cf1f72f3296d5ca5bdd373edb7ee;p=meta-freescale.git

mesa: Fix glcorearb.h collision with imx-gpu-viv

Fix ERROR:
The file /usr/include/GL/glcorearb.h is installed by both mesa and
imx-gpu-viv, aborting.

Signed-off-by: Mihai Lindner <mihai.lindner@nxp.com>
---

diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend
index c522315a..dbaab89e 100644
--- a/recipes-graphics/mesa/mesa_%.bbappend
+++ b/recipes-graphics/mesa/mesa_%.bbappend
@@ -41,6 +41,7 @@ BACKEND = \
 do_install_append_imxgpu3d () {
     rm -f ${D}${libdir}/libGL.* \
           ${D}${includedir}/GL/gl.h \
+          ${D}${includedir}/GL/glcorearb.h \
           ${D}${includedir}/GL/glext.h \
           ${D}${includedir}/GL/glx.h \
           ${D}${includedir}/GL/glxext.h