From a5495fb4752aab99836d2ee52a8829c1c2bafe0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Tue, 24 Apr 2012 11:02:26 +0200
Subject: [PATCH] vdpau: Switch from deprecated XKeycodeToKeysym() to
 XkbKeycodeToKeysym()

Conflicts:

	sys/vdpau/gstvdpsink.c
---
 sys/vdpau/gstvdpsink.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sys/vdpau/gstvdpsink.c b/sys/vdpau/gstvdpsink.c
index 5a5677eb48..35ea182a40 100644
--- a/sys/vdpau/gstvdpsink.c
+++ b/sys/vdpau/gstvdpsink.c
@@ -30,6 +30,8 @@
 #include <gst/interfaces/navigation.h>
 #include <gst/interfaces/xoverlay.h>
 
+#include <X11/XKBlib.h>
+
 /* Debugging category */
 #include <gst/gstinfo.h>
 
@@ -387,7 +389,8 @@ gst_vdp_sink_handle_xevents (VdpSink * vdp_sink)
             e.xkey.keycode, e.xkey.x, e.xkey.x);
         g_mutex_lock (vdp_sink->x_lock);
         keysym =
-            XKeycodeToKeysym (vdp_sink->device->display, e.xkey.keycode, 0);
+            XkbKeycodeToKeysym (vdp_sink->device->display, e.xkey.keycode, 0,
+            0);
         g_mutex_unlock (vdp_sink->x_lock);
         if (keysym != NoSymbol) {
           char *key_str = NULL;