From 1911aadc198f293c22c99c851943671fc1a7ec2b Mon Sep 17 00:00:00 2001
From: Zoran Vuckovic <casdevel@gmail.com>
Date: Sun, 4 Jun 2017 06:51:10 +0200
Subject: [PATCH 1/2] Remove duplicate keyboard handling

---
 input/drivers/udev_input.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/input/drivers/udev_input.c b/input/drivers/udev_input.c
index d301a1d27e..91eb871574 100644
--- a/input/drivers/udev_input.c
+++ b/input/drivers/udev_input.c
@@ -130,7 +130,6 @@ struct udev_input
 #ifdef HAVE_XKBCOMMON
 int init_xkb(int fd, size_t size);
 void free_xkb(void);
-int handle_xkb(int code, int value);
 #endif
 
 static uint8_t udev_key_state[UDEV_MAX_KEYS];
@@ -146,11 +145,6 @@ static void udev_handle_keyboard(void *data,
          else
             BIT_CLEAR(udev_key_state, event->code);
 
-#ifdef HAVE_XKBCOMMON
-         if (handle_xkb(event->code, event->value) == 0)
-            return;
-#endif
-
          input_keyboard_event(event->value,
                input_keymaps_translate_keysym_to_rk(event->code),
                0, 0, RETRO_DEVICE_KEYBOARD);

From ab793b92a39d44a416c8d96772117effbde28ceb Mon Sep 17 00:00:00 2001
From: Zoran Vuckovic <casdevel@gmail.com>
Date: Sun, 4 Jun 2017 07:23:32 +0200
Subject: [PATCH 2/2] Remove XKBCOMMON code

---
 input/drivers/udev_input.c | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/input/drivers/udev_input.c b/input/drivers/udev_input.c
index 91eb871574..8ea5567367 100644
--- a/input/drivers/udev_input.c
+++ b/input/drivers/udev_input.c
@@ -127,11 +127,6 @@ struct udev_input
    unsigned num_devices;
 };
 
-#ifdef HAVE_XKBCOMMON
-int init_xkb(int fd, size_t size);
-void free_xkb(void);
-#endif
-
 static uint8_t udev_key_state[UDEV_MAX_KEYS];
 
 static void udev_handle_keyboard(void *data,
@@ -159,10 +154,6 @@ static void udev_input_kb_free(void)
 {
    unsigned i;
 
-#ifdef HAVE_XKBCOMMON
-   free_xkb();
-#endif
-
    for (i = 0; i < UDEV_MAX_KEYS; i++)
       udev_key_state[i] = 0;
 }
@@ -816,11 +807,6 @@ static void *udev_input_init(const char *joypad_driver)
       udev_monitor_enable_receiving(udev->monitor);
    }
 
-#ifdef HAVE_XKBCOMMON
-   if (init_xkb(-1, 0) == -1)
-      goto error;
-#endif
-
    if (!epoll_new(&udev->epfd))
    {
       RARCH_ERR("Failed to create epoll FD.\n");