Delibcwrap, bump required server, update to 1.1.0.i740-1_1_0XORG-7_1

9 files changed, 25 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index 7efeda9..3ed86ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2006-04-07  Adam Jackson  <ajax@freedesktop.org>
+
+	* configure.ac:
+	* src/i740_accel.c:
+	* src/i740_cursor.c:
+	* src/i740_dga.c:
+	* src/i740_driver.c:
+	* src/i740_i2c.c:
+	* src/i740_io.c:
+	* src/i740_video.c:
+	Delibcwrap, bump required server, update to 1.1.0.
+
 2006-04-07  Aaron Plattner  <aplattner@nvidia.com>
 
 	* src/i740_video.c: (I740PutImage):
diff --git a/configure.ac b/configure.ac
index 4c05231..e5524fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-i740],
-        1.0.0.5,
+        1.1.0,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-i740)
 
@@ -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/i740_accel.c b/src/i740_accel.c
index 9cd1508..c11bf84 100644
--- a/src/i740_accel.c
+++ b/src/i740_accel.c
@@ -39,7 +39,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 
 #include "compiler.h"
 
diff --git a/src/i740_cursor.c b/src/i740_cursor.c
index f211a19..f3160b8 100644
--- a/src/i740_cursor.c
+++ b/src/i740_cursor.c
@@ -39,7 +39,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 #include "compiler.h"
 
 #include "xf86fbman.h"
diff --git a/src/i740_dga.c b/src/i740_dga.c
index 4a99dd3..170e38f 100644
--- a/src/i740_dga.c
+++ b/src/i740_dga.c
@@ -29,7 +29,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/i740_driver.c b/src/i740_driver.c
index 640eca7..c21163d 100644
--- a/src/i740_driver.c
+++ b/src/i740_driver.c
@@ -37,6 +37,9 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "config.h"
 #endif
 
+#include <string.h>
+#include <math.h>
+
 /*
  * This server does not support these XFree86 4.0 features yet
  * DDC1 & DDC2 (requires I2C)
@@ -53,7 +56,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  * These are X and server generic header files.
  */
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"
 #include "xf86RAC.h"
@@ -137,16 +139,15 @@ static void I740ProbeDDC(ScrnInfoPtr pScrn, int index);
 static Bool I740MapMem(ScrnInfoPtr pScrn);
 static Bool I740UnmapMem(ScrnInfoPtr pScrn);
 
-
-#define VERSION 4000
+#define I740_VERSION 4000
 #define I740_NAME "I740"
 #define I740_DRIVER_NAME "i740"
 #define I740_MAJOR_VERSION 1
-#define I740_MINOR_VERSION 0
+#define I740_MINOR_VERSION 1
 #define I740_PATCHLEVEL 0
 
 _X_EXPORT DriverRec I740 = {
-  VERSION,
+  I740_VERSION,
   I740_DRIVER_NAME,
   I740Identify,
   I740Probe,
@@ -397,7 +398,7 @@ I740Probe(DriverPtr drv, int flags) {
 	  /* Allocate new ScrnInfoRec and claim the slot */
 	  if ((pScrn = xf86ConfigPciEntity(pScrn, 0, usedChips[i],
 						 I740PciChipsets, 0, 0, 0, 0, 0))) {
-	      pScrn->driverVersion = VERSION;
+	      pScrn->driverVersion = I740_VERSION;
 	      pScrn->driverName = I740_DRIVER_NAME;
 	      pScrn->name = I740_NAME;
 	      pScrn->Probe = I740Probe;
@@ -429,7 +430,7 @@ I740Probe(DriverPtr drv, int flags) {
 	  ScrnInfoPtr pScrn = NULL;
 	  if ((pScrn  = xf86ConfigPciEntity(pScrn, 0, usedChips[i],
 						  I740PciChipsets, 0, 0, 0, 0, 0))) {
-	      pScrn->driverVersion = VERSION;
+	      pScrn->driverVersion = I740_VERSION;
 	      pScrn->driverName = I740_DRIVER_NAME;
 	      pScrn->name = I740_NAME;
 	      pScrn->Probe = I740Probe;
diff --git a/src/i740_i2c.c b/src/i740_i2c.c
index 5dab14d..e741eeb 100644
--- a/src/i740_i2c.c
+++ b/src/i740_i2c.c
@@ -31,7 +31,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 #include "compiler.h"
 
 #include "xf86Pci.h"
diff --git a/src/i740_io.c b/src/i740_io.c
index 47915bd..bfa6a10 100644
--- a/src/i740_io.c
+++ b/src/i740_io.c
@@ -37,7 +37,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #endif
 
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 #include "compiler.h"
 #include "vgaHW.h"
diff --git a/src/i740_video.c b/src/i740_video.c
index 31c625e..e1aa5d0 100644
--- a/src/i740_video.c
+++ b/src/i740_video.c
@@ -54,10 +54,12 @@
 #include "config.h"
 #endif
 
+#include <stdio.h>
+#include <string.h>
+
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"
-#include "xf86_ansic.h"
 #include "compiler.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"