build: drop check for XF86keysym.h

This is always included in the Xorg development headers. Strictly
speaking it's not necessarily available with other X implementations,
but these are hopefully all dead.

4 files changed, 1 insertions, 23 deletions

diff --git a/old-configure b/old-configure
index 0bfac3633c..b4b1f7cf2b 100755
--- a/old-configure
+++ b/old-configure
@@ -636,12 +636,6 @@ check_pkg_config "Xinerama" $_xinerama XINERAMA 'xinerama'
 
 check_pkg_config "Xrandr" $_xrandr XRANDR 'xrandr'
 
-# Check for the presence of special keycodes, like audio control buttons
-# that XFree86 might have.  Used to be bundled with the xf86vm check, but
-# has nothing to do with xf86vm and XFree 3.x has xf86vm but does NOT
-# have these new keycodes.
-check_statement_libs "XF86keysym" auto XF86XK X11/XF86keysym.h 'int x = XF86XK_AudioPause;'
-
 check_pkg_config "CACA" $_caca CACA 'caca >= 0.99.beta18'
 
 check_compile "DVB" $_dvb DVB waftools/fragments/dvb.c
diff --git a/video/out/x11_common.c b/video/out/x11_common.c
index 7863506cf3..d528456e28 100644
--- a/video/out/x11_common.c
+++ b/video/out/x11_common.c
@@ -46,6 +46,7 @@
 #include <X11/Xatom.h>
 #include <X11/keysym.h>
 #include <X11/XKBlib.h>
+#include <X11/XF86keysym.h>
 
 #if HAVE_XSS
 #include <X11/extensions/scrnsaver.h>
@@ -59,10 +60,6 @@
 #include <X11/extensions/Xinerama.h>
 #endif
 
-#if HAVE_XF86XK
-#include <X11/XF86keysym.h>
-#endif
-
 #if HAVE_XRANDR
 #include <X11/extensions/Xrandr.h>
 #endif
@@ -544,7 +541,6 @@ static const struct mp_keymap keymap[] = {
     {XK_KP_Right, MP_KEY_KP6}, {XK_KP_Home, MP_KEY_KP7}, {XK_KP_Up, MP_KEY_KP8},
     {XK_KP_Page_Up, MP_KEY_KP9}, {XK_KP_Delete, MP_KEY_KPDEL},
 
-#ifdef XF86XK_AudioPause
     {XF86XK_MenuKB, MP_KEY_MENU},
     {XF86XK_AudioPlay, MP_KEY_PLAY}, {XF86XK_AudioPause, MP_KEY_PAUSE},
     {XF86XK_AudioStop, MP_KEY_STOP}, {XF86XK_AudioPrev, MP_KEY_PREV},
@@ -554,7 +550,6 @@ static const struct mp_keymap keymap[] = {
     {XF86XK_HomePage, MP_KEY_HOMEPAGE}, {XF86XK_WWW, MP_KEY_WWW},
     {XF86XK_Mail, MP_KEY_MAIL}, {XF86XK_Favorites, MP_KEY_FAVORITES},
     {XF86XK_Search, MP_KEY_SEARCH}, {XF86XK_Sleep, MP_KEY_SLEEP},
-#endif
 
     {0, 0}
 };
diff --git a/waftools/fragments/xf86xk.c b/waftools/fragments/xf86xk.c
deleted file mode 100644
index 541e7ce3af..0000000000
--- a/waftools/fragments/xf86xk.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <X11/XF86keysym.h>
-
-int main(int argc, char **argv)
-{
-    return XF86XK_AudioPause;
-}
diff --git a/wscript b/wscript
index 478a6cefe7..d13b0533bc 100644
--- a/wscript
+++ b/wscript
@@ -572,11 +572,6 @@ video_output_features = [
         'deps': [ 'x11' ],
         'func': check_pkg_config('xrandr'),
     } , {
-        'name': '--xf86xk',
-        'desc': 'XF86keysym',
-        'deps': [ 'x11' ],
-        'func': check_cc(fragment=load_fragment('xf86xk.c'))
-    } , {
         'name': '--gl-cocoa',
         'desc': 'OpenGL Cocoa Backend',
         'deps': [ 'cocoa' ],