ChangeLog | 17 +++++++++++++++++
configure.ac | 6 +++++-
debian/changelog | 7 +++++++
src/vmware.c | 4 ++++
4 files changed, 33 insertions(+), 1 deletion(-)
New commits:
commit 3d66c43b9c0ab152dd827b9602755184bf22628b
Author: Cyril Brulebois <k...@debian.org>
Date: Mon Apr 2 01:41:48 2012 +0000
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 9559f18..5546265 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-vmware (1:12.0.2-1) UNRELEASED; urgency=low
+xserver-xorg-video-vmware (1:12.0.2-1) unstable; urgency=low
* New upstream release:
- Fix crash when built against Xserver 1.12.
- -- Cyril Brulebois <k...@debian.org> Mon, 02 Apr 2012 01:41:17 +0000
+ -- Cyril Brulebois <k...@debian.org> Mon, 02 Apr 2012 01:41:44 +0000
xserver-xorg-video-vmware (1:12.0.1-1) unstable; urgency=low
commit 14ce6e274691a961c664b5dcd9edc3ade69f69da
Author: Cyril Brulebois <k...@debian.org>
Date: Mon Apr 2 01:41:42 2012 +0000
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index 34051cf..2a5d2ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+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>
+
+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>
+
commit b70116b907aa8545f0275589a52275235083bb40
Author: Zack Rusin <za...@vmware.com>
Date: Thu Mar 15 11:37:26 2012 -0400
diff --git a/debian/changelog b/debian/changelog
index a682399..9559f18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-vmware (1:12.0.2-1) UNRELEASED; urgency=low
+
+ * New upstream release:
+ - Fix crash when built against Xserver 1.12.
+
+ -- Cyril Brulebois <k...@debian.org> Mon, 02 Apr 2012 01:41:17 +0000
+
xserver-xorg-video-vmware (1:12.0.1-1) unstable; urgency=low
* New upstream release.
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/e1sewl3-00063e...@vasks.debian.org
