diff options
| author | Adam Jackson <ajax@nwnk.net> | 2006-04-07 18:34:37 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2006-04-07 18:34:37 +0000 |
| commit | cdfc8e010e230763250eb8b57d0106d20cf40080 (patch) | |
| tree | 67cd90ff9ae2fe85da594c2e5b42fa54ef84a77b | |
| parent | bf98a33803e6c74f6b0015add1271e7f843e5ac6 (diff) | |
Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/apm.h | 2 | ||||
| -rw-r--r-- | src/apm_dga.c | 1 | ||||
| -rw-r--r-- | src/apm_driver.c | 4 |
5 files changed, 13 insertions, 6 deletions
@@ -1,3 +1,11 @@ +2006-04-06 Adam Jackson <ajax@freedesktop.org> + + * configure.ac: + * src/apm.h: + * src/apm_dga.c: + * src/apm_driver.c: + Unlibcwrap. Bump server version requirement. Bump to 1.1.0. + 2005-12-26 Adam Jackson <ajax@freedesktop.org> * src/apm_driver.c: diff --git a/configure.ac b/configure.ac index 28d2359..27b2af9 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-apm], - 1.0.1.5, + 1.1.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-apm) @@ -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) PKG_CHECK_MODULES(XF86RUSH, xxf86rush, have_xf86rush=yes, have_xf86rush=no) @@ -1,12 +1,12 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm.h,v 1.19tsi Exp $ */ +#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/apm_dga.c b/src/apm_dga.c index caf273b..152e91b 100644 --- a/src/apm_dga.c +++ b/src/apm_dga.c @@ -11,7 +11,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "xf86Pci.h" #include "xf86PciInfo.h" #include "xaa.h" diff --git a/src/apm_driver.c b/src/apm_driver.c index 0c920a0..5967443 100644 --- a/src/apm_driver.c +++ b/src/apm_driver.c @@ -20,8 +20,8 @@ #define APM_NAME "APM" #define APM_DRIVER_NAME "apm" #define APM_MAJOR_VERSION 1 -#define APM_MINOR_VERSION 0 -#define APM_PATCHLEVEL 1 +#define APM_MINOR_VERSION 1 +#define APM_PATCHLEVEL 0 #ifndef PCI_CHIP_AT3D #define PCI_CHIP_AT3D 0x643D #endif |