xserver-xorg-video-vmware: Changes to 'debian-experimental'
ChangeLog | 126 +++++++++++++++++
Makefile.am | 2
configure.ac | 22 ++
debian/changelog | 12 +
debian/control | 5
debian/rules | 1
debian/xserver-xorg-video-vmware.install | 1
src/Makefile.am | 4
src/bits2pixels.c | 1
src/bits2pixels.h | 2
src/guest_os.h | 2
src/includeCheck.h | 1
src/svga_limits.h | 2
src/vm_basic_types.h | 2
src/vm_device_version.h | 2
src/vmware.c | 93 ++++++++----
src/vmware.h | 2
src/vmwarectrl.c | 10 -
src/vmwarecurs.c | 1
src/vmwaremodule.c | 56 ++++++-
src/vmwarevideo.c | 41 ++++-
src/vmwarexinerama.c | 7
vmwarectrl/AUTHORS | 1
vmwarectrl/COPYING | 26 ---
vmwarectrl/ChangeLog | 8 -
vmwarectrl/INSTALL | 229 -------------------------------
vmwarectrl/Makefile.am | 12 +
vmwarectrl/NEWS | 4
vmwarectrl/README | 6
vmwarectrl/autogen.sh | 12 -
vmwarectrl/configure.ac | 12 -
31 files changed, 331 insertions(+), 374 deletions(-)
New commits:
commit 1e7ec47bf050dabbaf945f2abf97522698a72f6d
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Nov 9 17:47:11 2010 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index 7e952ba..d2b252c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-vmware (1:11.0.3-1) UNRELEASED; urgency=low
+xserver-xorg-video-vmware (1:11.0.3-1) experimental; urgency=low
* New upstream release.
* No longer require libdrm-dev on hurd-i386, since upstream now supports
@@ -8,7 +8,7 @@ xserver-xorg-video-vmware (1:11.0.3-1) UNRELEASED; urgency=low
client tool.
* Add usr/bin/vmwarectrl to .install file accordingly.
- -- Cyril Brulebois <kibi@debian.org> Tue, 09 Nov 2010 16:32:14 +0100
+ -- Cyril Brulebois <kibi@debian.org> Tue, 09 Nov 2010 17:47:08 +0100
xserver-xorg-video-vmware (1:11.0.2-1) experimental; urgency=low
commit d44eda8d3889a4de674d42e0eb8b888f40e5e0b8
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Nov 9 17:46:09 2010 +0100
Add usr/bin/vmwarectrl to .install file accordingly.
diff --git a/debian/changelog b/debian/changelog
index 8f31c61..7e952ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ xserver-xorg-video-vmware (1:11.0.3-1) UNRELEASED; urgency=low
* Add build-dep on libx11-dev, needed for vmwarectrl.
* Pass --enable-vmwarectrl-client to enable the vmwarectrl unit test
client tool.
+ * Add usr/bin/vmwarectrl to .install file accordingly.
-- Cyril Brulebois <kibi@debian.org> Tue, 09 Nov 2010 16:32:14 +0100
diff --git a/debian/xserver-xorg-video-vmware.install b/debian/xserver-xorg-video-vmware.install
index 614cfb4..daa64ce 100644
--- a/debian/xserver-xorg-video-vmware.install
+++ b/debian/xserver-xorg-video-vmware.install
@@ -1,2 +1,3 @@
usr/lib/xorg/modules/drivers/*.so
usr/share/man/man4/*
+usr/bin/vmwarectrl
commit 7679e7867a4c460e423fff066a0f0d3be4545c86
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Nov 9 17:44:30 2010 +0100
Pass --enable-vmwarectrl-client to enable the vmwarectrl unit test client tool.
diff --git a/debian/changelog b/debian/changelog
index 30a4e3a..8f31c61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ xserver-xorg-video-vmware (1:11.0.3-1) UNRELEASED; urgency=low
* No longer require libdrm-dev on hurd-i386, since upstream now supports
building and running without libdrm.
* Add build-dep on libx11-dev, needed for vmwarectrl.
+ * Pass --enable-vmwarectrl-client to enable the vmwarectrl unit test
+ client tool.
-- Cyril Brulebois <kibi@debian.org> Tue, 09 Nov 2010 16:32:14 +0100
diff --git a/debian/rules b/debian/rules
index ad087b1..fedf586 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,6 +42,7 @@ build/Makefile: configure
cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
+ --enable-vmwarectrl-client \
CFLAGS="$(CFLAGS)"
build: build-stamp
commit 941eb6333ca6651ae5598669f71a5f7cf79401ad
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Nov 9 17:39:55 2010 +0100
Add build-dep on libx11-dev, needed for vmwarectrl.
diff --git a/debian/changelog b/debian/changelog
index fddf108..30a4e3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-video-vmware (1:11.0.3-1) UNRELEASED; urgency=low
* New upstream release.
* No longer require libdrm-dev on hurd-i386, since upstream now supports
building and running without libdrm.
+ * Add build-dep on libx11-dev, needed for vmwarectrl.
-- Cyril Brulebois <kibi@debian.org> Tue, 09 Nov 2010 16:32:14 +0100
diff --git a/debian/control b/debian/control
index b91c52c..0cc781b 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,8 @@ Build-Depends:
libtool,
xutils-dev (>= 1:7.5+4),
libdrm-dev [!hurd-i386],
- libxext-dev
+ libxext-dev,
+ libx11-dev,
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-vmware
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-vmware.git
commit e0201de1f5aa4c73ad9e8bf3292ed246ed72c1ad
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Nov 9 17:38:18 2010 +0100
No longer require libdrm-dev on hurd-i386.
Upstream now supports building and running without libdrm.
diff --git a/debian/changelog b/debian/changelog
index 4968dd2..fddf108 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
xserver-xorg-video-vmware (1:11.0.3-1) UNRELEASED; urgency=low
* New upstream release.
+ * No longer require libdrm-dev on hurd-i386, since upstream now supports
+ building and running without libdrm.
-- Cyril Brulebois <kibi@debian.org> Tue, 09 Nov 2010 16:32:14 +0100
diff --git a/debian/control b/debian/control
index 7b647f9..b91c52c 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
automake,
libtool,
xutils-dev (>= 1:7.5+4),
- libdrm-dev,
+ libdrm-dev [!hurd-i386],
libxext-dev
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-vmware
commit 64f0087705e1c0fbe2e2fb823ffdd65725668db8
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Nov 9 16:32:29 2010 +0100
Update changelogs.
diff --git a/ChangeLog b/ChangeLog
index 4143185..3e9b3d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,129 @@
+commit 8f8f71f0075d9d5cbbfca93425462ba03c5b8046
+Author: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Tue Nov 9 14:31:30 2010 +0100
+
+ Bump package version to 11.0.3 for release
+
+ Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+
+commit 30ac6eaf64aa4831025555b72b65843686a35094
+Author: Jesse Adkins <jesserayadkins@gmail.com>
+Date: Tue Sep 28 13:29:52 2010 -0700
+
+ Purge cvs tags.
+
+ Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 083a663bbb186bfb854eda3b9f33d7fc24252ec5
+Author: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Thu Sep 16 10:08:12 2010 +0200
+
+ Make the modinfo string contain an optional subpatch number
+
+ The idea is that the build system assigns this number if needed.
+ As an example it might be the commit number since the last version tag.
+
+ Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+
+commit 5a2206c328caaed95daf91aff9220d3a51b492bd
+Author: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Thu Sep 16 09:58:07 2010 +0200
+
+ Make sure we build on 1.4.99.
+
+ Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+
+commit da0f931b90833c7f706ace24b0c9dff2672f1e97
+Author: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Wed Sep 8 09:57:35 2010 +0200
+
+ vmwlegacy: Fix a segfault in vmwareCursorCloseScreen.
+
+ The segfault occured because the named function was using resources that
+ were already taken down, because VMWARECloseScreen was called very late
+ in the CloseScreen callchain.
+
+ Make sure we wrap the CloseScreen pointers late in ScreenInit to avoid this.
+
+ Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+
+commit 03dca39afa06da04472d56ec4888f010186c6a13
+Author: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Tue Sep 7 21:55:28 2010 +0200
+
+ vmwlegacy: A number of Xv fixes
+
+ Properly init and uninit the port private clipboxes on setup and end.
+ Clear the port private clipboxes on video stop, to force re-painting
+ of the colorkey when the stream is resumed.
+ Make sure the colorkey is painted *before* the overlay is flushed. Some
+ host implementations seem picky about this.
+
+ Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+
+commit dfb062e024dfd20789ee8d43c7f94640faa5ea9f
+Author: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Tue Sep 7 12:17:46 2010 +0200
+
+ vmware/vmwlegacy: Silence compilation errors and -warnings.
+
+ Silence warnings and errors on various server versions due to incorrect
+ usage of libc functions.
+
+ Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+
+commit 12e4577c020c6905d09459d833fd1c5313f1647b
+Author: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Fri Sep 3 11:19:01 2010 +0200
+
+ vmwlegacy: Always scale screen dimensions to the initial DPI on modeswitch.
+
+ When we switch mode we usually alter the size in a constant DPI environment
+ rather than keeping the size constant and alter the DPI.
+
+ Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+
+commit 81a0a1a37e703296d109022bb76a1291e84064fd
+Author: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Wed Sep 1 07:58:18 2010 +0200
+
+ vmware: Handle chain-loader failures gracefully.
+
+ If the vmwlegacy driver wasn't present when expected, that would
+ leave the X server in a confused state. Thus report loading errors properly
+ back to the X server.
+
+ Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+
+commit 2a72ea7a1b1519451350e0741d145f513124a208
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Aug 18 10:57:02 2010 -0400
+
+ vmwarectrl: rework standalone package as a subdir of driver
+
+ vmwarectrl is a unit test client tool for developers.
+ By default, it is not built unless --enable-vmwarectrl-client is used.
+
+ Acked-by: Thomas Hellstrom <thellstrom@vmware.com>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit f51ca2cb756dcd541a27f0326496f0aadab3f214
+Author: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Wed Aug 18 11:34:49 2010 +0200
+
+ Make the driver build and run without libdrm.
+
+ Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+
+commit 2e6eca3e7bb19ea69db2cc367c9704c7d657db79
+Author: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Thu Aug 12 17:43:59 2010 +0200
+
+ Only set the first xinerama output as primary.
+
+ Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+
commit 456b74e8778ab0c44e8a70aa45f447ff5c562be3
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 10 11:02:05 2010 -0400
diff --git a/debian/changelog b/debian/changelog
index 20ab210..4968dd2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-vmware (1:11.0.3-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Cyril Brulebois <kibi@debian.org> Tue, 09 Nov 2010 16:32:14 +0100
+
xserver-xorg-video-vmware (1:11.0.2-1) experimental; urgency=low
[ Robert Hooker ]
commit 8f8f71f0075d9d5cbbfca93425462ba03c5b8046
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date: Tue Nov 9 14:31:30 2010 +0100
Bump package version to 11.0.3 for release
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
diff --git a/configure.ac b/configure.ac
index 9ccdf25..e3dcf30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-vmware],
- [11.0.2],
+ [11.0.3],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-vmware])
AC_CONFIG_SRCDIR([Makefile.am])
commit 30ac6eaf64aa4831025555b72b65843686a35094
Author: Jesse Adkins <jesserayadkins@gmail.com>
Date: Tue Sep 28 13:29:52 2010 -0700
Purge cvs tags.
Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/src/bits2pixels.c b/src/bits2pixels.c
index 2a1cc14..e3801c5 100644
--- a/src/bits2pixels.c
+++ b/src/bits2pixels.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/bits2pixels.c,v 1.1 2001/04/05 19:29:43 dawes Exp $ */
/* **********************************************************
* Copyright (C) 1999-2001 VMware, Inc.
* All Rights Reserved
diff --git a/src/bits2pixels.h b/src/bits2pixels.h
index 585f6fc..7eb4631 100644
--- a/src/bits2pixels.h
+++ b/src/bits2pixels.h
@@ -1,8 +1,6 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/bits2pixels.h,v 1.2 2002/12/11 17:07:58 dawes Exp $ */
/* **********************************************************
* Copyright (C) 1999-2001 VMware, Inc.
* All Rights Reserved
- * Id: bits2pixels.h,v 1.4 2001/01/26 23:32:15 yoel Exp $
* **********************************************************/
/*
diff --git a/src/guest_os.h b/src/guest_os.h
index dedebe0..4beaf7c 100644
--- a/src/guest_os.h
+++ b/src/guest_os.h
@@ -1,8 +1,6 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/guest_os.h,v 1.1 2001/04/05 19:29:44 dawes Exp $ */
/* *********************************************************
* Copyright (C) 1999-2001 VMware, Inc.
* All Rights Reserved
- * Id: guest_os.h,v 1.5 2001/01/26 23:32:15 yoel Exp $
* **********************************************************/
#ifndef _GUEST_OS_H_
diff --git a/src/includeCheck.h b/src/includeCheck.h
index 8df4666..88ac8ef 100644
--- a/src/includeCheck.h
+++ b/src/includeCheck.h
@@ -1,3 +1,2 @@
/* This space intentionally left blank. */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/includeCheck.h,v 1.3 2002/10/16 22:12:53 alanh Exp $ */
diff --git a/src/svga_limits.h b/src/svga_limits.h
index 209dd8f..3b35ccc 100644
--- a/src/svga_limits.h
+++ b/src/svga_limits.h
@@ -1,8 +1,6 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/svga_limits.h,v 1.1 2001/04/05 19:29:44 dawes Exp $ */
/* **********************************************************
* Copyright (C) 1998-2001 VMware, Inc.
* All Rights Reserved
- * $Id$
* **********************************************************/
/*
diff --git a/src/vm_basic_types.h b/src/vm_basic_types.h
index 673522f..37272ee 100644
--- a/src/vm_basic_types.h
+++ b/src/vm_basic_types.h
@@ -1,8 +1,6 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/vm_basic_types.h,v 1.5 2002/01/07 20:38:29 dawes Exp $ */
/* **********************************************************
* Copyright (C) 1998-2001 VMware, Inc.
* All Rights Reserved
- * Id: vm_basic_types.h,v 1.9 2001/02/14 22:22:53 bennett Exp $
* **********************************************************/
/*
diff --git a/src/vm_device_version.h b/src/vm_device_version.h
index 8f6dd3b..92a5cac 100644
--- a/src/vm_device_version.h
+++ b/src/vm_device_version.h
@@ -1,8 +1,6 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/vm_device_version.h,v 1.1 2001/04/05 19:29:44 dawes Exp $ */
/* **********************************************************
* Copyright (C) 1998-2001 VMware, Inc.
* All Rights Reserved
- * Id: vm_device_version.h,v 1.2 2001/01/26 21:53:27 yoel Exp $
* **********************************************************/
diff --git a/src/vmware.c b/src/vmware.c
index 8560b0e..73e86fe 100644
--- a/src/vmware.c
+++ b/src/vmware.c
@@ -6,7 +6,6 @@
char rcsId_vmware[] =
"Id: vmware.c,v 1.11 2001/02/23 02:10:39 yoel Exp $";
#endif
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/vmware.c,v 1.18 2003/09/24 02:43:31 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff --git a/src/vmware.h b/src/vmware.h
index a3920ab..9216dcd 100644
--- a/src/vmware.h
+++ b/src/vmware.h
@@ -1,9 +1,7 @@
/* **********************************************************
* Copyright (C) 1998-2001 VMware, Inc.
* All Rights Reserved
- * Id: vmware.h,v 1.6 2001/01/30 18:13:47 bennett Exp $
* **********************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/vmware.h,v 1.11 2003/04/13 18:09:27 dawes Exp $ */
#ifndef VMWARE_H
#define VMWARE_H
diff --git a/src/vmwarecurs.c b/src/vmwarecurs.c
index 38c5988..2e2effb 100644
--- a/src/vmwarecurs.c
+++ b/src/vmwarecurs.c
@@ -6,7 +6,6 @@
char rcsId_vmwarecurs[] =
"Id: vmwarecurs.c,v 1.5 2001/01/30 23:33:02 bennett Exp $";
#endif
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/vmwarecurs.c,v 1.10 2003/02/04 01:39:53 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
commit 083a663bbb186bfb854eda3b9f33d7fc24252ec5
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date: Thu Sep 16 10:08:12 2010 +0200
Make the modinfo string contain an optional subpatch number
The idea is that the build system assigns this number if needed.
As an example it might be the commit number since the last version tag.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
diff --git a/src/vmware.c b/src/vmware.c
index ed31b02..8560b0e 100644
--- a/src/vmware.c
+++ b/src/vmware.c
@@ -101,12 +101,21 @@ static const char VMWAREBuildStr[] = "VMware Guest X Server "
/*
* Standard four digit version string expected by VMware Tools installer.
- * As the driver's version is only {major, minor, patchlevel}, simply append an
- * extra zero for the fourth digit.
+ * As the driver's version is only {major, minor, patchlevel},
+ * The fourth digit may describe the commit number relative to the
+ * last version tag as output from `git describe`
*/
+
#ifdef __GNUC__
-const char vmwlegacy_drv_modinfo[] __attribute__((section(".modinfo"),unused)) =
- "version=" VMWARE_DRIVER_VERSION_STRING ".0";
+#ifdef VMW_SUBPATCH
+const char vmwlegacy_drv_modinfo[]
+__attribute__((section(".modinfo"),unused)) =
+ "version=" VMWARE_DRIVER_VERSION_STRING "." VMW_STRING(VMW_SUBPATCH);
+#else
+const char vmwlegacy_drv_modinfo[]
+__attribute__((section(".modinfo"),unused)) =
+ "version=" VMWARE_DRIVER_VERSION_STRING ".0";
+#endif /*VMW_SUBPATCH*/
#endif
static SymTabRec VMWAREChipsets[] = {
diff --git a/src/vmwaremodule.c b/src/vmwaremodule.c
index 392062f..2754879 100644
--- a/src/vmwaremodule.c
+++ b/src/vmwaremodule.c
@@ -62,12 +62,19 @@
/*
* Standard four digit version string expected by VMware Tools installer.
- * As the driver's version is only {major, minor, patchlevel}, simply append an
- * extra zero for the fourth digit.
+ * As the driver's version is only {major, minor, patchlevel},
+ * the fourth digit may describe the commit number relative to the
+ * last version tag as output from `git describe`
*/
+
#ifdef __GNUC__
+#ifdef VMW_SUBPATCH
+const char vmware_drv_modinfo[] __attribute__((section(".modinfo"),unused)) =
+ "version=" VMWARE_DRIVER_VERSION_STRING "." VMW_STRING(VMW_SUBPATCH);
+#else
const char vmware_drv_modinfo[] __attribute__((section(".modinfo"),unused)) =
- "version=" VMWARE_DRIVER_VERSION_STRING ".0";
+ "version=" VMWARE_DRIVER_VERSION_STRING ".0";
+#endif /*VMW_SUBPATCH*/
#endif
static XF86ModuleVersionInfo vmware_version;
commit 5a2206c328caaed95daf91aff9220d3a51b492bd
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date: Thu Sep 16 09:58:07 2010 +0200
Make sure we build on 1.4.99.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
diff --git a/configure.ac b/configure.ac
index 0ea3472..9ccdf25 100644
--- a/configure.ac
+++ b/configure.ac
@@ -89,7 +89,7 @@ PKG_CHECK_EXISTS([xorg-server >= 1.2.0],
[AC_DEFINE([HAVE_XORG_SERVER_1_2_0], 1,
[Has version 1.2.0 or greater of the Xserver])])
-PKG_CHECK_EXISTS([xorg-server >= 1.5.0],
+PKG_CHECK_EXISTS([xorg-server >= 1.4.99],
[AC_DEFINE([HAVE_XORG_SERVER_1_5_0], 1,
[Has version 1.5.0 or greater of the Xserver])])
commit da0f931b90833c7f706ace24b0c9dff2672f1e97
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date: Wed Sep 8 09:57:35 2010 +0200
vmwlegacy: Fix a segfault in vmwareCursorCloseScreen.
The segfault occured because the named function was using resources that
were already taken down, because VMWARECloseScreen was called very late
in the CloseScreen callchain.
Make sure we wrap the CloseScreen pointers late in ScreenInit to avoid this.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
diff --git a/src/vmware.c b/src/vmware.c
index a4e4d08..ed31b02 100644
--- a/src/vmware.c
+++ b/src/vmware.c
@@ -1748,12 +1748,9 @@ VMWAREScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
fbPictureInit (pScreen, 0, 0);
/*
- * Save the old screen vector, then wrap CloseScreen and
- * set SaveScreen.
+ * Save the old screen vector.
*/
pVMWARE->ScrnFuncs = *pScreen;
- pScreen->CloseScreen = VMWARECloseScreen;
- pScreen->SaveScreen = VMWARESaveScreen;
/*
* Set initial black & white colourmap indices.
@@ -1864,6 +1861,17 @@ VMWAREScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
}
}
+ /**
+ * Wrap CloseScreen and SaveScreen. Do this late since we
+ * want to be first in the callchain, to avoid using resources
+ * already taken down in CloseScreen.
+ */
+
+ pVMWARE->ScrnFuncs.CloseScreen = pScreen->CloseScreen;
+ pVMWARE->ScrnFuncs.SaveScreen = pScreen->SaveScreen;
+
+ pScreen->CloseScreen = VMWARECloseScreen;
+ pScreen->SaveScreen = VMWARESaveScreen;
/* Done */
return TRUE;
commit 03dca39afa06da04472d56ec4888f010186c6a13
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date: Tue Sep 7 21:55:28 2010 +0200
vmwlegacy: A number of Xv fixes
Properly init and uninit the port private clipboxes on setup and end.
Clear the port private clipboxes on video stop, to force re-painting
of the colorkey when the stream is resumed.
Make sure the colorkey is painted *before* the overlay is flushed. Some
host implementations seem picky about this.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
diff --git a/src/vmwarevideo.c b/src/vmwarevideo.c
index 7f78887..4ce0d5d 100644
--- a/src/vmwarevideo.c
+++ b/src/vmwarevideo.c
@@ -510,6 +510,7 @@ vmwareVideoEnd(ScreenPtr pScreen)
pVid = (VMWAREVideoPtr) &pVMWARE->videoStreams[VMWARE_VID_NUM_PORTS];
for (i = 0; i < VMWARE_VID_NUM_PORTS; ++i) {
vmwareVideoEndStream(pScrn, &pVid[i]);
+ REGION_UNINIT(pScreen, &pVid[i].clipBoxes);
}
free(pVMWARE->videoStreams);
@@ -577,6 +578,7 @@ vmwareVideoSetup(ScrnInfoPtr pScrn)
pPriv[i].flags = SVGA_VIDEO_FLAG_COLORKEY;
pPriv[i].colorKey = VMWARE_VIDEO_COLORKEY;
pPriv[i].isAutoPaintColorkey = TRUE;
+ REGION_NULL(pScreen, &pPriv[i].clipBoxes);
adaptor->pPortPrivates[i].ptr = &pPriv[i];
}
pVMWARE->videoStreams = du;
@@ -671,7 +673,17 @@ vmwareVideoInitStream(ScrnInfoPtr pScrn, VMWAREVideoPtr pVid,
REGION_COPY(pScrn->pScreen, &pVid->clipBoxes, clipBoxes);
if (pVid->isAutoPaintColorkey) {
+ BoxPtr boxes = REGION_RECTS(&pVid->clipBoxes);
+ int nBoxes = REGION_NUM_RECTS(&pVid->clipBoxes);
+
xf86XVFillKeyHelper(pScrn->pScreen, pVid->colorKey, clipBoxes);
+
+ /**
+ * Force update to paint the colorkey before the overlay flush.
+ */
+
+ while(nBoxes--)
+ vmwareSendSVGACmdUpdate(pVMWARE, boxes++);
}
VmwareLog(("Got offscreen region, offset %d, size %d "
@@ -841,7 +853,18 @@ vmwareVideoPlay(ScrnInfoPtr pScrn, VMWAREVideoPtr pVid,
if (!vmwareIsRegionEqual(&pVid->clipBoxes, clipBoxes)) {
REGION_COPY(pScrn->pScreen, &pVid->clipBoxes, clipBoxes);
if (pVid->isAutoPaintColorkey) {
+ BoxPtr boxes = REGION_RECTS(&pVid->clipBoxes);
+ int nBoxes = REGION_NUM_RECTS(&pVid->clipBoxes);
+
xf86XVFillKeyHelper(pScrn->pScreen, pVid->colorKey, clipBoxes);
+
+ /**
+ * Force update to paint the colorkey before the overlay flush.
+ */
+
+ while(nBoxes--)
+ vmwareSendSVGACmdUpdate(pVMWARE, boxes++);
+
}
}
@@ -1093,6 +1116,9 @@ vmwareStopVideo(ScrnInfoPtr pScrn, pointer data, Bool Cleanup)
if (!vmwareVideoEnabled(pVMWARE)) {
return;
}
+
+ REGION_EMPTY(pScrn->pScreen, &pVid->clipBoxes);
+
if (!Cleanup) {
VmwareLog(("vmwareStopVideo: Cleanup is FALSE.\n"));
return;
commit dfb062e024dfd20789ee8d43c7f94640faa5ea9f
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date: Tue Sep 7 12:17:46 2010 +0200
vmware/vmwlegacy: Silence compilation errors and -warnings.
Silence warnings and errors on various server versions due to incorrect
usage of libc functions.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
diff --git a/configure.ac b/configure.ac
index 7249ca1..0ea3472 100644
--- a/configure.ac
+++ b/configure.ac
@@ -89,6 +89,10 @@ PKG_CHECK_EXISTS([xorg-server >= 1.2.0],
[AC_DEFINE([HAVE_XORG_SERVER_1_2_0], 1,
[Has version 1.2.0 or greater of the Xserver])])
+PKG_CHECK_EXISTS([xorg-server >= 1.5.0],
+ [AC_DEFINE([HAVE_XORG_SERVER_1_5_0], 1,
+ [Has version 1.5.0 or greater of the Xserver])])
+
PKG_CHECK_EXISTS([xorg-server >= 1.7.0],
[AC_DEFINE([HAVE_XORG_SERVER_1_7_0], 1,
[Has version 1.7.0 or greater of the Xserver])])
diff --git a/src/vmware.c b/src/vmware.c
index 599ac07..a4e4d08 100644
--- a/src/vmware.c
+++ b/src/vmware.c
@@ -41,6 +41,11 @@ char rcsId_vmware[] =
#include "vm_device_version.h"
#include "svga_modes.h"
+#ifndef HAVE_XORG_SERVER_1_5_0
+#include <xf86_ansic.h>
+#include <xf86_libc.h>
+#endif
+
#ifdef HaveDriverFuncs
#define VMWARE_DRIVER_FUNC HaveDriverFuncs
#else
@@ -247,7 +252,7 @@ static void
VMWAREFreeRec(ScrnInfoPtr pScrn)
{
if (pScrn->driverPrivate) {
- xfree(pScrn->driverPrivate);
+ free(pScrn->driverPrivate);
pScrn->driverPrivate = NULL;
}
}
@@ -560,7 +565,7 @@ VMWAREParseTopologyString(ScrnInfoPtr pScrn,
numOutputs, width, height, x, y);
numOutputs++;
- extents = xrealloc(extents, numOutputs * sizeof (xXineramaScreenInfo));
+ extents = realloc(extents, numOutputs * sizeof (xXineramaScreenInfo));
extents[numOutputs - 1].x_org = x;
extents[numOutputs - 1].y_org = y;
extents[numOutputs - 1].width = width;
@@ -573,7 +578,7 @@ VMWAREParseTopologyString(ScrnInfoPtr pScrn,
error:
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Parsing static Xinerama topology: Failed.\n");
- xfree(extents);
+ free(extents);
extents = NULL;
numOutputs = 0;
@@ -877,7 +882,7 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int flags)
#endif
xf86CollectOptions(pScrn, NULL);
- if (!(options = xalloc(sizeof(VMWAREOptions))))
+ if (!(options = malloc(sizeof(VMWAREOptions))))
return FALSE;
memcpy(options, VMWAREOptions, sizeof(VMWAREOptions));
xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, options);
@@ -909,7 +914,7 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int flags)
pScrn->videoRam = pVMWARE->videoRam / 1024;
pScrn->memPhysBase = pVMWARE->memPhysBase;
- xfree(options);
+ free(options);
{
Gamma zeros = { 0.0, 0.0, 0.0 };
@@ -922,7 +927,7 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int flags)
/* print error message */
VMWAREFreeRec(pScrn);
if (i > 0) {
- xfree(pciList);
+ free(pciList);
}
return FALSE;
}
@@ -1218,7 +1223,7 @@ vmwareNextXineramaState(VMWAREPtr pVMWARE)
*/
if (pVMWARE->xinerama && !pVMWARE->xineramaStatic) {
if (pVMWARE->xineramaNextState) {
- xfree(pVMWARE->xineramaState);
+ free(pVMWARE->xineramaState);
pVMWARE->xineramaState = pVMWARE->xineramaNextState;
pVMWARE->xineramaNumOutputs = pVMWARE->xineramaNextNumOutputs;
@@ -1233,14 +1238,14 @@ vmwareNextXineramaState(VMWAREPtr pVMWARE)
* follow a VMwareCtrlDoSetTopology call.
*/
VMWAREXineramaPtr basicState =
- (VMWAREXineramaPtr)xcalloc(1, sizeof (VMWAREXineramaRec));
+ (VMWAREXineramaPtr)calloc(1, sizeof (VMWAREXineramaRec));
if (basicState) {
basicState->x_org = 0;
basicState->y_org = 0;
basicState->width = vmwareReg->svga_reg_width;
basicState->height = vmwareReg->svga_reg_height;
- xfree(pVMWARE->xineramaState);
+ free(pVMWARE->xineramaState);
pVMWARE->xineramaState = basicState;
pVMWARE->xineramaNumOutputs = 1;
}
@@ -1488,10 +1493,10 @@ VMWAREAddDisplayMode(ScrnInfoPtr pScrn,
{
DisplayModeRec *mode;
- mode = xalloc(sizeof(DisplayModeRec));
+ mode = malloc(sizeof(DisplayModeRec));
memset(mode, 0, sizeof *mode);
- mode->name = xalloc(strlen(name) + 1);
+ mode->name = malloc(strlen(name) + 1);
strcpy(mode->name, name);
mode->status = MODE_OK;
mode->type = M_T_DEFAULT;
@@ -1614,7 +1619,7 @@ VMWAREScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
xf86CollectOptions(pScrn, NULL);
- if (!(options = xalloc(sizeof(VMWAREOptions))))
+ if (!(options = malloc(sizeof(VMWAREOptions))))
return FALSE;
memcpy(options, VMWAREOptions, sizeof(VMWAREOptions));
xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, options);
@@ -1639,11 +1644,11 @@ VMWAREScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
pVMWARE->xineramaStatic = pVMWARE->xineramaState != NULL;
- xfree(topology);
+ free(topology);
}
}
- xfree(options);
+ free(options);
/* Initialise VMWARE_CTRL extension. */
VMwareCtrl_ExtInit(pScrn);
@@ -1993,7 +1998,7 @@ VMWAREProbe(DriverPtr drv, int flags)
numUsed = xf86MatchPciInstances(VMWARE_NAME, PCI_VENDOR_VMWARE,
VMWAREChipsets, VMWAREPciChipsets, devSections,
numDevSections, drv, &usedChips);
- xfree(devSections);
+ free(devSections);
if (numUsed <= 0)
return FALSE;
if (flags & PROBE_DETECT)
@@ -2023,7 +2028,7 @@ VMWAREProbe(DriverPtr drv, int flags)
foundScreen = TRUE;
}
}
- xfree(usedChips);
+ free(usedChips);
}
return foundScreen;
}
diff --git a/src/vmwarectrl.c b/src/vmwarectrl.c
index d0aace5..acaa856 100644
--- a/src/vmwarectrl.c
+++ b/src/vmwarectrl.c
@@ -45,6 +45,10 @@
#include "vmware.h"
#include "vmwarectrlproto.h"
+#ifndef HAVE_XORG_SERVER_1_5_0
+#include <xf86_ansic.h>
+#include <xf86_libc.h>
+#endif
/*
*----------------------------------------------------------------------------
@@ -122,7 +126,7 @@ VMwareCtrlDoSetRes(ScrnInfoPtr pScrn,
VmwareLog(("DoSetRes: %d %d\n", x, y));
if (resetXinerama) {
- xfree(pVMWARE->xineramaNextState);
+ free(pVMWARE->xineramaNextState);
pVMWARE->xineramaNextState = NULL;
pVMWARE->xineramaNextNumOutputs = 0;
}
@@ -276,7 +280,7 @@ VMwareCtrlDoSetTopology(ScrnInfoPtr pScrn,
VmwareLog(("DoSetTopology: %d %d\n", maxX, maxY));
- xineramaState = (VMWAREXineramaPtr)xcalloc(number, sizeof(VMWAREXineramaRec));
+ xineramaState = (VMWAREXineramaPtr)calloc(number, sizeof(VMWAREXineramaRec));
if (xineramaState) {
memcpy(xineramaState, extents, number * sizeof (VMWAREXineramaRec));
@@ -289,7 +293,7 @@ VMwareCtrlDoSetTopology(ScrnInfoPtr pScrn,
* will be no mode change. In this case, push it out
* immediately.
*/
- xfree(pVMWARE->xineramaNextState);
+ free(pVMWARE->xineramaNextState);
pVMWARE->xineramaNextState = xineramaState;
pVMWARE->xineramaNextNumOutputs = number;
diff --git a/src/vmwaremodule.c b/src/vmwaremodule.c
index caa7d68..392062f 100644
--- a/src/vmwaremodule.c
+++ b/src/vmwaremodule.c
@@ -34,6 +34,11 @@
#include <xf86drm.h>
#endif
+#ifndef HAVE_XORG_SERVER_1_5_0
+#include <xf86_ansic.h>
+#include <xf86_libc.h>
+#endif
+
/*
* Defines and exported module info.
*/
@@ -188,7 +193,7 @@ vmware_chain_module(pointer opts)
gdev->driver = driver_name;
}
- xfree(gdevs);
+ free(gdevs);
if (!matched) {
if (xf86LoadOneModule(driver_name, opts) == NULL) {
diff --git a/src/vmwarevideo.c b/src/vmwarevideo.c
index 8522383..7f78887 100644
--- a/src/vmwarevideo.c
+++ b/src/vmwarevideo.c
@@ -46,6 +46,11 @@
#include <X11/extensions/Xv.h>
+#ifndef HAVE_XORG_SERVER_1_5_0
+#include <xf86_ansic.h>
+#include <xf86_libc.h>
+#endif
+
#define MAKE_ATOM(a) MakeAtom(a, sizeof(a) - 1, TRUE)
/*
@@ -334,7 +339,7 @@ vmwareOffscreenAllocate(VMWAREPtr pVMWARE, uint32 size)
return NULL;
}
- memptr = xalloc(sizeof(VMWAREOffscreenRec));
+ memptr = malloc(sizeof(VMWAREOffscreenRec));
if (!memptr) {
return NULL;
}
@@ -443,7 +448,7 @@ vmwareVideoInit(ScreenPtr pScreen)
numAdaptors = 1;
overlayAdaptors = &newAdaptor;
} else {
- newAdaptors = xalloc((numAdaptors + 1) *
+ newAdaptors = malloc((numAdaptors + 1) *
sizeof(XF86VideoAdaptorPtr*));
if (!newAdaptors) {
xf86XVFreeVideoAdaptorRec(newAdaptor);
@@ -463,7 +468,7 @@ vmwareVideoInit(ScreenPtr pScreen)
}
if (newAdaptors) {
- xfree(newAdaptors);
Reply to: