From 92ca2458cc541baab04a092378b1248348dbf703 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Apr 19 2011 18:00:14 +0000
Subject: swrastg rename


---

diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 30ca637..e3625bc 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -30,7 +30,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.10.1
-Release:   8%{?gitdate:.%{gitdate}}%{dist}
+Release:   9%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -93,6 +93,9 @@ Patch7009: xserver-1.10-bg-none-revert.patch
 # Will be in 1.10.2
 Patch7010: xserver-1.10.1-Xi-fix-valuator-alignment-in-DeepCopyDeviceClasses-3.patch
 
+# not like the upstream patch due to refactoring
+Patch7011: xserver-1.10-swrastg.patch
+
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -557,7 +560,10 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
-* Tue Apr 19 2011 Peter Hutterer <peter.hutterer@redhat.com> 1.10.1-7
+* Tue Apr 19 2011 Adam Jackson <ajax@redhat.com> 1.10.1-9
+- xserver-1.10-swrastg.patch: Also look for swrastg
+
+* Tue Apr 19 2011 Peter Hutterer <peter.hutterer@redhat.com> 1.10.1-8
 - xserver-1.10.1-Xi-fix-valuator-alignment-in-DeepCopyDeviceClasses-3.patch
   (#697450)
 
diff --git a/xserver-1.10-swrastg.patch b/xserver-1.10-swrastg.patch
new file mode 100644
index 0000000..7e39f65
--- /dev/null
+++ b/xserver-1.10-swrastg.patch
@@ -0,0 +1,31 @@
+From a7949c46adda1d4bc223e7832361373577455c1b Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 19 Apr 2011 13:50:12 -0400
+Subject: [PATCH] load swrastg
+
+---
+ glx/glxdriswrast.c |    8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/glx/glxdriswrast.c b/glx/glxdriswrast.c
+index 08ea338..14e7469 100644
+--- a/glx/glxdriswrast.c
++++ b/glx/glxdriswrast.c
+@@ -453,6 +453,14 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
+ 	     "%s/%s_dri.so", dri_driver_path, driverName);
+ 
+     screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
++
++    if (screen->driver == NULL) {
++	driverName = "swrastg";
++	snprintf(filename, sizeof filename,
++		 "%s/%s_dri.so", dri_driver_path, driverName);
++	screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
++    }
++
+     if (screen->driver == NULL) {
+ 	LogMessage(X_ERROR, "AIGLX error: dlopen of %s failed (%s)\n",
+ 		   filename, dlerror());
+-- 
+1.7.4.4
+