From de8912cbcb06b221fb4617f3042e06b68f74c814 Mon Sep 17 00:00:00 2001 From: Hugo Hromic Date: Fri, 11 May 2018 15:54:01 +0100 Subject: [PATCH] wayland: do not install libwayland-egl from wayland Wayland was updated recently in Poky, and now includes `libwayland-egl`: commit 8097bf7012a0d97d3b8b48eceb5dc20cc4ae7ca9 Author: Denys Dmytriyenko Date: Tue Apr 10 15:06:09 2018 -0400 wayland: upgrade to 1.15.0 Official announcement: https://lists.freedesktop.org/archives/wayland-devel/2018-April/037767.html | libwayland-egl is now part of libwayland, and will presumably be removed | from mesa in the not too distant future. Update mesa recipe by removing corresponding libwayland-egl entries. (From OE-Core rev: 6e5952fcfc13ff4b63c9376bd41a1dbba957f425) Signed-off-by: Denys Dmytriyenko Signed-off-by: Ross Burton Signed-off-by: Richard Purdie However, the `userland` ships its own version of the library (see issue #243). Until further testing, for now discard the version in `wayland` in favour of the version in `userland`. Signed-off-by: Hugo Hromic --- recipes-graphics/wayland/wayland_%.bbappend | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 recipes-graphics/wayland/wayland_%.bbappend diff --git a/recipes-graphics/wayland/wayland_%.bbappend b/recipes-graphics/wayland/wayland_%.bbappend new file mode 100644 index 0000000..ee2676a --- /dev/null +++ b/recipes-graphics/wayland/wayland_%.bbappend @@ -0,0 +1,6 @@ +# remove provided `libwayland-egl` library in favour of the version in `userland` until fully tested + +do_install_append_rpi () { + rm -f ${D}${libdir}/libwayland-egl* + rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc +}