[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gentoo-sparc
Subject:    [gentoo-sparc] Patch available for the 'kernel-2.4.xx must use deprecated keyboard
From:       Ferris McCormick <fmccor () gentoo ! org>
Date:       2005-07-17 23:38:27
Message-ID: Pine.LNX.4.63.0507172314330.2673 () terciopelo ! krait ! us
[Download RAW message or body]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Our nuisance problem 'kernel-2.4.xx users must build and use the xorg 
deprecated keyboard driver' is now fixed upstream at X.org, thanks to
Matthias Muthmann.  This closes our beloved bug 61940 as 'Fixed Upstream.'

For those who care, there is a patch available.  In fact, there are two,
both at Bug 61940.  The first is xorg's CVS diff, indicating a release at 
version 16.  The second is a 'diff -u' patch for gentoo use.

If you want to try it, get the gentoo patch id=63633, and follow the 
instructions at Comment 24.  Or, since they are pretty simple, they are 
duplicated here.
1.  Start a build of your favorite version of xorg-x11;
2.  Once everything is unpacked,
     a.  cd ${PORTAGE_TMPDIR}/portage/xorg-x11-[version]/work
     b.  patch -b -z- -p0 < [path-to]/kbd.patch-gentoo

In fact, this is a 31-line patch, I'll just attach it. If you try it,
feedback requested.

Regards,
Ferris

- --
Ferris McCormick (P44646, MI) <fmccor@gentoo.org>
Developer, Gentoo Linux (sparc, devrel)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)

iD8DBQFC2uv3Qa6M3+I///cRAjUyAKDF3toGUpdVNbGsQbJPUtHrjxTgiACg5JjT
DDWGpHcBMzYEKnTZbUEry0U=
=rq2Y
-----END PGP SIGNATURE-----
["kbd.patch-gentoo" (TEXT/PLAIN)]

--- xc/programs/Xserver/hw/xfree86/input/keyboard/kbd.c-	2004-12-16 03:38:45.000000000 +0000
+++ xc/programs/Xserver/hw/xfree86/input/keyboard/kbd.c	2005-07-15 04:08:48.000000000 +0000
@@ -541,6 +541,20 @@
   if (xf86inSuspend)
       return;
 
+    if (pKbd->sunKbd) {
+     /*
+      * XXX XXX XXX:
+      *
+      * I really don't know what's wrong here, but passing the real
+      * scanCode offsets by one from XKB's point of view.
+      *
+      * (ecd@skynet.be, 980405)
+      */
+      scanCode--;
+      goto sunKeyboards;
+  }
+
+
   /*
    * First do some special scancode remapping ...
    */
@@ -602,6 +616,7 @@
     scanCode = KEY_Pause;
 #endif
 
+sunKeyboards:
   /*
    * Now map the scancodes to real X-keycodes ...
    */

-- 
gentoo-sparc@gentoo.org mailing list


[prev in list] [next in list] [prev in thread] [next in thread]