From ace7a71b09df24de7b70f52edcd425366f39d56e Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sun, 2 May 2021 22:01:28 +0200 Subject: xwayland: remove protocol.txt - it clashes with xserver-xorg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Images with wayland-compositors + xwayland + xserver fail to build * Fedora - they introduced standalone xwayland - does same [1] [1] https://src.fedoraproject.org/rpms/xorg-x11-server-Xwayland/blob/rawhide/f/xorg-x11-server-Xwayland.spec Signed-off-by: Andreas Müller Signed-off-by: Richard Purdie --- meta/recipes-graphics/xwayland/xwayland_21.1.1.bb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/recipes-graphics/xwayland/xwayland_21.1.1.bb b/meta/recipes-graphics/xwayland/xwayland_21.1.1.bb index b2ff25fbbc..8b1c96fc4a 100644 --- a/meta/recipes-graphics/xwayland/xwayland_21.1.1.bb +++ b/meta/recipes-graphics/xwayland/xwayland_21.1.1.bb @@ -17,5 +17,10 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl" DEPENDS += "xorgproto xtrans pixman libxkbfile libxfont2 wayland wayland-native wayland-protocols libdrm libepoxy" +do_install_append() { + # remove files not needed and clashing with xserver-xorg + rm -rf ${D}/${libdir}/xorg/ +} + FILES_${PN} += "${libdir}/xorg/protocol.txt" -- cgit 1.2.3-korg