rpms/xorg-x11-server/F-12 xorg-x11-server.spec, 1.536, 1.537 xserver-1.6.1-nouveau.patch, 1.2, 1.3

[Adam Jackson]

Author: ajax

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

Modified Files:
	xorg-x11-server.spec xserver-1.6.1-nouveau.patch 
Log Message:
* Fri Mar 05 2010 Adam Jackson <ajax at redhat.com> 1.7.5.901-2
- xserver-1.6.1-nouveau.patch: Fall back to nv if nouveau fails.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-12/xorg-x11-server.spec,v
retrieving revision 1.536
retrieving revision 1.537
diff -u -p -r1.536 -r1.537
--- xorg-x11-server.spec	5 Mar 2010 01:20:08 -0000	1.536
+++ xorg-x11-server.spec	5 Mar 2010 15:37:12 -0000	1.537
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.7.5.901
-Release:   1%{dist}
+Release:   2%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -522,6 +522,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Fri Mar 05 2010 Adam Jackson <ajax at redhat.com> 1.7.5.901-2
+- xserver-1.6.1-nouveau.patch: Fall back to nv if nouveau fails.
+
 * Fri Mar 05 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.7.5.901-1
 - xerver 1.7.5.901 (1.7.6RC1)
 

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

Index: xserver-1.6.1-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-12/xserver-1.6.1-nouveau.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xserver-1.6.1-nouveau.patch	24 Aug 2009 05:05:49 -0000	1.2
+++ xserver-1.6.1-nouveau.patch	5 Mar 2010 15:37:12 -0000	1.3
@@ -43,7 +43,6 @@ index 5fb75a4..45c79c9 100644
      return NULL;
  }
 diff --git a/glx/glxdri2.c b/glx/glxdri2.c
-index 529b2df..ff4490b 100644
 --- a/glx/glxdri2.c
 +++ b/glx/glxdri2.c
 @@ -587,6 +587,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
@@ -75,10 +74,9 @@ index 529b2df..ff4490b 100644
      return NULL;
  }
 diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
-index bc4c80b..d8fa80f 100644
 --- a/hw/xfree86/common/xf86AutoConfig.c
 +++ b/hw/xfree86/common/xf86AutoConfig.c
-@@ -180,7 +180,23 @@ videoPtrToDriverList(struct pci_device *dev,
+@@ -180,7 +180,24 @@ videoPtrToDriverList(struct pci_device *dev,
  	    break;
  	case 0x102b:		    driverList[0] = "mga";	break;
  	case 0x10c8:		    driverList[0] = "neomagic"; break;
@@ -97,6 +95,7 @@ index bc4c80b..d8fa80f 100644
 +		break;
 +	    default:
 +		driverList[0] = "nouveau";
++		driverList[1] = "nv";
 +		break;
 +	    }
 +	    break;