Unlibcwrap. Bump server version requirement. Bump to 1.1.0.sunffb-1_1_0XORG-7_1

8 files changed, 22 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 6748595..97e9ab2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-04-07  Adam Jackson  <ajax@freedesktop.org>
+
+	* configure.ac:
+	* src/ffb.h:
+	* src/ffb_dac.c:
+	* src/ffb_ddc.c:
+	* src/ffb_dga.c:
+	* src/ffb_dri.c:
+	* src/ffb_driver.c:
+	Unlibcwrap.  Bump server version requirement.  Bump to 1.1.0.
+
 2006-01-25  Adam Jackson  <ajax@freedesktop.org>
 
 	* src/ffb_bcopy.c:
diff --git a/configure.ac b/configure.ac
index 5340c7f..06bfe6e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-sunffb],
-        1.0.1.3,
+        1.1.0,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-sunffb)
 
@@ -64,7 +64,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/ffb.h b/src/ffb.h
index 6dcd3d9..cb21251 100644
--- a/src/ffb.h
+++ b/src/ffb.h
@@ -31,7 +31,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 #include "xf86RamDac.h"
 #include "xaa.h"
 #include <X11/Xmd.h>
diff --git a/src/ffb_dac.c b/src/ffb_dac.c
index 92f1e33..fab463d 100644
--- a/src/ffb_dac.c
+++ b/src/ffb_dac.c
@@ -33,7 +33,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 
 #include "xf86DDC.h"
 
diff --git a/src/ffb_ddc.c b/src/ffb_ddc.c
index 3e7be37..b665105 100644
--- a/src/ffb_ddc.c
+++ b/src/ffb_ddc.c
@@ -33,7 +33,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 
 #include "xf86DDC.h"
 
diff --git a/src/ffb_dga.c b/src/ffb_dga.c
index ed5d6ae..0b40b06 100644
--- a/src/ffb_dga.c
+++ b/src/ffb_dga.c
@@ -29,7 +29,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 #include "dgaproc.h"
 
 #include "ffb.h"
diff --git a/src/ffb_dri.c b/src/ffb_dri.c
index 209a9d3..dd471d4 100644
--- a/src/ffb_dri.c
+++ b/src/ffb_dri.c
@@ -26,9 +26,10 @@
 #include "config.h"
 #endif
 
+#include <stdio.h>
+
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 #include "xf86Priv.h"
 
 #include "xf86PciInfo.h"
diff --git a/src/ffb_driver.c b/src/ffb_driver.c
index 3bb8cdd..8bd05fc 100644
--- a/src/ffb_driver.c
+++ b/src/ffb_driver.c
@@ -26,9 +26,10 @@
 #include "config.h"
 #endif
 
+#include <string.h>
+
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 #include "xf86Version.h"
 #include "mipointer.h"
 #include "mibstore.h"
@@ -66,12 +67,12 @@ extern void FFB_InitDGA(ScreenPtr pScreen);
 
 void FFBSync(ScrnInfoPtr pScrn);
 
-#define VERSION 4000
+#define FFB_VERSION 4000
 #define FFB_NAME "SUNFFB"
 #define FFB_DRIVER_NAME "sunffb"
 #define FFB_MAJOR_VERSION 1
-#define FFB_MINOR_VERSION 0
-#define FFB_PATCHLEVEL 1
+#define FFB_MINOR_VERSION 1
+#define FFB_PATCHLEVEL 0
 
 /* 
  * This contains the functions needed by the server after loading the driver
@@ -82,7 +83,7 @@ void FFBSync(ScrnInfoPtr pScrn);
  */
 
 _X_EXPORT DriverRec SUNFFB = {
-    VERSION,
+    FFB_VERSION,
     FFB_DRIVER_NAME,
     FFBIdentify,
     FFBProbe,
@@ -265,7 +266,7 @@ FFBProbe(DriverPtr drv, int flags)
 	    pScrn = xf86AllocateScreen(drv, 0);
 
 	    /* Fill in what we can of the ScrnInfoRec */
-	    pScrn->driverVersion = VERSION;
+	    pScrn->driverVersion = FFB_VERSION;
 	    pScrn->driverName	 = FFB_DRIVER_NAME;
 	    pScrn->name		 = FFB_NAME;
 	    pScrn->Probe	 = FFBProbe;