>From wayland >= 1.15, it is provided by wayland and thus conflict
occurs.
Signed-off-by: Jean-Francois Dagenais <jeff.dagen...@gmail.com>
---
.../recipes-graphics/libgles/files/wayland-egl.pc | 12 ------------
meta-xilinx-bsp/recipes-graphics/libgles/libmali-xlnx.bb | 7 ++++---
2 files changed, 4 insertions(+), 15 deletions(-)
delete mode 100644
meta-xilinx-bsp/recipes-graphics/libgles/files/wayland-egl.pc
diff --git a/meta-xilinx-bsp/recipes-graphics/libgles/files/wayland-egl.pc
b/meta-xilinx-bsp/recipes-graphics/libgles/files/wayland-egl.pc
deleted file mode 100644
index 719fb3e..0000000
--- a/meta-xilinx-bsp/recipes-graphics/libgles/files/wayland-egl.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=/usr/include
-
-Name: wayland-egl
-Description: MALI wayland-egl library
-Requires.private:
-Version: r8p0
-Libs: -L${libdir} -lwayland-egl
-Libs.private: -lm -lpthread -ldl
-Cflags: -I${includedir}
diff --git a/meta-xilinx-bsp/recipes-graphics/libgles/libmali-xlnx.bb
b/meta-xilinx-bsp/recipes-graphics/libgles/libmali-xlnx.bb
index 5bf7d4d..9834816 100644
--- a/meta-xilinx-bsp/recipes-graphics/libgles/libmali-xlnx.bb
+++ b/meta-xilinx-bsp/recipes-graphics/libgles/libmali-xlnx.bb
@@ -18,7 +18,6 @@ PROVIDES += "\
virtual/libgles2 \
virtual/egl \
virtual/libgbm \
- virtual/libwayland-egl \
"
FILESEXTRAPATHS_append := " \
@@ -36,7 +35,6 @@ SRC_URI = " \
file://glesv1_cm.pc \
file://glesv1.pc \
file://glesv2.pc \
- file://wayland-egl.pc \
file://gbm.pc \
"
@@ -108,7 +106,6 @@ do_install() {
if [ "${USE_WL}" = "yes" ]; then
install -m 0644 ${S}/${PV}/glesHeaders/GBM/gbm.h ${D}${includedir}/
install -m 0644 ${WORKDIR}/gbm.pc ${D}${libdir}/pkgconfig/gbm.pc
- install -m 0644 ${WORKDIR}/wayland-egl.pc
${D}${libdir}/pkgconfig/wayland-egl.pc
install -Dm 0644 ${S}/${PV}/${ARCH_PLATFORM_DIR}/wayland/libMali.so.8.0
${D}${libdir}/wayland/libMali.so.8.0
ln -snf wayland/libMali.so.8.0 ${D}${libdir}/libMali.so.8.0
elif [ "${USE_X11}" = "yes" ]; then
@@ -125,6 +122,10 @@ do_install() {
if ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'false', 'true', d)};
then
sed -i -e 's/^#if defined(MESA_EGL_NO_X11_HEADERS)$/#if (1)/'
${D}${includedir}/EGL/eglplatform.h
fi
+
+ # libwayland-egl has been moved to wayland 1.15+
+ rm -f ${D}${libdir}/libwayland-egl*
+ rmdir --ignore-fail-on-non-empty ${D}${libdir}/pkgconfig
}
--
2.11.0
--
_______________________________________________
meta-xilinx mailing list
meta-xilinx@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-xilinx
