diff options
| author | Adam Jackson <ajax@nwnk.net> | 2006-04-07 18:50:19 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2006-04-07 18:50:19 +0000 |
| commit | 7432eaf48b70437bd55e5cc98833cce224d9e131 (patch) | |
| tree | ac344d43034179a5f4372eedc3a517ad24c9101d | |
| parent | 474af880791908da7e006c4d500bc7318107bbd1 (diff) | |
Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/dummy.h | 2 | ||||
| -rw-r--r-- | src/dummy_cursor.c | 1 | ||||
| -rw-r--r-- | src/dummy_dga.c | 1 | ||||
| -rw-r--r-- | src/dummy_driver.c | 7 |
6 files changed, 15 insertions, 9 deletions
@@ -1,3 +1,12 @@ +2006-04-06 Adam Jackson <ajax@freedesktop.org> + + * configure.ac: + * src/dummy.h: + * src/dummy_cursor.c: + * src/dummy_dga.c: + * src/dummy_driver.c: + Unlibcwrap. Bump server version requirement. Bump to 0.2.0. + 2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> * configure.ac: diff --git a/configure.ac b/configure.ac index 8fd2885..f019cd1 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-dummy], - 0.1.0.5, + 0.2.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-dummy) @@ -54,7 +54,7 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto) XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto) # 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) CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src' diff --git a/src/dummy.h b/src/dummy.h index e9dabe0..17d872d 100644 --- a/src/dummy.h +++ b/src/dummy.h @@ -3,12 +3,12 @@ /* All drivers should typically include these */ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "xf86Cursor.h" #include "xf86xv.h" #include <X11/extensions/Xv.h> +#include <string.h> /* Supported chipsets */ typedef enum { diff --git a/src/dummy_cursor.c b/src/dummy_cursor.c index 58fa18a..aa6021f 100644 --- a/src/dummy_cursor.c +++ b/src/dummy_cursor.c @@ -5,7 +5,6 @@ /* All drivers should typically include these */ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "xf86Cursor.h" #include "cursorstr.h" diff --git a/src/dummy_dga.c b/src/dummy_dga.c index 98131ed..2c74600 100644 --- a/src/dummy_dga.c +++ b/src/dummy_dga.c @@ -4,7 +4,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "xf86Pci.h" #include "xf86PciInfo.h" #include "dgaproc.h" diff --git a/src/dummy_driver.c b/src/dummy_driver.c index 0c5fd71..2846aa6 100644 --- a/src/dummy_driver.c +++ b/src/dummy_driver.c @@ -11,7 +11,6 @@ /* All drivers should typically include these */ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" /* This is used for module versioning */ #include "xf86Version.h" @@ -82,12 +81,12 @@ static Bool dummyDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op, /* static void DUMMYDisplayPowerManagementSet(ScrnInfoPtr pScrn, */ /* int PowerManagementMode, int flags); */ -#define VERSION 4000 +#define DUMMY_VERSION 4000 #define DUMMY_NAME "DUMMY" #define DUMMY_DRIVER_NAME "dummy" #define DUMMY_MAJOR_VERSION 0 -#define DUMMY_MINOR_VERSION 1 +#define DUMMY_MINOR_VERSION 2 #define DUMMY_PATCHLEVEL 0 /* @@ -106,7 +105,7 @@ static int pix24bpp = 0; */ _X_EXPORT DriverRec DUMMY = { - VERSION, + DUMMY_VERSION, DUMMY_DRIVER_NAME, DUMMYIdentify, DUMMYProbe, |