rpms/xorg-x11-server/OLPC-3 swrast-dont-abort.patch, 1.1, 1.2 xorg-x11-server.spec, 1.339, 1.340

[Daniel Drake (dsd)]

Author: dsd

Update of /cvs/pkgs/rpms/xorg-x11-server/OLPC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2076

Modified Files:
	swrast-dont-abort.patch xorg-x11-server.spec 
Log Message:
update swrast patch to upstream version, fixes errno bug


swrast-dont-abort.patch:

Index: swrast-dont-abort.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/OLPC-3/swrast-dont-abort.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- swrast-dont-abort.patch	24 Jul 2008 19:06:12 -0000	1.1
+++ swrast-dont-abort.patch	25 Jul 2008 15:57:01 -0000	1.2
@@ -1,30 +1,32 @@
-From 6bf46df463d19456761ae670f60e0b153e285bd9 Mon Sep 17 00:00:00 2001
+From eff25430b4a391409e39337962ff7697165d23c7 Mon Sep 17 00:00:00 2001
 From: Daniel Drake <dsd at laptop.org>
-Date: Thu, 24 Jul 2008 14:42:22 -0400
+Date: Thu, 24 Jul 2008 21:06:34 -0500
 Subject: [PATCH] Don't abort if swrast library is not present
 
+GLX is enabled by default, but the current swrast behaviour causes X
+to abort with fatal error if the swrast dri library dlopen fails.
+
+Handle the case where the swrast library is not present, and do not
+register the GLX extension unless at least one screen has a usable
+GL provider.
 ---
- glx/glxdriswrast.c |    6 ++++++
+ glx/glxdriswrast.c |    2 +-
  glx/glxext.c       |   37 ++++++++++++++++++++++++-------------
- 2 files changed, 30 insertions(+), 13 deletions(-)
+ 2 files changed, 25 insertions(+), 14 deletions(-)
 
 diff --git a/glx/glxdriswrast.c b/glx/glxdriswrast.c
-index cf4827e..20c39ab 100644
+index 199f5f8..2859704 100644
 --- a/glx/glxdriswrast.c
 +++ b/glx/glxdriswrast.c
-@@ -468,6 +468,12 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
+@@ -515,7 +515,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
  
-     screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
-     if (screen->driver == NULL) {
-+	if (errno == ENOENT) {
-+	    xfree(screen);
-+	    LogMessage(X_INFO, "AIGLX: swrast library %s not found\n",
-+		       filename);
-+	    return NULL;
-+	}
- 	LogMessage(X_ERROR, "AIGLX error: dlopen of %s failed (%s)\n",
- 		   filename, dlerror());
-         goto handle_error;
+     xfree(screen);
+ 
+-    FatalError("GLX: could not load software renderer\n");
++    LogMessage(X_ERROR, "GLX: could not load software renderer\n");
+ 
+     return NULL;
+ }
 diff --git a/glx/glxext.c b/glx/glxext.c
 index 13c65da..6ba404f 100644
 --- a/glx/glxext.c


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/OLPC-3/xorg-x11-server.spec,v
retrieving revision 1.339
retrieving revision 1.340
diff -u -r1.339 -r1.340
--- xorg-x11-server.spec	24 Jul 2008 19:06:12 -0000	1.339
+++ xorg-x11-server.spec	25 Jul 2008 15:57:01 -0000	1.340
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.4.99.906
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -462,6 +462,10 @@
 
 
 %changelog
+* Fri Jul 25 2008 Daniel Drake <dsd at laptop.org> 1.4.99.906-2
+- update no-swrast patch to the one that went upstream, this one had a bug
+  (dlopen isn't documented to populate errno)
+
 * Thu Jul 24 2008 Daniel Drake <dsd at laptop.org> 1.4.99.906-1
 - resync with F-9 for new xinput ABI
 - add patch to allow X server to run when mesa's swrast is not present