Unlibcwrap. Bump server version requirement. Bump to 10.13.0.

diff --git a/configure.ac b/configure.ac
index 980cb1f..99b996f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-vmware],
-        10.12.0.0,
+        10.13.0,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-vmware)
 
@@ -53,7 +53,7 @@ XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
 XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
 
 # Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
 # Checks for libraries.

diff --git a/src/vmware.c b/src/vmware.c
index 3aa9be7..7a22468 100644 (file)
--- a/src/vmware.c
+++ b/src/vmware.c
@@ -18,7 +18,6 @@ char rcsId_vmware[] =
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 #include "xf86Resources.h"
 
 #include "compiler.h"  /* inb/outb */
@@ -82,7 +81,7 @@ char rcsId_vmware[] =
 #define VMWARE_NAME "VMWARE"
 #define VMWARE_DRIVER_NAME "vmware"
 #define VMWARE_MAJOR_VERSION   10
-#define VMWARE_MINOR_VERSION   12
+#define VMWARE_MINOR_VERSION   13
 #define VMWARE_PATCHLEVEL      0
 #define VMWARE_DRIVER_VERSION \
    (VMWARE_MAJOR_VERSION * 65536 + VMWARE_MINOR_VERSION * 256 + VMWARE_PATCHLEVEL)

diff --git a/src/vmware.h b/src/vmware.h
index 3993979..b640260 100644 (file)
--- a/src/vmware.h
+++ b/src/vmware.h
@@ -8,9 +8,10 @@
 #ifndef VMWARE_H
 #define VMWARE_H
 
+#include <string.h>
+
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 #include "xf86Resources.h"
 
 #include "compiler.h"          /* inb/outb */