diff options
| author | Adam Jackson <ajax@nwnk.net> | 2006-04-07 21:05:21 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2006-04-07 21:05:21 +0000 |
| commit | fe557561f9fd14ac1d44dbb6ecce28e22076ccef (patch) | |
| tree | 25bbd6f0d462049667ad2c2936b37e1c774f570c | |
| parent | 1b851e8180dcb4795b82f28cf1e3c15f6d6210a1 (diff) | |
Unlibcwrap. Bump server version requirement. Bump to 0.9.0.sis-0_9_0
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/sis.h | 13 |
3 files changed, 17 insertions, 6 deletions
@@ -1,3 +1,9 @@ +2006-04-07 Adam Jackson <ajax@freedesktop.org> + + * configure.ac: + * src/sis.h: + Unlibcwrap. Bump server version requirement. Bump to 0.9.0. + 2006-04-06 Eric Anholt <anholt@FreeBSD.org> * src/sis_driver.c: diff --git a/configure.ac b/configure.ac index 12ac91e..599c2a6 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-sis], - 0.8.1.3, + 0.9.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-sis) @@ -62,7 +62,7 @@ XORG_DRIVER_CHECK_EXT(XF86MISC, xf86miscproto) XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) # Checks for pkg-config packages -PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto xf86dgaproto $REQUIRED_MODULES]) +PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto xf86dgaproto $REQUIRED_MODULES]) sdkdir=$(pkg-config --variable=sdkdir xorg-server) # Checks for libraries. @@ -1,5 +1,5 @@ /* $XFree86$ */ -/* $XdotOrg$ */ +/* $XdotOrg: driver/xf86-video-sis/src/sis.h,v 1.66 2005/11/09 21:31:21 kem Exp $ */ /* * Main global data and definitions * @@ -35,6 +35,11 @@ #ifndef _SIS_H_ #define _SIS_H_ +#include <stdio.h> +#include <string.h> +#include <math.h> +#include <setjmp.h> + #define SISDRIVERVERSIONYEAR 5 #define SISDRIVERVERSIONMONTH 9 #define SISDRIVERVERSIONDAY 20 @@ -65,7 +70,6 @@ #include "siscp.H" #endif -#include "xf86_ansic.h" #include "compiler.h" #include "xf86Pci.h" #include "xf86Priv.h" @@ -107,11 +111,12 @@ #define SIS_DRIVER_NAME "sis" #define SIS_MAJOR_VERSION 0 #ifdef SISISXORG6899900 -#define SIS_MINOR_VERSION 8 /* DRI changes */ +#define SIS_MINOR_VERSION 9 /* DRI changes */ +#define SIS_PATCHLEVEL 0 #else #define SIS_MINOR_VERSION 7 -#endif #define SIS_PATCHLEVEL 1 +#endif #define SIS_CURRENT_VERSION ((SIS_MAJOR_VERSION << 16) | \ (SIS_MINOR_VERSION << 8) | SIS_PATCHLEVEL ) |