diff options
| author | Adam Jackson <ajax@nwnk.net> | 2006-04-07 21:24:15 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2006-04-07 21:24:15 +0000 |
| commit | 612e84c6ba39e86857d16553d202be71d3e0c0e4 (patch) | |
| tree | b84320bcd418055e11c43cda8764e55500f0d76f | |
| parent | b011bb947ca9dab087574ae867ad2dbd57ab2193 (diff) | |
Unlibcwrap. Bump server version requirement. Bump to 1.1.0.suncg6-1_1_0XORG-7_1
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/cg6.h | 1 | ||||
| -rw-r--r-- | src/cg6_driver.c | 11 |
4 files changed, 15 insertions, 8 deletions
@@ -1,3 +1,10 @@ +2006-04-07 Adam Jackson <ajax@freedesktop.org> + + * configure.ac: + * src/cg6.h: + * src/cg6_driver.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 839b14f..313342e 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-suncg6], - 1.0.0.5, + 1.1.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-suncg6) @@ -52,7 +52,7 @@ XORG_DRIVER_CHECK_EXT(RANDR, randrproto) XORG_DRIVER_CHECK_EXT(RENDER, renderproto) # 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. @@ -27,7 +27,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "xf86RamDac.h" #include <X11/Xmd.h> #include "gcstruct.h" diff --git a/src/cg6_driver.c b/src/cg6_driver.c index eda4f5a..baad7c3 100644 --- a/src/cg6_driver.c +++ b/src/cg6_driver.c @@ -26,9 +26,10 @@ #include "config.h" #endif +#include <string.h> + #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "xf86Version.h" #include "mipointer.h" #include "mibstore.h" @@ -61,11 +62,11 @@ static ModeStatus CG6ValidMode(int scrnIndex, DisplayModePtr mode, void CG6Sync(ScrnInfoPtr pScrn); -#define VERSION 4000 +#define CG6_VERSION 4000 #define CG6_NAME "SUNCG6" #define CG6_DRIVER_NAME "suncg6" #define CG6_MAJOR_VERSION 1 -#define CG6_MINOR_VERSION 0 +#define CG6_MINOR_VERSION 1 #define CG6_PATCHLEVEL 0 /* @@ -77,7 +78,7 @@ void CG6Sync(ScrnInfoPtr pScrn); */ _X_EXPORT DriverRec SUNCG6 = { - VERSION, + CG6_VERSION, CG6_DRIVER_NAME, CG6Identify, CG6Probe, @@ -260,7 +261,7 @@ CG6Probe(DriverPtr drv, int flags) pScrn = xf86AllocateScreen(drv, 0); /* Fill in what we can of the ScrnInfoRec */ - pScrn->driverVersion = VERSION; + pScrn->driverVersion = CG6_VERSION; pScrn->driverName = CG6_DRIVER_NAME; pScrn->name = CG6_NAME; pScrn->Probe = CG6Probe; |