diff options
| author | Adam Jackson <ajax@nwnk.net> | 2006-04-07 21:17:54 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2006-04-07 21:17:54 +0000 |
| commit | 92e60405e69ccfdf522126842e407d7f529916ed (patch) | |
| tree | f3be4c37836eed3a2a86fcd78d012f2eb89fcb45 | |
| parent | 56c6e7a98584130a3dc5a24e9e20a757dc66f1da (diff) | |
Unlibcwrap. Bump server version requirement. Bump to 1.1.0.suncg14-1_1_0XORG-7_1
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/cg14.h | 1 | ||||
| -rw-r--r-- | src/cg14_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/cg14.h: + * src/cg14_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 2f996e6..0067442 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-suncg14], - 1.0.0.5, + 1.1.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-suncg14) @@ -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/cg14_driver.c b/src/cg14_driver.c index 783122e..039f379 100644 --- a/src/cg14_driver.c +++ b/src/cg14_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" @@ -63,11 +64,11 @@ static ModeStatus CG14ValidMode(int scrnIndex, DisplayModePtr mode, void CG14Sync(ScrnInfoPtr pScrn); -#define VERSION 4000 +#define CG14_VERSION 4000 #define CG14_NAME "SUNCG14" #define CG14_DRIVER_NAME "suncg14" #define CG14_MAJOR_VERSION 1 -#define CG14_MINOR_VERSION 0 +#define CG14_MINOR_VERSION 1 #define CG14_PATCHLEVEL 0 /* @@ -79,7 +80,7 @@ void CG14Sync(ScrnInfoPtr pScrn); */ _X_EXPORT DriverRec SUNCG14 = { - VERSION, + CG14_VERSION, CG14_DRIVER_NAME, CG14Identify, CG14Probe, @@ -257,7 +258,7 @@ CG14Probe(DriverPtr drv, int flags) pScrn = xf86AllocateScreen(drv, 0); /* Fill in what we can of the ScrnInfoRec */ - pScrn->driverVersion = VERSION; + pScrn->driverVersion = CG14_VERSION; pScrn->driverName = CG14_DRIVER_NAME; pScrn->name = CG14_NAME; pScrn->Probe = CG14Probe; |