diff options
| author | root <root@rshg054.dnsready.net> | 2012-04-02 00:01:14 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-04-02 00:01:14 +0000 |
| commit | 8ebbe4e4befac1396a153b356fc9793655dde4ff (patch) | |
| tree | b957bcef566f4da47b8d4a406c64837ec6e3b2e7 /testing/xorg-server | |
| parent | 939efb693a8b362edc0c6ccba62c5ce54fb501af (diff) | |
Mon Apr 2 00:01:14 UTC 2012
Diffstat (limited to 'testing/xorg-server')
| -rw-r--r-- | testing/xorg-server/PKGBUILD | 10 | ||||
| -rw-r--r-- | testing/xorg-server/autoconfig-nvidia.patch | 12 | ||||
| -rw-r--r-- | testing/xorg-server/autoconfig-sis.patch | 18 |
3 files changed, 21 insertions, 19 deletions
diff --git a/testing/xorg-server/PKGBUILD b/testing/xorg-server/PKGBUILD index 5764faa47..ec72f28f7 100644 --- a/testing/xorg-server/PKGBUILD +++ b/testing/xorg-server/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 152190 2012-03-05 06:05:59Z andyrtr $ +# $Id: PKGBUILD 154933 2012-03-31 09:51:27Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> 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.12.0 +pkgver=1.12.0.901 pkgrel=1 arch=('i686' 'x86_64') license=('custom') @@ -20,9 +20,9 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 xvfb-run xvfb-run.1 10-quirks.conf) -sha1sums=('5f48db767f71e9f58ded6ff356f3b8340820e524' - 'f19658773d3fa4dc468bb28f9f01866acce71540' - '962fecc159c128728f14e8ba231c5b00391ff4ac' +sha1sums=('80465deb799cdc6b7c2cc7d61e7ad8b4bc3892d7' + '63836e5cfb4ae7353fb2e31239a544409c7ead32' + '175de5630b43dbc97778adfba5563b7fdd77f11f' 'c94f742d3f9cabf958ae58e4015d9dd185aabedc' '6838fc00ef4618c924a77e0fb03c05346080908a' '993798f3d22ad672d769dae5f48d1fa068d5578f') diff --git a/testing/xorg-server/autoconfig-nvidia.patch b/testing/xorg-server/autoconfig-nvidia.patch index 9ed9b7aee..6d5220ac7 100644 --- a/testing/xorg-server/autoconfig-nvidia.patch +++ b/testing/xorg-server/autoconfig-nvidia.patch @@ -1,11 +1,11 @@ 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 -@@ -1111,7 +1111,23 @@ - { - int idx = 0; +@@ -1144,7 +1144,23 @@ + int idx = 0; + #ifdef __linux__ -- driverList[idx++] = "nouveau"; +- driverList[idx++] = "nouveau"; + switch (dev->device_id) + { + /* NV1 */ @@ -24,5 +24,5 @@ diff -Nur xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c xorg-serve + break; + } #endif - driverList[idx++] = "nv"; - break; + driverList[idx++] = "nv"; + break; diff --git a/testing/xorg-server/autoconfig-sis.patch b/testing/xorg-server/autoconfig-sis.patch index d936efaaa..0b50049db 100644 --- a/testing/xorg-server/autoconfig-sis.patch +++ b/testing/xorg-server/autoconfig-sis.patch @@ -1,10 +1,12 @@ --- 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; +@@ -1200,9 +1200,15 @@ + break; + } + break; +- case 0x1039: +- driverList[0] = "sis"; +- break; + case 0x1039: + switch (dev->device_id) + { @@ -14,6 +16,6 @@ + driverList[0] = "sis"; break; + } + break; - case 0x126f: driverList[0] = "siliconmotion"; break; - case 0x121a: - if (dev->device_id < 0x0003) + case 0x126f: + driverList[0] = "siliconmotion"; + break; |