diff options
| author | Adam Jackson <ajax@nwnk.net> | 2006-04-07 19:28:16 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2006-04-07 19:28:16 +0000 |
| commit | a02507545b53ab20f6003c8771b800a6927c7106 (patch) | |
| tree | 830ca35df55f5ce1d795d985d068bb7045b3c49a | |
| parent | 72681940d2523cc2928b0c2803b006483e8e4929 (diff) | |
Unlibcwrap. Bump server version requirement. Bump to 0.2.0.newport-0_2_0XORG-7_1
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/newport.h | 1 | ||||
| -rw-r--r-- | src/newport_accel.c | 1 | ||||
| -rw-r--r-- | src/newport_driver.c | 13 |
5 files changed, 19 insertions, 8 deletions
@@ -1,3 +1,11 @@ +2006-04-07 Adam Jackson <ajax@freedesktop.org> + + * configure.ac: + * src/newport.h: + * src/newport_accel.c: + * src/newport_driver.c: + Unlibcwrap. Bump server version requirement. Bump to 0.2.0. + 2006-01-09 David Nusinow <gravity-at-freedesktop-dot-org> * man/newport.man: diff --git a/configure.ac b/configure.ac index a642657..e81783b 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-newport], - 0.1.4.1, + 0.2.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-newport) @@ -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/newport.h b/src/newport.h index 443162a..f7354e9 100644 --- a/src/newport.h +++ b/src/newport.h @@ -22,7 +22,6 @@ */ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "compiler.h" #include "xf86Resources.h" diff --git a/src/newport_accel.c b/src/newport_accel.c index 90b4c31..404c59d 100644 --- a/src/newport_accel.c +++ b/src/newport_accel.c @@ -11,6 +11,7 @@ #endif #include "newport.h" +#include <values.h> #ifdef NEWPORT_ACCEL diff --git a/src/newport_driver.c b/src/newport_driver.c index 18e9f88..2bb6cab 100644 --- a/src/newport_driver.c +++ b/src/newport_driver.c @@ -56,12 +56,15 @@ #include "xf86xv.h" #include <X11/extensions/Xv.h> -#define VERSION 4000 +#include <string.h> +#include <stdio.h> + +#define NEWPORT_VERSION 4000 #define NEWPORT_NAME "NEWPORT" #define NEWPORT_DRIVER_NAME "newport" #define NEWPORT_MAJOR_VERSION 0 -#define NEWPORT_MINOR_VERSION 1 -#define NEWPORT_PATCHLEVEL 4 +#define NEWPORT_MINOR_VERSION 2 +#define NEWPORT_PATCHLEVEL 0 /* Prototypes ------------------------------------------------------- */ @@ -85,7 +88,7 @@ static Bool NewportProbeCardInfo(ScrnInfoPtr pScrn); /* ------------------------------------------------------------------ */ _X_EXPORT DriverRec NEWPORT = { - VERSION, + NEWPORT_VERSION, NEWPORT_DRIVER_NAME, NewportIdentify, NewportProbe, @@ -280,7 +283,7 @@ NewportProbe(DriverPtr drv, int flags) pScrn = xf86ConfigIsaEntity(pScrn, 0, entity, NULL, range, \ NULL, NULL, NULL, NULL); /* Allocate a ScrnInfoRec */ - pScrn->driverVersion = VERSION; + pScrn->driverVersion = NEWPORT_VERSION; pScrn->driverName = NEWPORT_DRIVER_NAME; pScrn->name = NEWPORT_NAME; pScrn->Probe = NewportProbe; |