configure.ac | 6 +++++-
src/vmware.c | 4 ++++
2 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 4d76cfe5e8e5d594ec357b0ef3339f56eeca9c64
Author: Jakob Bornecrantz <ja...@vmware.com>
Date: Tue Mar 20 22:05:30 2012 +0100
Bump version number for the release
Signed-off-by: Jakob Bornecrantz <ja...@vmware.com>
diff --git a/configure.ac b/configure.ac
index d12dd19..d57a3c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-vmware],
- [12.0.1],
+ [12.0.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-vmware])
AC_CONFIG_SRCDIR([Makefile.am])
commit c6f27561c7cf7c30f89493d64e3c5694b5f53469
Author: Jakob Bornecrantz <ja...@vmware.com>
Date: Mon Mar 19 14:53:34 2012 +0100
vmware/legacy: Fix crash on Xserver 1.12.0
Signed-off-by: Jakob Bornecrantz <ja...@vmware.com>
Reviewed-by: Zack Rusin <za...@vmware.com>
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.
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1sewl4-00063t...@vasks.debian.org
