diff options
| author | Adam Jackson <ajax@nwnk.net> | 2006-04-07 21:40:34 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2006-04-07 21:40:34 +0000 |
| commit | 4fb2560e8ef828e91a6a2a2ca3367befd99748f0 (patch) | |
| tree | 5f3030f4506f74595c96c3ff1d026eb2e2e83a37 | |
| parent | b87b76bd12cf8d155b598b1bb2b7640cea4f7b8d (diff) | |
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/BT463ramdac.c | 1 | ||||
| -rw-r--r-- | src/BTramdac.c | 1 | ||||
| -rw-r--r-- | src/IBM561ramdac.c | 1 | ||||
| -rw-r--r-- | src/tga_accel.c | 1 | ||||
| -rw-r--r-- | src/tga_dac.c | 1 | ||||
| -rw-r--r-- | src/tga_driver.c | 11 | ||||
| -rw-r--r-- | src/tga_line.c | 1 | ||||
| -rw-r--r-- | src/tga_regs.h | 3 |
10 files changed, 22 insertions, 15 deletions
@@ -1,3 +1,16 @@ +2006-04-07 Adam Jackson <ajax@freedesktop.org> + + * configure.ac: + * src/BT463ramdac.c: + * src/BTramdac.c: + * src/IBM561ramdac.c: + * src/tga_accel.c: + * src/tga_dac.c: + * src/tga_driver.c: + * src/tga_line.c: + * src/tga_regs.h: + 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 e54332d..2588294 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-tga], - 1.0.0.5, + 1.1.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-tga) @@ -55,7 +55,7 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto) # 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/BT463ramdac.c b/src/BT463ramdac.c index ffcf658..c723727 100644 --- a/src/BT463ramdac.c +++ b/src/BT463ramdac.c @@ -6,7 +6,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "xf86PciInfo.h" #include "xf86Pci.h" diff --git a/src/BTramdac.c b/src/BTramdac.c index fad4c9b..ceab49d 100644 --- a/src/BTramdac.c +++ b/src/BTramdac.c @@ -32,7 +32,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "xf86PciInfo.h" #include "xf86Pci.h" diff --git a/src/IBM561ramdac.c b/src/IBM561ramdac.c index bc76d1d..f8b4931 100644 --- a/src/IBM561ramdac.c +++ b/src/IBM561ramdac.c @@ -6,7 +6,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "xf86PciInfo.h" #include "xf86Pci.h" diff --git a/src/tga_accel.c b/src/tga_accel.c index f7708e3..76decdf 100644 --- a/src/tga_accel.c +++ b/src/tga_accel.c @@ -34,7 +34,6 @@ #include "micmap.h" #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "xf86PciInfo.h" #include "xf86Pci.h" #include "xf86cmap.h" diff --git a/src/tga_dac.c b/src/tga_dac.c index 48d0ad9..81d0793 100644 --- a/src/tga_dac.c +++ b/src/tga_dac.c @@ -29,7 +29,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "xf86PciInfo.h" #include "xf86Pci.h" diff --git a/src/tga_driver.c b/src/tga_driver.c index 3f42f60..5f6dc1e 100644 --- a/src/tga_driver.c +++ b/src/tga_driver.c @@ -28,10 +28,11 @@ #include "config.h" #endif +#include <string.h> + /* everybody includes these */ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" /* PCI headers */ #include "xf86PciInfo.h" @@ -114,11 +115,11 @@ static void TGADisplayPowerManagementSet(ScrnInfoPtr pScrn, void TGASync(ScrnInfoPtr pScrn); -#define VERSION 4000 +#define TGA_VERSION 4000 #define TGA_NAME "TGA" #define TGA_DRIVER_NAME "tga" #define TGA_MAJOR_VERSION 1 -#define TGA_MINOR_VERSION 0 +#define TGA_MINOR_VERSION 1 #define TGA_PATCHLEVEL 0 /* @@ -130,7 +131,7 @@ void TGASync(ScrnInfoPtr pScrn); */ _X_EXPORT DriverRec TGA = { - VERSION, + TGA_VERSION, TGA_DRIVER_NAME, TGAIdentify, TGAProbe, @@ -399,7 +400,7 @@ TGAProbe(DriverPtr drv, int flags) TGAPciChipsets, NULL, NULL, NULL, NULL, NULL))) { /* Fill in what we can of the ScrnInfoRec */ - pScrn->driverVersion = VERSION; + pScrn->driverVersion = TGA_VERSION; pScrn->driverName = TGA_DRIVER_NAME; pScrn->name = TGA_NAME; pScrn->Probe = TGAProbe; diff --git a/src/tga_line.c b/src/tga_line.c index dd5968f..c8b3649 100644 --- a/src/tga_line.c +++ b/src/tga_line.c @@ -38,7 +38,6 @@ #include <X11/X.h> #include "misc.h" #include "xf86.h" -#include "xf86_ansic.h" #include "xf86_OSproc.h" #include "scrnintstr.h" diff --git a/src/tga_regs.h b/src/tga_regs.h index 4bda04a..0cf054d 100644 --- a/src/tga_regs.h +++ b/src/tga_regs.h @@ -21,7 +21,7 @@ * * Author: Alan Hourihane, <alanh@fairlite.demon.co.uk> */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/tga_regs.h,v 1.12 2002/05/13 05:22:37 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/tga_regs.h,v 1.11 2000/10/20 12:57:26 alanh Exp $ */ /* TGA hardware description (minimal) * @@ -34,7 +34,6 @@ #ifndef TGA_REGS_H #define TGA_REGS_H -#include "xf86_ansic.h" #include "compiler.h" #define TYPE_TGA_8PLANE 0 |