diff options
author | Adam Jackson <ajax@nwnk.net> | 2006-04-07 20:50:21 +0000 |
---|---|---|
committer | Adam Jackson <ajax@nwnk.net> | 2006-04-07 20:50:21 +0000 |
commit | 2796accd84d93651cb654329815dc8880e34ea68 (patch) | |
tree | 0769c3be7db44146e98e6d6cd892b175d8dc12ae | |
parent | 018a01800804c218123f686c30e4a86a9aca4d9f (diff) |
Unlibcwrap. Bump server version requirement. Bump to 1.9.0s3virge-1_9_0
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | src/s3v.h | 3 | ||||
-rw-r--r-- | src/s3v_dga.c | 1 | ||||
-rw-r--r-- | src/s3v_driver.c | 6 | ||||
-rw-r--r-- | src/s3v_i2c.c | 1 | ||||
-rw-r--r-- | src/s3v_shadow.c | 1 |
7 files changed, 17 insertions, 9 deletions
@@ -1,3 +1,13 @@ +2006-04-07 Adam Jackson <ajax@freedesktop.org> + + * configure.ac: + * src/s3v.h: + * src/s3v_dga.c: + * src/s3v_driver.c: + * src/s3v_i2c.c: + * src/s3v_shadow.c: + Unlibcwrap. Bump server version requirement. Bump to 1.9.0. + 2006-02-08 Luc Verhaegen <libv@skynet.be> * src/s3v.h: diff --git a/configure.ac b/configure.ac index 24b656c..0fdb1fc 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-s3virge], - 1.8.6.5, + 1.9.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-s3virge) @@ -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. @@ -28,12 +28,13 @@ in this Software without prior written authorization from the XFree86 Project. #ifndef _S3V_H #define _S3V_H +#include <string.h> + /* All drivers should typically include these */ #include "xf86.h" #include "xf86_OSproc.h" /* All drivers need this */ -#include "xf86_ansic.h" /* Everything using inb/outb, etc needs "compiler.h" */ #include "compiler.h" diff --git a/src/s3v_dga.c b/src/s3v_dga.c index 059ce6a..4449a67 100644 --- a/src/s3v_dga.c +++ b/src/s3v_dga.c @@ -62,7 +62,6 @@ in this Software without prior written authorization from the XFree86 Project. #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "xf86Pci.h" #include "xf86PciInfo.h" #include "xaa.h" diff --git a/src/s3v_driver.c b/src/s3v_driver.c index 5a5df07..af13a5f 100644 --- a/src/s3v_driver.c +++ b/src/s3v_driver.c @@ -121,10 +121,10 @@ static int pix24bpp = 0; #define S3VIRGE_NAME "S3VIRGE" #define S3VIRGE_DRIVER_NAME "s3virge" -#define S3VIRGE_VERSION_NAME "1.8.6" +#define S3VIRGE_VERSION_NAME "1.9.0" #define S3VIRGE_VERSION_MAJOR 1 -#define S3VIRGE_VERSION_MINOR 8 -#define S3VIRGE_PATCHLEVEL 6 +#define S3VIRGE_VERSION_MINOR 9 +#define S3VIRGE_PATCHLEVEL 0 #define S3VIRGE_DRIVER_VERSION ((S3VIRGE_VERSION_MAJOR << 24) | \ (S3VIRGE_VERSION_MINOR << 16) | \ S3VIRGE_PATCHLEVEL) diff --git a/src/s3v_i2c.c b/src/s3v_i2c.c index 6ae29c4..2dd812b 100644 --- a/src/s3v_i2c.c +++ b/src/s3v_i2c.c @@ -56,7 +56,6 @@ in this Software without prior written authorization from the XFree86 Project. #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "compiler.h" #include "xf86Pci.h" diff --git a/src/s3v_shadow.c b/src/s3v_shadow.c index 253f295..b2cdf9d 100644 --- a/src/s3v_shadow.c +++ b/src/s3v_shadow.c @@ -62,7 +62,6 @@ in this Software without prior written authorization from the XFree86 Project. #include "xf86.h" #include "xf86_OSproc.h" #include "xf86Resources.h" -#include "xf86_ansic.h" #include "xf86PciInfo.h" #include "xf86Pci.h" #include "shadowfb.h" |