diff options
| author | root <root@rshg054.dnsready.net> | 2011-09-25 23:14:59 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2011-09-25 23:14:59 +0000 |
| commit | 21efc9511d14394cc1d8426e2e0a6c668964fbe9 (patch) | |
| tree | 7e6141022e93959706f4a4cba61e40b0d083161b /testing/xorg-server | |
| parent | 38a0b12ffffc8842019f47425b60688253e709b0 (diff) | |
Sun Sep 25 23:14:59 UTC 2011
Diffstat (limited to 'testing/xorg-server')
| -rw-r--r-- | testing/xorg-server/PKGBUILD | 11 | ||||
| -rw-r--r-- | testing/xorg-server/autoconfig-sis.patch | 19 |
2 files changed, 27 insertions, 3 deletions
diff --git a/testing/xorg-server/PKGBUILD b/testing/xorg-server/PKGBUILD index a9121811c..ab8e8ae14 100644 --- a/testing/xorg-server/PKGBUILD +++ b/testing/xorg-server/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 136479 2011-08-30 08:44:30Z jgc $ +# $Id: PKGBUILD 138468 2011-09-24 11:29:23Z jgc $ # 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.11.0 +pkgver=1.11.1 pkgrel=1 arch=('i686' 'x86_64') license=('custom') @@ -12,11 +12,13 @@ makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtra 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 @@ build() { # 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 \ diff --git a/testing/xorg-server/autoconfig-sis.patch b/testing/xorg-server/autoconfig-sis.patch new file mode 100644 index 000000000..d936efaaa --- /dev/null +++ b/testing/xorg-server/autoconfig-sis.patch @@ -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) |