diff options
| author | Adam Jackson <ajax@nwnk.net> | 2006-04-07 21:14:47 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2006-04-07 21:14:47 +0000 |
| commit | 0d47924bba0872ce4c6cadedff6783be3ce03f86 (patch) | |
| tree | bfcf15e9ae4dbf0bed3e512884c0216018f2c12f | |
| parent | a9e83a10f9bfd354af448c20b41d0c85db7e489d (diff) | |
Unlibcwrap. Bump server version requirement. Bump to 1.1.0.xf86-video-sunbw2-1.1.0sunbw2-1_1_0XORG-7_1
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/bw2.h | 1 | ||||
| -rw-r--r-- | src/bw2_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/bw2.h: + * src/bw2_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 2dcd6b6..dd5a950 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-sunbw2], - 1.0.0.5, + 1.1.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-sunbw2) @@ -51,7 +51,7 @@ AC_ARG_WITH(xorg-module-dir, XORG_DRIVER_CHECK_EXT(RANDR, randrproto) # Checks for pkg-config packages -PKG_CHECK_MODULES(XORG, [xorg-server xproto $REQUIRED_MODULES]) +PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto $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/bw2_driver.c b/src/bw2_driver.c index 318adc4..1bd064c 100644 --- a/src/bw2_driver.c +++ b/src/bw2_driver.c @@ -28,7 +28,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "xf86Version.h" #include "mipointer.h" #include "mibstore.h" @@ -61,11 +60,11 @@ static ModeStatus BW2ValidMode(int scrnIndex, DisplayModePtr mode, void BW2Sync(ScrnInfoPtr pScrn); -#define VERSION 4000 +#define BW2_VERSION 4000 #define BW2_NAME "SUNBW2" #define BW2_DRIVER_NAME "sunbw2" #define BW2_MAJOR_VERSION 1 -#define BW2_MINOR_VERSION 0 +#define BW2_MINOR_VERSION 1 #define BW2_PATCHLEVEL 0 /* @@ -77,7 +76,7 @@ void BW2Sync(ScrnInfoPtr pScrn); */ _X_EXPORT DriverRec SUNBW2 = { - VERSION, + BW2_VERSION, BW2_DRIVER_NAME, BW2Identify, BW2Probe, @@ -251,7 +250,7 @@ BW2Probe(DriverPtr drv, int flags) pScrn = xf86AllocateScreen(drv, 0); /* Fill in what we can of the ScrnInfoRec */ - pScrn->driverVersion = VERSION; + pScrn->driverVersion = BW2_VERSION; pScrn->driverName = BW2_DRIVER_NAME; pScrn->name = BW2_NAME; pScrn->Probe = BW2Probe; |