From: Alejandro Enedino Hernandez Samaniego <[email protected]>

Mesa-GL provides the KHR headers since 87c156183 (mesa)
even if egl is not selected, assuming opengl is.

This creates a conflict since when something DEPENDS
on virtual/libgl and virtual/gles1, both dependencies
will provide the same file.

Dont provide KHR headers to avoid this conflict.

Signed-off-by: Alejandro Enedino Hernandez Samaniego <[email protected]>
Signed-off-by: Sai Hari Chandana Kalluri <[email protected]>
Signed-off-by: Manjukumar Matha <[email protected]>
---
 meta-xilinx-bsp/recipes-graphics/libgles/libmali-xlnx.bb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/meta-xilinx-bsp/recipes-graphics/libgles/libmali-xlnx.bb 
b/meta-xilinx-bsp/recipes-graphics/libgles/libmali-xlnx.bb
index 3611e58..124da63 100644
--- a/meta-xilinx-bsp/recipes-graphics/libgles/libmali-xlnx.bb
+++ b/meta-xilinx-bsp/recipes-graphics/libgles/libmali-xlnx.bb
@@ -80,8 +80,6 @@ do_install() {
     install -m 0644 ${S}/${PV}/glesHeaders/GLES/*.h ${D}${includedir}/GLES/
     install -d -m 0655 ${D}${includedir}/GLES2
     install -m 0644 ${S}/${PV}/glesHeaders/GLES2/*.h ${D}${includedir}/GLES2/
-    install -d -m 0655 ${D}${includedir}/KHR
-    install -m 0644 ${S}/${PV}/glesHeaders/KHR/*.h ${D}${includedir}/KHR/
 
     install -d ${D}${libdir}/pkgconfig
     install -m 0644 ${WORKDIR}/egl.pc ${D}${libdir}/pkgconfig/egl.pc
-- 
2.7.4

-- 
_______________________________________________
meta-xilinx mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-xilinx

Reply via email to