Unlibcwrap. Bump server version requirement. Bump to 1.1.0.vesa-1_1_0

4 files changed, 13 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index e6c8681..67986fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-07  Adam Jackson  <ajax@freedesktop.org>
+
+	* configure.ac:
+	* src/vesa.c:
+	* src/vesa.h:
+	Unlibcwrap.  Bump server version requirement.  Bump to 1.1.0.
+
 2005-12-20  Kevin E. Martin  <kem-at-freedesktop-dot-org>
 
 	* configure.ac:
diff --git a/configure.ac b/configure.ac
index 8c82130..68d05ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-vesa],
-        1.0.1.3,
+        1.1.0,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-vesa)
 
@@ -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)
 
 CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
diff --git a/src/vesa.c b/src/vesa.c
index f83d28d..3e3fc8b 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -35,6 +35,8 @@
 #include "config.h"
 #endif
 
+#include <string.h>
+
 #include "vesa.h"
 
 /* All drivers initialising the SW cursor need this */
diff --git a/src/vesa.h b/src/vesa.h
index 787c229..c321329 100644
--- a/src/vesa.h
+++ b/src/vesa.h
@@ -38,7 +38,6 @@
 #include "xf86Resources.h"
 
 /* All drivers need this */
-#include "xf86_ansic.h"
 
 #include "compiler.h"
 
@@ -84,8 +83,8 @@
 #define VESA_NAME		"VESA"
 #define VESA_DRIVER_NAME	"vesa"
 #define VESA_MAJOR_VERSION	1
-#define VESA_MINOR_VERSION	0
-#define VESA_PATCHLEVEL		1
+#define VESA_MINOR_VERSION	1
+#define VESA_PATCHLEVEL		0
 
 /*XXX*/