summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2006-04-07 16:50:50 +0000
committerAdam Jackson <ajax@nwnk.net>2006-04-07 16:50:50 +0000
commite65a8abb1da2058a5fefa60950054ed01ae2f467 (patch)
treeb6f26d366f70cff81db63bb47f29804024c8b86b
parent10f7f22a718f2242bda8d378795d3061767cbc4b (diff)
Unlibcwrap. Bump server version requirement. Bump to 1.1.0.xf86-video-impact-0_2_0aiptek-1_0_1XORG-7_1
-rw-r--r--ChangeLog7
-rw-r--r--configure.ac4
-rw-r--r--src/xf86Aiptek.c5
-rw-r--r--src/xf86Aiptek.h3
4 files changed, 14 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index ea7eac3..2cd93da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-06 Adam Jackson <ajax@freedesktop.org>
+
+ * configure.ac:
+ * src/xf86Aiptek.c:
+ * src/xf86Aiptek.h:
+ 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 0a00261..5d1b8ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-aiptek],
- 1.0.0.5,
+ 1.0.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-aiptek)
@@ -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/xf86Aiptek.c b/src/xf86Aiptek.c
index cd80fce..2eea74e 100644
--- a/src/xf86Aiptek.c
+++ b/src/xf86Aiptek.c
@@ -104,6 +104,9 @@
#endif
#include "xf86Aiptek.h"
+#include <errno.h>
+#include <string.h>
+#include <math.h>
static const char identification[] = "$Identification: 0 $";
static InputDriverPtr aiptekDrv;
@@ -2440,7 +2443,7 @@ static XF86ModuleVersionInfo xf86AiptekVersionRec =
MODINFOSTRING1,
MODINFOSTRING2,
XORG_VERSION_CURRENT,
- 1, 0, 0,
+ 1, 1, 0,
ABI_CLASS_XINPUT,
ABI_XINPUT_VERSION,
MOD_CLASS_XINPUT,
diff --git a/src/xf86Aiptek.h b/src/xf86Aiptek.h
index e484c4c..c79682f 100644
--- a/src/xf86Aiptek.h
+++ b/src/xf86Aiptek.h
@@ -34,7 +34,7 @@
* TORTIOUS ACTIONS, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/input/aiptek/xf86Aiptek.h,v 1.2 2004/04/23 19:54:02 eich Exp $ */
+/* $XdotOrg: driver/xf86-input-aiptek/src/xf86Aiptek.h,v 1.4 2005/07/13 02:18:12 kem Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/input/aiptek/xf86Aiptek.h,v 1.2 2003/11/03 05:36:32 tsi Exp $ */
#ifndef _AIPTEK_H_
@@ -69,7 +69,6 @@
#define NEED_XF86_TYPES
#if !defined(DGUX)
-# include <xf86_ansic.h>
# include <xisb.h>
#endif