diff options
| author | Adam Jackson <ajax@nwnk.net> | 2006-04-07 18:37:02 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2006-04-07 18:37:02 +0000 |
| commit | 1e341ca5f80f603e0d139bf464ba0143249f32cb (patch) | |
| tree | f80966c87464a112e26e8996c73ca2ec0a54697a | |
| parent | 8a81f9ec9d1faaeb4913596961c39a9b7400e230 (diff) | |
Unlibcwrap. Bump server version requirement. Bump to 0.6.0.xf86-video-impact-0_2_0ark-0_6_0XORG-7_1
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/ark.h | 7 | ||||
| -rw-r--r-- | src/ark_accel.c | 1 | ||||
| -rw-r--r-- | src/ark_driver.c | 2 |
5 files changed, 14 insertions, 8 deletions
@@ -1,3 +1,11 @@ +2006-04-06 Adam Jackson <ajax@freedesktop.org> + + * configure.ac: + * src/ark.h: + * src/ark_accel.c: + * src/ark_driver.c: + Unlibcwrap. Bump server version requirement. Bump to 0.6.0. + 2006-02-08 Luc Verhaegen <libv@skynet.be> * src/ark_driver.c: (ARKPreInit): diff --git a/configure.ac b/configure.ac index d612231..87a7472 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-ark], - 0.5.0.5, + 0.6.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-ark) @@ -53,7 +53,7 @@ XORG_DRIVER_CHECK_EXT(RENDER, renderproto) 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) CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src' @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark.h,v 1.3 2002/01/25 21:55:56 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark.h,v 1.2 2001/01/29 15:15:44 keithp Exp $ */ /* * ark */ @@ -10,7 +10,6 @@ #include "xf86Pci.h" #include "xf86PciInfo.h" #include "xaa.h" -#include "xf86_ansic.h" #include "vgaHW.h" typedef struct _ARKRegRec { @@ -56,9 +55,9 @@ typedef struct _ARKRec { #define DRIVER_NAME "ark" -#define DRIVER_VERSION "0.5.0" +#define DRIVER_VERSION "0.6.0" #define VERSION_MAJOR 0 -#define VERSION_MINOR 5 +#define VERSION_MINOR 6 #define PATCHLEVEL 0 #define ARK_VERSION ((VERSION_MAJOR << 24) | \ (VERSION_MINOR << 16) | \ diff --git a/src/ark_accel.c b/src/ark_accel.c index 4637dc1..315226d 100644 --- a/src/ark_accel.c +++ b/src/ark_accel.c @@ -34,7 +34,6 @@ #include <X11/Xarch.h> #include "xf86.h" -#include "xf86_ansic.h" #include "xf86_OSproc.h" #include "xaa.h" #include "xf86PciInfo.h" diff --git a/src/ark_driver.c b/src/ark_driver.c index 1febb9b..e5ee7e5 100644 --- a/src/ark_driver.c +++ b/src/ark_driver.c @@ -34,7 +34,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "xf86Pci.h" #include "xf86PciInfo.h" #include "xf86Version.h" @@ -49,6 +48,7 @@ #include "fb.h" #include "ark.h" +#include <string.h> /* * prototypes |