Skip to contentSkip to conversation

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

PATCH New Andreas Müller 1 participant 1 message May 2, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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

---
 meta/recipes-graphics/xwayland/xwayland_21.1.1.bb | 5 +++++
 1 file changed, 5 insertions(+)
meta/recipes-graphics/xwayland/xwayland_21.1.1.bb +5 -0
index b2ff25fbbc..8b1c96fc4a 100644
@@ -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"
 
Signature · 1 line
2.30.2