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

[Jan de Groot]

    Date: Saturday, September 24, 2011 @ 07:27:33
  Author: jgc
Revision: 138465

upgpkg: xorg-server 1.11.1-1

Update to 1.11.1, add patch to select the sisimedia driver where needed

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

----------------------+
 PKGBUILD             |    9 +++++++--
 autoconfig-sis.patch |   19 +++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-09-24 10:12:16 UTC (rev 138464)
+++ PKGBUILD	2011-09-24 11:27:33 UTC (rev 138465)
@@ -3,7 +3,7 @@
 
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.11.0
+pkgver=1.11.1
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom')
@@ -12,11 +12,13 @@
 options=('!libtool')
 source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
         autoconfig-nvidia.patch
+        autoconfig-sis.patch
         xvfb-run
         xvfb-run.1
         10-quirks.conf)
-sha1sums=('5fa0c0a190fbe1030a14e435de2d5a3259ca70be'
+sha1sums=('ed0358b61294f1283aad42cf1e609752ceeffafd'
           '0249b892f27243d8fe6fe6d226bf4c2391cedf49'
+          '962fecc159c128728f14e8ba231c5b00391ff4ac'
           'c94f742d3f9cabf958ae58e4015d9dd185aabedc'
           '6838fc00ef4618c924a77e0fb03c05346080908a'
           '993798f3d22ad672d769dae5f48d1fa068d5578f')
@@ -27,6 +29,9 @@
   # Use nouveau/nv/nvidia drivers for nvidia devices
   patch -Np1 -i "${srcdir}/autoconfig-nvidia.patch"
 
+  # Use unofficial imedia SiS driver for supported SiS devices
+  patch -Np0 -i "${srcdir}/autoconfig-sis.patch"
+
   autoreconf
   ./configure --prefix=/usr \
       --enable-ipv6 \

Added: autoconfig-sis.patch
===================================================================
--- autoconfig-sis.patch	                        (rev 0)
+++ autoconfig-sis.patch	2011-09-24 11:27:33 UTC (rev 138465)
@@ -0,0 +1,19 @@
+--- hw/xfree86/common/xf86pciBus.c.orig	2011-09-24 10:53:45.421697668 +0000
++++ hw/xfree86/common/xf86pciBus.c	2011-09-24 10:55:56.416250708 +0000
+@@ -1140,7 +1140,15 @@
+ 		    driverList[0] = "savage"; break;
+ 	    }
+ 	    break;
+-	case 0x1039:		    driverList[0] = "sis";	break;
++	case 0x1039:
++	    switch (dev->device_id)
++	    {
++		case 0x6350: case 0x6351:
++		    driverList[0] = "sisimedia"; driverList[1] = "sis"; break;
++		default:
++		    driverList[0] = "sis"; break;
++	    }
++	    break;
+ 	case 0x126f:		    driverList[0] = "siliconmotion"; break;
+ 	case 0x121a:
+ 	    if (dev->device_id < 0x0003)