diff options
| author | Vladimir Zapolskiy <vzapolskiy@gmail.com> | 2010-06-03 20:23:16 +0400 |
|---|---|---|
| committer | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2010-06-03 16:43:58 +0400 |
| commit | a27dbeff9fb99e646de653c69bd4458f03101419 (patch) | |
| tree | 13e5e4dfcfb4f65dd0658bdbb73691beda936562 | |
| parent | 1039e5f1a17448a9c1a83cb922bb215453c057b6 (diff) | |
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@gmail.com>
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
| -rw-r--r-- | recipes/xorg-xserver/xserver-kdrive-1.5.3/keyboard_device.patch | 16 | ||||
| -rw-r--r-- | 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 0000000000..dcb9eb01a5 --- /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 680582e632..07e88f507c 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}" |