snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

xorg-server: update to 1.12.0.902 (1.12.1-RC1).

This commit is contained in:
Juan RP 2012-04-10 08:50:46 +02:00
parent 6d71a82cb5
commit 198bcb5122
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
srcpkgs/xorg-server/patches/autoconfig-nvidia.patch
View File

@ -1,10 +1,10 @@
--- hw/xfree86/common/xf86pciBus.c 2012-02-10 10:10:37.583014924 +0000 --- 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 +++ hw/xfree86/common/xf86pciBus.c 2012-02-10 11:16:07.148971317 +0000
@@ -1111,7 +1111,23 @@ @@ -1144,7 +1144,23 @@
{ int idx = 0;
int idx = 0;
#ifdef __linux__ #ifdef __linux__
- driverList[idx++] = "nouveau"; - driverList[idx++] = "nouveau";
+ switch (dev->device_id) + switch (dev->device_id)
+ { + {
+ /* NV1 */ + /* NV1 */
@ -23,5 +23,5 @@
+ break; + break;
+ } + }
#endif #endif
driverList[idx++] = "nv"; driverList[idx++] = "nv";
break; break;

18
srcpkgs/xorg-server/patches/autoconfig-sis.patch
View File

@ -1,10 +1,12 @@
--- hw/xfree86/common/xf86pciBus.c.orig 2011-09-24 10:53:45.421697668 +0000 --- 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 +++ hw/xfree86/common/xf86pciBus.c 2011-09-24 10:55:56.416250708 +0000
@@ -1140,7 +1140,15 @@ @@ -1200,9 +1200,15 @@
driverList[0] = "savage"; break; break;
} }
break; break;
- case 0x1039: driverList[0] = "sis"; break; - case 0x1039:
- driverList[0] = "sis";
- break;
+ case 0x1039: + case 0x1039:
+ switch (dev->device_id) + switch (dev->device_id)
+ { + {
@ -14,6 +16,6 @@
+ driverList[0] = "sis"; break; + driverList[0] = "sis"; break;
+ } + }
+ break; + break;
case 0x126f: driverList[0] = "siliconmotion"; break; case 0x126f:
case 0x121a: driverList[0] = "siliconmotion";
if (dev->device_id < 0x0003) break;

4
srcpkgs/xorg-server/template
View File

@ -1,6 +1,6 @@
# Template build file for 'xorg-server'. # Template build file for 'xorg-server'.
pkgname=xorg-server pkgname=xorg-server
version=1.12.0 version=1.12.0.902
distfiles="${XORG_SITE}/xserver/$pkgname-$version.tar.bz2" distfiles="${XORG_SITE}/xserver/$pkgname-$version.tar.bz2"
build_style=gnu-configure build_style=gnu-configure
configure_args="--enable-ipv6 --enable-xcsecurity --enable-record configure_args="--enable-ipv6 --enable-xcsecurity --enable-record
@ -15,7 +15,7 @@ short_desc="X11 server from X.org"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xorg.freedesktop.org" homepage="http://xorg.freedesktop.org"
license="MIT/X11, BSD" license="MIT/X11, BSD"
checksum=280a14c5de8697a4aab18dca85429671286e69e5ada0c1535f03666e56f07799 checksum=dbd81e096ec5d23b55b8fb67e08aefc2717e5c95209be1132432fd4461b41116
long_desc=" long_desc="
The X11 server from the modularized source tree of X.org." The X11 server from the modularized source tree of X.org."