summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2006-04-07 21:31:45 +0000
committerAdam Jackson <ajax@nwnk.net>2006-04-07 21:31:45 +0000
commit41c0df572fa1ab1cb50304d69a1ac3da50103c9b (patch)
tree2028bddb88704582ef5e65d1ada07e51482593cc
parentb23bc8a174f7bb356fcf27d88595db9e1233bc6f (diff)
Unlibcwrap. Bump server version requirement. Bump to 1.1.0.suntcx-1_1_0XORG-7_1
-rw-r--r--ChangeLog7
-rw-r--r--configure.ac4
-rw-r--r--src/tcx.h1
-rw-r--r--src/tcx_driver.c11
4 files changed, 15 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index e6c8681..9044bb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-07 Adam Jackson <ajax@freedesktop.org>
+
+ * configure.ac:
+ * src/tcx.h:
+ * src/tcx_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 789f624..32500ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-suntcx],
- 1.0.0.5,
+ 1.1.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-suntcx)
@@ -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.
diff --git a/src/tcx.h b/src/tcx.h
index 71e6326..4996cfd 100644
--- a/src/tcx.h
+++ b/src/tcx.h
@@ -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/tcx_driver.c b/src/tcx_driver.c
index 41a0b0b..e82a419 100644
--- a/src/tcx_driver.c
+++ b/src/tcx_driver.c
@@ -26,9 +26,10 @@
#include "config.h"
#endif
+#include <string.h>
+
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86_ansic.h"
#include "xf86Version.h"
#include "mipointer.h"
#include "mibstore.h"
@@ -62,11 +63,11 @@ static ModeStatus TCXValidMode(int scrnIndex, DisplayModePtr mode,
void TCXSync(ScrnInfoPtr pScrn);
-#define VERSION 4000
+#define TCX_VERSION 4000
#define TCX_NAME "SUNTCX"
#define TCX_DRIVER_NAME "suntcx"
#define TCX_MAJOR_VERSION 1
-#define TCX_MINOR_VERSION 0
+#define TCX_MINOR_VERSION 1
#define TCX_PATCHLEVEL 0
/*
@@ -78,7 +79,7 @@ void TCXSync(ScrnInfoPtr pScrn);
*/
_X_EXPORT DriverRec SUNTCX = {
- VERSION,
+ TCX_VERSION,
TCX_DRIVER_NAME,
TCXIdentify,
TCXProbe,
@@ -259,7 +260,7 @@ TCXProbe(DriverPtr drv, int flags)
pScrn = xf86AllocateScreen(drv, 0);
/* Fill in what we can of the ScrnInfoRec */
- pScrn->driverVersion = VERSION;
+ pScrn->driverVersion = TCX_VERSION;
pScrn->driverName = TCX_DRIVER_NAME;
pScrn->name = TCX_NAME;
pScrn->Probe = TCXProbe;