ChangeLog | 22 ++++++++++++++++++++++
debian/changelog | 7 +++++++
src/hurd_mouse.c | 8 ++++++++
src/mouse.c | 2 ++
4 files changed, 39 insertions(+)
New commits:
commit e49cd0ca5509f72b5f0d8aaa9f5126cb3645ac7a
Author: Cyril Brulebois <k...@debian.org>
Date: Fri Apr 1 02:19:05 2011 +0200
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index f880d4f..0c45fac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-input-mouse (1:1.7.0-2) UNRELEASED; urgency=low
+xserver-xorg-input-mouse (1:1.7.0-2) unstable; urgency=low
* Merge two more commits from upstream to fix Hurd support, thanks to
Samuel Thibault (Closes: #620089).
- -- Cyril Brulebois <k...@debian.org> Fri, 01 Apr 2011 02:17:28 +0200
+ -- Cyril Brulebois <k...@debian.org> Fri, 01 Apr 2011 02:18:50 +0200
xserver-xorg-input-mouse (1:1.7.0-1) unstable; urgency=low
commit 90c839a1d9a5d785e2c00755b7e992d771e1cb00
Author: Cyril Brulebois <k...@debian.org>
Date: Fri Apr 1 02:18:48 2011 +0200
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index c809cc5..f4c972b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+commit 1780667854d73bbd0e0596271b09f93321cd0b1d
+Author: Samuel Thibault <samuel.thiba...@ens-lyon.org>
+Date: Wed Mar 30 02:26:25 2011 +0200
+
+ Fix Hurd mouse driver with XInput ABI before 12
+
+ Commit 7bf22a36 (Use pInfo->options instead of conf-idev.) updated the
+ xf86CollectInputOptions call into keeping previous options (for ABI before
+ 12). The hurd mouse driver also needs to be updated.
+
+commit d6e9623875de5714e85f7da5782ea665116f86dc
+Author: Samuel Thibault <samuel.thiba...@ens-lyon.org>
+Date: Wed Mar 30 01:00:47 2011 +0200
+
+ Fix OSMouse OS-defined protocol support
+
+ Fix regression introduced by 0a088df6: in the case of an OS-specific
+ protocol, the protocol is PROT_UNKNOWN, but should not be rejected: the
core
+ mouse drive just needs to let the OS driver handle it.
+
+ Signed-off-by: Samuel Thibault <samuel.thiba...@ens-lyon.org>
+
commit a07c353f01f99ef3e62f84a32e91d539a4e4863a
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Thu Mar 10 08:32:23 2011 +1000
diff --git a/debian/changelog b/debian/changelog
index ba9425d..f880d4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-input-mouse (1:1.7.0-2) UNRELEASED; urgency=low
+
+ * Merge two more commits from upstream to fix Hurd support, thanks to
+ Samuel Thibault (Closes: #620089).
+
+ -- Cyril Brulebois <k...@debian.org> Fri, 01 Apr 2011 02:17:28 +0200
+
xserver-xorg-input-mouse (1:1.7.0-1) unstable; urgency=low
* New upstream release:
commit 1780667854d73bbd0e0596271b09f93321cd0b1d
Author: Samuel Thibault <samuel.thiba...@ens-lyon.org>
Date: Wed Mar 30 02:26:25 2011 +0200
Fix Hurd mouse driver with XInput ABI before 12
Commit 7bf22a36 (Use pInfo->options instead of conf-idev.) updated the
xf86CollectInputOptions call into keeping previous options (for ABI before
12). The hurd mouse driver also needs to be updated.
diff --git a/src/hurd_mouse.c b/src/hurd_mouse.c
index a285a87..031e44b 100644
--- a/src/hurd_mouse.c
+++ b/src/hurd_mouse.c
@@ -144,7 +144,15 @@ OsMousePreInit(InputInfoPtr pInfo, const char *protocol,
int flags)
xf86Msg(X_CONFIG, "%s: Protocol: %s\n", pInfo->name, protocol);
/* Collect the options, and process the common options. */
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
+ /* need some special handling here. xf86CollectInputOptions will reset
+ * pInfo->options. To re-merge the previously set arguments, pass the
+ * original pInfo->options in.
+ */
+ xf86CollectInputOptions(pInfo, NULL, pInfo->options);
+#else
COLLECT_INPUT_OPTIONS(pInfo, NULL);
+#endif
xf86ProcessCommonOptions(pInfo, pInfo->options);
/* Check if the device can be opened. */
commit d6e9623875de5714e85f7da5782ea665116f86dc
Author: Samuel Thibault <samuel.thiba...@ens-lyon.org>
Date: Wed Mar 30 01:00:47 2011 +0200
Fix OSMouse OS-defined protocol support
Fix regression introduced by 0a088df6: in the case of an OS-specific
protocol, the protocol is PROT_UNKNOWN, but should not be rejected: the core
mouse drive just needs to let the OS driver handle it.
Signed-off-by: Samuel Thibault <samuel.thiba...@ens-lyon.org>
diff --git a/src/mouse.c b/src/mouse.c
index edb998f..c3498ea 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -953,6 +953,8 @@ MousePreInit(InputDriverPtr drv, InputInfoPtr pInfo, int
flags)
MouseFindDevice(pInfo, protocol);
xf86Msg(protocolFrom, "%s: Protocol: \"%s\"\n", pInfo->name, protocol);
+ if (protocolID == PROT_UNKNOWN)
+ goto out;
if (!(pProto = GetProtocol(protocolID)))
{
rc = BadValue;
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1q5sah-0005sk...@alioth.debian.org
