xserver-xorg-input-aiptek: Changes to 'upstream-unstable'
.gitignore | 6 ++++++
ChangeLog | 46 ----------------------------------------------
Makefile.am | 9 +++++++++
README | 20 ++++++++++++++++++++
configure.ac | 17 ++++++++++-------
man/.gitignore | 2 --
man/aiptek.man | 2 +-
src/.gitignore | 6 ------
src/Makefile.am | 5 +++--
src/xf86Aiptek.c | 2 ++
src/xf86Aiptek.h | 2 +-
11 files changed, 52 insertions(+), 65 deletions(-)
New commits:
commit b4dfb51ee61f5c54134e5731e0581f9f74bc6829
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Feb 24 13:44:25 2009 +1000
aiptek 1.2.0
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 6ef54bb..ea887d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-aiptek],
- 1.1.1,
+ 1.2.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-aiptek)
commit acfbb985d63861cf414f568001a4bce89b75b0d9
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Mon Feb 2 18:13:44 2009 -0200
Janitor: rework make distcheck
Don't use a static ChangeLog, and distribute the generated one.
Use only one .gitignore file.
Minor cleanup on configure.ac, aiming as similar as possible
drivers configure.ac's.
diff --git a/.gitignore b/.gitignore
index 2df4a8d..59d9468 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+.deps
+.libs
Makefile
Makefile.in
*.la
@@ -18,3 +20,7 @@ ltmain.sh
missing
stamp-h1
*~
+*.4
+xf86-input-aiptek-*.tar.*
+ChangeLog
+tags
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 2cd93da..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,46 +0,0 @@
-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:
- Update package version for X11R7 release.
-
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for final X11R7 release candidate.
-
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
-
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC3 release.
-
-2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Remove extraneous AC_MSG_RESULT.
-
-2005-11-29 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- Only build dlloader modules by default.
-
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC2 release.
-
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update pkgcheck depedencies to work with separate build roots.
diff --git a/Makefile.am b/Makefile.am
index 7052905..6a0325e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,3 +20,12 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
+EXTRA_DIST = ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index b1fe39a..6ef54bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,15 +32,16 @@ AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
-DRIVER_NAME=aiptek
-AC_SUBST([DRIVER_NAME])
-
+# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
AM_CONFIG_HEADER([config.h])
# Checks for programs.
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AC_PROG_CC
+XORG_CWARNFLAGS
AH_TOP([#include "xorg-server.h"])
@@ -77,16 +78,18 @@ XORG_DRIVER_CHECK_EXT(XINPUT, inputproto)
# Checks for pkg-config packages
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'
-AC_SUBST([CFLAGS])
+XORG_CFLAGS="$CWARNFLAGS $XORG_CFLAGS"
# Checks for libraries.
# Checks for header files.
AC_HEADER_STDC
+DRIVER_NAME=aiptek
+AC_SUBST([DRIVER_NAME])
+
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile src/Makefile man/Makefile])
diff --git a/man/.gitignore b/man/.gitignore
deleted file mode 100644
index 282522d..0000000
--- a/man/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index 9730646..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
diff --git a/src/Makefile.am b/src/Makefile.am
index ea416ae..42eb63b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,11 +24,11 @@
# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
+AM_CFLAGS = $(XORG_CFLAGS) -DLINUX_INPUT
+
@DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
@DRIVER_NAME@_drv_ladir = @inputdir@
@DRIVER_NAME@_drv_la_LIBADD = -lm
@DRIVER_NAME@_drv_la_SOURCES = xf86Aiptek.c xf86Aiptek.h
-
-AM_CFLAGS = -DLINUX_INPUT
commit 3c0327e190e134a4435b4c22238749fed12a6709
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Jan 29 15:11:26 2009 -0800
Add README with pointers to mailing list, bugzilla & git repos
diff --git a/README b/README
new file mode 100644
index 0000000..7fd395e
--- /dev/null
+++ b/README
@@ -0,0 +1,20 @@
+xf86-input-aiptek - Aiptek USB Digital Tablet Input Driver for Linux
+
+Please submit bugs & patches to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/driver/xf86-input-aiptek
+
+ http://cgit.freedesktop.org/xorg/driver/xf86-input-aiptek
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
commit 8d05f481f0219dafed821b7cc89784afe73a5e24
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 9 16:10:14 2009 -0800
Remove xorgconfig & xorgcfg from See Also list in man page
diff --git a/man/aiptek.man b/man/aiptek.man
index 23ab17f..accb67e 100644
--- a/man/aiptek.man
+++ b/man/aiptek.man
@@ -150,7 +150,7 @@ sets the level of debugging info reported.
This driver is currently Linux specific.
.PP
.SH "SEE ALSO"
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__), hyperpen(__drivermansuffix__).
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__), hyperpen(__drivermansuffix__).
.SH AUTHORS
Bryan W. Headley <bheadley@earthlink.net>
.SH PROJECT PAGE
commit 9caf1a8372b5c9bae4032d256bb6065d8dbf26ba
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Aug 14 15:01:28 2008 +0930
Fix build, xf86Version.h has been superseeded by xorgVersion.h
diff --git a/src/xf86Aiptek.h b/src/xf86Aiptek.h
index 0e6daa8..2842775 100644
--- a/src/xf86Aiptek.h
+++ b/src/xf86Aiptek.h
@@ -56,7 +56,7 @@
# endif
#endif
-#include <xf86Version.h>
+#include <xorgVersion.h>
#ifndef XFree86LOADER
# include <unistd.h>
commit 87a3bd344129c06e4f4f90b10d13347b77f2be93
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jul 17 18:25:05 2008 +0200
Link against -lm for sqrt()
diff --git a/src/Makefile.am b/src/Makefile.am
index 4a1f6f2..ea416ae 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,6 +27,7 @@
@DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
@DRIVER_NAME@_drv_ladir = @inputdir@
+@DRIVER_NAME@_drv_la_LIBADD = -lm
@DRIVER_NAME@_drv_la_SOURCES = xf86Aiptek.c xf86Aiptek.h
commit 056b2a86085fd68f6408c53eb148284e2b506e77
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon May 26 22:01:29 2008 +0930
Check for XINPUT ABI 3.
diff --git a/src/xf86Aiptek.c b/src/xf86Aiptek.c
index d57d451..a26ca60 100644
--- a/src/xf86Aiptek.c
+++ b/src/xf86Aiptek.c
@@ -1611,7 +1611,9 @@ xf86AiptekProc(DeviceIntPtr pAiptek, int requestCode)
if (InitValuatorClassDeviceStruct(pAiptek,
numAxes,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
xf86GetMotionEvents,
+#endif
local->history_size,
((device->flags & ABSOLUTE_FLAG)
? Absolute : Relative) | OutOfProximity ) == FALSE)
Reply to: