summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2006-04-07 16:54:17 +0000
committerAdam Jackson <ajax@nwnk.net>2006-04-07 16:54:17 +0000
commit35b73a133fea204931b1624c8fa60ba75f9b99dd (patch)
treeb898af2825866fec617e0cfb1e083650393723aa
parentcdc0e8108a47f9ccf7dd1898bd75a996480a7df1 (diff)
Unlibcwrap. Bump server version requirement. Bump to 1.1.0.xf86-video-impact-0_2_0calcomp-1_1_0XORG-7_1
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac4
-rw-r--r--src/xf86Calcomp.c7
3 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index e6c8681..b22e61d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-06 Adam Jackson <ajax@freedesktop.org>
+
+ * configure.ac:
+ * src/xf86Calcomp.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 6eb06b5..c2696dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-calcomp],
- 1.0.0.5,
+ 1.1.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-calcomp)
@@ -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/xf86Calcomp.c b/src/xf86Calcomp.c
index af0ffec..89ec00c 100644
--- a/src/xf86Calcomp.c
+++ b/src/xf86Calcomp.c
@@ -45,11 +45,12 @@
#include <misc.h>
#include <xf86.h>
#define NEED_XF86_TYPES
-#include <xf86_ansic.h>
#include <xf86_OSproc.h>
#include <xf86Xinput.h>
#include <xisb.h>
-#include <exevents.h> /* Needed for InitValuator/Proximity stuff */
+#include <exevents.h> /* Needed for InitValuator/Proximity stuff */
+#include <string.h>
+#include <errno.h>
/*****************************************************************************
* Local Headers
@@ -100,7 +101,7 @@ static XF86ModuleVersionInfo VersionRec =
MODINFOSTRING1,
MODINFOSTRING2,
XORG_VERSION_CURRENT,
- 1, 0, 0,
+ 1, 1, 0,
ABI_CLASS_XINPUT,
ABI_XINPUT_VERSION,
MOD_CLASS_XINPUT,