[arch-commits] Commit in xorg-server/trunk (PKGBUILD autoconfig-nvidia.patch)

[Laurent Carlier]

    Date: Thursday, July 31, 2014 @ 14:02:24
  Author: lcarlier
Revision: 218446

upgpkg: xorg-server 1.16.0-6

revert autoconfigure-nvidia patch (FS#41380)

Added:
  xorg-server/trunk/autoconfig-nvidia.patch
Modified:
  xorg-server/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |    8 +++++++-
 autoconfig-nvidia.patch |   28 ++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-07-31 11:42:34 UTC (rev 218445)
+++ PKGBUILD	2014-07-31 12:02:24 UTC (rev 218446)
@@ -5,7 +5,7 @@
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-xwayland' 'xorg-server-common' 'xorg-server-devel')
 pkgver=1.16.0
-pkgrel=5 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild
+pkgrel=6 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org"
@@ -16,6 +16,7 @@
              'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 'dri2proto' 'libgcrypt' 'libepoxy'
              'xcb-util' 'xcb-util-image' 'xcb-util-wm' 'xcb-util-keysyms' 'dri3proto' 'libxshmfence') 
 source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig}
+        autoconfig-nvidia.patch
         autoconfig-sis.patch
         glamor-upstream-fix.patch
         nvidia-drm-outputclass.conf
@@ -23,6 +24,7 @@
         xvfb-run.1)
 sha256sums=('38330a03c5f7a38745a3f9816cf069db5b8844eebb358fd39dbabf61f32cd06b'
             'SKIP'
+            '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162'
             'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84'
             'fbd898f0e867c77c9bf918fd2e7956c7776ecb3cc3634c61290fb03513b47987'
             'af1c3d2ea5de7f6a6b5f7c60951a189a4749d1495e5462f3157ae7ac8fe1dc56'
@@ -33,6 +35,10 @@
   cd "${pkgbase}-${pkgver}"
   # Use unofficial imedia SiS driver for supported SiS devices
   patch -Np0 -i ../autoconfig-sis.patch
+  # outputclass config file works only when nvidia-drm kernel driver is exposed
+  # this means that older drivers (304xx and before) aren't currently supported
+  # Use nouveau/nv/nvidia drivers for nvidia devices
+  patch -Np1 -i ../autoconfig-nvidia.patch
   # merged upstream (1.16 branch)
   patch -Np1 -i ../glamor-upstream-fix.patch
 }

Added: autoconfig-nvidia.patch
===================================================================
--- autoconfig-nvidia.patch	                        (rev 0)
+++ autoconfig-nvidia.patch	2014-07-31 12:02:24 UTC (rev 218446)
@@ -0,0 +1,28 @@
+diff -Nur xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c
+--- xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c	2012-02-10 10:10:37.583014924 +0000
++++ xorg-server-1.11.99.902/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++] = "nouveau";
++		    driverList[idx++] = "nvidia";
++		    break;
++		}
+ #endif
+         driverList[idx++] = "nv";
+         break;