From cf6178871bb82d2f5bdd3df9f38f4c5f0c2456b2 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Tue, 10 Nov 2015 08:24:01 +0100
Subject: [PATCH] xorg-server: update to 1.18.

- ABI video bumped to 20.
- ABI input bumped to 22.
---
 srcpkgs/xorg-server/template | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 00ef6056562..b282136abcc 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,7 +1,7 @@
 # Template build file for 'xorg-server'.
 pkgname=xorg-server
-version=1.17.4
-revision=2
+version=1.18.0
+revision=1
 build_pie=yes
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-record --enable-xorg
@@ -14,13 +14,13 @@ configure_args="--enable-ipv6 --enable-record --enable-xorg
  --enable-kdrive --enable-kdrive-evdev --enable-kdrive-kbd
  --disable-linux-acpi --disable-linux-apm --enable-xwayland
  --enable-suid-wrapper --with-shared-memory-dir=/dev/shm
- --disable-systemd --without-systemd-daemon"
+ --without-systemd-daemon"
 short_desc="The X11 server from X.org"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://xorg.freedesktop.org"
 license="MIT, BSD"
 distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.bz2"
-checksum=0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457
+checksum=195670819695d9cedd8dde95fbe069be0d0f488a77797a2d409f9f702daf312e
 
 lib32disabled=yes
 
@@ -37,13 +37,13 @@ makedepends="
  wayland-devel libepoxy-devel xcb-util-renderutil-devel"
 # See hw/xfree86/common/xf86Module.h. Only care for the major version.
 depends="xkeyboard-config"
-provides="xserver-abi-extension-9_1 xserver-abi-input-21_1 xserver-abi-video-19_1 xf86-video-modesetting-1_1"
+provides="xserver-abi-extension-9_1 xserver-abi-input-22_1 xserver-abi-video-20_1 xf86-video-modesetting-1_1"
 replaces="xf86-video-modesetting>=0"
 
 case "$XBPS_TARGET_MACHINE" in
 i686*|x86_64*)
 	# Enable glamor/dri/opengl by default on x86.
-	configure_args+=" --enable-glamor --enable-dri2 --enable-dri3 --enable-glx-tls --enable-glx"
+	configure_args+=" --enable-glamor --enable-dri2 --enable-dri3 --enable-glx"
 	makedepends+=" MesaLib-devel"
 	replaces+=" glamor-egl>=0"
 	;;
@@ -54,14 +54,6 @@ i686*|x86_64*)
 	;;
 esac
 
-case "$XBPS_TARGET_MACHINE" in
-aarch64*) ;;
-*)
-	configure_args+=" --enable-libunwind"
-	makedepends+=" libunwind-devel"
-	;;
-esac
-
 conf_files="/etc/X11/Xwrapper.config"
 
 pre_configure() {
@@ -73,8 +65,6 @@ pre_configure() {
 	esac
 }
 post_install() {
-	# provided by xf86-input-evdev
-	rm ${DESTDIR}/usr/share/X11/xorg.conf.d/10-evdev.conf
 	vinstall ${FILESDIR}/20-modules.conf 644 usr/share/X11/xorg.conf.d
 	vinstall ${FILESDIR}/30-nvidia-drm-outputclass.conf 644 usr/share/X11/xorg.conf.d
 	vinstall ${FILESDIR}/Xwrapper.config 644 etc/X11