* Re: split xwayland from xorg-server
2021-03-20 23:35 [PR PATCH] split xwayland from xorg-server paper42
@ 2021-03-20 23:45 ` ericonr
2021-03-20 23:54 ` [PR PATCH] [Updated] " paper42
` (11 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: ericonr @ 2021-03-20 23:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 661 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/29641#issuecomment-803479590
Comment:
I would suggest naming the new package `xorg-server-xwayland` (so you just revbump xorg-server and remove the subpackage from there), it should make for the easiest transition. I'm not sure renaming to xwayland is necessary, but I can be convinced otherwise.
Is the new package picking up updates correctly? It might need an `update` file.
You can put me as maintainer, if you don't want to do it yourself.
Haven't looked at the contents of the conflicting file, but my gut reaction is to `rm` it from xwayland.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] split xwayland from xorg-server
2021-03-20 23:35 [PR PATCH] split xwayland from xorg-server paper42
2021-03-20 23:45 ` ericonr
@ 2021-03-20 23:54 ` paper42
2021-03-21 22:58 ` paper42
` (10 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: paper42 @ 2021-03-20 23:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2115 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:
- [ ] fiigure out `depends=`
- [ ] should xwayland use `replaces=xorg-server-xwayland`?
- [ ] packages depending on xorg-server-xwayland should depend on xwayland instead
- [ ] 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: 3486 bytes --]
From 961e5cd082d4f19d497898adc3ee991040438444 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sun, 21 Mar 2021 00:52:43 +0100
Subject: [PATCH 1/2] New package: xwayland-21.1.0
---
srcpkgs/xwayland/template | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100644 srcpkgs/xwayland/template
diff --git a/srcpkgs/xwayland/template b/srcpkgs/xwayland/template
new file mode 100644
index 000000000000..82f3e79be698
--- /dev/null
+++ b/srcpkgs/xwayland/template
@@ -0,0 +1,19 @@
+# Template file for 'xwayland'
+pkgname=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"
+short_desc="Compact xserver to run under wayland for compatibility"
+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
From 5fe87523cf811935ff7013085637e713652c1494 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sun, 21 Mar 2021 00:54:14 +0100
Subject: [PATCH 2/2] xorg-server: remove wayland support
---
srcpkgs/xorg-server/template | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 780738711835..2b299aa9767a 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"
@@ -78,10 +78,9 @@ 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
- }
+ build_style=meta
+ short_desc="Nested X server that runs as a wayland client - transitional dummy pkg"
+ depends="xwayland"
}
xorg-server-xnest_package() {
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] split xwayland from xorg-server
2021-03-20 23:35 [PR PATCH] split xwayland from xorg-server paper42
2021-03-20 23:45 ` ericonr
2021-03-20 23:54 ` [PR PATCH] [Updated] " paper42
@ 2021-03-21 22:58 ` paper42
2021-03-21 23:04 ` paper42
` (9 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: paper42 @ 2021-03-21 22:58 UTC (permalink / raw)
To: ml
[-- 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: 4974 bytes --]
From 1832c3e772b8c9ed877f4eafbada21faa15f88be 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 87c410b296965b0f2efde8fad710efd78e067e64 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 | 26 ++++++++++++++++++++++++++
srcpkgs/xorg-server-xwayland/update | 1 +
3 files changed, 27 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..d61cfb9237da
--- /dev/null
+++ b/srcpkgs/xorg-server-xwayland/template
@@ -0,0 +1,26 @@
+# 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() {
+ # provided by xorg-server-common
+ rm ${DESTDIR}/usr/lib/xorg/protocol.txt
+ 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
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: split xwayland from xorg-server
2021-03-20 23:35 [PR PATCH] split xwayland from xorg-server paper42
` (2 preceding siblings ...)
2021-03-21 22:58 ` paper42
@ 2021-03-21 23:04 ` paper42
2021-03-24 3:53 ` [PR REVIEW] " ericonr
` (8 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: paper42 @ 2021-03-21 23:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 427 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/29641#issuecomment-803675975
Comment:
* renamed the package back to xorg-server-xwayland
* added a new subpackage xorg-server-common which provides the conflicting file (protocol.txt). This is neccessary because xorg-server-xwayland doesn't depend on xorg-server, but still needs the file.
* I will take the maintainership
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR REVIEW] split xwayland from xorg-server
2021-03-20 23:35 [PR PATCH] split xwayland from xorg-server paper42
` (3 preceding siblings ...)
2021-03-21 23:04 ` paper42
@ 2021-03-24 3:53 ` ericonr
2021-04-10 15:04 ` [PR PATCH] [Updated] " paper42
` (7 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: ericonr @ 2021-03-24 3:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 342 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/29641#discussion_r600143988
Comment:
If this is being split out, it should be in `depends` for `xorg-server`. But I'd like to confirm that this is necessary and it can't simply be removed from `Xwayland`, which would be much easier.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] split xwayland from xorg-server
2021-03-20 23:35 [PR PATCH] split xwayland from xorg-server paper42
` (4 preceding siblings ...)
2021-03-24 3:53 ` [PR REVIEW] " ericonr
@ 2021-04-10 15:04 ` paper42
2021-04-10 15:07 ` [PR REVIEW] " paper42
` (6 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: paper42 @ 2021-04-10 15:04 UTC (permalink / raw)
To: ml
[-- 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: 4346 bytes --]
From b6b98d7fb3cd414799ee995ed1a2202d473a0e23 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/template | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 780738711835..c2aeccde6743 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() {
From 0232b55d229f1c626dfc691c1259b1a13cde8721 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 | 25 +++++++++++++++++++++++++
srcpkgs/xorg-server-xwayland/update | 1 +
3 files changed, 26 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..e77c0e29ca72
--- /dev/null
+++ b/srcpkgs/xorg-server-xwayland/template
@@ -0,0 +1,25 @@
+# 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"
+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() {
+ # provided by xorg-server-common
+ rm ${DESTDIR}/usr/lib/xorg/protocol.txt
+ 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
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR REVIEW] split xwayland from xorg-server
2021-03-20 23:35 [PR PATCH] split xwayland from xorg-server paper42
` (5 preceding siblings ...)
2021-04-10 15:04 ` [PR PATCH] [Updated] " paper42
@ 2021-04-10 15:07 ` paper42
2021-04-10 18:44 ` ericonr
` (5 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: paper42 @ 2021-04-10 15:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 400 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/29641#discussion_r611055891
Comment:
Other distributions (arch, alpine) split protocol.txt to a separate package, but I tested if xwayland works without this file and it seems to work fine. The source seems to suggest protocol.txt is only installed and never used. I removed the subpackage.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR REVIEW] split xwayland from xorg-server
2021-03-20 23:35 [PR PATCH] split xwayland from xorg-server paper42
` (6 preceding siblings ...)
2021-04-10 15:07 ` [PR REVIEW] " paper42
@ 2021-04-10 18:44 ` ericonr
2021-04-10 19:08 ` paper42
` (4 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: ericonr @ 2021-04-10 18:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 253 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/29641#discussion_r611079441
Comment:
It seems to be used here: https://sources.debian.org/src/xorg-server/2:1.20.10-3/dix/registry.c/?hl=35#L35
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR REVIEW] split xwayland from xorg-server
2021-03-20 23:35 [PR PATCH] split xwayland from xorg-server paper42
` (7 preceding siblings ...)
2021-04-10 18:44 ` ericonr
@ 2021-04-10 19:08 ` paper42
2021-04-10 19:35 ` [PR PATCH] [Updated] " paper42
` (3 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: paper42 @ 2021-04-10 19:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 279 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/29641#discussion_r611082024
Comment:
Oh, thanks for catching this. This code path is hit sometimes, because we enable xcsecurity, I will add the -common subpackage back.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] split xwayland from xorg-server
2021-03-20 23:35 [PR PATCH] split xwayland from xorg-server paper42
` (8 preceding siblings ...)
2021-04-10 19:08 ` paper42
@ 2021-04-10 19:35 ` paper42
2021-04-11 14:42 ` paper42
` (2 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: paper42 @ 2021-04-10 19:35 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] split xwayland from xorg-server
2021-03-20 23:35 [PR PATCH] split xwayland from xorg-server paper42
` (9 preceding siblings ...)
2021-04-10 19:35 ` [PR PATCH] [Updated] " paper42
@ 2021-04-11 14:42 ` paper42
2021-04-14 10:13 ` paper42
2021-04-18 3:55 ` [PR PATCH] [Merged]: " ericonr
12 siblings, 0 replies; 14+ messages in thread
From: paper42 @ 2021-04-11 14:42 UTC (permalink / raw)
To: ml
[-- 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: 5465 bytes --]
From b78bda7f42862aeb1048cff3ba5347a0ac4278b2 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 | 28 ++++++++++++++--------------
2 files changed, 15 insertions(+), 14 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..944767031ca6 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,7 +1,7 @@
# Template file for 'xorg-server'
pkgname=xorg-server
version=1.20.10
-revision=4
+revision=5
build_style=meson
configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
-Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb
@@ -9,16 +9,16 @@ 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')"
+depends="xkeyboard-config $(vopt_if elogind 'elogind') xorg-server-common"
checkdepends="xkeyboard-config"
short_desc="X11 server from X.org"
maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -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 298627255f829e311d3f5208e5e14c5ad92b8bfe 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
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] split xwayland from xorg-server
2021-03-20 23:35 [PR PATCH] split xwayland from xorg-server paper42
` (10 preceding siblings ...)
2021-04-11 14:42 ` paper42
@ 2021-04-14 10:13 ` paper42
2021-04-18 3:55 ` [PR PATCH] [Merged]: " ericonr
12 siblings, 0 replies; 14+ messages in thread
From: paper42 @ 2021-04-14 10:13 UTC (permalink / raw)
To: ml
[-- 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: 5465 bytes --]
From 5761488b531b7e7558dba410633afc10cdcd8fed 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 | 28 ++++++++++++++--------------
2 files changed, 15 insertions(+), 14 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 7832f45ff7e6..852c3ab2f573 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,7 +1,7 @@
# Template file for 'xorg-server'
pkgname=xorg-server
version=1.20.11
-revision=1
+revision=2
build_style=meson
configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
-Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb
@@ -9,16 +9,16 @@ 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')"
+depends="xkeyboard-config $(vopt_if elogind 'elogind') xorg-server-common"
checkdepends="xkeyboard-config"
short_desc="X11 server from X.org"
maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -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 58a4402f324c3c02d6a0f65e185f39d41246b089 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.1
---
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..2bc4ff38b1c6
--- /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.1
+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=f93c8a92d1f8eabde40713c7af01200a9040b3b73eafba54589732dac0a937fe
+
+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
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Merged]: split xwayland from xorg-server
2021-03-20 23:35 [PR PATCH] split xwayland from xorg-server paper42
` (11 preceding siblings ...)
2021-04-14 10:13 ` paper42
@ 2021-04-18 3:55 ` ericonr
12 siblings, 0 replies; 14+ messages in thread
From: ericonr @ 2021-04-18 3:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1814 bytes --]
There's a merged pull request on the void-packages repository
split xwayland from xorg-server
https://github.com/void-linux/void-packages/pull/29641
Description:
<!-- 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`)
^ permalink raw reply [flat|nested] 14+ messages in thread