summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2006-04-07 17:37:57 +0000
committerAdam Jackson <ajax@nwnk.net>2006-04-07 17:37:57 +0000
commit00af26a17458c72989012d68d1d297981ea78ea6 (patch)
tree268394e490f617ddc316e72434b45c812c9aed62
parentd02c91044525bea6d799f207ea2decb016d2f634 (diff)
Unlibcwrap. Bump server version requirement. Bump to 1.1.0.xf86-video-impact-0_2_0jamstudio-1_1_0XORG-7_1
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac4
-rw-r--r--src/js_x.c5
3 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index e6c8681..e873cfc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-06 Adam Jackson <ajax@freedesktop.org>
+
+ * configure.ac:
+ * src/js_x.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 50bb934..5737181 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-jamstudio],
- 1.0.0.5,
+ 1.1.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-jamstudio)
@@ -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/js_x.c b/src/js_x.c
index f4e56b4..184025c 100644
--- a/src/js_x.c
+++ b/src/js_x.c
@@ -33,7 +33,6 @@
#endif
#include "misc.h"
#include "xf86.h"
-#include "xf86_ansic.h"
#include "xf86_OSproc.h"
#include "xf86Xinput.h"
#include "exevents.h" /* Needed for InitValuator/Proximity stuff */
@@ -42,6 +41,8 @@
#ifdef XFree86LOADER
#include "xf86Module.h"
#endif
+#include <errno.h>
+#include <string.h>
#define JSX_XCOORD 65584
#define JSX_YCOORD 65585
@@ -350,7 +351,7 @@ static XF86ModuleVersionInfo xf86JS_XVersionRec = {
MODINFOSTRING1,
MODINFOSTRING2,
XORG_VERSION_CURRENT,
- 1, 0, 0,
+ 1, 1, 0,
ABI_CLASS_XINPUT,
ABI_XINPUT_VERSION,
MOD_CLASS_XINPUT,