Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=acd9bf758a5f1f11da56cc44b5e41a49c12e80e5

commit acd9bf758a5f1f11da56cc44b5e41a49c12e80e5
Author: Elentir <elen...@frugalware.org>
Date:   Mon Jul 25 17:59:14 2011 +0200

xorg-server-minimal-1.10.3-1-x86_64

* version bump

diff --git a/source/x11-extra/xorg-server-minimal/FrugalBuild 
b/source/x11-extra/xorg-server-minimal/FrugalBuild
index f30190e..5088a33 100644
--- a/source/x11-extra/xorg-server-minimal/FrugalBuild
+++ b/source/x11-extra/xorg-server-minimal/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=xorg-server-minimal
_F_xorg_name=xorg-server
-pkgver=1.10.2
+pkgver=1.10.3
pkgrel=1
pkgdesc="X.Org X Server for Fwife Install CD"
groups=('x11-extra')
@@ -22,10 +22,12 @@ up2date="lynx -dump $_F_xorg_url | grep -v '90[123456]' | 
Flasttar"
F_cd_path=$_F_xorg_name-$pkgver
options=("nodocs")
source=($source hack-since-suffix-support-is-half-br0ken.patch \
-       10-evdev.conf)
-sha1sums=('fd831b3c6297d1a68830c602d767752d87b9ca54' \
+        10-evdev.conf \
+        xorg-server-1.9-nouveau-default.patch)
+sha1sums=('1699be5c0edeca553cfa3ee6caa228483465136b' \
'6bee396c9f0ced47b63a6a3a4bfef5fa8bd79d79' \
-          '7a7802630be5a1477e247a1ce2e29f167c77bbfa')
+          '7a7802630be5a1477e247a1ce2e29f167c77bbfa' \
+          'bda6f333b53fcc2e1d823364a1e12e2061a66700')
Fconfopts="$Fconfopts --enable-install-setuid \
--disable-kdrive --disable-xvfb\
--disable-glx --disable-xvmc \
diff --git 
a/source/x11-extra/xorg-server-minimal/xorg-server-1.9-nouveau-default.patch 
b/source/x11-extra/xorg-server-minimal/xorg-server-1.9-nouveau-default.patch
new file mode 100644
index 0000000..7bbde41
--- /dev/null
+++ b/source/x11-extra/xorg-server-minimal/xorg-server-1.9-nouveau-default.patch
@@ -0,0 +1,31 @@
+diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
+index 74016af..9c296f5 100644
+--- a/hw/xfree86/common/xf86pciBus.c
++++ b/hw/xfree86/common/xf86pciBus.c
+@@ -1118,7 +1118,24 @@ videoPtrToDriverList(struct pci_device *dev,
+           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";
++              break;
++          }
++          break;
+       case 0x1106:                driverList[0] = "openchrome"; break;
+         case 0x1b36:              driverList[0] = "qxl"; break;
+       case 0x1163:                driverList[0] = "rendition"; break;
+--
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to