diff options
| author | Adam Jackson <ajax@nwnk.net> | 2006-04-07 20:55:14 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2006-04-07 20:55:14 +0000 |
| commit | e423d8649334a62c4657f7633a09f7976be50e34 (patch) | |
| tree | d65240982a1a57bfe07f3349245871d72b2cbaa1 | |
| parent | bb4fede8dc7741d00014fdb353945b0832599333 (diff) | |
Unlibcwrap. Bump server version requirement. Bump to 2.1.0.savage-2_1_0
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/savage_dri.c | 1 | ||||
| -rw-r--r-- | src/savage_driver.h | 11 | ||||
| -rw-r--r-- | src/savage_hwmc.c | 1 | ||||
| -rw-r--r-- | src/savage_i2c.c | 1 |
6 files changed, 18 insertions, 9 deletions
@@ -1,3 +1,12 @@ +2006-04-07 Adam Jackson <ajax@freedesktop.org> + + * configure.ac: + * src/savage_dri.c: + * src/savage_driver.h: + * src/savage_hwmc.c: + * src/savage_i2c.c: + Unlibcwrap. Bump server version requirement. Bump to 2.1.0. + 2006-02-08 Luc Verhaegen <libv@skynet.be> * src/savage_dri.c: (SAVAGEDRIScreenInit): diff --git a/configure.ac b/configure.ac index 2494b3a..5500ae1 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-savage], - 2.0.2.3, + 2.1.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-savage) @@ -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/savage_dri.c b/src/savage_dri.c index e0099fa..78987af 100644 --- a/src/savage_dri.c +++ b/src/savage_dri.c @@ -30,7 +30,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "xf86Priv.h" #include "xaalocal.h" diff --git a/src/savage_driver.h b/src/savage_driver.h index ca60dcb..9d7d339 100644 --- a/src/savage_driver.h +++ b/src/savage_driver.h @@ -3,9 +3,12 @@ #ifndef SAVAGE_VGAHWMMIO_H #define SAVAGE_VGAHWMMIO_H +#include <stdio.h> +#include <string.h> +#include <math.h> + #define MODE_24 24 -#include "xf86_ansic.h" #include "compiler.h" #include "vgaHW.h" #include "xf86.h" @@ -148,10 +151,10 @@ typedef struct #define SAVAGE_TV_ON 4 #define SAVAGE_DRIVER_NAME "savage" -#define SAVAGE_DRIVER_VERSION "2.0.2" +#define SAVAGE_DRIVER_VERSION "2.1.0" #define SAVAGE_VERSION_MAJOR 2 -#define SAVAGE_VERSION_MINOR 0 -#define SAVAGE_PATCHLEVEL 2 +#define SAVAGE_VERSION_MINOR 1 +#define SAVAGE_PATCHLEVEL 0 #define SAVAGE_VERSION ((SAVAGE_VERSION_MAJOR << 24) | \ (SAVAGE_VERSION_MINOR << 16) | \ SAVAGE_PATCHLEVEL) diff --git a/src/savage_hwmc.c b/src/savage_hwmc.c index 6e42779..6a39754 100644 --- a/src/savage_hwmc.c +++ b/src/savage_hwmc.c @@ -29,7 +29,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/savage_i2c.c b/src/savage_i2c.c index 6aeea9e..6873003 100644 --- a/src/savage_i2c.c +++ b/src/savage_i2c.c @@ -31,7 +31,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" |