diff options
| author | Adam Jackson <ajax@nwnk.net> | 2006-04-07 19:02:07 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2006-04-07 19:02:07 +0000 |
| commit | fe1fa4c016202e7e07f4e3143b6cedb7f9e82f9b (patch) | |
| tree | 3c56108d6606a3d68822f78bf9efebefc5b318a2 | |
| parent | 41a763816d9319680f31690baeab66407cd5f41c (diff) | |
Unlibcwrap. Bump server version requirement. Bump to 0.2.0.fbdev-0_2_0
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/fbdev.c | 11 |
3 files changed, 14 insertions, 7 deletions
@@ -1,3 +1,9 @@ +2006-04-06 Adam Jackson <ajax@freedesktop.org> + + * configure.ac: + * src/fbdev.c: + Unlibcwrap. Bump server version requirement. Bump to 0.2.0. + 2006-01-09 David Nusinow <gravity-at-freedesktop-dot-org> * man/fbdev.man: diff --git a/configure.ac b/configure.ac index eaa5fe8..8fcc06e 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-fbdev], - 0.1.0.5, + 0.2.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-fbdev) @@ -53,7 +53,7 @@ XORG_DRIVER_CHECK_EXT(RENDER, renderproto) XORG_DRIVER_CHECK_EXT(XV, videoproto) # 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/fbdev.c b/src/fbdev.c index f7c0c65..b3bd75f 100644 --- a/src/fbdev.c +++ b/src/fbdev.c @@ -9,10 +9,11 @@ #include "config.h" #endif +#include <string.h> + /* all driver need this */ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "mipointer.h" #include "mibstore.h" @@ -81,14 +82,14 @@ enum { FBDEV_ROTATE_NONE=0, FBDEV_ROTATE_CW=270, FBDEV_ROTATE_UD=180, FBDEV_ROTA */ static int pix24bpp = 0; -#define VERSION 4000 +#define FBDEV_VERSION 4000 #define FBDEV_NAME "FBDEV" #define FBDEV_DRIVER_NAME "fbdev" #define FBDEV_MAJOR_VERSION 0 -#define FBDEV_MINOR_VERSION 1 +#define FBDEV_MINOR_VERSION 2 _X_EXPORT DriverRec FBDEV = { - VERSION, + FBDEV_VERSION, FBDEV_DRIVER_NAME, #if 0 "driver for linux framebuffer devices", @@ -360,7 +361,7 @@ FBDevProbe(DriverPtr drv, int flags) if (pScrn) { foundScreen = TRUE; - pScrn->driverVersion = VERSION; + pScrn->driverVersion = FBDEV_VERSION; pScrn->driverName = FBDEV_DRIVER_NAME; pScrn->name = FBDEV_NAME; pScrn->Probe = FBDevProbe; |