xserver-xorg-input-vmmouse: Changes to 'debian-unstable'
ChangeLog | 46 ++++++++++++++++++++++++++++++++++++++
configure.ac | 2 -
debian/changelog | 6 +++++
fdi/11-x11-vmmouse.fdi | 3 ++
src/vmmouse.c | 49 ++++++++++++++++++++++++++++-------------
tools/69-xorg-vmmouse.rules.in | 2 -
6 files changed, 91 insertions(+), 17 deletions(-)
New commits:
commit c6141ac21a77e1c1b3685b46145a3310167c2b20
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Mar 20 21:01:25 2012 +0000
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index ff63c63..add6cda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-input-vmmouse (1:12.8.0-1) UNRELEASED; urgency=low
+xserver-xorg-input-vmmouse (1:12.8.0-1) unstable; urgency=low
* New upstream release.
- -- Cyril Brulebois <kibi@debian.org> Tue, 20 Mar 2012 21:01:09 +0000
+ -- Cyril Brulebois <kibi@debian.org> Tue, 20 Mar 2012 21:01:22 +0000
xserver-xorg-input-vmmouse (1:12.7.0-2) unstable; urgency=low
commit d2e621d73893f350c8617ff1b2a4fa05823852a0
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Mar 20 21:01:19 2012 +0000
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index 9858bde..0e850d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,49 @@
+commit e925b2e6e9d548db5a6646a76d513fb6881f69b4
+Author: Zack Rusin <zackr@vmware.com>
+Date: Thu Mar 8 09:51:48 2012 -0500
+
+ vmmouse 12.8.0
+
+ bump the version number for the new release
+
+ Signed-off-by: Zack Rusin <zackr@vmware.com>
+
+commit 189dc266a66485d48303acbc1a4fbe4642c75e9f
+Author: Zack Rusin <zackr@vmware.com>
+Date: Wed Mar 7 23:22:35 2012 -0500
+
+ Adjust the kernel name in the udev file.
+
+ Some distros (most notable OpenSuSE) are unable to match on the
+ 'event' devices, since we should be using 'mouse' kernel anyway
+ (because that's what the 'udevadm info' reports) switch to it in the
+ rules file.
+
+ Signed-off-by: Zack Rusin <zackr@vmware.com>
+ Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
+
+commit 3960dd29b4e839d224b9da4e28ab4302832e906f
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Sat Nov 12 14:08:13 2011 +1000
+
+ Deal with opaque InputOption types in ABI 14
+
+ Tested-by: Jakob Bornecrantz <jakob@vmware.com>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
+
+commit fd140bfbea9fac8f05ad525dd798a5ca39f68c44
+Author: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Tue Apr 5 14:42:37 2011 +0200
+
+ Make the fdi script work with FreeBSD
+
+ The key "input.originating_device" is not present on FreeBSD.
+ Use "freebsd.driver" instead.
+
+ Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+ Reviewed-by: Michel D�er <daenzer@vmware.com>
+
commit de2b5ca7a76f1ffac1e8d4ed88408dda0f77a83c
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date: Wed Mar 2 11:50:12 2011 +0100
diff --git a/debian/changelog b/debian/changelog
index 571dbf4..ff63c63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-vmmouse (1:12.8.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Cyril Brulebois <kibi@debian.org> Tue, 20 Mar 2012 21:01:09 +0000
+
xserver-xorg-input-vmmouse (1:12.7.0-2) unstable; urgency=low
* Pass --bindir=/bin to configure, lost in the dh-ification. Thanks to
commit e925b2e6e9d548db5a6646a76d513fb6881f69b4
Author: Zack Rusin <zackr@vmware.com>
Date: Thu Mar 8 09:51:48 2012 -0500
vmmouse 12.8.0
bump the version number for the new release
Signed-off-by: Zack Rusin <zackr@vmware.com>
diff --git a/configure.ac b/configure.ac
index 20d6806..5938ca7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-vmmouse],
- [12.7.0],
+ [12.8.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-vmmouse)
commit 189dc266a66485d48303acbc1a4fbe4642c75e9f
Author: Zack Rusin <zackr@vmware.com>
Date: Wed Mar 7 23:22:35 2012 -0500
Adjust the kernel name in the udev file.
Some distros (most notable OpenSuSE) are unable to match on the
'event' devices, since we should be using 'mouse' kernel anyway
(because that's what the 'udevadm info' reports) switch to it in the
rules file.
Signed-off-by: Zack Rusin <zackr@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
diff --git a/tools/69-xorg-vmmouse.rules.in b/tools/69-xorg-vmmouse.rules.in
index 602afb6..9af3938 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", KERNEL=="event[0-9]*", PROGRAM="__BIN_PREFIX__/vmmouse_detect", ENV{ID_INPUT.tags}="vmmouse"
+ACTION=="add|change", ENV{ID_INPUT_MOUSE}=="?*", ATTRS{description}=="i8042 AUX port", KERNEL=="mouse[0-9]*", PROGRAM="__BIN_PREFIX__/vmmouse_detect", ENV{ID_INPUT.tags}="vmmouse"
commit 3960dd29b4e839d224b9da4e28ab4302832e906f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sat Nov 12 14:08:13 2011 +1000
Deal with opaque InputOption types in ABI 14
Tested-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
diff --git a/src/vmmouse.c b/src/vmmouse.c
index ad014ec..285ba26 100644
--- a/src/vmmouse.c
+++ b/src/vmmouse.c
@@ -228,11 +228,40 @@ static char reverseMap[32] = { 0, 4, 2, 6, 1, 5, 3, 7,
#define reverseBits(map, b) (((b) & ~0x0f) | map[(b) & 0x0f])
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 14
+
+static InputOption*
+input_option_new(InputOption *list, char *key, char *value)
+{
+ InputOption *new;
+
+ new = calloc(1, sizeof(InputOption));
+ new->key = key;
+ new->value = value;
+ new->next = list;
+ return new;
+}
+
+static void
+input_option_free_list(InputOption **opts)
+{
+ InputOption *tmp = *opts;
+ while(*opts)
+ {
+ tmp = (*opts)->next;
+ free((*opts)->key);
+ free((*opts)->value);
+ free((*opts));
+ *opts = tmp;
+ }
+}
+#endif
+
static int
VMMouseInitPassthru(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
{
InputAttributes *attrs = NULL;
- InputOption *input_options = NULL, *tmp, *opts;
+ InputOption *input_options = NULL;
pointer options;
DeviceIntPtr dev;
int rc;
@@ -241,25 +270,15 @@ VMMouseInitPassthru(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
options = xf86ReplaceStrOption(options, "Driver", "mouse");
while(options) {
- tmp = calloc(1, sizeof(InputOption));
- tmp->key = xf86OptionName(options);
- tmp->value = xf86OptionValue(options);
- tmp->next = input_options;
- input_options = tmp;
+ input_options = input_option_new(input_options,
+ xf86OptionName(options),
+ xf86OptionValue(options));
options = xf86NextOption(options);
}
rc = NewInputDeviceRequest(input_options, attrs, &dev);
- opts = input_options;
- tmp = opts;
- while(opts) {
- tmp = opts->next;
- free(opts->key);
- free(opts->value);
- free(opts);
- opts = tmp;
- }
+ input_option_free_list(&input_options);
return rc;
}
commit fd140bfbea9fac8f05ad525dd798a5ca39f68c44
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date: Tue Apr 5 14:42:37 2011 +0200
Make the fdi script work with FreeBSD
The key "input.originating_device" is not present on FreeBSD.
Use "freebsd.driver" instead.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Michel D�er <daenzer@vmware.com>
diff --git a/fdi/11-x11-vmmouse.fdi b/fdi/11-x11-vmmouse.fdi
index 6151196..77f0abd 100644
--- a/fdi/11-x11-vmmouse.fdi
+++ b/fdi/11-x11-vmmouse.fdi
@@ -5,6 +5,9 @@
<match key="input.originating_device" contains="i8042_">
<append key="info.callouts.add" type="strlist">hal-probe-vmmouse</append>
</match>
+ <match key="freebsd.driver" contains="psm">
+ <append key="info.callouts.add" type="strlist">hal-probe-vmmouse</append>
+ </match>
</match>
</device>
</deviceinfo>
Reply to: