[oe-commits] Vladimir Zapolskiy : kdrive: fix keyboard device support in kdrive

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: a27dbeff9fb99e646de653c69bd4458f03101419
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=a27dbeff9fb99e646de653c69bd4458f03101419

Author: Vladimir Zapolskiy <vzapolskiy at gmail.com>
Date:   Thu Jun  3 20:23:16 2010 +0400

kdrive: fix keyboard device support in kdrive

This fixes option selection for keyboard device in kdrive server without XKB
support.

Signed-off-by: Vladimir Zapolskiy <vzapolskiy at gmail.com>
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov at gmail.com>

---

 .../xserver-kdrive-1.5.3/keyboard_device.patch     |   16 ++++++++++++++++
 recipes/xorg-xserver/xserver-kdrive_1.5.3.bb       |    1 +
 2 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/recipes/xorg-xserver/xserver-kdrive-1.5.3/keyboard_device.patch b/recipes/xorg-xserver/xserver-kdrive-1.5.3/keyboard_device.patch
new file mode 100644
index 0000000..dcb9eb0
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-kdrive-1.5.3/keyboard_device.patch
@@ -0,0 +1,16 @@
+--- a/hw/kdrive/src/kinput.c	2010-06-03 19:03:41.000000000 +0400
++++ b/hw/kdrive/src/kinput.c	2010-06-03 19:08:26.000000000 +0400
+@@ -1174,10 +1174,11 @@
+             ki->xkbVariant = option->value;
+         else if (strcasecmp(option->key, "XkbOptions") == 0)
+             ki->xkbOptions = option->value;
+-        else if (!strcasecmp (option->key, "device"))
+-            ki->path = KdSaveString(option->value);
+         else
+ #endif
++        if (!strcasecmp (option->key, "device"))
++            ki->path = KdSaveString(option->value);
++        else
+            ErrorF("Kbd option key (%s) of value (%s) not assigned!\n", 
+                     option->key, option->value);
+     }
diff --git a/recipes/xorg-xserver/xserver-kdrive_1.5.3.bb b/recipes/xorg-xserver/xserver-kdrive_1.5.3.bb
index 680582e..07e88f5 100644
--- a/recipes/xorg-xserver/xserver-kdrive_1.5.3.bb
+++ b/recipes/xorg-xserver/xserver-kdrive_1.5.3.bb
@@ -20,6 +20,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	file://sysroot_fix.patch \
 	file://drmfix.patch \
 	file://no_xkb.patch \
+	file://keyboard_device.patch \
         "
 
 S = "${WORKDIR}/xorg-server-${PV}"