From 446b7ee72d4f0e4d9a2e8981bad68710151d2eae Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.eu>
Date: Tue, 18 Apr 2017 23:01:49 +0200
Subject: [PATCH] xorg-server: reenable Xwayland

---
 srcpkgs/xorg-server-xwayland |  1 +
 srcpkgs/xorg-server/template | 14 ++++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)
 create mode 120000 srcpkgs/xorg-server-xwayland

diff --git a/srcpkgs/xorg-server-xwayland b/srcpkgs/xorg-server-xwayland
new file mode 120000
index 00000000000..0e680f217e7
--- /dev/null
+++ b/srcpkgs/xorg-server-xwayland
@@ -0,0 +1 @@
+xorg-server
\ No newline at end of file
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index cbc02d1e5fd..3191312c5e7 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,12 +1,12 @@
 # Template build file for 'xorg-server'.
 pkgname=xorg-server
 version=1.19.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-record --enable-xorg
  --enable-xnest --enable-xephyr --enable-composite --enable-xvfb
  --disable-static --disable-config-hal --disable-xfbdev --disable-xfake
- --enable-config-udev --enable-config-udev-kms
+ --enable-config-udev --enable-config-udev-kms --enable-xwayland
  --with-xkb-path=/usr/share/X11/xkb --with-xkb-output=/var/lib/xkb
  --with-fontrootdir=/usr/share/fonts/X11 --with-sha1=libcrypto
  --disable-dmx --disable-xfree86-utils --enable-kdrive-mouse
@@ -23,7 +23,6 @@ checksum=677a8166e03474719238dfe396ce673c4234735464d6dadf2959b600d20e5a98
 
 lib32disabled=yes
 
-# XXX --enable-xwayland has been disabled temporarily
 hostmakedepends="pkg-config perl flex"
 makedepends="
  damageproto inputproto glproto xproto presentproto
@@ -34,7 +33,8 @@ makedepends="
  libXfont-devel libXmu-devel libXrender-devel libXfixes-devel libXi-devel
  libXaw-devel libdrm-devel libXtst-devel libXres-devel libxkbui-devel
  libxkbfile-devel libXxf86dga-devel libXv-devel pixman-devel libxshmfence-devel
- wayland-devel libepoxy-devel xcb-util-renderutil-devel libXfont2-devel"
+ wayland-devel wayland-protocols libepoxy-devel xcb-util-renderutil-devel
+ libXfont2-devel"
 # See hw/xfree86/common/xf86Module.h. Only care for the major version.
 depends="xkeyboard-config"
 provides="xserver-abi-extension-10_1 xserver-abi-input-24_1 xserver-abi-video-23_1 xf86-video-modesetting-1_1"
@@ -85,6 +85,12 @@ post_install() {
 	fi
 }
 
+xorg-server-xwayland_package() {
+	short_desc="A nested X server that runs as a wayland client"
+	pkg_install() {
+		vmove usr/bin/Xwayland
+	}
+}
 xorg-server-xnest_package() {
 	short_desc="A nested X server that runs as an X application"
 	pkg_install() {