Unlibcwrap. Bump server version requirement. Bump to 1.1.0.

12 files changed, 20 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 74982bc..1fab582 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2006-04-06  Adam Jackson  <ajax@freedesktop.org>
+
+	* configure.ac:
+	* src/ct_accel.c:
+	* src/ct_bank.c:
+	* src/ct_cursor.c:
+	* src/ct_ddc.c:
+	* src/ct_dga.c:
+	* src/ct_driver.c:
+	* src/ct_driver.h:
+	* src/ct_regs.c:
+	* src/ct_shadow.c:
+	* src/ct_video.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 83578c7..c287331 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-chips],
-        1.0.1.3,
+        1.1.0,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-chips)
 
@@ -54,7 +54,7 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
 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/ct_accel.c b/src/ct_accel.c
index a8bf3e8..d56f009 100644
--- a/src/ct_accel.c
+++ b/src/ct_accel.c
@@ -42,7 +42,6 @@
 /* All drivers should typically include these */
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 #include "compiler.h"
 
 /* Drivers that need to access the PCI config space directly need this */
diff --git a/src/ct_bank.c b/src/ct_bank.c
index b5be768..7f50e3e 100644
--- a/src/ct_bank.c
+++ b/src/ct_bank.c
@@ -44,7 +44,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/ct_cursor.c b/src/ct_cursor.c
index 2d0a8af..34019e2 100644
--- a/src/ct_cursor.c
+++ b/src/ct_cursor.c
@@ -33,7 +33,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/ct_ddc.c b/src/ct_ddc.c
index 4008e79..2202fd6 100644
--- a/src/ct_ddc.c
+++ b/src/ct_ddc.c
@@ -7,7 +7,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/ct_dga.c b/src/ct_dga.c
index c271a1b..e4d1c89 100644
--- a/src/ct_dga.c
+++ b/src/ct_dga.c
@@ -6,7 +6,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 #include "xf86Pci.h"
 #include "xf86PciInfo.h"
 #include "xaa.h"
diff --git a/src/ct_driver.c b/src/ct_driver.c
index 3c270ae..d31f9b9 100644
--- a/src/ct_driver.c
+++ b/src/ct_driver.c
@@ -77,7 +77,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"
@@ -467,8 +466,8 @@ static DisplayModeRec ChipsNTSCMode = {
 #define CHIPS_NAME "CHIPS"
 #define CHIPS_DRIVER_NAME "chips"
 #define CHIPS_MAJOR_VERSION 1
-#define CHIPS_MINOR_VERSION 0
-#define CHIPS_PATCHLEVEL 1
+#define CHIPS_MINOR_VERSION 1
+#define CHIPS_PATCHLEVEL 0
 
 /*
  * This contains the functions needed by the server after loading the driver
diff --git a/src/ct_driver.h b/src/ct_driver.h
index 6c43617..0c5b604 100644
--- a/src/ct_driver.h
+++ b/src/ct_driver.h
@@ -36,6 +36,7 @@
 #include "xf86DDC.h"
 #include "xf86xv.h"
 #include "vgaHW.h"
+#include <string.h>
 
 /* Supported chipsets */
 typedef enum {
diff --git a/src/ct_regs.c b/src/ct_regs.c
index 56894c8..5a88a1c 100644
--- a/src/ct_regs.c
+++ b/src/ct_regs.c
@@ -55,7 +55,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/ct_shadow.c b/src/ct_shadow.c
index d610ae1..fe757c5 100644
--- a/src/ct_shadow.c
+++ b/src/ct_shadow.c
@@ -7,7 +7,6 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"
-#include "xf86_ansic.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
 #include "shadowfb.h"
diff --git a/src/ct_video.c b/src/ct_video.c
index 4a1f1b4..81b6de2 100644
--- a/src/ct_video.c
+++ b/src/ct_video.c
@@ -7,7 +7,6 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"
-#include "xf86_ansic.h"
 #include "compiler.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"