xserver-xorg-input-vmmouse: Changes to 'upstream-experimental'
.gitignore | 73 +++++++++++-
COPYING | 66 ++++++++---
ChangeLog | 25 ----
INSTALL | 231 -----------------------------------------
Makefile.am | 14 ++
configure.ac | 76 ++++++++-----
man/Makefile.am | 55 ++++-----
man/vmmouse.man | 2
man/vmmouse_detect.1 | 58 ----------
man/vmmouse_detect.man | 58 ++++++++++
shared/Makefile.am | 4
shared/vmmouse_defs.h | 6 +
shared/vmmouse_proto.h | 9 +
src/Makefile.am | 2
src/vmmouse.c | 218 +++++++++++++++++++-------------------
tools/.gitignore | 4
tools/50-vmmouse.conf | 7 +
tools/69-xorg-vmmouse.rules.in | 1
tools/Makefile.am | 29 ++++-
tools/hal-probe-vmmouse.in | 1
tools/vmmouse_detect.c | 6 +
21 files changed, 425 insertions(+), 520 deletions(-)
New commits:
commit adc177e3af9dc5da982ceb7a93e9c5e3bc6aed59
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 10 10:36:33 2010 -0400
xf86-input-vmmouse 12.6.10
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/configure.ac b/configure.ac
index 6c29dc2..8c1322c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-vmmouse],
- 12.6.9,
+ 12.6.10,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-vmmouse)
commit cc76aec9b712403c777b7ce1290fa1e7ca62bf8c
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 10 10:36:21 2010 -0400
Fix distcheck
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 02a721e..77a9731 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -31,7 +31,7 @@ callouts_SCRIPTS = hal-probe-vmmouse
hal-probe-vmmouse: hal-probe-vmmouse.in
$(AM_V_GEN)$(SED) -e 's|__BIN_PREFIX__|$(bindir)|g' \
-e 's|__HAL_BIN_PREFIX__|$(HAL_BIN_DIR)|g' \
- < hal-probe-vmmouse.in > $@
+ < $< > $@
EXTRA_DIST = hal-probe-vmmouse.in
@@ -52,7 +52,8 @@ udev_DATA = 69-xorg-vmmouse.rules
$(udev_DATA): $(udev_DATA).in
sed -e 's|__BIN_PREFIX__|$(bindir)|g' < $< > $@
-EXTRA_DIST += $(udev_DATA).in
CLEANFILES += $(udev_DATA)
endif # HAS_UDEV_RULES_DIR
+
+EXTRA_DIST = $(udev_DATA).in hal-probe-vmmouse.in
commit 61608b87c01ce87bd29869c1554a2ade5998782c
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Jul 9 20:45:53 2010 -0700
Improve Solaris compatibility of hal-probe-vmmouse generation rule
Use $(SED) from AC_PROG_SED to ensure a good version of sed is found
Use explicit input file name instead of $< to workaround Solaris make
issue with $< in explicit rules.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 581ad65..02a721e 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -29,9 +29,9 @@ calloutsdir=$(HAL_CALLOUTS_DIR)
callouts_SCRIPTS = hal-probe-vmmouse
hal-probe-vmmouse: hal-probe-vmmouse.in
- sed -e 's|__BIN_PREFIX__|$(bindir)|g' \
+ $(AM_V_GEN)$(SED) -e 's|__BIN_PREFIX__|$(bindir)|g' \
-e 's|__HAL_BIN_PREFIX__|$(HAL_BIN_DIR)|g' \
- < $< > $@
+ < hal-probe-vmmouse.in > $@
EXTRA_DIST = hal-probe-vmmouse.in
commit d7700bed84f6632913a6590cc9cc9d10b815a08c
Author: Fernando Carrijo <fcarrijo@yahoo.com.br>
Date: Thu Jul 1 07:14:14 2010 -0300
Purge macro NEED_EVENTS
Signed-off-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/src/vmmouse.c b/src/vmmouse.c
index 1b08eff..f5ad234 100644
--- a/src/vmmouse.c
+++ b/src/vmmouse.c
@@ -48,7 +48,6 @@
#endif
#include <stdio.h>
-#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xproto.h>
commit 4e3bf19d2637cb034e31611ef184348f12677e81
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Jun 12 10:09:48 2010 -0400
COPYING: update and refactor Copyright notices
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/COPYING b/COPYING
index 901b59f..ae6cbd9 100644
--- a/COPYING
+++ b/COPYING
@@ -1,23 +1,51 @@
-Copyright (c) 2006 VMware, Inc.
+Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
+Copyright 1993 by David Dawes <dawes@xfree86.org>
+Copyright 2002 by SuSE Linux AG, Author: Egbert Eich
+Copyright 1994-2002 by The XFree86 Project, Inc.
+Copyright 2002 by Paul Elliott
+Copyright 2002-2006 by VMware, Inc.
-Permission is hereby granted, free of charge, to any person obtaining a copy of this
-software and associated documentation files (the "Software"), to deal in the Software
-without restriction, including without limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of the Software, and to permit
-persons to whom the Software is furnished to do so, subject to the following conditions:
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the names of copyright holders not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission. The copyright holders
+make no representations about the suitability of this
+software for any purpose. It is provided "as is" without express or
+implied warranty.
-The above copyright notice and this permission notice shall be included in all copies or
-substantial portions of the Software.
+THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
+CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
-FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
+Copyright (c) 1999-2003 by The XFree86 Project, Inc.
+Copyright 2002-2006 by VMware, Inc.
-Except as contained in this notice, the name of the copyright holder(s) and author(s)
-shall not be used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the copyright holder(s) and
-author(s).
-
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
commit 833698b3b9857fda176c91a0dbb128275a174624
Author: Gaetan Nadon <memsize@videotron.ca>
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 <memsize@videotron.ca>
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 <jakob@vmware.com>
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 <jcristau@debian.org>
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 @@ lib@DRIVER_NAME@_la_SOURCES = @DRIVER_NAME@_defs.h \
@DRIVER_NAME@_client.c @DRIVER_NAME@_client.h \
@DRIVER_NAME@_proto.c @DRIVER_NAME@_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_NAME@_drv_la_LIBADD = $(top_builddir)/shared/lib@DRIVER_NAME@.la
@DRIVER_NAME@_drv_ladir = @inputdir@
-INCLUDES = -I$(top_srcdir)/shared
+AM_CPPFLAGS = -I$(top_srcdir)/shared $(XORG_CFLAGS)
@DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c 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_NAME@_detect
-INCLUDES = -I$(top_srcdir)/shared
+AM_CPPFLAGS = -I$(top_srcdir)/shared $(XORG_CFLAGS)
@DRIVER_NAME@_detect_SOURCES = vmmouse_detect.c
@DRIVER_NAME@_detect_LDADD = $(top_builddir)/shared/lib@DRIVER_NAME@.la
commit 1cba87aab183eb3846757a0ee0828e3eb119a6e6
Author: Julien Cristau <jcristau@debian.org>
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 <jcristau@debian.org>
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"
commit 01f03ca8fbca96957d6c2718f4279e31cb406c2f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Apr 9 08:30:26 2010 +1000
Bump for 12.6.9 release.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 8bd1926..472c705 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-vmmouse],
- 12.6.8,
+ 12.6.9,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-vmmouse)
commit 7b2ff5322b298ed8458c7442a16b8c0a14bcc5dc
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Apr 9 07:57:17 2010 +1000
man: move vmmouse_detect back to section 1
Was moved to section 4 in commit 36c2cd8ec6d3bf7191a98a04a876e8d7b6f64d5d,
"man: build vmmouse_detect man page".
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/man/Makefile.am b/man/Makefile.am
index 142eb1d..d59d374 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -23,13 +23,17 @@
drivermandir = $(DRIVER_MAN_DIR)
-driverman_PRE = @DRIVER_NAME@.man @DRIVER_NAME@_detect.man
+driverman_PRE = @DRIVER_NAME@.man
driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
-EXTRA_DIST = @DRIVER_NAME@.man @DRIVER_NAME@_detect.man
+appmandir = $(APP_MAN_DIR)
+appman_PRE = @DRIVER_NAME@_detect.man
+appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-CLEANFILES = $(driverman_DATA)
+EXTRA_DIST = @DRIVER_NAME@.man $(appman_PRE)
+
+CLEANFILES = $(driverman_DATA) $(appman_DATA)
# Strings to replace in man pages
XORGRELSTRING = @PACKAGE_STRING@
@@ -51,3 +55,5 @@ SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
.man.$(DRIVER_MAN_SUFFIX):
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
+.man.$(APP_MAN_SUFFIX):
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff --git a/man/vmmouse_detect.man b/man/vmmouse_detect.man
index a7b884e..53cc36d 100644
--- a/man/vmmouse_detect.man
+++ b/man/vmmouse_detect.man
@@ -18,7 +18,7 @@
.\"
.\" That's right, although mdetect itself is under the QPL, this manpage is
.\" under the GPL. Enjoy!
-.TH vmmouse_detect __drivermansuffix__ __vendorversion__
+.TH vmmouse_detect __appmansuffix__ __vendorversion__
.SH NAME
vmmouse_detect \- VMware mouse device autodetection tool
.SH SYNOPSIS
commit 21f53010d204c681e1a82b176841c2d4af8f61d8
Author: Michel Dänzer <daenzer@vmware.com>
Date: Thu Apr 8 16:18:07 2010 +0200
Bump for 12.6.8 release.
diff --git a/configure.ac b/configure.ac
index 7623b98..8bd1926 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-vmmouse],
- 12.6.7,
+ 12.6.8,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-vmmouse)
commit 80f671233e583ae085986bce12057fc45da444aa
Author: Michel Dänzer <daenzer@vmware.com>
Date: Thu Apr 1 18:35:38 2010 +0200
Add InputClass support.
The InputClass can match the tag "vmmouse". A sample xorg.conf.d snippet is
provided to try and make sure the driver will be loaded automatically in a
compatible VM also if the X server uses udev instead of HAL.
The configure script tries to determine if and where it makes sense to install
the udev rule and xorg.conf.d snippet but allows overriding both.
Thanks to Timo Aaltonen for the udev rules file and Dan Nicholson and Simon
Thum for review and suggestions for improvement.
diff --git a/Makefile.am b/Makefile.am
index daf09d4..f1ad5af 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,6 +18,9 @@
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# Ensure xorg.conf.d snippets are installed below $(prefix) for distcheck
+DISTCHECK_CONFIGURE_FLAGS = --with-xorg-conf-dir='$${datadir}/X11/xorg.conf.d'
+
SUBDIRS = shared src tools fdi man
MAINTAINERCLEANFILES = ChangeLog INSTALL
.PHONY: ChangeLog INSTALL
diff --git a/configure.ac b/configure.ac
index e39fcbb..7623b98 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,6 +59,14 @@ AC_ARG_WITH(xorg-module-dir,
inputdir=${moduledir}/input
AC_SUBST(inputdir)
+AC_ARG_WITH(xorg-conf-dir,
+ AC_HELP_STRING([--with-xorg-conf-dir=DIR],
+ [Default xorg.conf.d directory [[default=from $PKG_CONFIG xorg-server]]]),
+ [XORG_CONF_DIR="$withval"],
+ [XORG_CONF_DIR="`$PKG_CONFIG --variable=sysconfigdir xorg-server`"])
+AC_SUBST(XORG_CONF_DIR)
+AM_CONDITIONAL(HAS_XORG_CONF_DIR, [test "x$XORG_CONF_DIR" != "x" && test "x$XORG_CONF_DIR" != "xno"])
+
AC_ARG_WITH(hal-bin-dir,
AC_HELP_STRING([--with-hal-bin-dir=DIR],
[Directory where HAL binaries where installed [[default=$bindir]]]),
@@ -85,6 +93,29 @@ AC_ARG_WITH(hal-fdi-dir,
HAL_FDI_DIR=${halfdidir}
AC_SUBST(HAL_FDI_DIR)
+case $host_os in
+ linux*)
+ if test "x$prefix" = "xNONE" -o "x$prefix" = "x/usr" -o "x$prefix" = "x/usr/local" ; then
+ slashlibdir=/lib
+ else
+ slashlibdir=$prefix/lib
+ fi
+ UDEV_RULES_DIR=$slashlibdir/udev/rules.d
+ ;;
+ *)
+ UDEV_RULES_DIR=no
+ ;;
+esac
+
+AC_ARG_WITH(udev-rules-dir,
+ AC_HELP_STRING([--with-udev-rules-dir=DIR],
+ [Default udev rules.d directory
+ [[default=($prefix)/lib/udev/rules.d on Linux, none otherwise]]]),
+ [UDEV_RULES_DIR="$withval"],
+ [])
+AC_SUBST(UDEV_RULES_DIR)
+AM_CONDITIONAL(HAS_UDEV_RULES_DIR, [test "x$UDEV_RULES_DIR" != "xno"])
+
# Checks for extensions
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
XORG_DRIVER_CHECK_EXT(XINPUT, inputproto)
diff --git a/tools/50-vmmouse.conf b/tools/50-vmmouse.conf
new file mode 100644
index 0000000..35c438e
--- /dev/null
+++ b/tools/50-vmmouse.conf
@@ -0,0 +1,7 @@
+Section "InputClass"
+ Identifier "vmmouse"
+ MatchIsPointer "on"
+ MatchTag "vmmouse"
+ Driver "vmmouse"
+EndSection
+
diff --git a/tools/69-xorg-vmmouse.rules.in b/tools/69-xorg-vmmouse.rules.in
new file mode 100644
index 0000000..0d7f028
--- /dev/null
+++ b/tools/69-xorg-vmmouse.rules.in
@@ -0,0 +1 @@
+ACTION=="add|change", ENV{ID_INPUT_MOUSE}=="?*", ATTRS{description}=="i8042 AUX port", PROGRAM="__BIN_PREFIX__/vmmouse_detect", ENV{ID_INPUT.tags}="vmmouse"
diff --git a/tools/Makefile.am b/tools/Makefile.am
index f5b8902..8c40369 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -36,3 +36,23 @@ hal-probe-vmmouse: hal-probe-vmmouse.in
EXTRA_DIST = hal-probe-vmmouse.in
CLEANFILES = hal-probe-vmmouse
+
+if HAS_XORG_CONF_DIR
+
+confdir=$(XORG_CONF_DIR)
+dist_conf_DATA = 50-vmmouse.conf
+
+endif
+
+if HAS_UDEV_RULES_DIR
+
+udevdir=$(UDEV_RULES_DIR)
+udev_DATA = 69-xorg-vmmouse.rules
+
+$(udev_DATA): $(udev_DATA).in
+ sed -e 's|__BIN_PREFIX__|$(bindir)|g' < $< > $@
+
+EXTRA_DIST += $(udev_DATA).in
+CLEANFILES += $(udev_DATA)
+
+endif # HAS_UDEV_RULES_DIR
diff --git a/tools/hal-probe-vmmouse.in b/tools/hal-probe-vmmouse.in
index 1f75e25..42c9da3 100755
--- a/tools/hal-probe-vmmouse.in
+++ b/tools/hal-probe-vmmouse.in
@@ -26,5 +26,6 @@
__BIN_PREFIX__/vmmouse_detect
if [ $? -eq 0 ]; then
__HAL_BIN_PREFIX__/hal-set-property --direct --udi "$UDI" --key input.x11_driver --string "vmmouse"
+ __HAL_BIN_PREFIX__/hal-set-property --direct --udi "$UDI" --key input.tags --string "vmmouse"
fi
commit b9c3bc94ee86a72216e9738aaecede80cc1c043c
Author: Michel Dänzer <daenzer@vmware.com>
Date: Thu Apr 8 16:09:51 2010 +0200
Improve make rule for hal-probe-vmmouse.
Make sure changes to hal-probe-vmmouse.in get picked up automatically and
simplify the way it's passed to sed.
Thanks to Dan Nicholson for the suggestion.
diff --git a/tools/Makefile.am b/tools/Makefile.am
index c00d65d..f5b8902 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -28,10 +28,10 @@ INCLUDES = -I$(top_srcdir)/shared
calloutsdir=$(HAL_CALLOUTS_DIR)
callouts_SCRIPTS = hal-probe-vmmouse
-hal-probe-vmmouse:
+hal-probe-vmmouse: hal-probe-vmmouse.in
sed -e 's|__BIN_PREFIX__|$(bindir)|g' \
-e 's|__HAL_BIN_PREFIX__|$(HAL_BIN_DIR)|g' \
- < $(srcdir)/$@.in > $@
+ < $< > $@
EXTRA_DIST = hal-probe-vmmouse.in
commit 36c2cd8ec6d3bf7191a98a04a876e8d7b6f64d5d
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Mar 26 20:44:23 2010 -0400
man: build vmmouse_detect man page
The generated file was checked-in and was wrong.
The file suffix is now computed based on the platform
The macro substitution has been restored
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 6fc3b6a..e39fcbb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,6 +47,7 @@ AM_CONFIG_HEADER([config.h])
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AC_PROG_CC
+AC_PROG_SED
AH_TOP([#include "xorg-server.h"])
diff --git a/man/.gitignore b/man/.gitignore
deleted file mode 100644
index f2c0616..0000000
--- a/man/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Add & Override for this directory and it's subdirectories
-# Override default pattern *.[0-9] from top level .gitignore
-!vmmouse_detect.1
diff --git a/man/Makefile.am b/man/Makefile.am
index 2671512..142eb1d 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -21,20 +21,16 @@
# DEALINGS IN THE SOFTWARE.
#
-man_MANS = @DRIVER_NAME@_detect.1
-
drivermandir = $(DRIVER_MAN_DIR)
-driverman_PRE = @DRIVER_NAME@.man
+driverman_PRE = @DRIVER_NAME@.man @DRIVER_NAME@_detect.man
driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
-EXTRA_DIST = @DRIVER_NAME@.man @DRIVER_NAME@_detect.1
+EXTRA_DIST = @DRIVER_NAME@.man @DRIVER_NAME@_detect.man
CLEANFILES = $(driverman_DATA)
-SED = sed
-
# Strings to replace in man pages
XORGRELSTRING = @PACKAGE_STRING@
XORGMANNAME = X Version 11
@@ -54,4 +50,4 @@ MAN_SUBSTS = \
SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
.man.$(DRIVER_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff --git a/man/vmmouse_detect.1 b/man/vmmouse_detect.1
deleted file mode 100644
index ca1ec71..0000000
--- a/man/vmmouse_detect.1
+++ /dev/null
@@ -1,58 +0,0 @@
-.\" This manpage is copyright (C) 2007 Canonical, Ltd
-.\" Author: Bryce Harrington <bryce@ubuntu.com>
-.\"
-.\" This is free software; you may redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2,
-.\" or (at your option) any later version.
-.\"
-.\" This is distributed in the hope that it will be useful, but
-.\" WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License
-.\" along with the Debian GNU/Linux system; if not, write to the Free
-.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-.\" 02111-1307 USA
-.\"
-.\" That's right, although mdetect itself is under the QPL, this manpage is
-.\" under the GPL. Enjoy!
-.TH vmmouse_detect 1 "2007-07-19" "Debian GNU/Linux"
-.SH NAME
-vmmouse_detect \- VMware mouse device autodetection tool
-.SH SYNOPSIS
-vmmouse_detect
-.SH OPTIONS
-vmmouse_detect has no options
-.SH DESCRIPTION
-.B vmmouse_detect
-is a tool for detecting if running in a VMware environment where vmmouse
-is used. It exits with a 0 return value if the vmmouse client is
-enabled, and 1 if not.
-.SH DIAGNOSTICS
-.BR vmmouse_detect 's
-exit status is used to communicate information.
-.IP 0
-.B vmmouse_detect
-found a mouse and exited normally.
-.IP 1
-Either the vmmouse client was not enabled, or it is not being run from
-within a VMware virtual machine.
-.SH BUGS
-Please report bugs in
-.B vmmouse_detect
-<https://bugs.launchpad.net/ubuntu/+source/mdetect/vmmouse_detect>.
-.SH AUTHORS
-.B vmmouse_detect
-is copyright 2007 VMware, Inc.
-.SH LICENSING
-The
-.B vmmouse_detect
-source code is licensed under a BSD-like license. See COPYING for
-details.
-.PP
-This manual page is licensed under the GNU General Public License.
-.SH SEE ALSO
-.IR mdetect (1),
-.IR XFree86 (1)
diff --git a/man/vmmouse_detect.man b/man/vmmouse_detect.man
new file mode 100644
index 0000000..a7b884e
--- /dev/null
+++ b/man/vmmouse_detect.man
@@ -0,0 +1,58 @@
+.\" This manpage is copyright (C) 2007 Canonical, Ltd
+.\" Author: Bryce Harrington <bryce@ubuntu.com>
+.\"
+.\" This is free software; you may redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as
+.\" published by the Free Software Foundation; either version 2,
+.\" or (at your option) any later version.
+.\"
+.\" This is distributed in the hope that it will be useful, but
+.\" WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License
+.\" along with the Debian GNU/Linux system; if not, write to the Free
+.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+.\" 02111-1307 USA
+.\"
+.\" That's right, although mdetect itself is under the QPL, this manpage is
+.\" under the GPL. Enjoy!
+.TH vmmouse_detect __drivermansuffix__ __vendorversion__
+.SH NAME
+vmmouse_detect \- VMware mouse device autodetection tool
+.SH SYNOPSIS
+vmmouse_detect
+.SH OPTIONS
+vmmouse_detect has no options
+.SH DESCRIPTION
+.B vmmouse_detect
+is a tool for detecting if running in a VMware environment where vmmouse
+is used. It exits with a 0 return value if the vmmouse client is
+enabled, and 1 if not.
+.SH DIAGNOSTICS
+.BR vmmouse_detect 's
+exit status is used to communicate information.
+.IP 0
+.B vmmouse_detect
+found a mouse and exited normally.
+.IP 1
+Either the vmmouse client was not enabled, or it is not being run from
+within a VMware virtual machine.
+.SH BUGS
+Please report bugs in
+.B vmmouse_detect
+<https://bugs.launchpad.net/ubuntu/+source/mdetect/vmmouse_detect>.
+.SH AUTHORS
+.B vmmouse_detect
+is copyright 2007 VMware, Inc.
+.SH LICENSING
+The
+.B vmmouse_detect
+source code is licensed under a BSD-like license. See COPYING for
+details.
+.PP
+This manual page is licensed under the GNU General Public License.
+.SH SEE ALSO
+.IR mdetect (1),
+.IR XFree86 (1)
commit 27813c665b0eed0b3d8b4db5fcb555f20fe60c4a
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Mar 20 13:21:12 2010 -0400
make: remove unrequired INCLUDES = -I$(srcdir)
Already covered by DEFAULT_INCLUDES
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/shared/Makefile.am b/shared/Makefile.am
index feedffa..33c5862 100644
--- a/shared/Makefile.am
+++ b/shared/Makefile.am
@@ -18,8 +18,6 @@
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-INCLUDES = -I$(srcdir)
-
noinst_LTLIBRARIES = lib@DRIVER_NAME@.la
lib@DRIVER_NAME@_la_SOURCES = @DRIVER_NAME@_defs.h \
@DRIVER_NAME@_client.c @DRIVER_NAME@_client.h \
commit 40ba06b1389ab68482b3aa3ed69292011c09f9dd
Author: Jakob Bornecrantz <jakob@vmware.com>
Date: Thu Mar 18 16:23:27 2010 +0100
Bump for 12.6.7 release.
diff --git a/configure.ac b/configure.ac
index 0d73779..6fc3b6a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-vmmouse],
- 12.6.6,
+ 12.6.7,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-vmmouse)
commit fae10ac6c613f6de847e152d615e6da421147139
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Feb 26 17:30:08 2010 +0100
vmmouse: don't hardcode the module version in the source
XORG_RELEASE_VERSION gives us that info from configure.ac, let's use it.
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/src/vmmouse.c b/src/vmmouse.c
index 1f4774a..0394fb8 100644
--- a/src/vmmouse.c
+++ b/src/vmmouse.c
@@ -97,14 +97,11 @@
/*
* Version constants
*/
-#define VMMOUSE_MAJOR_VERSION 12
-#define VMMOUSE_MINOR_VERSION 6
-#define VMMOUSE_PATCHLEVEL 5
#define VMMOUSE_DRIVER_VERSION \
- (VMMOUSE_MAJOR_VERSION * 65536 + VMMOUSE_MINOR_VERSION * 256 + VMMOUSE_PATCHLEVEL)
+ (PACKAGE_VERSION_MAJOR * 65536 + PACKAGE_VERSION_MINOR * 256 + PACKAGE_VERSION_PATCHLEVEL)
#define VMMOUSE_DRIVER_VERSION_STRING \
- VMW_STRING(VMMOUSE_MAJOR_VERSION) "." VMW_STRING(VMMOUSE_MINOR_VERSION) \
- "." VMW_STRING(VMMOUSE_PATCHLEVEL)
+ VMW_STRING(PACKAGE_VERSION_MAJOR) "." VMW_STRING(PACKAGE_VERSION_MINOR) \
+ "." VMW_STRING(PACKAGE_VERSION_PATCHLEVEL)
/*
* Standard four digit version string expected by VMware Tools installer.
@@ -1217,7 +1214,7 @@ static XF86ModuleVersionInfo VMMouseVersionRec = {
MODINFOSTRING1,
MODINFOSTRING2,
XORG_VERSION_CURRENT,
- VMMOUSE_MAJOR_VERSION, VMMOUSE_MINOR_VERSION, VMMOUSE_PATCHLEVEL,
+ PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL,
ABI_CLASS_XINPUT,
ABI_XINPUT_VERSION,
MOD_CLASS_XINPUT,
commit f3ef776415820c7da1728d1fe27dd56dc24e935f
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Feb 10 02:16:43 2010 +0100
Bump to 12.6.6
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/configure.ac b/configure.ac
index 64a42f7..0d73779 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-vmmouse],
- 12.6.5,
+ 12.6.6,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-vmmouse)
commit ae58da22e6f4798498a1e9a0b1b6c6c0f19e2532
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Feb 10 02:15:38 2010 +0100
Require xorg-macros 1.4 for XORG_INSTALL
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/configure.ac b/configure.ac
index 80248c9..64a42f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,8 +34,8 @@ AM_MAINTAINER_MODE
# Require xorg-macros: XORG_DEFAULT_OPTIONS
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+ [m4_fatal([must install xorg-macros 1.4 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.4)
XORG_DEFAULT_OPTIONS
DRIVER_NAME=vmmouse
commit aca67eca8bbb1368a2f36614b0e78b98947f134f
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 15 15:15:54 2010 -0800
Update Sun license notices to current X.Org standard form
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/man/Makefile.am b/man/Makefile.am
index 1f31487..2671512 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,27 +1,24 @@
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation.
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-# OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the copyright holders shall
-# not be used in advertising or otherwise to promote the sale, use or
-# other dealings in this Software without prior written authorization
-# from the copyright holders.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
#
man_MANS = @DRIVER_NAME@_detect.1
commit b3b9f36deb3fb1fcf66e591fcb075fe295e0cf0e
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Dec 15 22:01:02 2009 -0500
configure.ac: remove unused sdkdir=$(pkg-config...) statement
The sdkdir variable isn't use, so remove the statement.
Reply to: