From fcfad7427c190dd180b39b3b90c05b80139e575f Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@fedoraproject.org>
Date: Apr 23 2008 07:07:38 +0000
Subject: * Wed Apr 23 2008 Dave Airlie <airlied@redhat.com> 1.4.99.901-24.20080415

- xserver-1.5.0-glcore-swap-no-crashy.patch: Fix issue with googleearth
  crashing GLcore.

---

diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 3c9fe3d..8c6e1e1 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:   23.%{gitdate}%{?dist}
+Release:   24.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -53,6 +53,7 @@ Patch2013:  xserver-1.4.99-document-fontpath-correctly.patch
 
 # Trivial things to maybe merge upstream at next rebase
 Patch3000:  xserver-1.5.0-stenciled-visuals.patch
+Patch3001:  xserver-1.5.0-glcore-swap-no-crashy.patch
 
 # Trivial things to never merge upstream ever
 # Don't merge this without protecting the gccisms.
@@ -514,6 +515,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Apr 23 2008 Dave Airlie <airlied@redhat.com> 1.4.99.901-24.20080415
+- xserver-1.5.0-glcore-swap-no-crashy.patch: Fix issue with googleearth
+  crashing GLcore.
+
 * Tue Apr 22 2008 Adam Jackson <ajax@redhat.com> 1.4.99.901-23.20080415
 - xserver-1.5.0-stenciled-visuals.patch: Prefer visuals with a stencil
   buffer for the default GLX visual.  (Hans de Goede, #442510)
diff --git a/xserver-1.5.0-glcore-swap-no-crashy.patch b/xserver-1.5.0-glcore-swap-no-crashy.patch
new file mode 100644
index 0000000..6e95040
--- /dev/null
+++ b/xserver-1.5.0-glcore-swap-no-crashy.patch
@@ -0,0 +1,26 @@
+From a368ab757edf36ed7bbda023673d28883ce11231 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@linux.ie>
+Date: Tue, 22  Apr  2008  05:13:57  +0000
+Subject: GLcore: make googleearth not crash the server on sw-rendering.
+
+I don't think this is the 100% correct answer as I get log spam saying
+(EE) DoSwapInterval: cx = 0x98b8998, GLX screen = 0x96dd780
+(EE) AIGLX: cx->pGlxScreen->swapInterval == NULL
+
+but thats better than X exiting in my book.
+---
+diff --git a/GL/glx/glxglcore.c b/GL/glx/glxglcore.c
+index 1eac0eb..c8a2514 100644
+--- a/GL/glx/glxglcore.c
++++ b/GL/glx/glxglcore.c
+@@ -432,6 +432,7 @@ __glXMesaScreenProbe(ScreenPtr pScreen)
+     screen->base.destroy        = __glXMesaScreenDestroy;
+     screen->base.createContext  = __glXMesaScreenCreateContext;
+     screen->base.createDrawable = __glXMesaScreenCreateDrawable;
++    screen->base.swapInterval  = NULL;
+     screen->base.pScreen       = pScreen;
+ 
+     return &screen->base;
+--
+cgit v0.7.2-37-g538c
+