diff options
| -rw-r--r-- | ChangeLog | 19 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/CirrusClk.c | 1 | ||||
| -rw-r--r-- | src/alp_driver.c | 1 | ||||
| -rw-r--r-- | src/alp_hwcurs.c | 1 | ||||
| -rw-r--r-- | src/alp_i2c.c | 1 | ||||
| -rw-r--r-- | src/alp_xaa.c | 1 | ||||
| -rw-r--r-- | src/alp_xaam.c | 1 | ||||
| -rw-r--r-- | src/cir.h | 4 | ||||
| -rw-r--r-- | src/cir_dga.c | 1 | ||||
| -rw-r--r-- | src/cir_driver.c | 7 | ||||
| -rw-r--r-- | src/cir_shadow.c | 1 | ||||
| -rw-r--r-- | src/lg_driver.c | 1 | ||||
| -rw-r--r-- | src/lg_hwcurs.c | 1 | ||||
| -rw-r--r-- | src/lg_i2c.c | 1 | ||||
| -rw-r--r-- | src/lg_xaa.c | 1 |
16 files changed, 27 insertions, 19 deletions
@@ -1,3 +1,22 @@ +2006-04-06 Adam Jackson <ajax@freedesktop.org> + + * configure.ac: + * src/CirrusClk.c: + * src/alp_driver.c: + * src/alp_hwcurs.c: + * src/alp_i2c.c: + * src/alp_xaa.c: + * src/alp_xaam.c: + * src/cir.h: + * src/cir_dga.c: + * src/cir_driver.c: + * src/cir_shadow.c: + * src/lg_driver.c: + * src/lg_hwcurs.c: + * src/lg_i2c.c: + * src/lg_xaa.c: + Unlibcwrap. Bump server version requirement. Bump to 1.1.0. + 2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> * configure.ac: diff --git a/configure.ac b/configure.ac index f3c03bb..88b64b7 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-cirrus], - 1.0.0.5, + 1.1.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-cirrus) @@ -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. diff --git a/src/CirrusClk.c b/src/CirrusClk.c index 6a8e57e..f23fde8 100644 --- a/src/CirrusClk.c +++ b/src/CirrusClk.c @@ -19,7 +19,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "xf86PciInfo.h" #include "xf86Pci.h" diff --git a/src/alp_driver.c b/src/alp_driver.c index 95c5420..6d17b37 100644 --- a/src/alp_driver.c +++ b/src/alp_driver.c @@ -22,7 +22,6 @@ #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/alp_hwcurs.c b/src/alp_hwcurs.c index 927a73e..79dfce7 100644 --- a/src/alp_hwcurs.c +++ b/src/alp_hwcurs.c @@ -8,7 +8,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "compiler.h" #include "xf86Pci.h" diff --git a/src/alp_i2c.c b/src/alp_i2c.c index 86f4788..9e6ae67 100644 --- a/src/alp_i2c.c +++ b/src/alp_i2c.c @@ -8,7 +8,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "compiler.h" #include "xf86Pci.h" diff --git a/src/alp_xaa.c b/src/alp_xaa.c index 3bcafd7..95741fc 100644 --- a/src/alp_xaa.c +++ b/src/alp_xaa.c @@ -8,7 +8,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "compiler.h" #include "xf86Pci.h" diff --git a/src/alp_xaam.c b/src/alp_xaam.c index 16d86be..0193a43 100644 --- a/src/alp_xaam.c +++ b/src/alp_xaam.c @@ -8,7 +8,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "compiler.h" #include "xf86Pci.h" @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir.h,v 1.21 2002/01/25 21:56:01 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir.h,v 1.20 2002/01/04 21:26:54 tsi Exp $ */ /* (c) Itai Nahshon */ @@ -8,6 +8,8 @@ #include "xf86Cursor.h" #include "xaa.h" #include "xf86i2c.h" +#include <string.h> +#include <stdlib.h> /* Card-specific driver information */ #define CIRPTR(p) ((CirPtr)((p)->driverPrivate)) diff --git a/src/cir_dga.c b/src/cir_dga.c index de95ccc..bedb796 100644 --- a/src/cir_dga.c +++ b/src/cir_dga.c @@ -30,7 +30,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/cir_driver.c b/src/cir_driver.c index 9a7b233..06e99b0 100644 --- a/src/cir_driver.c +++ b/src/cir_driver.c @@ -24,7 +24,6 @@ #include "xf86Resources.h" /* All drivers need this */ -#include "xf86_ansic.h" /* Drivers for PCI hardware need this */ #include "xf86PciInfo.h" @@ -51,11 +50,11 @@ static Bool CIRProbe(DriverPtr drv, int flags); static Bool lg_loaded = FALSE; static Bool alp_loaded = FALSE; -#define VERSION 4000 +#define CIR_VERSION 4000 #define CIR_NAME "CIRRUS" #define CIR_DRIVER_NAME "cirrus" #define CIR_MAJOR_VERSION 1 -#define CIR_MINOR_VERSION 0 +#define CIR_MINOR_VERSION 1 #define CIR_PATCHLEVEL 0 /* @@ -67,7 +66,7 @@ static Bool alp_loaded = FALSE; */ _X_EXPORT DriverRec CIRRUS = { - VERSION, + CIR_VERSION, CIR_DRIVER_NAME, CIRIdentify, CIRProbe, diff --git a/src/cir_shadow.c b/src/cir_shadow.c index 6c4c2bc..a7964cd 100644 --- a/src/cir_shadow.c +++ b/src/cir_shadow.c @@ -12,7 +12,6 @@ #include "xf86.h" #include "xf86_OSproc.h" #include "xf86Resources.h" -#include "xf86_ansic.h" #include "xf86PciInfo.h" #include "xf86Pci.h" #include "shadowfb.h" diff --git a/src/lg_driver.c b/src/lg_driver.c index c735fb2..7dab5e8 100644 --- a/src/lg_driver.c +++ b/src/lg_driver.c @@ -26,7 +26,6 @@ #include "xf86_OSproc.h" /* All drivers need this */ -#include "xf86_ansic.h" #include "compiler.h" diff --git a/src/lg_hwcurs.c b/src/lg_hwcurs.c index cf4c15d..b41b79a 100644 --- a/src/lg_hwcurs.c +++ b/src/lg_hwcurs.c @@ -18,7 +18,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "compiler.h" #include "xf86Pci.h" diff --git a/src/lg_i2c.c b/src/lg_i2c.c index 965343b..05e083c 100644 --- a/src/lg_i2c.c +++ b/src/lg_i2c.c @@ -8,7 +8,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "compiler.h" #include "xf86Pci.h" diff --git a/src/lg_xaa.c b/src/lg_xaa.c index c42652f..fd8c70a 100644 --- a/src/lg_xaa.c +++ b/src/lg_xaa.c @@ -18,7 +18,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "compiler.h" #include "xf86Pci.h" |