configure.ac | 3 --- shared/Makefile.am | 2 +- src/Makefile.am | 2 +- src/vmmouse.c | 1 + tools/.gitignore | 1 + tools/69-xorg-vmmouse.rules.in | 2 +- tools/Makefile.am | 2 +- 7 files changed, 6 insertions(+), 7 deletions(-)
New commits: commit 833698b3b9857fda176c91a0dbb128275a174624 Author: Gaetan Nadon <[email protected]> Date: Sun Apr 25 19:36:19 2010 -0400 config: git ignore recently added 69-xorg-vmmouse.rules Was added in 1d1c0514158abb66388ee4eb44764d201203a863 Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/tools/.gitignore b/tools/.gitignore index 96849a3..b402509 100644 --- a/tools/.gitignore +++ b/tools/.gitignore @@ -1,3 +1,4 @@ # Add & Override for this directory and it's subdirectories hal-probe-vmmouse vmmouse_detect +69-xorg-vmmouse.rules commit 1d1c0514158abb66388ee4eb44764d201203a863 Author: Jakob Bornecrantz <[email protected]> Date: Mon Apr 19 15:29:41 2010 +0100 Only match against event[0-9] in udev rules It looks like the udev rule was matched against two devices which caused the driver to be loaded twice. We shouldn't match against the other device because it will very seldom send bogus events. Some of the bug this caused was buttons getting stuck. diff --git a/tools/69-xorg-vmmouse.rules.in b/tools/69-xorg-vmmouse.rules.in index 0d7f028..602afb6 100644 --- a/tools/69-xorg-vmmouse.rules.in +++ b/tools/69-xorg-vmmouse.rules.in @@ -1 +1 @@ -ACTION=="add|change", ENV{ID_INPUT_MOUSE}=="?*", ATTRS{description}=="i8042 AUX port", PROGRAM="__BIN_PREFIX__/vmmouse_detect", ENV{ID_INPUT.tags}="vmmouse" +ACTION=="add|change", ENV{ID_INPUT_MOUSE}=="?*", ATTRS{description}=="i8042 AUX port", KERNEL=="event[0-9]*", PROGRAM="__BIN_PREFIX__/vmmouse_detect", ENV{ID_INPUT.tags}="vmmouse" commit b22d830a4e1c609a709e71c306a3b3a8ff8a6078 Author: Julien Cristau <[email protected]> Date: Sat Apr 17 01:39:23 2010 +0200 Don't clobber CFLAGS CFLAGS is a user variable, don't set it from configure. diff --git a/configure.ac b/configure.ac index 472c705..6c29dc2 100644 --- a/configure.ac +++ b/configure.ac @@ -138,9 +138,6 @@ PKG_CHECK_EXISTS([xorg-server >= 1.6.0], [AC_DEFINE([NO_MOUSE_MODULE], 1, [Do not include built-in mouse module fallback])]) -CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src' -AC_SUBST([CFLAGS]) - # Checks for libraries. # Checks for header files. diff --git a/shared/Makefile.am b/shared/Makefile.am index 33c5862..c1b6ca9 100644 --- a/shared/Makefile.am +++ b/shared/Makefile.am @@ -23,5 +23,5 @@ l...@driver_name@_la_SOURCES = @driver_n...@_defs.h \ @driver_n...@_client.c @driver_n...@_client.h \ @driver_n...@_proto.c @driver_n...@_proto.h - +AM_CPPFLAGS = $(XORG_CFLAGS) diff --git a/src/Makefile.am b/src/Makefile.am index 6848537..7e6ea36 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -23,7 +23,7 @@ @driver_n...@_drv_la_libadd = $(top_builddir)/shared/l...@[email protected] @driver_n...@_drv_ladir = @inputdir@ -INCLUDES = -I$(top_srcdir)/shared +AM_CPPFLAGS = -I$(top_srcdir)/shared $(XORG_CFLAGS) @driver_n...@_drv_la_sources = @[email protected] xf86OSmouse.h diff --git a/tools/Makefile.am b/tools/Makefile.am index 8c40369..581ad65 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -20,7 +20,7 @@ bin_PROGRAMS = @driver_n...@_detect -INCLUDES = -I$(top_srcdir)/shared +AM_CPPFLAGS = -I$(top_srcdir)/shared $(XORG_CFLAGS) @driver_n...@_detect_sources = vmmouse_detect.c @driver_n...@_detect_ldadd = $(top_builddir)/shared/l...@[email protected] commit 1cba87aab183eb3846757a0ee0828e3eb119a6e6 Author: Julien Cristau <[email protected]> Date: Sat Apr 17 01:30:15 2010 +0200 Include exevents.h for XIGetKnownProperty Fixes this compiler warning: vmmouse.c: In function ‘VMMouseDeviceControl’: vmmouse.c:734: warning: implicit declaration of function ‘XIGetKnownProperty’ Signed-off-by: Julien Cristau <[email protected]> diff --git a/src/vmmouse.c b/src/vmmouse.c index 0394fb8..1b08eff 100644 --- a/src/vmmouse.c +++ b/src/vmmouse.c @@ -70,6 +70,7 @@ #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 #include <xserver-properties.h> +#include "exevents.h" #endif #include "xisb.h" -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
