debian/changelog | 21 +++++++++++++ debian/patches/161_force_paired_kbd_device.patch | 37 +++++++++++++++++++++++ debian/patches/series | 2 + 3 files changed, 60 insertions(+)
New commits: commit 6652c5929c9d616813257fadb5472bb0db8aa449 Author: Bryce Harrington <br...@bryceharrington.org> Date: Tue Feb 17 17:30:25 2009 -0800 Adding cherrypicked patch for bug 318261 diff --git a/debian/changelog b/debian/changelog index 68caad9..893b423 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,24 @@ +xorg-server (2:1.5.99.902-0ubuntu7) jaunty; urgency=low + + * Add 161_force_paired_kbd_device.patch: Fixes issue where a multimedia + keyboard (or keyboard-like device) sends its multimedia key events + through the mouse device file. In this case, pair the device with the + master before processing the events. Patch cherrypicked from upstream. + (LP: #318261) + + -- Bryce Harrington <br...@ubuntu.com> Tue, 17 Feb 2009 17:20:51 -0800 + +xorg-server (2:1.5.99.902-0ubuntu6) jaunty; urgency=low + + * Add 999_default_modedebug_on.patch. Defaults ModeDebug to on. + Upstream requests that users include this option when forwarding bugs + upstream, thus it should be carried at least during development and + reverted by -beta. Performance won't be impacted, and boot time will + be slowed only a negligible amount, as it merely adds a few additional + prints. + + -- Bryce Harrington <br...@ubuntu.com> Tue, 10 Feb 2009 14:06:38 -0800 + xorg-server (2:1.5.99.902-0ubuntu5) jaunty; urgency=low * Revert 158_raise_maxclients.patch. Breaks -nvidia. Binary drivers FTL. diff --git a/debian/patches/161_force_paired_kbd_device.patch b/debian/patches/161_force_paired_kbd_device.patch new file mode 100644 index 0000000..d89a93f --- /dev/null +++ b/debian/patches/161_force_paired_kbd_device.patch @@ -0,0 +1,37 @@ +From 0d4beba90ad82998f123f05dc0a03003f031b6f0 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutte...@redhat.com> +Date: Fri, 16 Jan 2009 20:38:57 +1000 +Subject: [PATCH] mi: force the paired kbd device before CopyKeyClass. (#19574) + +Some multi-media keyboards send the key events for multimedia keys through the +device file used by the mouse. Sending a key event through the VCP however +will fail. The VCP doesn't have a key class so the server crashes or (with an +appropriate fix) the event is simply swallowed. + +Thus, for key events if the master does not have a key class, get the device +paired with the master (i.e. the VCK) before processing the event any further. + +X.Org Bug 19574 <http://bugs.freedesktop.org/show_bug.cgi?id=19574> +--- + mi/mieq.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/mi/mieq.c b/mi/mieq.c +index 15ba8e7..a602f87 100644 +--- a/mi/mieq.c ++++ b/mi/mieq.c +@@ -414,7 +414,11 @@ mieqProcessInputEvents(void) + is transferred. */ + if (event->u.u.type == DeviceKeyPress || + event->u.u.type == DeviceKeyRelease) ++ { ++ if (!master->key) ++ master = GetPairedDevice(master); + CopyKeyClass(dev, master); ++ } + + CopyGetMasterEvent(master, event, masterEvents, nevents); + } +-- +1.5.4.3 + diff --git a/debian/patches/series b/debian/patches/series index 3e5d88a..48823a8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -17,3 +17,5 @@ #158_raise_maxclients.patch 159_xinerama_focus.patch 160_log_timestamping.patch +999_default_modedebug_on.patch +161_force_paired_kbd_device.patch -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org