summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpiernov <piernov@piernov.org>2012-04-14 12:38:13 +0200
committerpiernov <piernov@piernov.org>2012-04-14 12:38:13 +0200
commit50e59b4e4be9122e6c63f0149b4cc461b6daa55b (patch)
treee9576d7bf26156d9831474e2c2ff1378501edf9f
parent0843b1998e9b182d3e28afa3fa3fb49a9905c628 (diff)
downloadnutyx-extra-50e59b4e4be9122e6c63f0149b4cc461b6daa55b.tar.gz
nutyx-extra-50e59b4e4be9122e6c63f0149b4cc461b6daa55b.tar.bz2
nutyx-extra-50e59b4e4be9122e6c63f0149b4cc461b6daa55b.tar.xz
nutyx-extra-50e59b4e4be9122e6c63f0149b4cc461b6daa55b.zip
xorg-server 1.12.1-1 màj port
-rw-r--r--xorg-server/.md5sum.i6864
-rw-r--r--xorg-server/.md5sum.x86_644
-rwxr-xr-xxorg-server/Pkgfile2
-rw-r--r--xorg-server/autoconfig-nvidia.patch12
4 files changed, 11 insertions, 11 deletions
diff --git a/xorg-server/.md5sum.i686 b/xorg-server/.md5sum.i686
index 6e0e87631..0c45e2ec2 100644
--- a/xorg-server/.md5sum.i686
+++ b/xorg-server/.md5sum.i686
@@ -1,3 +1,3 @@
81ebef7087bde56dc70477884189054b 15-quirks.conf
-3221b838db9b4177102ea0069c4f30ca autoconfig-nvidia.patch
-3a3c4281f32c8702749e8f129372a355 xorg-server-1.12.0.tar.bz2
+3608c935868fbe684e5dce82965b1af9 autoconfig-nvidia.patch
+20e73b422bda6f0d1405af676983cc70 xorg-server-1.12.1.tar.bz2
diff --git a/xorg-server/.md5sum.x86_64 b/xorg-server/.md5sum.x86_64
index 6e0e87631..0c45e2ec2 100644
--- a/xorg-server/.md5sum.x86_64
+++ b/xorg-server/.md5sum.x86_64
@@ -1,3 +1,3 @@
81ebef7087bde56dc70477884189054b 15-quirks.conf
-3221b838db9b4177102ea0069c4f30ca autoconfig-nvidia.patch
-3a3c4281f32c8702749e8f129372a355 xorg-server-1.12.0.tar.bz2
+3608c935868fbe684e5dce82965b1af9 autoconfig-nvidia.patch
+20e73b422bda6f0d1405af676983cc70 xorg-server-1.12.1.tar.bz2
diff --git a/xorg-server/Pkgfile b/xorg-server/Pkgfile
index 736b2e9b6..84db64e96 100755
--- a/xorg-server/Pkgfile
+++ b/xorg-server/Pkgfile
@@ -6,7 +6,7 @@
# Run on: mesa3d,xorg-bdftopcf,xorg-mkfontdir,xorg-mkfontscale,xorg-libxkbui,xorg-libxtst,xorg-libdmx,xorg-libxxf86misc,xorg-libxaw,xorg-libxvmc,xorg-libxi,xorg-libxres,xorg-libxcomposite,xorg-libxinerama,xorg-libxrandr,xorg-libxft,xorg-libxcursor,xorg-libxxf86dga,xorg-libpixman,xorg-libpciaccess,xorg-libxscrnsaver
name=xorg-server
-version=1.12.0
+version=1.12.1
release=1
source=(http://xorg.freedesktop.org/releases/individual/xserver/$name-$version.tar.bz2
autoconfig-nvidia.patch
diff --git a/xorg-server/autoconfig-nvidia.patch b/xorg-server/autoconfig-nvidia.patch
index b900bf228..ba0268117 100644
--- a/xorg-server/autoconfig-nvidia.patch
+++ b/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;