rpms/xorg-x11-server/devel xserver-1.5.0-dont-bitch-about-record.patch, NONE, 1.1 xserver-1.5.0-handle-failing-dri-create-screen.patch, NONE, 1.1 xorg-x11-server.spec, 1.320, 1.321

[Kristian Høgsberg (krh)]

Author: krh

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10118

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.5.0-dont-bitch-about-record.patch 
	xserver-1.5.0-handle-failing-dri-create-screen.patch 
Log Message:
* Fri Apr  4 2008 Kristian Høgsberg <krh at redhat.com> 1.4.99.901-7.20080401
- Add xserver-1.5.0-dont-bitch-about-record.patch (don't try to load
  librecord.so when we don't build it) and
  xserver-1.5.0-handle-failing-dri-create-screen.patch (#440491).


xserver-1.5.0-dont-bitch-about-record.patch:

--- NEW FILE xserver-1.5.0-dont-bitch-about-record.patch ---
>From 16a8ce75585ea360c39e0ffce4f7bb26a359b754 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Kristian=20H=C3=B8gsberg?= <krh at redhat.com>
Date: Thu, 3 Apr 2008 16:44:32 -0400
Subject: [PATCH] Only autoload RECORD if it was enabled.

---
 hw/xfree86/common/xf86Config.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 8de7426..208e23d 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -119,7 +119,9 @@ static ModuleDefault ModuleDefaults[] = {
     {.name = "dbe",      .toLoad = TRUE,    .load_opt=NULL},
     {.name = "glx",      .toLoad = TRUE,    .load_opt=NULL},
     {.name = "freetype", .toLoad = TRUE,    .load_opt=NULL},
+#ifdef XRECORD
     {.name = "record",   .toLoad = TRUE,    .load_opt=NULL},
+#endif
     {.name = "dri",      .toLoad = TRUE,    .load_opt=NULL},
     {.name = "dri2",     .toLoad = TRUE,    .load_opt=NULL},
     {.name = NULL,       .toLoad = FALSE,   .load_opt=NULL}
-- 
1.5.4.5


xserver-1.5.0-handle-failing-dri-create-screen.patch:

--- NEW FILE xserver-1.5.0-handle-failing-dri-create-screen.patch ---
>From ec17900f52bbd25d07566834756e5c7e832e0463 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Kristian=20H=C3=B8gsberg?= <krh at redhat.com>
Date: Fri, 4 Apr 2008 10:46:45 -0400
Subject: [PATCH] Convert __DRIconfigs after we've made sure createNewScreen succeeded.

---
 GL/glx/glxdri.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/GL/glx/glxdri.c b/GL/glx/glxdri.c
index ffa9a0b..9cd0738 100644
--- a/GL/glx/glxdri.c
+++ b/GL/glx/glxdri.c
@@ -1117,13 +1117,13 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
 					   &driConfigs,
 					   screen);
 
-    screen->base.fbconfigs = glxConvertConfigs(screen->core, driConfigs);
-
     if (screen->driScreen == NULL) {
 	LogMessage(X_ERROR, "AIGLX error: Calling driver entry point failed");
 	goto handle_error;
     }
 
+    screen->base.fbconfigs = glxConvertConfigs(screen->core, driConfigs);
+
     initializeExtensions(screen);
 
     DRIGetTexOffsetFuncs(pScreen, &screen->texOffsetStart,
-- 
1.5.4.5



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -r1.320 -r1.321
--- xorg-x11-server.spec	2 Apr 2008 16:56:31 -0000	1.320
+++ xorg-x11-server.spec	4 Apr 2008 14:56:28 -0000	1.321
@@ -20,7 +20,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.4.99.901
-Release:   16.%{gitdate}%{?dist}
+Release:   17.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -68,6 +68,8 @@
 Patch5011: xserver-1.5.0-fix-lsl-quirk.patch
 Patch5012: xserver-1.5.0-fix-dri2-crash-on-fail.patch
 Patch5013: xserver-1.5.0-unbreak-dri2-glcore-visuals.patch
+Patch5014: xserver-1.5.0-dont-bitch-about-record.patch
+Patch5015: xserver-1.5.0-handle-failing-dri-create-screen.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -516,6 +518,11 @@
 
 
 %changelog
+* Fri Apr  4 2008 Kristian Høgsberg <krh at redhat.com> 1.4.99.901-7.20080401
+- Add xserver-1.5.0-dont-bitch-about-record.patch (don't try to load
+  librecord.so when we don't build it) and
+  xserver-1.5.0-handle-failing-dri-create-screen.patch (#440491).
+
 * Wed Apr  2 2008 Kristian Høgsberg <krh at redhat.com> 1.4.99.901-16.20080401
 - Fix crash when DRI2 fails to initialize and crash when initializing
   software GL visuals (#440175).