Re: [PR PATCH] [Updated] split xwayland from xorg-server

[paper42 <paper42@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1971 bytes --]

There is an updated pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages xwayland
https://github.com/void-linux/void-packages/pull/29641

split xwayland from xorg-server
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->
xwayland releases were recently split from xorg releases. This PR works well on my system, but some parts should be improved.

@leahneukirchen you are the maintainer of xorg-server, do you want to maintain xwayland too? or @ericonr? (maintainer of wayland)

TODO:
- [x] fiigure out `depends=`
- [x] solve file conflict with xorg-server (`/usr/lib/xorg/protocol.txt`)

A patch file from https://github.com/void-linux/void-packages/pull/29641.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xwayland-29641.patch --]
[-- Type: text/x-diff, Size: 5036 bytes --]

From 2395950bde92f0c454140a8b97fd29600977b2fa Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sun, 21 Mar 2021 23:49:20 +0100
Subject: [PATCH 1/2] xorg-server: split -common and -xwayland

---
 srcpkgs/xorg-server-common   |  1 +
 srcpkgs/xorg-server/template | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 12 deletions(-)
 create mode 120000 srcpkgs/xorg-server-common

diff --git a/srcpkgs/xorg-server-common b/srcpkgs/xorg-server-common
new file mode 120000
index 000000000000..0e680f217e7c
--- /dev/null
+++ b/srcpkgs/xorg-server-common
@@ -0,0 +1 @@
+xorg-server
\ No newline at end of file
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 780738711835..729a0d0ec26d 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -9,14 +9,14 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
  -Ddmx=true -Dlinux_acpi=true -Dlinux_apm=false -Dsuid_wrapper=true
  -Dxcsecurity=true -Dsystemd_logind=$(vopt_if elogind true false)
  -Dos_vendor=Void -Dglamor=true -Ddri2=true -Ddri3=true -Dglx=true
- -Dxwayland=true"
-hostmakedepends="pkg-config wayland-devel xkbcomp flex"
+ -Dxwayland=false"
+hostmakedepends="pkg-config xkbcomp flex"
 makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
  libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
  libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel
- libxkbui-devel pixman-devel wayland-devel wayland-protocols
- xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
- xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"
+ libxkbui-devel pixman-devel xcb-util-image-devel xcb-util-keysyms-devel
+ xcb-util-renderutil-devel xcb-util-wm-devel xkbcomp nettle-devel
+ $(vopt_if elogind 'dbus-devel')"
 # See hw/xfree86/common/xf86Module.h. Only care for the major version.
 depends="xkeyboard-config $(vopt_if elogind 'elogind')"
 checkdepends="xkeyboard-config"
@@ -77,13 +77,6 @@ xorg-server-xdmx_package() {
 	}
 }
 
-xorg-server-xwayland_package() {
-	short_desc="Nested X server that runs as a wayland client"
-	pkg_install() {
-		vmove usr/bin/Xwayland
-	}
-}
-
 xorg-server-xnest_package() {
 	short_desc="Nested X server that runs as an X application"
 	pkg_install() {
@@ -109,6 +102,13 @@ xorg-server-xvfb_package() {
 	}
 }
 
+xorg-server-common_package() {
+	short_desc+="- common files"
+	pkg_install() {
+		vmove usr/lib/xorg/protocol.txt
+	}
+}
+
 xorg-server-devel_package() {
 	depends="${makedepends}"
 	short_desc+=" - development files"

From 5dce9e15630ea350b5013af56b6ec6f9d23180b3 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sun, 21 Mar 2021 23:55:58 +0100
Subject: [PATCH 2/2] New package: xorg-server-xwayland-21.1.0

---
 srcpkgs/xorg-server-xwayland          |  1 -
 srcpkgs/xorg-server-xwayland/template | 27 +++++++++++++++++++++++++++
 srcpkgs/xorg-server-xwayland/update   |  1 +
 3 files changed, 28 insertions(+), 1 deletion(-)
 delete mode 120000 srcpkgs/xorg-server-xwayland
 create mode 100644 srcpkgs/xorg-server-xwayland/template
 create mode 100644 srcpkgs/xorg-server-xwayland/update

diff --git a/srcpkgs/xorg-server-xwayland b/srcpkgs/xorg-server-xwayland
deleted file mode 120000
index 0e680f217e7c..000000000000
--- a/srcpkgs/xorg-server-xwayland
+++ /dev/null
@@ -1 +0,0 @@
-xorg-server
\ No newline at end of file
diff --git a/srcpkgs/xorg-server-xwayland/template b/srcpkgs/xorg-server-xwayland/template
new file mode 100644
index 000000000000..234836285419
--- /dev/null
+++ b/srcpkgs/xorg-server-xwayland/template
@@ -0,0 +1,27 @@
+# Template file for 'xorg-server-xwayland'
+pkgname=xorg-server-xwayland
+version=21.1.0
+revision=1
+wrksrc="xserver-xwayland-$version"
+build_style=meson
+configure_args="-Dipv6=true -Dxvfb=false -Dxdmcp=false -Dxcsecurity=true
+ -Ddri3=true -Dxwayland_eglstream=false -Dglamor=true -Dxkb_dir=/usr/share/X11/xkb
+ -Dxkb_output_dir=/var/lib/xkb"
+hostmakedepends="pkg-config wayland-devel"
+makedepends="nettle-devel libepoxy-devel font-util libXfont2-devel pixman-devel
+ libxkbfile-devel dbus-devel wayland-devel wayland-protocols libtirpc-devel
+ MesaLib-devel libxcb-devel"
+depends="xorg-server-common"
+short_desc="Nested X server that runs as a wayland client"
+maintainer="Paper <paper@tilde.institute>"
+license="MIT"
+homepage="https://xorg.freedesktop.org"
+distfiles="https://gitlab.freedesktop.org/xorg/xserver/-/archive/xwayland-$version/xserver-xwayland-$version.tar.gz"
+checksum=7633b12119af37905cf31bedc657cfc04e1b8d6bcc4bcb3bd7c43b9ab9f1525d
+
+post_install() {
+	# protocol.txt is provided by xorg-server-common
+	rm ${DESTDIR}/usr/lib/xorg/protocol.txt
+	rm ${DESTDIR}/usr/share/man/man1/Xserver.1
+	vlicense COPYING
+}
diff --git a/srcpkgs/xorg-server-xwayland/update b/srcpkgs/xorg-server-xwayland/update
new file mode 100644
index 000000000000..960c2c0b2633
--- /dev/null
+++ b/srcpkgs/xorg-server-xwayland/update
@@ -0,0 +1 @@
+pkgname=xserver-xwayland