From b894f130a811172a8ed9d73f196cdd55f2df1549 Mon Sep 17 00:00:00 2001 From: Kristian Høgsberg Date: Apr 04 2008 14:56:28 +0000 Subject: * Fri Apr 4 2008 Kristian Høgsberg 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). --- diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 8ed9c12..5ff2961 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -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 @@ Patch5009: xserver-1.5.0-no-evdev-keyboards-kthnx.patch 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 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Apr 4 2008 Kristian Høgsberg 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 1.4.99.901-16.20080401 - Fix crash when DRI2 fails to initialize and crash when initializing software GL visuals (#440175). diff --git a/xserver-1.5.0-dont-bitch-about-record.patch b/xserver-1.5.0-dont-bitch-about-record.patch new file mode 100644 index 0000000..0580620 --- /dev/null +++ b/xserver-1.5.0-dont-bitch-about-record.patch @@ -0,0 +1,26 @@ +From 16a8ce75585ea360c39e0ffce4f7bb26a359b754 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Kristian=20H=C3=B8gsberg?= +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 + diff --git a/xserver-1.5.0-handle-failing-dri-create-screen.patch b/xserver-1.5.0-handle-failing-dri-create-screen.patch new file mode 100644 index 0000000..a177dbc --- /dev/null +++ b/xserver-1.5.0-handle-failing-dri-create-screen.patch @@ -0,0 +1,32 @@ +From ec17900f52bbd25d07566834756e5c7e832e0463 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Kristian=20H=C3=B8gsberg?= +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 +