summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2006-04-07 18:12:40 +0000
committerAdam Jackson <ajax@nwnk.net>2006-04-07 18:12:40 +0000
commitcdf84bdf76f01f2cac0a71cacec695eb0b8e1d5b (patch)
treebc38acecbc291efc0850c13d5108faea23e0c9e6
parent9271df20f49406934d6334ec4078f7bb555fd201 (diff)
Unlibcwrap. Bump server version requirement. Bump to 1.1.0.xf86-video-impact-0_2_0tek4957-1_1_0XORG-7_1
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac4
-rw-r--r--src/xf86Tek4957.c8
3 files changed, 11 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index e6c8681..5d5d60f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-06 Adam Jackson <ajax@freedesktop.org>
+
+ * configure.ac:
+ * src/xf86Tek4957.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 8166d47..422c01f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-tek4957],
- 1.0.0.5,
+ 1.1.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-tek4957)
@@ -75,7 +75,7 @@ XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
XORG_DRIVER_CHECK_EXT(XINPUT, inputproto)
# 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)
CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
diff --git a/src/xf86Tek4957.c b/src/xf86Tek4957.c
index 938dafd..95b4edc 100644
--- a/src/xf86Tek4957.c
+++ b/src/xf86Tek4957.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/input/tek4957/xf86Tek4957.c,v 1.5 2005/06/27 18:32:54 ajax Exp $ */
+/* $XdotOrg: driver/xf86-input-tek4957/src/xf86Tek4957.c,v 1.9 2005/07/13 02:18:12 kem Exp $ */
/*
* Copyright 2002 by Olivier DANET <odanet@caramail.com>
*
@@ -28,16 +28,14 @@
#include "config.h"
#endif
-#ifndef XFree86LOADER
#include <unistd.h>
#include <errno.h>
-#endif
+#include <string.h>
#include "misc.h"
#include "xf86.h"
#define NEED_XF86_TYPES
#if !defined(DGUX)
-#include "xf86_ansic.h"
#include "xisb.h"
#endif
#include "xf86_OSproc.h"
@@ -761,7 +759,7 @@ static XF86ModuleVersionInfo TekVersionRec =
MODINFOSTRING1,
MODINFOSTRING2,
XORG_VERSION_CURRENT,
- 1, 0, 0,
+ 1, 1, 0,
ABI_CLASS_XINPUT,
ABI_XINPUT_VERSION,
MOD_CLASS_XINPUT,