diff options
| author | Adam Jackson <ajax@nwnk.net> | 2006-04-07 21:20:24 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2006-04-07 21:20:24 +0000 |
| commit | 916e7282982feb0e5c12639ebaf56a8accc15755 (patch) | |
| tree | 7a9e149ebc43add894e3286a0798bb5678b98a8c | |
| parent | 392e90da69ad373860015e71e612ba5d49b89883 (diff) | |
Unlibcwrap. Bump server version requirement. Bump to 1.1.0.suncg3-1_1_0XORG-7_1
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/cg3.h | 1 | ||||
| -rw-r--r-- | src/cg3_driver.c | 9 |
4 files changed, 13 insertions, 8 deletions
@@ -1,3 +1,10 @@ +2006-04-07 Adam Jackson <ajax@freedesktop.org> + + * configure.ac: + * src/cg3.h: + * src/cg3_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 d2ca93e..3db869d 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-suncg3], - 1.0.0.5, + 1.1.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-suncg3) @@ -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/cg3_driver.c b/src/cg3_driver.c index a85fb60..0aa3fba 100644 --- a/src/cg3_driver.c +++ b/src/cg3_driver.c @@ -29,7 +29,6 @@ #define PSZ 8 #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "xf86Version.h" #include "mipointer.h" #include "mibstore.h" @@ -62,11 +61,11 @@ static ModeStatus CG3ValidMode(int scrnIndex, DisplayModePtr mode, void CG3Sync(ScrnInfoPtr pScrn); -#define VERSION 4000 +#define CG3_VERSION 4000 #define CG3_NAME "SUNCG3" #define CG3_DRIVER_NAME "suncg3" #define CG3_MAJOR_VERSION 1 -#define CG3_MINOR_VERSION 0 +#define CG3_MINOR_VERSION 1 #define CG3_PATCHLEVEL 0 /* @@ -78,7 +77,7 @@ void CG3Sync(ScrnInfoPtr pScrn); */ _X_EXPORT DriverRec SUNCG3 = { - VERSION, + CG3_VERSION, CG3_DRIVER_NAME, CG3Identify, CG3Probe, @@ -252,7 +251,7 @@ CG3Probe(DriverPtr drv, int flags) pScrn = xf86AllocateScreen(drv, 0); /* Fill in what we can of the ScrnInfoRec */ - pScrn->driverVersion = VERSION; + pScrn->driverVersion = CG3_VERSION; pScrn->driverName = CG3_DRIVER_NAME; pScrn->name = CG3_NAME; pScrn->Probe = CG3Probe; |