Unlibcwrap. Bump server version requirement. Bump to 0.2.0.via-0_2_0

15 files changed, 33 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index c27701e..484df02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2006-04-07  Adam Jackson  <ajax@freedesktop.org>
+
+	* configure.ac:
+	* src/via.h:
+	* src/via_accel.c:
+	* src/via_dri.c:
+	* src/via_driver.h:
+	* src/via_memcpy.c:
+	* src/via_memory.c:
+	* src/via_mode.c:
+	* src/via_shadow.c:
+	* src/via_swov.c:
+	* src/via_vbe.c:
+	* src/via_vgahw.c:
+	* src/via_video.c:
+	* src/via_xvmc.c:
+	Unlibcwrap.  Bump server version requirement.  Bump to 0.2.0.
+
 2006-03-19  Thomas Hellstrom  <thomas-at-tungstengraphics.com>
 
 	* src/via_accel.c: (viaAccelPlaneMaskHelper),
diff --git a/configure.ac b/configure.ac
index 24369bf..508b18b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-via],
-        0.1.33.2,
+        0.2.0,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-via)
 
@@ -60,7 +60,7 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
 
 # Checks for pkg-config packages
 # via_3d_reg.h comes with libdrm ATM.
-PKG_CHECK_MODULES(XORG, [xorg-server xproto xvmc fontsproto libdrm $REQUIRED_MODULES])
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto xvmc fontsproto libdrm $REQUIRED_MODULES])
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
 # Checks for libraries.
diff --git a/src/via.h b/src/via.h
index 68ea458..e94b0df 100644
--- a/src/via.h
+++ b/src/via.h
@@ -25,6 +25,11 @@
 #ifndef _VIA_H_
 #define _VIA_H_ 1
 
+#include <errno.h>
+#include <string.h>
+#include <stdio.h>
+#include <math.h>
+
 /* Video status flag */
 
 #define VIDEO_MPEG_INUSE        0x08000000  /*Video is used with MPEG */
diff --git a/src/via_accel.c b/src/via_accel.c
index 990f67a..7227d02 100644
--- a/src/via_accel.c
+++ b/src/via_accel.c
@@ -34,6 +34,7 @@
 #include "xaarop.h"
 #include "miline.h"
 
+#include "via.h"
 #include "via_driver.h"
 #include "via_regs.h"
 #include "via_id.h"
diff --git a/src/via_dri.c b/src/via_dri.c
index 2caf4d0..6951ae3 100644
--- a/src/via_dri.c
+++ b/src/via_dri.c
@@ -28,7 +28,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 #include "xf86Priv.h"
 
 #include "xf86PciInfo.h"
@@ -38,6 +37,7 @@
 #include "GL/glxtokens.h"
 #include "sarea.h"
 
+#include "via.h"
 #include "via_driver.h"
 #include "via_drm.h"
 #include "via_dri.h"
diff --git a/src/via_driver.h b/src/via_driver.h
index b6e1788..5785639 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -37,7 +37,6 @@
 #include "vgaHW.h"
 #include "xf86.h"
 #include "xf86Resources.h"
-#include "xf86_ansic.h"
 #include "xf86Pci.h"
 #include "xf86PciInfo.h"
 #include "xf86_OSproc.h"
@@ -68,8 +67,8 @@
 
 #define DRIVER_NAME     "via"
 #define VERSION_MAJOR   0
-#define VERSION_MINOR   1
-#define PATCHLEVEL      33
+#define VERSION_MINOR   2
+#define PATCHLEVEL      0
 #define VIA_VERSION     ((VERSION_MAJOR<<24) | (VERSION_MINOR<<16) | PATCHLEVEL)
 
 #ifdef VIA_HAVE_EXA
diff --git a/src/via_memcpy.c b/src/via_memcpy.c
index aa490af..ea0c1d9 100644
--- a/src/via_memcpy.c
+++ b/src/via_memcpy.c
@@ -25,6 +25,7 @@
 #include "config.h"
 #endif
 
+#include <via.h>
 #include "via_driver.h"
 #include "via_memcpy.h"
 #include "compiler.h"
diff --git a/src/via_memory.c b/src/via_memory.c
index 37fbb84..c735f74 100644
--- a/src/via_memory.c
+++ b/src/via_memory.c
@@ -27,7 +27,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 #include "xf86fbman.h"
 
 #include "via.h"
diff --git a/src/via_mode.c b/src/via_mode.c
index 339daae..14f384a 100644
--- a/src/via_mode.c
+++ b/src/via_mode.c
@@ -34,6 +34,7 @@
 #include "config.h"
 #endif
 
+#include "via.h"
 #include "via_driver.h"
 #include "via_vgahw.h"
 #include "via_id.h"
diff --git a/src/via_shadow.c b/src/via_shadow.c
index d70c261..4b2d587 100644
--- a/src/via_shadow.c
+++ b/src/via_shadow.c
@@ -26,6 +26,7 @@
 #include "config.h"
 #endif
 
+#include "via.h"
 #include "via_driver.h"
 #include "shadowfb.h"
 #include "servermd.h"
diff --git a/src/via_swov.c b/src/via_swov.c
index 8a1f099..3770518 100644
--- a/src/via_swov.c
+++ b/src/via_swov.c
@@ -29,7 +29,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 #include "xf86fbman.h"
 
 #include "via.h"
diff --git a/src/via_vbe.c b/src/via_vbe.c
index e6f484c..a133009 100644
--- a/src/via_vbe.c
+++ b/src/via_vbe.c
@@ -31,6 +31,7 @@
 #include "config.h"
 #endif
 
+#include "via.h"
 #include "via_driver.h"
 #include "vbe.h"
 #include "vbeModes.h"
diff --git a/src/via_vgahw.c b/src/via_vgahw.c
index 853b7f0..4dfdb5b 100644
--- a/src/via_vgahw.c
+++ b/src/via_vgahw.c
@@ -32,7 +32,6 @@
 #include "config.h"
 #endif
 
-#include "xf86_ansic.h"
 #include "compiler.h"
 #include "xf86.h"
 #include "via_driver.h" /* for HAVE_DEBUG */
diff --git a/src/via_video.c b/src/via_video.c
index d334e8c..2fde828 100644
--- a/src/via_video.c
+++ b/src/via_video.c
@@ -33,7 +33,6 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"
-#include "xf86_ansic.h"
 #include "compiler.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
diff --git a/src/via_xvmc.c b/src/via_xvmc.c
index 008b7e0..a09b848 100644
--- a/src/via_xvmc.c
+++ b/src/via_xvmc.c
@@ -30,7 +30,6 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"
-#include "xf86_ansic.h"
 #include "compiler.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"