From 5761488b531b7e7558dba410633afc10cdcd8fed Mon Sep 17 00:00:00 2001 From: Paper 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 " @@ -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 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 " +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