summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2006-04-07 18:02:19 +0000
committerAdam Jackson <ajax@nwnk.net>2006-04-07 18:02:19 +0000
commite733e8f969cd566bd2ece3afb738e0311fcddcb5 (patch)
treedcc73a24f59b1816f81593cbbf0e1d3aae2ea06a
parentae2cc1656600d1be2237e822efc07a9d927c07f2 (diff)
Unlibcwrap. Bump server version requirement. Bump to 1.1.0.xf86-video-impact-0_2_0mutouch-1_1_0XORG-7_1
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac4
-rw-r--r--src/xf86MuTouch.c6
3 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index e6c8681..5f44eb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-06 Adam Jackson <ajax@freedesktop.org>
+
+ * configure.ac:
+ * src/xf86MuTouch.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 56aa727..49dca11 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-mutouch],
- 1.0.0.5,
+ 1.1.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-mutouch)
@@ -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/xf86MuTouch.c b/src/xf86MuTouch.c
index 9067f7b..058fc3c 100644
--- a/src/xf86MuTouch.c
+++ b/src/xf86MuTouch.c
@@ -46,6 +46,9 @@
#include "config.h"
#endif
+#include <string.h>
+#include <stdio.h>
+
#include "xf86Version.h"
#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(3,9,0,0,0)
#define XFREE86_V4
@@ -55,7 +58,6 @@
#include "misc.h"
#include "xf86.h"
#if !defined(DGUX)
-#include "xf86_ansic.h"
#endif
#include "xf86_OSproc.h"
#include "xf86Xinput.h"
@@ -1873,7 +1875,7 @@ static XF86ModuleVersionInfo version_rec = {
MODINFOSTRING1,
MODINFOSTRING2,
XORG_VERSION_CURRENT,
- 1, 0, 0,
+ 1, 1, 0,
ABI_CLASS_XINPUT,
ABI_XINPUT_VERSION,
MOD_CLASS_XINPUT,