diff options
author | Alejandro Enedino Hernandez Samaniego <alejandr@xilinx.com> | 2019-05-09 15:29:05 -0700 |
---|---|---|
committer | Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com> | 2019-11-19 16:01:14 -0800 |
commit | 9c2708913ab24d2697124b05bcb9d541a4903547 (patch) | |
tree | 38a5382e45e6b112471949a7811448e6f6fec5cf | |
parent | 3b225fd39c9e9774e1cdb3b1a9ab30f3665dfeaa (diff) | |
download | meta-xilinx-9c2708913ab24d2697124b05bcb9d541a4903547.tar.gz |
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 <alejandr@xilinx.com>
Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>
-rw-r--r-- | meta-xilinx-bsp/recipes-graphics/libgles/libmali-xlnx.bb | 2 |
1 files changed, 0 insertions, 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() { | |||
80 | install -m 0644 ${S}/${PV}/glesHeaders/GLES/*.h ${D}${includedir}/GLES/ | 80 | install -m 0644 ${S}/${PV}/glesHeaders/GLES/*.h ${D}${includedir}/GLES/ |
81 | install -d -m 0655 ${D}${includedir}/GLES2 | 81 | install -d -m 0655 ${D}${includedir}/GLES2 |
82 | install -m 0644 ${S}/${PV}/glesHeaders/GLES2/*.h ${D}${includedir}/GLES2/ | 82 | install -m 0644 ${S}/${PV}/glesHeaders/GLES2/*.h ${D}${includedir}/GLES2/ |
83 | install -d -m 0655 ${D}${includedir}/KHR | ||
84 | install -m 0644 ${S}/${PV}/glesHeaders/KHR/*.h ${D}${includedir}/KHR/ | ||
85 | 83 | ||
86 | install -d ${D}${libdir}/pkgconfig | 84 | install -d ${D}${libdir}/pkgconfig |
87 | install -m 0644 ${WORKDIR}/egl.pc ${D}${libdir}/pkgconfig/egl.pc | 85 | install -m 0644 ${WORKDIR}/egl.pc ${D}${libdir}/pkgconfig/egl.pc |