Unlibcwrap. Bump server version requirement. Bump to 1.4.0.mga-1_4_0

20 files changed, 30 insertions, 32 deletions

diff --git a/ChangeLog b/ChangeLog
index 6d37c36..0b2a7e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2006-04-07  Adam Jackson  <ajax@freedesktop.org>
+
+	* configure.ac:
+	* src/clientlx.c:
+	* src/mga.h:
+	* src/mga_arc.c:
+	* src/mga_bios.c:
+	* src/mga_dac3026.c:
+	* src/mga_dacG.c:
+	* src/mga_dga.c:
+	* src/mga_dh.c:
+	* src/mga_dri.c:
+	* src/mga_driver.c:
+	* src/mga_esc.c:
+	* src/mga_g450pll.c:
+	* src/mga_hwcurs.c:
+	* src/mga_merge.c:
+	* src/mga_shadow.c:
+	* src/mga_storm.c:
+	* src/mga_video.c:
+	Unlibcwrap.  Bump server version requirement.  Bump to 1.4.0.
+
 2006-04-01  Adam Jackson  <ajax@freedesktop.org>
 
 	* configure.ac:
diff --git a/configure.ac b/configure.ac
index cb0aa9c..cbd53c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-mga],
-        1.3,
+        1.4.0,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-mga)
 
@@ -59,7 +59,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/clientlx.c b/src/clientlx.c
index c4f312b..306d3ed 100644
--- a/src/clientlx.c
+++ b/src/clientlx.c
@@ -13,7 +13,6 @@
 
 #include "xf86_OSproc.h"
 #include "xf86Pci.h"
-#include "xf86_ansic.h"
 #include "client.h"
 #include "mga.h"
 
diff --git a/src/mga.h b/src/mga.h
index d12d940..88f0b04 100644
--- a/src/mga.h
+++ b/src/mga.h
@@ -14,6 +14,9 @@
 #ifndef MGA_H
 #define MGA_H
 
+#include <string.h>
+#include <stdio.h>
+
 #include "compiler.h"
 #include "xaa.h"
 #include "xf86Cursor.h"
@@ -22,30 +25,20 @@
 #include "xf86DDC.h"
 #include "xf86xv.h"
 
-
-
 #ifdef XF86DRI
 #include "xf86drm.h"
 
-
 #define _XF86DRI_SERVER_
 #include "mga_dripriv.h"
 #include "dri.h"
 #include "GL/glxint.h"
 
-
-
-
 #include "dri.h"
 
-
-
 #include "GL/glxint.h"
 #include "mga_dri.h"
 #endif
 
-
-
 #ifdef USEMGAHAL
 #include "client.h"
 #endif
@@ -160,7 +153,7 @@ void MGAdbg_outreg32(ScrnInfoPtr, int,int, char*);
 #define MGA_MODULE_DATA mgaModuleData
 #define MGA_DRIVER_NAME "mga"
 #define MGA_MAJOR_VERSION 1
