.gitignore | 4 ++
Makefile.am | 8 +---
README | 20 ++++++++++++
configure.ac | 25 +++++++++------
man/acecad.man | 2 -
src/Makefile.am | 7 ++++
src/acecad.c | 93 +++++++++++++++++++++++++++-----------------------------
src/acecad.h | 2 -
8 files changed, 96 insertions(+), 65 deletions(-)
New commits:
commit 1685d3b518cf5fe4cc6a8fb3e3c28beb9b3ddb82
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Tue Feb 24 13:22:46 2009 +1000
acecad 1.3.0
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/configure.ac b/configure.ac
index e87d22c..1787cb4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-acecad],
- 1.2.2,
+ 1.3.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-acecad)
commit 61ad1d4470491bd49484de0b6e4eb65a7a51c799
Author: Paulo Cesar Pereira de Andrade <p...@mandriva.com.br>
Date: Mon Feb 2 18:02:43 2009 -0200
Janitor: Correct make distcheck and minor configure.ac cleanup.
diff --git a/.gitignore b/.gitignore
index 5bd25d2..0f74990 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,7 @@ libtool
ltmain.sh
missing
stamp-h1
+*.4
+xf86-input-acecad-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index af2effb..6a0325e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,14 +20,12 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
-
-EXTRA_DIST = autogen.sh ChangeLog
-
-CLEANFILES = ChangeLog
+EXTRA_DIST = ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
.PHONY: ChangeLog
ChangeLog:
- (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv
.changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git
directory not found: installing possibly empty changelog.' >&2)
+ $(CHANGELOG_CMD)
dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index 392921e..e87d22c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,15 +32,16 @@ AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
-DRIVER_NAME=acecad
-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,9 +78,7 @@ 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.
@@ -94,7 +93,11 @@ if test x$HAVE_LIBSYSFS = xyes; then
fi
AM_CONDITIONAL(HAVE_LIBSYSFS, test x$HAVE_LIBSYSFS = xyes)
+DRIVER_NAME=acecad
+AC_SUBST([DRIVER_NAME])
+
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile src/Makefile man/Makefile])
diff --git a/src/Makefile.am b/src/Makefile.am
index 65b449b..fd1a098 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,6 +24,8 @@
# -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)
+
@driver_n...@_drv_la_ltlibraries = @driver_n...@_drv.la
@driver_n...@_drv_la_ldflags = -module -avoid-version
commit 482471e4fe445da6d5307d3a16e53de6afa143e8
Author: Alan Coopersmith <alan.coopersm...@sun.com>
Date: Thu Jan 29 15:09:23 2009 -0800
Add README with pointers to mailing list, bugzilla & git repos
diff --git a/README b/README
new file mode 100644
index 0000000..5028b73
--- /dev/null
+++ b/README
@@ -0,0 +1,20 @@
+xf86-input-acecad - Acecad Flair input driver for the Xorg X server
+
+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-acecad
+
+ http://cgit.freedesktop.org/xorg/driver/xf86-input-acecad
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
commit ef3446502993c8492149fd319a49f6bd894efb7a
Author: Alan Coopersmith <alan.coopersm...@sun.com>
Date: Fri Jan 9 16:09:43 2009 -0800
Remove xorgconfig & xorgcfg from See Also list in man page
diff --git a/man/acecad.man b/man/acecad.man
index a9cb68c..445951e 100644
--- a/man/acecad.man
+++ b/man/acecad.man
@@ -33,7 +33,7 @@ section only covers configuration details specific to this
driver.
.PP
Config details...
.SH "SEE ALSO"
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__),
xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__).
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__),
Xserver(__appmansuffix__), X(__miscmansuffix__).
.SH AUTHORS
Authors include...
Edouard TISSERANT
commit b9497ba77692f2d44a9a1339ae2d0ff436abed70
Author: Paulo Cesar Pereira de Andrade <p...@mandriva.com.br>
Date: Fri Nov 28 04:48:50 2008 -0200
Correct wrong check for Linux libsysfs.
This patch was the original one, and the previous test was a wrong
attempt to simplify the change.
Triggered by tinderbox build.
diff --git a/configure.ac b/configure.ac
index 73402a6..392921e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -89,8 +89,9 @@ AC_HEADER_CHECK([linux/input.h],
[AC_DEFINE([LINUX_INPUT], [1], [Using the Linux input
subsystem])]
)
AC_CHECK_HEADER(sysfs/libsysfs.h, HAVE_LIBSYSFS=yes, HAVE_LIBSYSFS=no)
-AC_DEFINE(LINUX_SYSFS, test x$HAVE_LIBSYSFS = xyes,
- [Using sysfs to probe devices])
+if test x$HAVE_LIBSYSFS = xyes; then
+ AC_DEFINE(LINUX_SYSFS, 1, [Using sysfs to probe devices])
+fi
AM_CONDITIONAL(HAVE_LIBSYSFS, test x$HAVE_LIBSYSFS = xyes)
XORG_MANPAGE_SECTIONS
commit 36675d65ddc1ed35190f5fdbb18d5b460c7ba972
Author: Paulo Cesar Pereira de Andrade <p...@mandriva.com.br>
Date: Fri Nov 28 01:45:54 2008 -0200
Dont dlopen libsysfs.so, instead, link with it when available.
diff --git a/configure.ac b/configure.ac
index 9fea96e..73402a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -88,9 +88,10 @@ AC_HEADER_STDC
AC_HEADER_CHECK([linux/input.h],
[AC_DEFINE([LINUX_INPUT], [1], [Using the Linux input
subsystem])]
)
-AC_HEADER_CHECK([sysfs/libsysfs.h],
- [AC_DEFINE([LINUX_SYSFS], [1], [Using sysfs to probe devices])]
- )
+AC_CHECK_HEADER(sysfs/libsysfs.h, HAVE_LIBSYSFS=yes, HAVE_LIBSYSFS=no)
+AC_DEFINE(LINUX_SYSFS, test x$HAVE_LIBSYSFS = xyes,
+ [Using sysfs to probe devices])
+AM_CONDITIONAL(HAVE_LIBSYSFS, test x$HAVE_LIBSYSFS = xyes)
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
diff --git a/src/Makefile.am b/src/Makefile.am
index 5ff68eb..65b449b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,6 +26,11 @@
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
@driver_n...@_drv_la_ltlibraries = @driver_n...@_drv.la
@driver_n...@_drv_la_ldflags = -module -avoid-version
+
+if HAVE_LIBSYSFS
+...@driver_name@_drv_la_LIBADD = -lsysfs
+endif
+
@driver_n...@_drv_ladir = @inputdir@
@driver_n...@_drv_la_sources = @driver_n...@.c @driver_n...@.h
diff --git a/src/acecad.c b/src/acecad.c
index f3c284a..63c5aaf 100644
--- a/src/acecad.c
+++ b/src/acecad.c
@@ -245,53 +245,48 @@ AceCadAutoDevProbe(LocalDevicePtr local, int verb)
char *link = NULL;
struct dlist *devs = NULL;
struct dlist *links = NULL;
- void *libsysfs = NULL;
-
- if ((libsysfs = dlopen("libsysfs.so", RTLD_NOW | RTLD_GLOBAL))) {
- xf86MsgVerb(X_INFO, verb, "%s: querying sysfs for Acecad tablets\n",
local->name);
- usb_bus = sysfs_open_bus(usb_bus_name);
- if (usb_bus) {
- xf86MsgVerb(X_PROBED, 4, "%s: usb bus opened\n", local->name);
- acecad_driver = sysfs_get_bus_driver(usb_bus, acecad_driver_name);
- if (acecad_driver) {
- xf86MsgVerb(X_PROBED, 4, "%s: usb_acecad driver opened\n",
local->name);
- devs = sysfs_get_driver_devices(acecad_driver);
- if (devs) {
- xf86MsgVerb(X_PROBED, 4, "%s: usb_acecad devices
retrieved\n", local->name);
- dlist_for_each_data(devs, candidate, struct sysfs_device) {
- xf86MsgVerb(X_PROBED, 4, "%s: device %s at %s\n",
local->name, candidate->name, candidate->path);
- links = sysfs_open_link_list(candidate->path);
- dlist_for_each_data(links, link, char) {
- if (sscanf(link, "input:event%d", &i) == 1) {
- xf86MsgVerb(X_PROBED, 4, "%s: device %s at %s:
%s\n", local->name, candidate->name, candidate->path, link);
- break;
- }
- }
- sysfs_close_list(links);
- if (i > 0) /* We found something */
- break;
- }
- } else
- xf86MsgVerb(X_WARNING, 4, "%s: no usb_acecad devices
found\n", local->name);
- } else
- xf86MsgVerb(X_WARNING, 4, "%s: usb_acecad driver not found\n",
local->name);
- } else
- xf86MsgVerb(X_WARNING, 4, "%s: usb bus not found\n", local->name);
- sysfs_close_bus(usb_bus);
- dlclose(libsysfs);
-
- if (i > 0) {
- /* We found something */
- np = SET_EVENT_NUM(fname, i);
- if (np < 0 || np >= EV_DEV_NAME_MAXLEN) {
- xf86MsgVerb(X_WARNING, verb, "%s: unable to manage event
device %d\n", local->name, i);
- } else {
- goto ProbeFound;
- }
- } else
- xf86MsgVerb(X_WARNING, verb, "%s: no Acecad devices found via
sysfs\n", local->name);
+
+ xf86MsgVerb(X_INFO, verb, "%s: querying sysfs for Acecad tablets\n",
local->name);
+ usb_bus = sysfs_open_bus(usb_bus_name);
+ if (usb_bus) {
+ xf86MsgVerb(X_PROBED, 4, "%s: usb bus opened\n", local->name);
+ acecad_driver = sysfs_get_bus_driver(usb_bus, acecad_driver_name);
+ if (acecad_driver) {
+ xf86MsgVerb(X_PROBED, 4, "%s: usb_acecad driver opened\n",
local->name);
+ devs = sysfs_get_driver_devices(acecad_driver);
+ if (devs) {
+ xf86MsgVerb(X_PROBED, 4, "%s: usb_acecad devices retrieved\n",
local->name);
+ dlist_for_each_data(devs, candidate, struct sysfs_device) {
+ xf86MsgVerb(X_PROBED, 4, "%s: device %s at %s\n",
local->name, candidate->name, candidate->path);
+ links = sysfs_open_link_list(candidate->path);
+ dlist_for_each_data(links, link, char) {
+ if (sscanf(link, "input:event%d", &i) == 1) {
+ xf86MsgVerb(X_PROBED, 4, "%s: device %s at %s:
%s\n", local->name, candidate->name, candidate->path, link);
+ break;
+ }
+ }
+ sysfs_close_list(links);
+ if (i > 0) /* We found something */
+ break;
+ }
+ } else
+ xf86MsgVerb(X_WARNING, 4, "%s: no usb_acecad devices found\n",
local->name);
+ } else
+ xf86MsgVerb(X_WARNING, 4, "%s: usb_acecad driver not found\n",
local->name);
+ } else
+ xf86MsgVerb(X_WARNING, 4, "%s: usb bus not found\n", local->name);
+ sysfs_close_bus(usb_bus);
+
+ if (i > 0) {
+ /* We found something */
+ np = SET_EVENT_NUM(fname, i);
+ if (np < 0 || np >= EV_DEV_NAME_MAXLEN) {
+ xf86MsgVerb(X_WARNING, verb, "%s: unable to manage event device
%d\n", local->name, i);
+ } else {
+ goto ProbeFound;
+ }
} else
- xf86MsgVerb(X_WARNING, 4, "%s: libsysfs not found\n", local->name);
+ xf86MsgVerb(X_WARNING, verb, "%s: no Acecad devices found via sysfs\n",
local->name);
#endif
commit 791cbbf9df621d9712731990271bf3b53076673a
Author: Peter Hutterer <pe...@cs.unisa.edu.au>
Date: Mon May 26 22:00:23 2008 +0930
Check for XINPUT ABI 3.
diff --git a/src/acecad.c b/src/acecad.c
index 71d2578..f3c284a 100644
--- a/src/acecad.c
+++ b/src/acecad.c
@@ -657,7 +657,10 @@ DeviceInit (DeviceIntPtr dev)
/* 3 axes */
- if (InitValuatorClassDeviceStruct (dev, 3, xf86GetMotionEvents,
+ if (InitValuatorClassDeviceStruct (dev, 3,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
+ xf86GetMotionEvents,
+#endif
local->history_size,
((priv->flags & ABSOLUTE_FLAG)? Absolute:
Relative)|OutOfProximity)
== FALSE)
commit 33e64334db17ed3d2307e3ac465450c5c9b39ad9
Author: Paulo Cesar Pereira de Andrade <p...@mandriva.com.br>
Date: Sun Mar 16 03:01:23 2008 -0300
Compile warning fixes.
Don't call xf86usleep, just call usleep directly.
Remove unused variables.
Signed-off-by: Peter Hutterer <pe...@cs.unisa.edu.au>
diff --git a/src/acecad.c b/src/acecad.c
index 41caa8c..71d2578 100644
--- a/src/acecad.c
+++ b/src/acecad.c
@@ -245,10 +245,9 @@ AceCadAutoDevProbe(LocalDevicePtr local, int verb)
char *link = NULL;
struct dlist *devs = NULL;
struct dlist *links = NULL;
- unsigned int major = 0, minor = 0;
void *libsysfs = NULL;
- if (libsysfs = dlopen("libsysfs.so", RTLD_NOW | RTLD_GLOBAL)) {
+ if ((libsysfs = dlopen("libsysfs.so", RTLD_NOW | RTLD_GLOBAL))) {
xf86MsgVerb(X_INFO, verb, "%s: querying sysfs for Acecad tablets\n",
local->name);
usb_bus = sysfs_open_bus(usb_bus_name);
if (usb_bus) {
diff --git a/src/acecad.h b/src/acecad.h
index 2f910ea..9acfca2 100644
--- a/src/acecad.h
+++ b/src/acecad.h
@@ -63,7 +63,7 @@
#define NOTAVAIL ((errno == ENODEV) || (errno == ENXIO) || (errno == ENOENT))
-#define milisleep(ms) xf86usleep (ms * 1000)
+#define milisleep(ms) usleep (ms * 1000)
#define SYSCALL(call) while(((call) == -1) && (errno == EINTR))
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
