From: Andreas Müller <schnitzeltony@gmail.com>
Date: Sun, 2 May 2021 20:01:28 +0000 (+0200)
Subject: xwayland: remove protocol.txt - it clashes with xserver-xorg
X-Git-Tag: uninative-3.2~221
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=ace7a71b09df24de7b70f52edcd425366f39d56e;p=openembedded-core.git

xwayland: remove protocol.txt - it clashes with xserver-xorg

* 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 <schnitzeltony@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

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"