(#63732) Revbump for keyboard LED fixes.

(Portage version: 2.1.3_rc9)

7 files changed, 143 insertions, 1 deletions

diff --git a/x11-drivers/xf86-input-keyboard/ChangeLog b/x11-drivers/xf86-input-keyboard/ChangeLog
index 54a84dbc2520..e37c98fc08f8 100644
--- a/x11-drivers/xf86-input-keyboard/ChangeLog
+++ b/x11-drivers/xf86-input-keyboard/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-drivers/xf86-input-keyboard
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-keyboard/ChangeLog,v 1.41 2007/07/03 12:59:40 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-keyboard/ChangeLog,v 1.42 2007/08/02 00:03:14 dberkholz Exp $
+
+*xf86-input-keyboard-1.2.0-r1 (02 Aug 2007)
+*xf86-input-keyboard-1.1.1-r1 (02 Aug 2007)
+
+  02 Aug 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/dont-release-keys-on-newer-servers.patch,
+  +files/fix-key-led-update.patch, +xf86-input-keyboard-1.1.1-r1.ebuild,
+  +xf86-input-keyboard-1.2.0-r1.ebuild:
+  (#63732) Revbump for keyboard LED fixes.
 
   03 Jul 2007; Lars Weiler <pylon@gentoo.org>
   xf86-input-keyboard-1.1.1.ebuild:
diff --git a/x11-drivers/xf86-input-keyboard/files/digest-xf86-input-keyboard-1.1.1-r1 b/x11-drivers/xf86-input-keyboard/files/digest-xf86-input-keyboard-1.1.1-r1
new file mode 100644
index 000000000000..d9d3b650ff2f
--- /dev/null
+++ b/x11-drivers/xf86-input-keyboard/files/digest-xf86-input-keyboard-1.1.1-r1
@@ -0,0 +1,6 @@
+MD5 56566e8c3fb4bb99791d1788d0a9a1a8 x11-driver-patches-4.tar.bz2 346
+RMD160 fcbd405de080d07612d46f455b927035fd8123a8 x11-driver-patches-4.tar.bz2 346
+SHA256 07069bbd072f2def50e83801a8f2a41a4c96495104f15cd6f56f7df7f89769bf x11-driver-patches-4.tar.bz2 346
+MD5 babf094e37bdfc08076d4adb4c69c1d9 xf86-input-keyboard-1.1.1.tar.bz2 235022
+RMD160 3587c2c6329ad5d218a4590b7d77cfde25d3cd7f xf86-input-keyboard-1.1.1.tar.bz2 235022
+SHA256 b7e7377d75f3a10cceb5df18019b8e4498fbed0100478edd4af75bf8cd45d6fd xf86-input-keyboard-1.1.1.tar.bz2 235022
diff --git a/x11-drivers/xf86-input-keyboard/files/digest-xf86-input-keyboard-1.2.0-r1 b/x11-drivers/xf86-input-keyboard/files/digest-xf86-input-keyboard-1.2.0-r1
new file mode 100644
index 000000000000..fb8255e782f3
--- /dev/null
+++ b/x11-drivers/xf86-input-keyboard/files/digest-xf86-input-keyboard-1.2.0-r1
@@ -0,0 +1,6 @@
+MD5 1b8cfd2923836ee93eda69abe50dda04 x11-driver-patches-1.tar.bz2 389
+RMD160 0c57d4b235d83f3d7c46691c13857fd121ddec2d x11-driver-patches-1.tar.bz2 389
+SHA256 64787d5b57d2845c0fa9297a9d924093ba191fc3551798239d9983f0bcca9b3e x11-driver-patches-1.tar.bz2 389
+MD5 06e14029e00b32ed085769775b398efd xf86-input-keyboard-1.2.0.tar.bz2 243204
+RMD160 2c6b8bd8340d2dcb583f6a7b181f267f45f00b76 xf86-input-keyboard-1.2.0.tar.bz2 243204
+SHA256 8c45fc324ea01377f9932250824ee1769bdf1eab6e4b661c22a39deb0b01580a xf86-input-keyboard-1.2.0.tar.bz2 243204
diff --git a/x11-drivers/xf86-input-keyboard/files/dont-release-keys-on-newer-servers.patch b/x11-drivers/xf86-input-keyboard/files/dont-release-keys-on-newer-servers.patch
new file mode 100644
index 000000000000..8f1a0261373e
--- /dev/null
+++ b/x11-drivers/xf86-input-keyboard/files/dont-release-keys-on-newer-servers.patch
@@ -0,0 +1,30 @@
+From: Daniel Stone <daniel@fooishbar.org>
+Date: Fri, 8 Dec 2006 07:09:24 +0000 (+0200)
+Subject: don't release keys on newer servers
+X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/driver/xf86-input-keyboard.git;a=commitdiff;h=caeb0f364c1a95a9ad3e64dd722c8ddc88077a86
+
+don't release keys on newer servers
+On newer servers, we take care of the key release over VT switch already,
+so don't do it twice; that will lead to hilarious results.
+---
+
+--- a/src/kbd.c
++++ b/src/kbd.c
+@@ -419,6 +419,8 @@ InitKBD(InputInfoPtr pInfo, Bool init)
+   kevent.u.keyButtonPointer.rootX = 0;
+   kevent.u.keyButtonPointer.rootY = 0;
+ 
++/* The server does this for us with i-h. */
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 1
+   /*
+    * Hmm... here is the biggest hack of every time !
+    * It may be possible that a switch-vt procedure has finished BEFORE
+@@ -448,6 +450,8 @@ InitKBD(InputInfoPtr pInfo, Bool init)
+           (* pKeyboard->public.processInputProc)(&kevent, pKeyboard, 1);
+         }
+       }
++#endif
++
+   pKbd->scanPrefix      = 0;
+ 
+   if (init) {
diff --git a/x11-drivers/xf86-input-keyboard/files/fix-key-led-update.patch b/x11-drivers/xf86-input-keyboard/files/fix-key-led-update.patch
new file mode 100644
index 000000000000..88c267160f46
--- /dev/null
+++ b/x11-drivers/xf86-input-keyboard/files/fix-key-led-update.patch
@@ -0,0 +1,46 @@
+From: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date: Mon, 5 Feb 2007 22:29:54 +0000 (-0800)
+Subject: Fix key led update
+X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/driver/xf86-input-keyboard.git;a=commitdiff;h=05dd89ef03cee6853e7c2db518b6b22785cc3e7c
+
+Fix key led update
+
+Cf: https://bugs.freedesktop.org/show_bug.cgi?id=313
+    https://bugs.freedesktop.org/attachment.cgi?id=8396&action=view
+
+ ------- Comment  #8 From Samuel Thibault  2007-01-14 14:28:16  [reply] -------
+
+Created an attachment (id=8396) [details]
+fix key led update
+
+Ok, found the problem: when XKB is used (!pKbd->noXkb), pKbd->keyLeds is not
+updated, so that UpdateLeds(), even if it called at the right places, actually
+just clears all LEDs.  Here is a patch.
+---
+
+--- a/src/kbd.c
++++ b/src/kbd.c
+@@ -383,7 +383,22 @@ KbdCtrl( DeviceIntPtr device, KeybdCtrl 
+    InputInfoPtr pInfo = (InputInfoPtr) device->public.devicePrivate;
+    KbdDevPtr pKbd = (KbdDevPtr) pInfo->private;
+ 
+-   if ( ctrl->leds & XCOMP ) {
++   if ( ctrl->leds & XLED1) {
++       pKbd->keyLeds |= CAPSFLAG;
++   } else {
++       pKbd->keyLeds &= ~CAPSFLAG;
++   }
++   if ( ctrl->leds & XLED2) {
++       pKbd->keyLeds |= NUMFLAG;
++   } else {
++       pKbd->keyLeds &= ~NUMFLAG;
++   }
++   if ( ctrl->leds & XLED3) {
++       pKbd->keyLeds |= SCROLLFLAG;
++   } else {
++       pKbd->keyLeds &= ~SCROLLFLAG;
++   }
++   if ( ctrl->leds & (XCOMP|XLED4) ) {
+        pKbd->keyLeds |= COMPOSEFLAG;
+    } else {
+        pKbd->keyLeds &= ~COMPOSEFLAG;
diff --git a/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.1.1-r1.ebuild b/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..5152538a5ee4
--- /dev/null
+++ b/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.1.1-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.1.1-r1.ebuild,v 1.1 2007/08/02 00:03:14 dberkholz Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+XDPVER=4
+
+inherit x-modular
+
+DESCRIPTION="Keyboard input driver"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/kbproto
+	x11-proto/randrproto
+	x11-proto/xproto"
+
+PATCHES="
+	${FILESDIR}/dont-release-keys-on-newer-servers.patch
+	${FILESDIR}/fix-key-led-update.patch
+	"
diff --git a/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.2.0-r1.ebuild b/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..e24c799206f4
--- /dev/null
+++ b/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.2.0-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.2.0-r1.ebuild,v 1.1 2007/08/02 00:03:14 dberkholz Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="Keyboard input driver"
+KEYWORDS=""
+RDEPEND=">=x11-base/xorg-server-1.2.99"
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/kbproto
+	x11-proto/randrproto
+	x11-proto/xproto"
+
+PATCHES="
+	${FILESDIR}/dont-release-keys-on-newer-servers.patch
+	${FILESDIR}/fix-key-led-update.patch
+	"