diff options
| author | Adam Jackson <ajax@nwnk.net> | 2006-04-07 21:58:28 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2006-04-07 21:58:28 +0000 |
| commit | e6743d920ddb245bd2af6c047dd769ae2deb9a74 (patch) | |
| tree | 5d4d481e56cfa84a708d8fa345fdf5ce00d701fd | |
| parent | 61355da3d5b6c4d0ddc8c850de9d26ff614c5446 (diff) | |
Unlibcwrap. Bump server version requirement. Bump to 1.1.0.voodoo-1_1_0XORG-7_1
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/voodoo.h | 6 | ||||
| -rw-r--r-- | src/voodoo_dga.c | 1 | ||||
| -rw-r--r-- | src/voodoo_driver.c | 5 | ||||
| -rw-r--r-- | src/voodoo_hardware.c | 1 |
6 files changed, 17 insertions, 9 deletions
@@ -1,3 +1,12 @@ +2006-04-07 Adam Jackson <ajax@freedesktop.org> + + * configure.ac: + * src/voodoo.h: + * src/voodoo_dga.c: + * src/voodoo_driver.c: + * src/voodoo_hardware.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 7954a0a..e3a422c 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-voodoo], - 1.0.0.5, + 1.1.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-voodoo) @@ -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 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. diff --git a/src/voodoo.h b/src/voodoo.h index 3a99aca..8aa0435 100644 --- a/src/voodoo.h +++ b/src/voodoo.h @@ -1,3 +1,5 @@ +#include <string.h> + typedef struct { CARD32 m; CARD32 n; @@ -74,11 +76,11 @@ typedef struct { #define VoodooPTR(p) ((VoodooPtr)((p)->driverPrivate)) -#define VERSION 4000 +#define VOODOO_VERSION 4000 #define VOODOO_NAME "Voodoo" #define VOODOO_DRIVER_NAME "voodoo" #define VOODOO_MAJOR_VERSION 1 -#define VOODOO_MINOR_VERSION 0 +#define VOODOO_MINOR_VERSION 1 #define VOODOO_PATCHLEVEL 0 #define PCI_CHIP_VOODOO1 0x0001 diff --git a/src/voodoo_dga.c b/src/voodoo_dga.c index 6c85dcd..6f1f925 100644 --- a/src/voodoo_dga.c +++ b/src/voodoo_dga.c @@ -42,7 +42,6 @@ #include "micmap.h" #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "xf86Version.h" #include "xf86PciInfo.h" #include "xf86Pci.h" diff --git a/src/voodoo_driver.c b/src/voodoo_driver.c index f161f8e..f4dcd96 100644 --- a/src/voodoo_driver.c +++ b/src/voodoo_driver.c @@ -50,7 +50,6 @@ #include "micmap.h" #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "xf86Version.h" #include "xf86PciInfo.h" #include "xf86Pci.h" @@ -101,7 +100,7 @@ static void VoodooDisplayPowerManagementSet(ScrnInfoPtr pScrn, */ _X_EXPORT DriverRec VOODOO = { - VERSION, + VOODOO_VERSION, VOODOO_DRIVER_NAME, VoodooIdentify, VoodooProbe, @@ -284,7 +283,7 @@ VoodooProbe(DriverPtr drv, int flags) VoodooPCIChipsets,NULL, NULL, NULL, NULL, NULL))) { - pScrn->driverVersion = VERSION; + pScrn->driverVersion = VOODOO_VERSION; pScrn->driverName = VOODOO_DRIVER_NAME; pScrn->name = VOODOO_NAME; pScrn->Probe = VoodooProbe; diff --git a/src/voodoo_hardware.c b/src/voodoo_hardware.c index 5aa3c49..c943ab4 100644 --- a/src/voodoo_hardware.c +++ b/src/voodoo_hardware.c @@ -43,7 +43,6 @@ #include "micmap.h" #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "xf86Version.h" #include "xf86PciInfo.h" #include "xf86Pci.h" |