From ddeb5364dff464d4a12ae97a813b674f0f7e9029 Mon Sep 17 00:00:00 2001 From: Paper 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 " +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 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() {