From 9c2708913ab24d2697124b05bcb9d541a4903547 Mon Sep 17 00:00:00 2001 From: Alejandro Enedino Hernandez Samaniego Date: Thu, 9 May 2019 15:29:05 -0700 Subject: libmali-xlnx: Dont provide KHR headers 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 Signed-off-by: Manjukumar Matha --- 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 3611e580..124da639 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 -- cgit v1.2.3-54-g00ecf