xorg-server: Changes to 'debian-unstable'

[Julien Cristau <jcristau@alioth.debian.org>]

 GL/glx/glxglcore.c |    1 +
 debian/changelog   |    7 +++++++
 2 files changed, 8 insertions(+)

New commits:
commit ab92077a10831eff21971d4aa171cfa935c3e379
Author: Julien Cristau <jcristau@debian.org>
Date:   Fri Jan 9 02:26:35 2009 +0100

    Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index a316198..8b6e9b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.4.2-10) unstable; urgency=medium
+
+  * Cherry-pick from upstream: GLcore: make googleearth not crash the server
+    on sw-rendering (closes: #495483).
+
+ -- Julien Cristau <jcristau@debian.org>  Fri, 09 Jan 2009 02:26:06 +0100
+
 xorg-server (2:1.4.2-9) unstable; urgency=low
 
   * Cherry-pick patches from upstream to make xf86ScaleAxis() work correctly.

commit 76ba8884f8ef248011bdbaee54f51998934a25c7
Author: Dave Airlie <airlied@linux.ie>
Date:   Tue Apr 22 15:13:57 2008 +1000

    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.
    (cherry picked from commit a368ab757edf36ed7bbda023673d28883ce11231)
    (cherry picked from commit d7db6dd1a15393e9a30acfe87f7651ca1c9a0d75)

diff --git a/GL/glx/glxglcore.c b/GL/glx/glxglcore.c
index 679d55c..a29e0ea 100644
--- a/GL/glx/glxglcore.c
+++ b/GL/glx/glxglcore.c
@@ -390,6 +390,7 @@ __glXMesaScreenProbe(ScreenPtr pScreen)
     screen->base.destroy        = __glXMesaScreenDestroy;
     screen->base.createContext  = __glXMesaScreenCreateContext;
     screen->base.createDrawable = __glXMesaScreenCreateDrawable;
+    screen->base.swapInterval  = NULL;
     screen->base.pScreen       = pScreen;
 
     /*