ChangeLog | 110 ++++++++++++++++++++++++++++ Makefile.am | 3 configure.ac | 38 ++++++++- debian/README.source | 2 debian/changelog | 10 ++ debian/control | 4 - debian/local/10-vmmouse.conf | 6 - debian/local/69-xorg-vmmouse.rules | 1 debian/patches/01-enable-detect-in-kvm.diff | 17 +++- debian/rules | 4 - debian/xserver-xorg-input-vmmouse.install | 2 debian/xsfbs/xsfbs.mk | 31 +++++-- man/.gitignore | 3 man/Makefile.am | 14 ++- man/vmmouse_detect.1 | 58 -------------- man/vmmouse_detect.man | 58 ++++++++++++++ shared/Makefile.am | 2 src/vmmouse.c | 11 +- tools/50-vmmouse.conf | 7 + tools/69-xorg-vmmouse.rules.in | 1 tools/Makefile.am | 24 +++++- tools/hal-probe-vmmouse.in | 1 22 files changed, 297 insertions(+), 110 deletions(-)
New commits: commit b803ab224b6b3165a3fcc7c49d81f0e51d01fa77 Author: Julien Cristau <[email protected]> Date: Sat Apr 17 01:27:26 2010 +0200 Add missing include in 01-enable-detect-in-kvm.diff diff --git a/debian/patches/01-enable-detect-in-kvm.diff b/debian/patches/01-enable-detect-in-kvm.diff index 9f9cc39..45c2e41 100644 --- a/debian/patches/01-enable-detect-in-kvm.diff +++ b/debian/patches/01-enable-detect-in-kvm.diff @@ -2,10 +2,19 @@ Description: add iopl() back so vmmouse_detect will work in kvm again. Origin: upstream, reverses http://cgit.freedesktop.org/xorg/driver/xf86-input-vmmouse/commit/?id=bcdec3d0cd4434770cd841c33c030e0d7203881f Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=525039 -diff -Nur xserver-xorg-input-vmmouse-12.6.5/tools/vmmouse_detect.c xserver-xorg-input-vmmouse-12.6.5.new/tools/vmmouse_detect.c ---- xserver-xorg-input-vmmouse-12.6.5/tools/vmmouse_detect.c 2009-05-11 12:59:48.000000000 -0400 -+++ xserver-xorg-input-vmmouse-12.6.5.new/tools/vmmouse_detect.c 2010-03-05 09:53:21.000000000 -0500 -@@ -53,6 +53,11 @@ +Index: xserver-xorg-input-vmmouse/tools/vmmouse_detect.c +=================================================================== +--- xserver-xorg-input-vmmouse.orig/tools/vmmouse_detect.c ++++ xserver-xorg-input-vmmouse/tools/vmmouse_detect.c +@@ -28,6 +28,7 @@ + + #include <stdlib.h> + #include <signal.h> ++#include <sys/io.h> + #include "vmmouse_client.h" + + #ifdef HAVE_CONFIG_H +@@ -53,6 +54,11 @@ signal(SIGSEGV, segvCB); #if defined __i386__ || defined __x86_64__ commit bb27f6bfc187122f403a05a5443d873ede5213d5 Author: Julien Cristau <[email protected]> Date: Sat Apr 17 01:24:37 2010 +0200 Actually install the udev rules and xorg.conf.d snippet in the package diff --git a/debian/xserver-xorg-input-vmmouse.install b/debian/xserver-xorg-input-vmmouse.install index 1d8fa70..afa6194 100644 --- a/debian/xserver-xorg-input-vmmouse.install +++ b/debian/xserver-xorg-input-vmmouse.install @@ -2,3 +2,5 @@ usr/lib/xorg/modules/input/*.so usr/bin/vmmouse_detect usr/lib/hal/hal-probe-vmmouse usr/share/man +usr/share/X11/xorg.conf.d +lib/udev/rules.d commit e656fdd951c487ea25c0b4158e6e7b0bcd47c28c Author: Julien Cristau <[email protected]> Date: Sat Apr 17 01:18:29 2010 +0200 Use new xsfbs and ${xinpdriver:Depends}. diff --git a/debian/changelog b/debian/changelog index e5ca50d..0b0173f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ xserver-xorg-input-vmmouse (1:12.6.9-1) UNRELEASED; urgency=low - Adds InputClass support * Drop our local udev rules and xorg.conf.d snippet, they're upstream now. * Bump build-dependency on xserver-xorg-dev for /usr/share/X11/xorg.conf.d. + * Use new xsfbs and ${xinpdriver:Depends}. -- Julien Cristau <[email protected]> Sat, 17 Apr 2010 01:11:13 +0200 diff --git a/debian/control b/debian/control index 3cdecc6..541d897 100644 --- a/debian/control +++ b/debian/control @@ -21,7 +21,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-vmmouse Package: xserver-xorg-input-vmmouse Architecture: i386 amd64 -Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}, +Depends: ${shlibs:Depends}, ${misc:Depends}, ${xinpdriver:Depends}, xserver-xorg-input-mouse, udev Provides: ${xinpdriver:Provides} commit cf9169723c794c1cf59ba73f4f19f03c0ef25690 Author: Julien Cristau <[email protected]> Date: Sat Apr 17 01:14:28 2010 +0200 Bump build-dependency on xserver-xorg-dev for /usr/share/X11/xorg.conf.d. diff --git a/debian/changelog b/debian/changelog index bb73d7f..e5ca50d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ xserver-xorg-input-vmmouse (1:12.6.9-1) UNRELEASED; urgency=low * New upstream release - Adds InputClass support * Drop our local udev rules and xorg.conf.d snippet, they're upstream now. + * Bump build-dependency on xserver-xorg-dev for /usr/share/X11/xorg.conf.d. -- Julien Cristau <[email protected]> Sat, 17 Apr 2010 01:11:13 +0200 diff --git a/debian/control b/debian/control index 86b6c04..3cdecc6 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: David Nusinow <[email protected]>, Drew Parsons <[email protected] Build-Depends: debhelper (>= 5), pkg-config, - xserver-xorg-dev (>= 2:1.7), + xserver-xorg-dev (>= 2:1.7.6.901), x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev, commit ad5ed1eee9b5c65251ed577abf765cc98ba24d04 Author: Julien Cristau <[email protected]> Date: Sat Apr 17 01:13:29 2010 +0200 Drop our local udev rules and xorg.conf.d snippet, they're upstream now. diff --git a/debian/changelog b/debian/changelog index 2ba82b5..bb73d7f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ xserver-xorg-input-vmmouse (1:12.6.9-1) UNRELEASED; urgency=low * New upstream release - Adds InputClass support + * Drop our local udev rules and xorg.conf.d snippet, they're upstream now. -- Julien Cristau <[email protected]> Sat, 17 Apr 2010 01:11:13 +0200 diff --git a/debian/local/10-vmmouse.conf b/debian/local/10-vmmouse.conf deleted file mode 100644 index 879b604..0000000 --- a/debian/local/10-vmmouse.conf +++ /dev/null @@ -1,6 +0,0 @@ -Section "InputClass" - Identifier "vmmouse catchall" - MatchTag "vmmouse" - Driver "vmmouse" -EndSection - diff --git a/debian/local/69-xorg-vmmouse.rules b/debian/local/69-xorg-vmmouse.rules deleted file mode 100644 index 7b1bd00..0000000 --- a/debian/local/69-xorg-vmmouse.rules +++ /dev/null @@ -1 +0,0 @@ -ACTION=="add|change", ENV{ID_INPUT_MOUSE}=="?*", ATTRS{description}=="i8042 AUX port", PROGRAM="/usr/bin/vmmouse_detect", ENV{ID_INPUT.tags}="vmmouse" diff --git a/debian/rules b/debian/rules index 17534d9..8f9b639 100755 --- a/debian/rules +++ b/debian/rules @@ -80,10 +80,6 @@ binary-arch: build install serverabi dh_installdocs README dh_installchangelogs ChangeLog dh_install --sourcedir=debian/tmp --list-missing --exclude=vmmouse_drv.la - install -d debian/xserver-xorg-input-vmmouse/lib/udev/rules.d - install -m 644 debian/local/69-xorg-vmmouse.rules debian/xserver-xorg-input-vmmouse/lib/udev/rules.d - install -d debian/xserver-xorg-input-vmmouse/usr/lib/X11/xorg.conf.d - install -m 644 debian/local/10-vmmouse.conf debian/xserver-xorg-input-vmmouse/usr/lib/X11/xorg.conf.d dh_installman dh_link dh_strip commit 9787a4960200a0e7524de41bb09cbb188e4e2bd5 Author: Julien Cristau <[email protected]> Date: Sat Apr 17 01:11:48 2010 +0200 Bump changelogs diff --git a/ChangeLog b/ChangeLog index d8e7ac3..b9d5c0e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,113 @@ +commit 01f03ca8fbca96957d6c2718f4279e31cb406c2f +Author: Peter Hutterer <[email protected]> +Date: Fri Apr 9 08:30:26 2010 +1000 + + Bump for 12.6.9 release. + + Signed-off-by: Peter Hutterer <[email protected]> + +commit 7b2ff5322b298ed8458c7442a16b8c0a14bcc5dc +Author: Peter Hutterer <[email protected]> +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 <[email protected]> + Reviewed-by: Alan Coopersmith <[email protected]> + +commit 21f53010d204c681e1a82b176841c2d4af8f61d8 +Author: Michel Dänzer <[email protected]> +Date: Thu Apr 8 16:18:07 2010 +0200 + + Bump for 12.6.8 release. + +commit 80f671233e583ae085986bce12057fc45da444aa +Author: Michel Dänzer <[email protected]> +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. + +commit b9c3bc94ee86a72216e9738aaecede80cc1c043c +Author: Michel Dänzer <[email protected]> +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. + +commit 36c2cd8ec6d3bf7191a98a04a876e8d7b6f64d5d +Author: Gaetan Nadon <[email protected]> +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 <[email protected]> + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 27813c665b0eed0b3d8b4db5fcb555f20fe60c4a +Author: Gaetan Nadon <[email protected]> +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 <[email protected]> + Reviewed-by: Dan Nicholson <[email protected]> + Signed-off-by: Peter Hutterer <[email protected]> + +commit 40ba06b1389ab68482b3aa3ed69292011c09f9dd +Author: Jakob Bornecrantz <[email protected]> +Date: Thu Mar 18 16:23:27 2010 +0100 + + Bump for 12.6.7 release. + +commit fae10ac6c613f6de847e152d615e6da421147139 +Author: Julien Cristau <[email protected]> +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 <[email protected]> + +commit f3ef776415820c7da1728d1fe27dd56dc24e935f +Author: Julien Cristau <[email protected]> +Date: Wed Feb 10 02:16:43 2010 +0100 + + Bump to 12.6.6 + + Signed-off-by: Julien Cristau <[email protected]> + +commit ae58da22e6f4798498a1e9a0b1b6c6c0f19e2532 +Author: Julien Cristau <[email protected]> +Date: Wed Feb 10 02:15:38 2010 +0100 + + Require xorg-macros 1.4 for XORG_INSTALL + + Signed-off-by: Julien Cristau <[email protected]> + commit aca67eca8bbb1368a2f36614b0e78b98947f134f Author: Alan Coopersmith <[email protected]> Date: Fri Jan 15 15:15:54 2010 -0800 diff --git a/debian/changelog b/debian/changelog index 20ae0a8..2ba82b5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xserver-xorg-input-vmmouse (1:12.6.9-1) UNRELEASED; urgency=low + + * New upstream release + - Adds InputClass support + + -- Julien Cristau <[email protected]> Sat, 17 Apr 2010 01:11:13 +0200 + xserver-xorg-input-vmmouse (1:12.6.5-4) unstable; urgency=low * Add 10-vmmouse.conf. commit b045afbd8277ad0c44e29d7c45802053c4335ccd Author: Julien Cristau <[email protected]> Date: Fri Apr 16 22:14:46 2010 +0200 Update serverabi rule for xserver 1.7.6.901 Add new variables ${xviddriver:Depends} and ${xinpdriver:Depends} for drivers. The ${xserver:Depends} variable is deprecated. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 351fea5..77c4a39 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -253,25 +253,33 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir # debian/*.prerm >$@ -SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null) +# Compute dependencies for drivers +# +VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null) +INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null) + +# these two can be removed post-squeeze VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) -SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS)) VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) + ifeq ($(PACKAGE),) PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) endif .PHONY: serverabi serverabi: install -ifeq ($(SERVERMINVERS),) - @echo error: xserver-xorg-dev needs to be installed +ifeq ($(VIDEODEP),) + @echo 'error: xserver-xorg-dev >= 1.7.6.901 needs to be installed' @exit 1 else - echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars + echo "xviddriver:Depends=$(VIDEODEP)" >> debian/$(PACKAGE).substvars + echo "xinpdriver:Depends=$(INPUTDEP)" >> debian/$(PACKAGE).substvars + # the following is there for compatibility... echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars + echo "xserver:Depends=$(VIDEODEP), $(INPUTDEP)" >> debian/$(PACKAGE).substvars endif # vim:set noet ai sts=8 sw=8 tw=0: commit 8bd2e9b523da35493db1bd781d4ef6bfbbeb2eff Author: Julien Cristau <[email protected]> Date: Tue Apr 13 14:06:33 2010 +0200 xsfbs.mk: don't use a directory as a make target The timestamp on the directory gets updated each time a file is added in it, which causes useless rebuilds. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 5e16b10..351fea5 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -110,14 +110,15 @@ $(STAMP_DIR)/stampdir: .PHONY: prepare stampdir_targets+=prepare prepare: $(STAMP_DIR)/prepare -$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts +$(STAMP_DIR)/prepare: $(STAMP_DIR)/logdir $(STAMP_DIR)/genscripts >$@ -.PHONY: log -stampdir_targets+=log -log: $(STAMP_DIR)/log -$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir +.PHONY: logdir +stampdir_targets+=logdir +logdir: $(STAMP_DIR)/logdir +$(STAMP_DIR)/logdir: $(STAMP_DIR)/stampdir mkdir -p $(STAMP_DIR)/log + >$@ # Apply all patches to the upstream source. .PHONY: patch @@ -145,7 +146,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare # Revert all patches to the upstream source. .PHONY: unpatch -unpatch: $(STAMP_DIR)/log +unpatch: $(STAMP_DIR)/logdir rm -f $(STAMP_DIR)/patch @echo -n "Unapplying patches..."; \ if $(QUILT) applied >/dev/null 2>/dev/null; then \ commit 01f03ca8fbca96957d6c2718f4279e31cb406c2f Author: Peter Hutterer <[email protected]> Date: Fri Apr 9 08:30:26 2010 +1000 Bump for 12.6.9 release. Signed-off-by: Peter Hutterer <[email protected]> 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 <[email protected]> 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 <[email protected]> Reviewed-by: Alan Coopersmith <[email protected]> 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 = @[email protected] @driver_n...@_detect.man +driverman_PRE = @[email protected] driverman_DATA = $(driverman_PRE:m...@driver_man_suffix@) -EXTRA_DIST = @[email protected] @driver_n...@_detect.man +appmandir = $(APP_MAN_DIR) +appman_PRE = @driver_n...@_detect.man +appman_DATA = $(appman_PRE:m...@app_man_suffix@) -CLEANFILES = $(driverman_DATA) +EXTRA_DIST = @[email protected] $(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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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)/[email protected] > $@ + < $< > $@ EXTRA_DIST = hal-probe-vmmouse.in commit 734e3b2d1dcfe5db07cb19902617fd1212c0c186 Author: Cyril Brulebois <[email protected]> Date: Thu Apr 1 20:49:15 2010 +0200 Fix typo. diff --git a/debian/README.source b/debian/README.source index 34ab4bf..b09a1ab 100644 --- a/debian/README.source +++ b/debian/README.source @@ -25,7 +25,7 @@ just need to be pulled into git.debian.org in a "upstream-*" branch. Otherwise, the upstream sources are manually installed in the Debian git repository. -The .orig.tar.gz upstream source file could be generated this +The .orig.tar.gz upstream source file could be generated using this "upstream-*" branch in the Debian git repository but it is actually copied from upstream tarballs directly. commit 36c2cd8ec6d3bf7191a98a04a876e8d7b6f64d5d Author: Gaetan Nadon <[email protected]> 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 <[email protected]> Signed-off-by: Gaetan Nadon <[email protected]> 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_n...@_detect.1 - drivermandir = $(DRIVER_MAN_DIR) -driverman_PRE = @[email protected] +driverman_PRE = @[email protected] @driver_n...@_detect.man driverman_DATA = $(driverman_PRE:m...@driver_man_suffix@) -EXTRA_DIST = @[email protected] @driver_n...@_detect.1 +EXTRA_DIST = @[email protected] @driver_n...@_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 <[email protected]> -.\" -.\" 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 <[email protected]> +.\" +.\" 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 <[email protected]> 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 <[email protected]> Reviewed-by: Dan Nicholson <[email protected]> Signed-off-by: Peter Hutterer <[email protected]> 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 = l...@[email protected] l...@driver_name@_la_SOURCES = @driver_n...@_defs.h \ @driver_n...@_client.c @driver_n...@_client.h \ commit 40ba06b1389ab68482b3aa3ed69292011c09f9dd Author: Jakob Bornecrantz <[email protected]> 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 <[email protected]> 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 <[email protected]> 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, -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
