Attachment 58683 Details for Bug 47280 – Fix

[patch] Fix

0001-vmware-legacy-Fix-crash-on-Xserver-1.12.0.patch (text/plain), 1.31 KB, created by Jakob Bornecrantz on 2012-03-19 06:57:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jakob Bornecrantz

Created: 2012-03-19 06:57:43 UTC

Size: 1.31 KB

patch

obsolete

>From 37c479e73c37cc0fa258ddbf2ce2d8781454eae7 Mon Sep 17 00:00:00 2001
>From: Jakob Bornecrantz <jakob@vmware.com>
>Date: Mon, 19 Mar 2012 14:53:34 +0100
>Subject: [PATCH] vmware/legacy: Fix crash on Xserver 1.12.0
>
>Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
>---
> configure.ac |    4 ++++
> src/vmware.c |    4 ++++
> 2 files changed, 8 insertions(+), 0 deletions(-)
>
>diff --git a/configure.ac b/configure.ac
>index 77ec7d6..d12dd19 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -90,6 +90,10 @@ PKG_CHECK_EXISTS([xorg-server >= 1.7.0],
>                  [Has version 1.7.0 or greater of the Xserver])
> 		 BUILD_VMWGFX=yes],[BUILD_VMWGFX=no])
> 
>+PKG_CHECK_EXISTS([xorg-server >= 1.12.0],
>+                 [AC_DEFINE([HAVE_XORG_SERVER_1_12_0], 1,
>+                 [Has version 1.12.0 or greater of the Xserver])])
>+
> # Obtain compiler/linker options for the vmwarectrl client tool
> PKG_CHECK_MODULES(X11, x11 xext)
> 
>diff --git a/src/vmware.c b/src/vmware.c
>index f20ddb9..e3892f1 100644
>--- a/src/vmware.c
>+++ b/src/vmware.c
>@@ -350,6 +350,10 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int flags)
>         return FALSE;
>     }
> 
>+#ifdef HAVE_XORG_SERVER_1_12_0
>+    vgaHWSetStdFuncs(VGAHWPTR(pScrn));
>+#endif
>+
>     /*
>      * Save the current video state.  Do it here before VMXGetVMwareSvgaId
>      * writes to any registers.
>-- 
>1.7.5.4
>

Actions: View | Splinter Review

Attachments on bug 47280: 58372 | 58373 | 58385 | 58386 | 58387 | 58683 | 60912 | 62503

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.