-#define MGA_MINOR_VERSION 3
+#define MGA_MINOR_VERSION 4
 #define MGA_PATCHLEVEL 0
 
 typedef struct {
diff --git a/src/mga_arc.c b/src/mga_arc.c
index 895b439..6d08a13 100644
--- a/src/mga_arc.c
+++ b/src/mga_arc.c
@@ -29,6 +29,7 @@ in this Software without prior written authorization from The Open Group.
 #include "config.h"
 #endif
 
+#include <values.h>
 #include <X11/X.h>
 #include "gcstruct.h"
 #include "windowstr.h"
@@ -43,7 +44,6 @@ in this Software without prior written authorization from The Open Group.
 #include "xaalocal.h"
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 
 #include "xf86Pci.h"
 
diff --git a/src/mga_bios.c b/src/mga_bios.c
index 282b558..dd75f3f 100644
--- a/src/mga_bios.c
+++ b/src/mga_bios.c
@@ -44,7 +44,6 @@
 #include "xf86Resources.h"
 
 /* All drivers need this */
-#include "xf86_ansic.h"
 
 #include "compiler.h"
 
diff --git a/src/mga_dac3026.c b/src/mga_dac3026.c
index d06f486..1eddefd 100644
--- a/src/mga_dac3026.c
+++ b/src/mga_dac3026.c
@@ -42,7 +42,6 @@
 /* All drivers should typically include these */
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h" 
 
 /* Drivers for PCI hardware need this */
 #include "xf86PciInfo.h"
diff --git a/src/mga_dacG.c b/src/mga_dacG.c
index 9d10811..6d7eac2 100644
--- a/src/mga_dacG.c
+++ b/src/mga_dacG.c
@@ -18,7 +18,6 @@
 /* All drivers should typically include these */
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h" 
 
 /* Drivers for PCI hardware need this */
 #include "xf86PciInfo.h"
diff --git a/src/mga_dga.c b/src/mga_dga.c
index c75ef0c..6bae9dc 100644
--- a/src/mga_dga.c
+++ b/src/mga_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/mga_dh.c b/src/mga_dh.c
index e5c0114..0bf89e9 100644
--- a/src/mga_dh.c
+++ b/src/mga_dh.c
@@ -12,7 +12,6 @@
 /* All drivers should typically include these */
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h" 
 
 /* Drivers for PCI hardware need this */
 #include "xf86PciInfo.h"
diff --git a/src/mga_dri.c b/src/mga_dri.c
index c235321..c675a63 100644
--- a/src/mga_dri.c
+++ b/src/mga_dri.c
@@ -34,7 +34,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 #include "xf86Priv.h"
 
 #include "xf86PciInfo.h"
@@ -47,8 +46,7 @@
 
 #include "miline.h"
 
-
-
+#include <errno.h>
 
 #include <inttypes.h>
 #include "mga_reg.h"
diff --git a/src/mga_driver.c b/src/mga_driver.c
index a5c78b2..88e6af5 100644
--- a/src/mga_driver.c
+++ b/src/mga_driver.c
@@ -57,7 +57,6 @@
 #include "xf86Resources.h"
 
 /* All drivers need this */
-#include "xf86_ansic.h"
 
 #include "compiler.h"
 
diff --git a/src/mga_esc.c b/src/mga_esc.c
index 3a72851..8beffa8 100644
--- a/src/mga_esc.c
+++ b/src/mga_esc.c
@@ -19,7 +19,6 @@
 #include "xf86Resources.h"
 
 /* All drivers need this */
-#include "xf86_ansic.h"
 
 #include "compiler.h"
 
diff --git a/src/mga_g450pll.c b/src/mga_g450pll.c
index da5bc9d..69f0497 100644
--- a/src/mga_g450pll.c
+++ b/src/mga_g450pll.c
@@ -7,7 +7,6 @@
 /* All drivers should typically include these */
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h" 
 
 /* Drivers for PCI hardware need this */
 #include "xf86PciInfo.h"
diff --git a/src/mga_hwcurs.c b/src/mga_hwcurs.c
index a3f106f..464bad0 100644
--- a/src/mga_hwcurs.c
+++ b/src/mga_hwcurs.c
@@ -6,7 +6,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 
 #include "xf86Pci.h"
 #include "xf86PciInfo.h"
diff --git a/src/mga_merge.c b/src/mga_merge.c
index 759e4c5..3fdc6ed 100644
--- a/src/mga_merge.c
+++ b/src/mga_merge.c
@@ -10,7 +10,6 @@
 #include "xf86Resources.h"
 
 /* All drivers need this */
-#include "xf86_ansic.h"
 
 #include "compiler.h"
 
diff --git a/src/mga_shadow.c b/src/mga_shadow.c
index cd63b07..94f199c 100644
--- a/src/mga_shadow.c
+++ b/src/mga_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 "mga_reg.h"
diff --git a/src/mga_storm.c b/src/mga_storm.c
index 187aa93..f4c9284 100644
--- a/src/mga_storm.c
+++ b/src/mga_storm.c
@@ -9,7 +9,6 @@
 /* All drivers should typically include these */
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 
 /* For correct __inline__ usage */
 #include "compiler.h"
diff --git a/src/mga_vga.c b/src/mga_vga.c
index 26fcefc..fbbfc60 100644
--- a/src/mga_vga.c
+++ b/src/mga_vga.c
@@ -1,7 +1,6 @@
 #include "misc.h"
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 #include "vgaHW.h"
 #include "compiler.h"
 #include "xf86cmap.h"
diff --git a/src/mga_video.c b/src/mga_video.c
index 3617ef8..1021249 100644
--- a/src/mga_video.c
+++ b/src/mga_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"