rpms/xorg-x11-server/F-11 xorg-x11-server.spec, 1.453, 1.454 xserver-1.6.1-nouveau.patch, 1.3, 1.4

[Ben Skeggs]

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-server/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20931

Modified Files:
	xorg-x11-server.spec xserver-1.6.1-nouveau.patch 
Log Message:
* Wed Jul 29 2009 Ben Skeggs <bskeggs at redhat.com> 1.6.2-3
- Fix nouveau autoconfig patch (rh#512851)




Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/xorg-x11-server.spec,v
retrieving revision 1.453
retrieving revision 1.454
diff -u -p -r1.453 -r1.454
--- xorg-x11-server.spec	10 Jul 2009 14:30:33 -0000	1.453
+++ xorg-x11-server.spec	28 Jul 2009 23:02:45 -0000	1.454
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.2
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -532,6 +532,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jul 29 2009 Ben Skeggs <bskeggs at redhat.com> 1.6.2-3
+- Fix nouveau autoconfig patch (rh#512851)
+
 * Fri Jul 10 2009 Lubomir Rintel <lkundrak at v3.sk> 1.6.2-2
 - Add vboxvideo driver to the autodetection routine
 

xserver-1.6.1-nouveau.patch:
 glx/glxdri.c                       |    7 +++++--
 glx/glxdri2.c                      |    7 +++++--
 hw/xfree86/common/xf86AutoConfig.c |   28 ++++++++++++++++++++++++++--
 3 files changed, 36 insertions(+), 6 deletions(-)

Index: xserver-1.6.1-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/xserver-1.6.1-nouveau.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xserver-1.6.1-nouveau.patch	11 Jun 2009 05:40:29 -0000	1.3
+++ xserver-1.6.1-nouveau.patch	28 Jul 2009 23:02:45 -0000	1.4
@@ -78,7 +78,7 @@ diff --git a/hw/xfree86/common/xf86AutoC
 index 19c06c8..e40551e 100644
 --- a/hw/xfree86/common/xf86AutoConfig.c
 +++ b/hw/xfree86/common/xf86AutoConfig.c
-@@ -181,7 +181,31 @@ videoPtrToDriverList(struct pci_device *dev,
+@@ -181,7 +181,32 @@ videoPtrToDriverList(struct pci_device *dev,
  	case 0x102b:		    driverList[0] = "mga";	break;
  	case 0x10c8:		    driverList[0] = "neomagic"; break;
  	case 0x105d:		    driverList[0] = "i128";	break;
@@ -108,6 +108,7 @@ index 19c06c8..e40551e 100644
 +		}
 +		break;
 +	    }
++	    break;
  	case 0x1163:		    driverList[0] = "rendition"; break;
  	case 0x5333:
  	    switch (dev->device_id)