Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] split xwayland from xorg-server
@ 2021-03-20 23:35 paper42
  2021-03-20 23:45 ` ericonr
                   ` (12 more replies)
  0 siblings, 13 replies; 14+ messages in thread
From: paper42 @ 2021-03-20 23:35 UTC (permalink / raw)
  To: ml

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

There is a new 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: 3472 bytes --]

From ddeb5364dff464d4a12ae97a813b674f0f7e9029 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sun, 21 Mar 2021 00:26:05 +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..7d416d4bfd6e
--- /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"
+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 4bf40f91daa68b4ed1693d3a50af401bacb852b0 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sun, 21 Mar 2021 00:26:24 +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
end of thread, other threads:[~2021-04-18  3:55 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2021-03-24  3:53 ` [PR REVIEW] " ericonr
2021-04-10 15:04 ` [PR PATCH] [Updated] " paper42
2021-04-10 15:07 ` [PR REVIEW] " paper42
2021-04-10 18:44 ` ericonr
2021-04-10 19:08 ` paper42
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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).