.gitignore | 1 +
configure.ac | 2 +-
man/vmware.man | 2 +-
src/vmware.c | 20 ++++++++++++++++----
4 files changed, 19 insertions(+), 6 deletions(-)
New commits:
commit 73db59fd82ced7a88f6da35d5088608e163f3d86
Author: Philip Langdale <[EMAIL PROTECTED]>
Date: Tue Sep 25 16:06:38 2007 -0700
Update for 10.15.2 release
diff --git a/configure.ac b/configure.ac
index 02b615e..7b604e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-vmware],
- 10.15.1,
+ 10.15.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-vmware)
diff --git a/src/vmware.c b/src/vmware.c
index 68219ff..ac46ea1 100644
--- a/src/vmware.c
+++ b/src/vmware.c
@@ -83,7 +83,7 @@ char rcsId_vmware[] =
#define VMWARE_DRIVER_NAME "vmware"
#define VMWARE_MAJOR_VERSION 10
#define VMWARE_MINOR_VERSION 15
-#define VMWARE_PATCHLEVEL 1
+#define VMWARE_PATCHLEVEL 2
#define VMWARE_DRIVER_VERSION \
(VMWARE_MAJOR_VERSION * 65536 + VMWARE_MINOR_VERSION * 256 +
VMWARE_PATCHLEVEL)
#define VMWARE_DRIVER_VERSION_STRING \
commit ee2fe14d37c9f3c8a170f8e3fcbc62403687ab8f
Author: Philip Langdale <[EMAIL PROTECTED]>
Date: Mon Sep 24 11:48:12 2007 -0700
There are problems when running with old X releases with a
global symbol collision with the mouse driver.
diff --git a/src/vmware.c b/src/vmware.c
index a8d169c..68219ff 100644
--- a/src/vmware.c
+++ b/src/vmware.c
@@ -99,7 +99,7 @@ static const char VMWAREBuildStr[] = "VMware Guest X Server "
* extra zero for the fourth digit.
*/
#ifdef __GNUC__
-const char vm_version[] __attribute__((section(".modinfo"),unused)) =
+const char vm_svga_version[] __attribute__((section(".modinfo"),unused)) =
"version=" VMWARE_DRIVER_VERSION_STRING ".0";
#endif
commit cfdb0140fa53155ae134ba961ec7d593d5d94713
Author: Philip Langdale <[EMAIL PROTECTED]>
Date: Mon Sep 10 21:19:38 2007 -0700
Guard modinfo section against gcc.
diff --git a/src/vmware.c b/src/vmware.c
index 3db8029..a8d169c 100644
--- a/src/vmware.c
+++ b/src/vmware.c
@@ -98,8 +98,10 @@ static const char VMWAREBuildStr[] = "VMware Guest X Server "
* As the driver's version is only {major, minor, patchlevel}, simply append
an
* extra zero for the fourth digit.
*/
+#ifdef __GNUC__
const char vm_version[] __attribute__((section(".modinfo"),unused)) =
"version=" VMWARE_DRIVER_VERSION_STRING ".0";
+#endif
static SymTabRec VMWAREChipsets[] = {
{ PCI_CHIP_VMWARE0405, "vmware0405" },
commit e41aef1fb187c1b450fbea0163eb16e0c40f0435
Author: Philip Langdale <[EMAIL PROTECTED]>
Date: Mon Sep 10 21:16:04 2007 -0700
Ready 10.15.1 release.
To allow for easier detection of driver version by other VMware tools,
we are embedding the version in a .modinfo section so that the Linux
kernel 'modinfo' tool can be (ab)used to check it.
diff --git a/configure.ac b/configure.ac
index 725555b..02b615e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-vmware],
- 10.15.0,
+ 10.15.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-vmware)
diff --git a/src/vmware.c b/src/vmware.c
index e02e2fa..3db8029 100644
--- a/src/vmware.c
+++ b/src/vmware.c
@@ -83,13 +83,23 @@ char rcsId_vmware[] =
#define VMWARE_DRIVER_NAME "vmware"
#define VMWARE_MAJOR_VERSION 10
#define VMWARE_MINOR_VERSION 15
-#define VMWARE_PATCHLEVEL 0
+#define VMWARE_PATCHLEVEL 1
#define VMWARE_DRIVER_VERSION \
(VMWARE_MAJOR_VERSION * 65536 + VMWARE_MINOR_VERSION * 256 +
VMWARE_PATCHLEVEL)
+#define VMWARE_DRIVER_VERSION_STRING \
+ VMW_STRING(VMWARE_MAJOR_VERSION) "." VMW_STRING(VMWARE_MINOR_VERSION) \
+ "." VMW_STRING(VMWARE_PATCHLEVEL)
-static const char VMWAREBuildStr[] = "VMware Guest X Server "
- VMW_STRING(VMWARE_MAJOR_VERSION) "." VMW_STRING(VMWARE_MINOR_VERSION)
- "." VMW_STRING(VMWARE_PATCHLEVEL) " - build=$Name$\n";
+static const char VMWAREBuildStr[] = "VMware Guest X Server "
+ VMWARE_DRIVER_VERSION_STRING " - build=$Name$\n";
+
+/*
+ * 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.
+ */
+const char vm_version[] __attribute__((section(".modinfo"),unused)) =
+ "version=" VMWARE_DRIVER_VERSION_STRING ".0";
static SymTabRec VMWAREChipsets[] = {
{ PCI_CHIP_VMWARE0405, "vmware0405" },
commit 2331c7d1629f9841c02cf907ef4fa8b679cc5141
Author: James Cloos <[EMAIL PROTECTED]>
Date: Mon Sep 3 05:52:51 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
diff --git a/.gitignore b/.gitignore
index e33b624..2f0756a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ libtool
ltmain.sh
install-sh
missing
+*~
commit ec4dc29434bbbcf382de51fe3355679654489ad7
Author: Philip Langdale <[EMAIL PROTECTED]>
Date: Mon Jul 9 13:45:22 2007 -0700
Update copyright date.
diff --git a/man/vmware.man b/man/vmware.man
index c487747..65f0d94 100644
--- a/man/vmware.man
+++ b/man/vmware.man
@@ -40,4 +40,4 @@ and so on. Negative offsets are not supported.
.SH "SEE ALSO"
__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__),
xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
.SH AUTHORS
-Copyright (c) 1999-2006 VMware, Inc.
+Copyright (c) 1999-2007 VMware, Inc.
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
