Skip to contentSkip to conversation

xwayland: add a standalone recipe

PATCH In review Alexander Kanavin 2 participants 3 messages Apr 19, 2021 – Apr 22, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 xwayland: add a standalone recipe

Please see here for the rationale for splitting XWayland out of main xserver-xorg tree:
https://fedoraproject.org/wiki/Changes/XwaylandStandalone

Release announcement:
https://lists.x.org/archives/xorg-announce/2021-March/003076.html

---
 meta/conf/distro/include/maintainers.inc      |  1 +
 .../xwayland/xwayland_21.1.1.bb               | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 meta/recipes-graphics/xwayland/xwayland_21.1.1.bb
meta/conf/distro/include/maintainers.inc +1 -0
index e1b1afcd7e..db0b2b4df0 100644
@@ -797,6 +797,7 @@ RECIPE_MAINTAINER_pn-xset = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-xtrans = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-xuser-account = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-xvinfo = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xwayland = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-xwininfo = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-xxhash = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-xz = "Denys Dmytriyenko <[email protected]>"
meta/recipes-graphics/xwayland/xwayland_21.1.1.bb new file +21 -0
new file mode 100644
index 0000000000..82765cdaf9
@@ -0,0 +1,21 @@
+SUMMARY = "XWayland is an X Server that runs under Wayland."
+DESCRIPTION = "XWayland is an X Server running as a Wayland client, \
+and thus is capable of displaying native X11 client applications in a \
+Wayland compositor environment. The goal of XWayland is to facilitate \
+the transition from X Window System to Wayland environments, providing \
+a way to run unported applications in the meantime."
+HOMEPAGE = "https://fedoraproject.org/wiki/Changes/XwaylandStandalone"
+
+LICENSE = "MIT-X"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880"
+
+SRC_URI = "https://www.x.org/archive/individual/xserver/xwayland-${PV}.tar.xz"
+SRC_URI[sha256sum] = "31f261ce51bbee76a6ca3ec02aa367ffa2b5efa2b98412df57ccefd7a19003ce"
+
+inherit meson features_check
+REQUIRED_DISTRO_FEATURES = "x11"
+
+DEPENDS += "xorgproto xtrans pixman libxkbfile libxfont2 wayland wayland-native wayland-protocols libdrm libepoxy"
+
+FILES_${PN} += "${libdir}/xorg/protocol.txt"
+
Signature · 1 line
2.30.2
#1 lore raw

PATCH 2/2 weston: use standalone xwayland instead of outdated xserver-xorg version

---
 meta/recipes-graphics/wayland/weston_9.0.0.bb       | 2 +-
 meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
meta/recipes-graphics/wayland/weston_9.0.0.bb +1 -1
index 50fbfa613b..34ac66d4e9 100644
@@ -124,7 +124,7 @@ SUMMARY_libweston-${WESTON_MAJOR_VERSION} = "Helper library for implementing 'wa
 FILES_${PN}-examples = "${bindir}/*"
 
 FILES_${PN}-xwayland = "${libdir}/libweston-${WESTON_MAJOR_VERSION}/xwayland.so"
-RDEPENDS_${PN}-xwayland += "xserver-xorg-xwayland"
+RDEPENDS_${PN}-xwayland += "xwayland"
 
 RDEPENDS_${PN} += "xkeyboard-config"
 RRECOMMENDS_${PN} = "weston-init liberation-fonts"
meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +0 -1
index b3e03744c0..da025171db 100644
@@ -122,7 +122,6 @@ EXTRA_OECONF += "--with-fop=no \
 OPENGL_PKGCONFIGS = "dri glx glamor dri3 xshmfence"
 PACKAGECONFIG ??= "dga dri2 udev ${XORG_CRYPTO} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \
-                   ${@bb.utils.contains('DISTRO_FEATURES', 'opengl wayland', 'xwayland', '', d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd systemd-logind', '', d)} \
 "
 
Signature · 1 line
2.30.2
#2 lore raw

Re: [OE-core] [PATCH 2/2] weston: use standalone xwayland instead of outdated xserver-xorg version

Quoted 12 lines · Alexander Kanavin
---
 meta/recipes-graphics/wayland/weston_9.0.0.bb       | 2 +-
 meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
meta/recipes-graphics/wayland/weston_9.0.0.bb +0 -0
index 50fbfa613b..34ac66d4e9 100644

meta/recipes-graphics/wayland/weston_9.0.0.bb SUMMARY_libweston-${WESTON_MAJOR_VERSION} = "Helper library for implementing 'wa · line 127

Quoted 5 lines
meta/recipes-graphics/wayland/weston_9.0.0.bb +1 -1
@@ -124,7 +124,7 @@ SUMMARY_libweston-${WESTON_MAJOR_VERSION} = "Helper library for implementing 'wa
 FILES_${PN}-examples = "${bindir}/*"
 
 FILES_${PN}-xwayland = "${libdir}/libweston-${WESTON_MAJOR_VERSION}/xwayland.so"
-RDEPENDS_${PN}-xwayland += "xserver-xorg-xwayland"
+RDEPENDS_${PN}-xwayland += "xwayland"

this patch causes weston to not start with sysvinit since xwayland.so plugin is no longer available, I have sent a follow up
to fix this fallout.

Quoted 21 lines
meta/recipes-graphics/wayland/weston_9.0.0.bb +0 -0
 RDEPENDS_${PN} += "xkeyboard-config"
 RRECOMMENDS_${PN} = "weston-init liberation-fonts"
meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +0 -2
index b3e03744c0..da025171db 100644
@@ -122,7 +122,6 @@ EXTRA_OECONF += "--with-fop=no \
 OPENGL_PKGCONFIGS = "dri glx glamor dri3 xshmfence"
 PACKAGECONFIG ??= "dga dri2 udev ${XORG_CRYPTO} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \
-                   ${@bb.utils.contains('DISTRO_FEATURES', 'opengl wayland', 'xwayland', '', d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd systemd-logind', '', d)} \
 "
 
--

2.30.2