diff options
| -rw-r--r-- | xorg-server/.footprint.i686 | 2 | ||||
| -rw-r--r-- | xorg-server/.footprint.x86_64 | 2 | ||||
| -rw-r--r-- | xorg-server/.md5sum.i686 | 4 | ||||
| -rw-r--r-- | xorg-server/.md5sum.x86_64 | 4 | ||||
| -rwxr-xr-x | xorg-server/Pkgfile | 2 | ||||
| -rw-r--r-- | xorg-server/autoconfig-nvidia.patch | 55 |
6 files changed, 33 insertions, 36 deletions
diff --git a/xorg-server/.footprint.i686 b/xorg-server/.footprint.i686 index c59f391dc..d5f636f75 100644 --- a/xorg-server/.footprint.i686 +++ b/xorg-server/.footprint.i686 @@ -102,7 +102,6 @@ drwxr-xr-x root/root usr/include/xorg/ -rw-r--r-- root/root usr/include/xorg/mizerarc.h -rw-r--r-- root/root usr/include/xorg/msp3430.h -rw-r--r-- root/root usr/include/xorg/opaque.h --rw-r--r-- root/root usr/include/xorg/optionstr.h -rw-r--r-- root/root usr/include/xorg/os.h -rw-r--r-- root/root usr/include/xorg/panoramiX.h -rw-r--r-- root/root usr/include/xorg/panoramiXsrv.h @@ -157,7 +156,6 @@ drwxr-xr-x root/root usr/include/xorg/ -rw-r--r-- root/root usr/include/xorg/xf86Modes.h -rw-r--r-- root/root usr/include/xorg/xf86Module.h -rw-r--r-- root/root usr/include/xorg/xf86Opt.h --rw-r--r-- root/root usr/include/xorg/xf86Optionstr.h -rw-r--r-- root/root usr/include/xorg/xf86Optrec.h -rw-r--r-- root/root usr/include/xorg/xf86Parser.h -rw-r--r-- root/root usr/include/xorg/xf86Pci.h diff --git a/xorg-server/.footprint.x86_64 b/xorg-server/.footprint.x86_64 index c59f391dc..d5f636f75 100644 --- a/xorg-server/.footprint.x86_64 +++ b/xorg-server/.footprint.x86_64 @@ -102,7 +102,6 @@ drwxr-xr-x root/root usr/include/xorg/ -rw-r--r-- root/root usr/include/xorg/mizerarc.h -rw-r--r-- root/root usr/include/xorg/msp3430.h -rw-r--r-- root/root usr/include/xorg/opaque.h --rw-r--r-- root/root usr/include/xorg/optionstr.h -rw-r--r-- root/root usr/include/xorg/os.h -rw-r--r-- root/root usr/include/xorg/panoramiX.h -rw-r--r-- root/root usr/include/xorg/panoramiXsrv.h @@ -157,7 +156,6 @@ drwxr-xr-x root/root usr/include/xorg/ -rw-r--r-- root/root usr/include/xorg/xf86Modes.h -rw-r--r-- root/root usr/include/xorg/xf86Module.h -rw-r--r-- root/root usr/include/xorg/xf86Opt.h --rw-r--r-- root/root usr/include/xorg/xf86Optionstr.h -rw-r--r-- root/root usr/include/xorg/xf86Optrec.h -rw-r--r-- root/root usr/include/xorg/xf86Parser.h -rw-r--r-- root/root usr/include/xorg/xf86Pci.h diff --git a/xorg-server/.md5sum.i686 b/xorg-server/.md5sum.i686 index 6e0e87631..3fbfbab27 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 +6c7e87d63ac4b535e19a80c89d0cf091 autoconfig-nvidia.patch +256325e9b17dff479d92bed97f6b0adb xorg-server-1.11.4.tar.bz2 diff --git a/xorg-server/.md5sum.x86_64 b/xorg-server/.md5sum.x86_64 index 6e0e87631..3fbfbab27 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 +6c7e87d63ac4b535e19a80c89d0cf091 autoconfig-nvidia.patch +256325e9b17dff479d92bed97f6b0adb xorg-server-1.11.4.tar.bz2 diff --git a/xorg-server/Pkgfile b/xorg-server/Pkgfile index 3debe8eef..3c51f39c5 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.11.4 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..baa2eb601 100644 --- a/xorg-server/autoconfig-nvidia.patch +++ b/xorg-server/autoconfig-nvidia.patch @@ -1,28 +1,29 @@ -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; - #ifdef __linux__ -- driverList[idx++] = "nouveau"; -+ switch (dev->device_id) -+ { -+ /* NV1 */ -+ case 0x0008: -+ case 0x0009: -+ driverList[idx++] = "vesa"; -+ break; -+ /* NV3 */ -+ case 0x0018: -+ case 0x0019: -+ driverList[idx++] = "nouveau"; -+ break; -+ default: -+ driverList[idx++] = "nouveau"; -+ driverList[idx++] = "nvidia"; -+ break; -+ } - #endif - driverList[idx++] = "nv"; +--- a/hw/xfree86/common/xf86pciBus.c ++++ b/hw/xfree86/common/xf86pciBus.c +@@ -1123,7 +1123,25 @@ videoPtrToDriverList(struct pci_device * break; + case 0x102b: driverList[0] = "mga"; break; + case 0x10c8: driverList[0] = "neomagic"; break; +- case 0x10de: case 0x12d2: driverList[0] = "nv"; break; ++ case 0x10de: case 0x12d2: ++ switch (dev->device_id) { ++ /* NV1 */ ++ case 0x0008: ++ case 0x0009: ++ driverList[0] = "vesa"; ++ break; ++ /* NV3 */ ++ case 0x0018: ++ case 0x0019: ++ driverList[0] = "nv"; ++ break; ++ default: ++ driverList[0] = "nouveau"; ++ driverList[1] = "nv"; ++ driverList[2] = "nvidia"; ++ break; ++ } ++ break; + case 0x1106: driverList[0] = "openchrome"; break; + case 0x1b36: driverList[0] = "qxl"; break; + case 0x1163: driverList[0] = "rendition"; break; |