From 758c43a790bb41e49733d3782e8700d2293ac94ac39116e6402e075bde6ddb99 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Thu, 18 Jan 2007 00:48:45 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=8

---
 bug-211314_mesa-context.diff | 27 +++++++++++++++++++++++++++
 xorg-x11-server.changes      |  6 ++++++
 xorg-x11-server.spec         |  9 ++++++++-
 3 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 bug-211314_mesa-context.diff

diff --git a/bug-211314_mesa-context.diff b/bug-211314_mesa-context.diff
new file mode 100644
index 0000000..3d6c94e
--- /dev/null
+++ b/bug-211314_mesa-context.diff
@@ -0,0 +1,27 @@
+--- src/mesa/drivers/x11/xm_api.c.orig 	2006-11-30 20:45:42.000000000 +0100
++++ src/mesa/drivers/x11/xm_api.c	2006-11-30 20:47:12.000000000 +0100
+@@ -2101,7 +2101,11 @@ static void FXgetImage( XMesaBuffer b )
+    static unsigned short pixbuf[MAX_WIDTH];
+    GLuint x, y;
+    GLuint width, height;
+-   XMesaContext xmesa = XMESA_CONTEXT(ctx);
++   XMesaContext xmesa;
++   
++   if (! ctx)
++     return;
++   xmesa = XMESA_CONTEXT(ctx);
+ 
+ #ifdef XFree86Server
+    x = b->frontxrb->pixmap->x;
+@@ -2535,7 +2539,9 @@ void
+ XMesaResizeBuffers( XMesaBuffer b )
+ {
+    GET_CURRENT_CONTEXT(ctx);
+-   XMesaContext xmctx = XMESA_CONTEXT(ctx);
+-   xmesa_check_and_update_buffer_size(xmctx, b);
++   if (ctx) {
++     XMesaContext xmctx = XMESA_CONTEXT(ctx);
++     xmesa_check_and_update_buffer_size(xmctx, b);
++   }
+ }
+ 
diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index 80a902c..067538b 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan 17 20:21:04 CET 2007 - sndirsch@suse.de
+
+- bug-211314_mesa-context.diff:
+  * fixes Xserver crash in software rendering fallback (Bug #211314)
+
 -------------------------------------------------------------------
 Tue Jan 16 22:50:02 CET 2007 - sndirsch@suse.de
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index b8aabdf..0db2571 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -21,7 +21,7 @@ BuildRequires:  libjpeg-devel
 URL:            http://xorg.freedesktop.org/
 %define EXPERIMENTAL 0
 Version:        7.2
-Release:        43
+Release:        44
 License:        X11/MIT
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/X11/Servers/XF86_4
@@ -83,6 +83,7 @@ Patch40:        0018-vnc-support.txt.diff
 %endif
 Patch41:        loadmod-bug197195.diff
 Patch42:        bug227111-ddc_screensize.diff
+Patch43:        bug-211314_mesa-context.diff
 Patch334:       p_pci-domain.diff
 Patch357:       p_pci-ce-x.diff
 
@@ -177,6 +178,9 @@ popd
 %endif
 %patch41 -p1
 %patch42 -p1
+pushd ../Mesa
+%patch43 -p0
+popd
 
 %build
 autoreconf -fi
@@ -500,6 +504,9 @@ exit 0
 %endif
 
 %changelog -n xorg-x11-server
+* Wed Jan 17 2007 - sndirsch@suse.de
+- bug-211314_mesa-context.diff:
+  * fixes Xserver crash in software rendering fallback (Bug #211314)
 * Tue Jan 16 2007 - sndirsch@suse.de
 - 0018-vnc-support.txt.diff
   * fixed unresolved symbols vncRandomBytes/deskey in VNC module