From 12d6c7b942457fc13f6f9555b385efec5d131669ff592b1d9831f9bdbf9e76cd Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Wed, 20 Feb 2013 13:47:22 +0000
Subject: [PATCH] - added u_init_framebuffer_base.patch: initialize buffer.base
 to fix   Xorg segfault in virtualbox guest (bnc#799480)

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=431
---
 u_init_framebuffer_base.patch | 21 +++++++++++++++++++++
 xorg-x11-server.changes       |  6 ++++++
 xorg-x11-server.spec          |  2 ++
 3 files changed, 29 insertions(+)
 create mode 100644 u_init_framebuffer_base.patch

diff --git a/u_init_framebuffer_base.patch b/u_init_framebuffer_base.patch
new file mode 100644
index 0000000..033eab4
--- /dev/null
+++ b/u_init_framebuffer_base.patch
@@ -0,0 +1,21 @@
+Index: xorg-server-1.13.2/glx/glxdri.c
+===================================================================
+--- xorg-server-1.13.2/glx/glxdri.c
++++ xorg-server-1.13.2/glx/glxdri.c
+@@ -971,13 +971,15 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
+     size_t buffer_size;
+     ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
+ 
++    framebuffer.base = NULL;
++
+     if (!xf86LoaderCheckSymbol("DRIQueryDirectRenderingCapable") ||
+         !DRIQueryDirectRenderingCapable(pScreen, &isCapable) || !isCapable) {
+         LogMessage(X_INFO,
+                    "AIGLX: Screen %d is not DRI capable\n", pScreen->myNum);
+         return NULL;
+     }
+-
++   
+     screen = calloc(1, sizeof *screen);
+     if (screen == NULL)
+         return NULL;
diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index b7923bc..492bf11 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb 20 13:36:40 UTC 2013 - sndirsch@suse.com
+
+- added u_init_framebuffer_base.patch: initialize buffer.base to fix 
+  Xorg segfault in virtualbox guest (bnc#799480)
+
 -------------------------------------------------------------------
 Thu Jan 31 18:09:30 UTC 2013 - tobias.johannes.klausmann@mni.thm.de
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 53133fb..e33ee3d 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -177,6 +177,7 @@ Patch220:       N_Use-external-tool-for-creating-backtraces-on-crashes.patch
 Patch222:       N_sync-fix.patch
 Patch225:       u_Do-not-use-intel-driver-on-Poulsbo-Oaktrail-Medfield.patch
 Patch226:       u_vgaHW-no-legacy.patch
+Patch227:       u_init_framebuffer_base.patch
 
 %description
 This package contains the X.Org Server.
@@ -295,6 +296,7 @@ cp %{SOURCE96} .
 #%patch222 -p1
 %patch225 -p1
 %patch226 -p0
+%patch227 -p1
 
 %build
 autoreconf -fi