Unlibcwrap. Bump server version requirement. Bump to 1.1.0.

8 files changed, 18 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index bcb1d76..69a3ced 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-04-06  Adam Jackson  <ajax@freedesktop.org>
+
+	* configure.ac:
+	* src/cyrix.h:
+	* src/cyrix_accel.c:
+	* src/cyrix_bank.c:
+	* src/cyrix_driver.c:
+	* src/cyrix_helper.c:
+	* src/cyrix_shadow.c:
+	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 fd37994..c163f0b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-cyrix],
-        1.0.0.5,
+        1.1.0,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-cyrix)
 
@@ -54,7 +54,7 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
 XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
 
 # 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/cyrix.h b/src/cyrix.h
index c75c222..162b009 100644
--- a/src/cyrix.h
+++ b/src/cyrix.h
@@ -37,7 +37,7 @@
  *          Dirk H. Hohndel (hohndel@suse.de),
  *          Portions: the GGI project & confidential CYRIX databooks.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.h,v 1.4 2002/11/06 11:38:59 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.h,v 1.2 2000/04/19 16:57:43 eich Exp $ */
 
 #ifndef _CYRIX_H_
 #define _CYRIX_H_
@@ -45,6 +45,7 @@
 #include "xaa.h"
 #include "xf86Cursor.h"
 #include "vgaHW.h"
+#include <string.h>
 
 /* this code is partly based on the MediaGX sources from the GGI project
    based on CYRIX example code (gxvideo.c) and included with CYRIX and
diff --git a/src/cyrix_accel.c b/src/cyrix_accel.c
index cda6246..b76b924 100644
--- a/src/cyrix_accel.c
+++ b/src/cyrix_accel.c
@@ -34,11 +34,9 @@
 
 #include "vgaHW.h"
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xaalocal.h"
 #include "cyrix.h"
 #include "miline.h"
-#include "xf86_libc.h"
 #include "compiler.h"
 
 /* size of color expand source area (embedded in frame buffer) */
diff --git a/src/cyrix_bank.c b/src/cyrix_bank.c
index 38c1eca..580c23e 100644
--- a/src/cyrix_bank.c
+++ b/src/cyrix_bank.c
@@ -37,7 +37,6 @@
 /* All drivers should typically include these */
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 
 /* Everything using inb/outb, etc needs "compiler.h" */
 #include "compiler.h"
diff --git a/src/cyrix_driver.c b/src/cyrix_driver.c
index 9dfa4e4..d98108c 100644
--- a/src/cyrix_driver.c
+++ b/src/cyrix_driver.c
@@ -61,7 +61,6 @@
 #include "micmap.h"
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 #include "xf86Version.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
@@ -120,11 +119,11 @@ void     CYRIXSetRead(int bank);
 void     CYRIXSetWrite(int bank);
 void     CYRIXSetReadWrite(int bank);
 
-#define VERSION 4000
+#define CYRIX_VERSION 4000
 #define CYRIX_NAME "CYRIX"
 #define CYRIX_DRIVER_NAME "cyrix"
 #define CYRIX_MAJOR_VERSION 1
-#define CYRIX_MINOR_VERSION 0
+#define CYRIX_MINOR_VERSION 1
 #define CYRIX_PATCHLEVEL 0
 #define VGA_REGION 2
 
@@ -141,7 +140,7 @@ enum GenericTypes {
  */
 
 _X_EXPORT DriverRec CYRIX = {
-    VERSION,
+    CYRIX_VERSION,
     CYRIX_DRIVER_NAME,
     CYRIXIdentify,
     CYRIXProbe,
diff --git a/src/cyrix_helper.c b/src/cyrix_helper.c
index bbb8641..d62af0e 100644
--- a/src/cyrix_helper.c
+++ b/src/cyrix_helper.c
@@ -47,7 +47,6 @@
 
 #include "cyrix.h"
 #include "vgaHW.h"
-#include "xf86_ansic.h"
 #include "compiler.h"
 #include "xf86.h"
 
diff --git a/src/cyrix_shadow.c b/src/cyrix_shadow.c
index 4c06858..a914429 100644
--- a/src/cyrix_shadow.c
+++ b/src/cyrix_shadow.c
@@ -12,7 +12,6 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"
-#include "xf86_ansic.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
 #include "cyrix.h"