From 875249abddd8a44198b56ea6266efd8a61baa9e1 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sat, 26 Jul 2014 07:54:42 +0200
Subject: [PATCH] xorg-server: misc cleanups with driver automatching and
 system config.

- nvidia autoconfiguration can now be done via a configuration
file rather than patching.
- remove obsolete 11-quirks.conf.
- fix system configuration directory, previously it was set to /etc/X11/X11.
---
 srcpkgs/xorg-server/files/11-quirks.conf      | 10 -------
 .../files/nvidia-drm-outputclass.conf         |  6 +++++
 .../patches/autoconfig-nvidia.patch           | 27 -------------------
 srcpkgs/xorg-server/template                  | 10 +++----
 4 files changed, 11 insertions(+), 42 deletions(-)
 delete mode 100644 srcpkgs/xorg-server/files/11-quirks.conf
 create mode 100644 srcpkgs/xorg-server/files/nvidia-drm-outputclass.conf
 delete mode 100644 srcpkgs/xorg-server/patches/autoconfig-nvidia.patch

diff --git a/srcpkgs/xorg-server/files/11-quirks.conf b/srcpkgs/xorg-server/files/11-quirks.conf
deleted file mode 100644
index 7afad22dc6..0000000000
--- a/srcpkgs/xorg-server/files/11-quirks.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# Collection of quirks and blacklist/whitelists for specific devices.
-
-
-# Accelerometer device, posts data through ABS_X/ABS_Y, making X unusable
-# http://bugs.freedesktop.org/show_bug.cgi?id=22442 
-Section "InputClass"
-        Identifier "ThinkPad HDAPS accelerometer blacklist"
-        MatchProduct "ThinkPad HDAPS accelerometer data"
-        Option "Ignore" "on"
-EndSection
diff --git a/srcpkgs/xorg-server/files/nvidia-drm-outputclass.conf b/srcpkgs/xorg-server/files/nvidia-drm-outputclass.conf
new file mode 100644
index 0000000000..40c1e08b5f
--- /dev/null
+++ b/srcpkgs/xorg-server/files/nvidia-drm-outputclass.conf
@@ -0,0 +1,6 @@
+Section "OutputClass"
+	Identifier "nvidia"
+	MatchDriver "nvidia-drm"
+	Driver "nvidia"
+EndSection
+
diff --git a/srcpkgs/xorg-server/patches/autoconfig-nvidia.patch b/srcpkgs/xorg-server/patches/autoconfig-nvidia.patch
deleted file mode 100644
index 48a575d719..0000000000
--- a/srcpkgs/xorg-server/patches/autoconfig-nvidia.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- hw/xfree86/common/xf86pciBus.c	2012-02-10 10:10:37.583014924 +0000
-+++ hw/xfree86/common/xf86pciBus.c	2012-02-10 11:16:07.148971317 +0000
-@@ -1144,7 +1144,23 @@
-         int idx = 0;
-
- #ifdef __linux__
--        driverList[idx++] = "nouveau";
-+	    switch (dev->device_id)
-+		{
-+		/* NV1 */
-+		case 0x0008:
-+		case 0x0009:
-+		    driverList[idx++] = "vesa";
-+		    break;
-+		/* NV3 */
-+		case 0x0018:
-+		case 0x0019:
-+		    driverList[idx++] = "nouveau";
-+		    break;
-+		default:
-+		    driverList[idx++] = "nvidia";
-+		    driverList[idx++] = "nouveau";
-+		    break;
-+		}
- #endif
-         driverList[idx++] = "nv";
-         break;
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 05979824a5..b66cb3cff5 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.16.0
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xcsecurity --enable-record
  --enable-xnest --enable-xephyr --enable-composite --enable-xvfb
  --disable-static --disable-config-hal --disable-xfbdev --disable-xfake
- --enable-config-udev --enable-config-udev-kms --sysconfdir=/etc/X11
+ --enable-config-udev --enable-config-udev-kms
  --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-dga --enable-xorg
@@ -61,7 +61,8 @@ else
 fi
 
 post_install() {
-	vinstall ${FILESDIR}/11-quirks.conf 644 etc/X11/xorg.conf.d
+	vinstall ${FILESDIR}/nvidia-drm-outputclass.conf 644 usr/share/X11/xorg.conf.d
+
 	vinstall COPYING 644 usr/share/licenses/${pkgname}
 
 	chmod 4755 ${DESTDIR}/usr/libexec/Xorg.wrap
@@ -69,8 +70,7 @@ post_install() {
 	if [ -e ${DESTDIR}/usr/lib/xorg/modules/extensions/libglx.so ]; then
 		# Support nvidia and amd binary blobs to provide their own
 		# implementation.
-		mv ${DESTDIR}/usr/lib/xorg/modules/extensions/libglx.so \
-			${DESTDIR}/usr/lib/xorg/modules/extensions/libglx-xorg.so
+		mv ${DESTDIR}/usr/lib/xorg/modules/extensions/{libglx.so,libglx-xorg.so}
 	fi
 }