Attachment #205273 for bug #227345




# $FreeBSD$

PORTNAME=	RetroArch
PORTVERSION=	1.7.7 # sync with games/libretro-core-info
DISTVERSIONPREFIX=	v
CATEGORIES=	games emulators
CATEGORIES=	games

MAINTAINER=	yuri@FreeBSD.org
COMMENT=	Cross-platform entertainment system based on libretro API

LIB_DEPENDS=	libxkbcommon.so:x11/libxkbcommon \
		libdrm.so:graphics/libdrm \
		libass.so:multimedia/libass
RUN_DEPENDS=	retroarch-assets<=0:games/retroarch-assets

BROKEN_powerpc64=	fails to compile: features_cpu.c: undefined reference to __mftb

USES=		compiler:c++11-lib gmake pkgconfig shebangfix
USE_GITHUB=	yes
GH_ACCOUNT=	libretro
SUB_FILES=	pkg-message
HAS_CONFIGURE=	yes
CONFIGURE_ARGS+=--global-config-dir=${LOCALBASE}/etc
USE_XORG=	x11 xcb xext xinerama xrandr xv xxf86vm
LLD_UNSAFE=	yes
CFLAGS=		-fPIC
SHEBANG_FILES=	libretro-common/glsym/glgen.py libretro-common/glsym/rglgen.py tools/cg2glsl.py tools/vulkan_loader_generator.py

CONFIGURE_ARGS+=--enable-threads --disable-discord
CONFIGURE_ENV+=	MAN_DIR=${MANPREFIX}/man

OPTIONS_DEFINE=	ALSA FFMPEG FREETYPE JACK OPENAL OPENGL OSS PULSEAUDIO PYTHON QT SDL UDEV V4L WAYLAND
OPTIONS_DEFAULT=FFMPEG FREETYPE OPENAL OPENGL OSS PULSEAUDIO PYTHON QT SDL UDEV V4L WAYLAND
FFMPEG_DESC=	On-the-fly recording of gameplay with libavcodec
NETPLAY_DESC=	Peer-to-peer netplay
PYTHON_DESC=	Script support in shaders
QT_DESC=	Qt based desktop-style GUI
UDEV_DESC=	udev device hotplug support
WAYLAND_DESC=	Wayland display support

ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
ALSA_CONFIGURE_ENABLE=	alsa
FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
FFMPEG_CONFIGURE_ENABLE=ffmpeg
FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
FREETYPE_CONFIGURE_ENABLE=	freetype
JACK_LIB_DEPENDS=	libjack.so:audio/jack
JACK_CONFIGURE_ENABLE=	jack
OPENAL_USES=		openal:soft
OPENAL_CONFIGURE_ENABLE=al
OPENGL_USES=		gl
OPENGL_USE=		GL=egl,gbm,gl
OPENGL_CONFIGURE_ENABLE=opengl
OSS_CONFIGURE_ENABLE=	oss
PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
PULSEAUDIO_CONFIGURE_ENABLE=	pulse
PYTHON_CONFIGURE_ENABLE=python
PYTHON_USES=		python:3.6
QT_USES=		qt:5
QT_USE=			QT=concurrent,core,gui,network,widgets
QT_CONFIGURE_ENABLE=	qt
SDL_USES=		sdl
SDL_USE=		SDL=sdl2,image2
SDL_CONFIGURE_ON=	--disable-sdl --enable-sdl2
SDL_CONFIGURE_OFF=	--disable-sdl --disable-sdl2
UDEV_LIB_DEPENDS=	libudev.so:devel/libudev-devd \
			libepoll-shim.so:devel/libepoll-shim
UDEV_CFLAGS=		-I${LOCALBASE}/include/libepoll-shim
UDEV_LDFLAGS=		-lepoll-shim
UDEV_CONFIGURE_ENABLE=	udev
PYTHON_CONFIGURE_ENABLE=python
PYTHON_USES=		python:3.4+
V4L_LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
V4L_BUILD_DEPENDS=	v4l_compat>0:multimedia/v4l_compat
V4L_CONFIGURE_ENABLE=	v4l2
WAYLAND_BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto \
			${LOCALBASE}/include/linux/kd.h:graphics/svgalib
WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
			libwayland-server.so:graphics/wayland \
			libwayland-egl.so:graphics/mesa-libs
WAYLAND_CONFIGURE_ENABLE=	wayland

CFLAGS+=	-pthread
LDFLAGS+=	-pthread
CONFIGURE_ARGS+=--enable-threads
CONFIGURE_ENV+=	MAN_DIR=${MANPREFIX}/man

USES=		compiler:c++11-lib gmake pkgconfig shebangfix
USE_GITHUB=	yes
GH_ACCOUNT=	libretro
SUB_FILES=	pkg-message
GNU_CONFIGURE=	yes
CONFIGURE_ARGS+=--global-config-dir=${LOCALBASE}/etc
USE_XORG=	x11 xcb xext xinerama xv xxf86vm
LLD_UNSAFE=	yes
SHEBANG_FILES=	libretro-common/glsym/glgen.py libretro-common/glsym/rglgen.py tools/cg2glsl.py tools/vulkan_loader_generator.py

post-patch:
	@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|' \
		${WRKSRC}/camera/drivers/video4linux2.c \


post-install:
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/retroarch
	@${REINPLACE_CMD} \
		-e 's|# libretro_directory =|libretro_directory = "${PREFIX}/lib/libretro"|' \
		-e 's|# libretro_info_path =|libretro_info_path = "${PREFIX}/share/libretro/info"|' \
		-e 's|# assets_directory =|assets_directory = "${PREFIX}/share/libretro/assets"|' \
		-e 's|# video_shader_dir =|video_shader_dir = "${PREFIX}/share/libretro/shaders"|' \
		-e 's|# video_filter_dir =|video_filter_dir = "${PREFIX}/lib/retroarch/filters/video"|' \
		-e 's|# audio_filter_dir =|audio_filter_dir = "${PREFIX}/lib/retroarch/filters/audio"|' \
		-e 's|# joypad_autoconfig_dir =|joypad_autoconfig_dir = "${PREFIX}/share/retroarch/autoconfig"|' \
		-e 's|# menu_show_core_updater = true|menu_show_core_updater = false|' \
		${STAGEDIR}${PREFIX}/etc/retroarch.cfg

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)retroarch/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1468710318	1	TIMESTAMP = 1561150238
2	SHA256 (libretro-RetroArch-v1.3.6_GH0.tar.gz) = bed4201e49b2e97809e97df07d08c752879af0274feec93965a07cf6140759f5	2	SHA256 (libretro-RetroArch-v1.7.7_GH0.tar.gz) = 84cdf88b7dfbbe229521c32489820040eeee7736ef8fb43f1f345235b34e9732
3	SIZE (libretro-RetroArch-v1.3.6_GH0.tar.gz) = 11967473	3	SIZE (libretro-RetroArch-v1.7.7_GH0.tar.gz) = 28479975




--- gfx/common/x11_common.c.orig	2019-05-07 23:56:49 UTC
+++ gfx/common/x11_common.c
@@ -422,7 +422,7 @@ bool x11_get_metrics(void *data,
    return true;
 }
 
-static void x11_handle_key_event(unsigned keycode, XEvent *event, XIC ic, bool filter)
+static void x11_handle_key_event(XEvent *event, XIC ic, bool filter)
 {
    int i;
    Status status;
@@ -473,9 +473,7 @@ static void x11_handle_key_event(unsigned keycode, XEv
    if (keysym >= XK_A && keysym <= XK_Z)
        keysym += XK_z - XK_Z;
 
-   /* Get the real keycode,
-      that correctly ignores international layouts as windows code does. */
-   key     = input_keymaps_translate_keysym_to_rk(keycode);
+   key     = input_keymaps_translate_keysym_to_rk(keysym);
 
    if (state & ShiftMask)
       mod |= RETROKMOD_SHIFT;
@@ -485,10 +483,10 @@ static void x11_handle_key_event(unsigned keycode, XEv
       mod |= RETROKMOD_CTRL;
    if (state & Mod1Mask)
       mod |= RETROKMOD_ALT;
-   if (state & Mod2Mask)
-      mod |= RETROKMOD_NUMLOCK;
    if (state & Mod4Mask)
       mod |= RETROKMOD_META;
+   if (IsKeypadKey(keysym))
+      mod |= RETROKMOD_NUMLOCK;
 
    input_keyboard_event(down, key, chars[0], mod, RETRO_DEVICE_KEYBOARD);
 
@@ -503,16 +501,10 @@ bool x11_alive(void *data)
    {
       XEvent event;
       bool filter = false;
-      unsigned keycode = 0;
 
       /* Can get events from older windows. Check this. */
       XNextEvent(g_x11_dpy, &event);
 
-      /* IMPORTANT - Get keycode before XFilterEvent
-         because the event is localizated after the call */
-      keycode = event.xkey.keycode;
-      filter = XFilterEvent(&event, g_x11_win);
-
       switch (event.type)
       {
          case ClientMessage:
@@ -587,7 +579,7 @@ bool x11_alive(void *data)
             }
          case KeyPress:
             if (event.xkey.window == g_x11_win)
-               x11_handle_key_event(keycode, &event, g_x11_xic, filter);
+               x11_handle_key_event(&event, g_x11_xic, filter);
             break;
       }
    }




--- input/drivers/x11_input.c.orig	2019-05-07 23:56:49 UTC
+++ input/drivers/x11_input.c
@@ -75,7 +75,7 @@ static void *x_input_init(const char *joypad_driver)
 
 static bool x_keyboard_pressed(x11_input_t *x11, unsigned key)
 {
-   int keycode = rarch_keysym_lut[(enum retro_key)key];
+   int keycode = XKeysymToKeycode(x11->display, rarch_keysym_lut[(enum retro_key)key]);
    return x11->state[keycode >> 3] & (1 << (keycode & 7));
 }
 
@@ -155,20 +155,23 @@ static int16_t x_pressed_analog(x11_input_t *x11,
    unsigned id_plus      = 0;
    int id_minus_key      = 0;
    int id_plus_key       = 0;
-   unsigned keycode      = 0;
+   unsigned sym          = 0;
+   int keycode           = 0;
 
    input_conv_analog_id_to_bind_id(idx, id, &id_minus, &id_plus);
 
    id_minus_key          = binds[id_minus].key;
    id_plus_key           = binds[id_plus].key;
 
-   keycode               = rarch_keysym_lut[(enum retro_key)id_minus_key];
+   sym                   = rarch_keysym_lut[(enum retro_key)id_minus_key];
+   keycode               = XKeysymToKeycode(x11->display, sym);
    if (      binds[id_minus].valid
          && (id_minus_key < RETROK_LAST)
          && (x11->state[keycode >> 3] & (1 << (keycode & 7))))
       pressed_minus = -0x7fff;
 
-   keycode               = rarch_keysym_lut[(enum retro_key)id_plus_key];
+   sym                   = rarch_keysym_lut[(enum retro_key)id_plus_key];
+   keycode               = XKeysymToKeycode(x11->display, sym);
    if (      binds[id_plus].valid
          && (id_plus_key < RETROK_LAST)
          && (x11->state[keycode >> 3] & (1 << (keycode & 7))))




--- input/input_keymaps.c.orig	2019-05-07 23:56:49 UTC
+++ input/input_keymaps.c
@@ -50,7 +50,9 @@
 #endif
 
 #ifdef HAVE_X11
-#include "input/include/xfree86_keycodes.h"
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/keysym.h>
 #endif
 
 #ifdef HAVE_DINPUT
@@ -951,123 +953,156 @@ const struct rarch_key_map rarch_key_map_wiiu[] = {
 
 #ifdef HAVE_X11
 
-const struct rarch_key_map rarch_key_map_x11[] = {
+#ifndef XF68XK_Calculator
+#define XF86XK_Calculator          0x1008FF1D
+#endif
 
-   { XFVK_ESC, RETROK_ESCAPE },
-   { XFVK_FK01, RETROK_F1 },
-   { XFVK_FK02, RETROK_F2 },
-   { XFVK_FK03, RETROK_F3 },
-   { XFVK_FK04, RETROK_F4 },
-   { XFVK_FK05, RETROK_F5 },
-   { XFVK_FK06, RETROK_F6 },
-   { XFVK_FK07, RETROK_F7 },
-   { XFVK_FK08, RETROK_F8 },
-   { XFVK_FK09, RETROK_F9 },
-   { XFVK_FK10, RETROK_F10 },
-   { XFVK_FK11, RETROK_F11 },
-   { XFVK_FK12, RETROK_F12 },
-
-   { XFVK_TLDE, RETROK_BACKQUOTE },
-   { XFVK_AE01, RETROK_1 },
-   { XFVK_AE02, RETROK_2 },
-   { XFVK_AE03, RETROK_3 },
-   { XFVK_AE04, RETROK_4 },
-   { XFVK_AE05, RETROK_5 },
-   { XFVK_AE06, RETROK_6 },
-   { XFVK_AE07, RETROK_7 },
-   { XFVK_AE08, RETROK_8 },
-   { XFVK_AE09, RETROK_9 },
-   { XFVK_AE10, RETROK_0 },
-   { XFVK_AE11, RETROK_MINUS },
-   { XFVK_AE12, RETROK_EQUALS },
-   { XFVK_BKSP, RETROK_BACKSPACE },
-
-   { XFVK_TAB, RETROK_TAB },
-   { XFVK_AD01, RETROK_q },
-   { XFVK_AD02, RETROK_w },
-   { XFVK_AD03, RETROK_e },
-   { XFVK_AD04, RETROK_r },
-   { XFVK_AD05, RETROK_t },
-   { XFVK_AD06, RETROK_y },
-   { XFVK_AD07, RETROK_u },
-   { XFVK_AD08, RETROK_i },
-   { XFVK_AD09, RETROK_o },
-   { XFVK_AD10, RETROK_p },
-   { XFVK_AD11, RETROK_LEFTBRACKET },
-   { XFVK_AD12, RETROK_RIGHTBRACKET },
-   { XFVK_RTRN, RETROK_RETURN },
-
-   { XFVK_CAPS, RETROK_CAPSLOCK },
-   { XFVK_AC01, RETROK_a },
-   { XFVK_AC02, RETROK_s },
-   { XFVK_AC03, RETROK_d },
-   { XFVK_AC04, RETROK_f },
-   { XFVK_AC05, RETROK_g },
-   { XFVK_AC06, RETROK_h },
-   { XFVK_AC07, RETROK_j },
-   { XFVK_AC08, RETROK_k },
-   { XFVK_AC09, RETROK_l },
-   { XFVK_AC10, RETROK_SEMICOLON },
-   { XFVK_AC11, RETROK_QUOTE },
-   { XFVK_AC12, RETROK_BACKSLASH },
-
-   { XFVK_LFSH, RETROK_LSHIFT },
-   { XFVK_AB01, RETROK_z },
-   { XFVK_AB02, RETROK_x },
-   { XFVK_AB03, RETROK_c },
-   { XFVK_AB04, RETROK_v },
-   { XFVK_AB05, RETROK_b },
-   { XFVK_AB06, RETROK_n },
-   { XFVK_AB07, RETROK_m },
-   { XFVK_AB08, RETROK_COMMA },
-   { XFVK_AB09, RETROK_PERIOD },
-   { XFVK_AB10, RETROK_SLASH },
-   { XFVK_RTSH, RETROK_RSHIFT },
-
-   { XFVK_LALT, RETROK_LALT },
-   { XFVK_LCTL, RETROK_LCTRL },
-   { XFVK_SPCE, RETROK_SPACE },
-   { XFVK_RCTL, RETROK_RCTRL },
-   { XFVK_RALT, RETROK_RALT },
-
-   { XFVK_LSGT, RETROK_OEM_102 },
-   { XFVK_MENU, RETROK_MENU },
-   { XFVK_LWIN, RETROK_LSUPER },
-   { XFVK_RWIN, RETROK_RSUPER },
-   { XFVK_CALC, RETROK_HELP },
-
-   { XFVK_PRSC, RETROK_PRINT },
-   { XFVK_SCLK, RETROK_SCROLLOCK },
-   { XFVK_PAUS, RETROK_PAUSE },
-   { XFVK_INS, RETROK_INSERT },
-   { XFVK_HOME, RETROK_HOME },
-   { XFVK_PGUP, RETROK_PAGEUP },
-   { XFVK_DELE, RETROK_DELETE },
-   { XFVK_END, RETROK_END },
-   { XFVK_PGDN, RETROK_PAGEDOWN },
-   { XFVK_UP, RETROK_UP },
-   { XFVK_LEFT, RETROK_LEFT },
-   { XFVK_DOWN, RETROK_DOWN },
-   { XFVK_RGHT, RETROK_RIGHT },
-
-   { XFVK_NMLK, RETROK_NUMLOCK },
-   { XFVK_KPDV, RETROK_KP_DIVIDE },
-   { XFVK_KPMU, RETROK_KP_MULTIPLY },
-   { XFVK_KPSU, RETROK_KP_MINUS },
-   { XFVK_KP7, RETROK_KP7 },
-   { XFVK_KP8, RETROK_KP8 },
-   { XFVK_KP9, RETROK_KP9 },
-   { XFVK_KPAD, RETROK_KP_PLUS },
-   { XFVK_KP4, RETROK_KP4 },
-   { XFVK_KP5, RETROK_KP5 },
-   { XFVK_KP6, RETROK_KP6 },
-   { XFVK_KP1, RETROK_KP1 },
-   { XFVK_KP2, RETROK_KP2 },
-   { XFVK_KP3, RETROK_KP3 },
-   { XFVK_KPEN, RETROK_KP_ENTER },
-   { XFVK_KP0, RETROK_KP0 },
-   { XFVK_KPDL, RETROK_KP_PERIOD },
-   { XFVK_KPEQ, RETROK_KP_EQUALS },
+const struct rarch_key_map rarch_key_map_x11[] = {
+   { XK_BackSpace, RETROK_BACKSPACE },
+   { XK_Tab, RETROK_TAB },
+   { XK_Clear, RETROK_CLEAR },
+   { XK_Return, RETROK_RETURN },
+   { XK_Pause, RETROK_PAUSE },
+   { XK_Escape, RETROK_ESCAPE },
+   { XK_space, RETROK_SPACE },
+   { XK_exclam, RETROK_EXCLAIM },
+   { XK_quotedbl, RETROK_QUOTEDBL },
+   { XK_numbersign, RETROK_HASH },
+   { XK_dollar, RETROK_DOLLAR },
+   { XK_ampersand, RETROK_AMPERSAND },
+   { XK_apostrophe, RETROK_QUOTE },
+   { XK_parenleft, RETROK_LEFTPAREN },
+   { XK_parenright, RETROK_RIGHTPAREN },
+   { XK_asterisk, RETROK_ASTERISK },
+   { XK_plus, RETROK_PLUS },
+   { XK_comma, RETROK_COMMA },
+   { XK_minus, RETROK_MINUS },
+   { XK_period, RETROK_PERIOD },
+   { XK_slash, RETROK_SLASH },
+   { XK_0, RETROK_0 },
+   { XK_1, RETROK_1 },
+   { XK_2, RETROK_2 },
+   { XK_3, RETROK_3 },
+   { XK_4, RETROK_4 },
+   { XK_5, RETROK_5 },
+   { XK_6, RETROK_6 },
+   { XK_7, RETROK_7 },
+   { XK_8, RETROK_8 },
+   { XK_9, RETROK_9 },
+   { XK_colon, RETROK_COLON },
+   { XK_semicolon, RETROK_SEMICOLON },
+   { XK_less, RETROK_LESS },
+   { XK_equal, RETROK_EQUALS },
+   { XK_greater, RETROK_GREATER },
+   { XK_question, RETROK_QUESTION },
+   { XK_at, RETROK_AT },
+   { XK_bracketleft, RETROK_LEFTBRACKET },
+   { XK_backslash, RETROK_BACKSLASH },
+   { XK_bracketright, RETROK_RIGHTBRACKET },
+   { XK_dead_circumflex, RETROK_CARET },
+   { XK_underscore, RETROK_UNDERSCORE },
+   { XK_grave, RETROK_BACKQUOTE },
+   { XK_a, RETROK_a },
+   { XK_b, RETROK_b },
+   { XK_c, RETROK_c },
+   { XK_d, RETROK_d },
+   { XK_e, RETROK_e },
+   { XK_f, RETROK_f },
+   { XK_g, RETROK_g },
+   { XK_h, RETROK_h },
+   { XK_i, RETROK_i },
+   { XK_j, RETROK_j },
+   { XK_k, RETROK_k },
+   { XK_l, RETROK_l },
+   { XK_m, RETROK_m },
+   { XK_n, RETROK_n },
+   { XK_o, RETROK_o },
+   { XK_p, RETROK_p },
+   { XK_q, RETROK_q },
+   { XK_r, RETROK_r },
+   { XK_s, RETROK_s },
+   { XK_t, RETROK_t },
+   { XK_u, RETROK_u },
+   { XK_v, RETROK_v },
+   { XK_w, RETROK_w },
+   { XK_x, RETROK_x },
+   { XK_y, RETROK_y },
+   { XK_z, RETROK_z },
+   { XK_Delete, RETROK_DELETE },
+   { XK_KP_0, RETROK_KP0 },
+   { XK_KP_1, RETROK_KP1 },
+   { XK_KP_2, RETROK_KP2 },
+   { XK_KP_3, RETROK_KP3 },
+   { XK_KP_4, RETROK_KP4 },
+   { XK_KP_5, RETROK_KP5 },
+   { XK_KP_6, RETROK_KP6 },
+   { XK_KP_7, RETROK_KP7 },
+   { XK_KP_8, RETROK_KP8 },
+   { XK_KP_9, RETROK_KP9 },
+   { XK_KP_Decimal, RETROK_KP_PERIOD },
+   { XK_KP_Divide, RETROK_KP_DIVIDE },
+   { XK_KP_Multiply, RETROK_KP_MULTIPLY },
+   { XK_KP_Subtract, RETROK_KP_MINUS },
+   { XK_KP_Add, RETROK_KP_PLUS },
+   { XK_KP_Enter, RETROK_KP_ENTER },
+   { XK_KP_Equal, RETROK_KP_EQUALS },
+   { XK_Up, RETROK_UP },
+   { XK_Down, RETROK_DOWN },
+   { XK_Right, RETROK_RIGHT },
+   { XK_Left, RETROK_LEFT },
+   { XK_Insert, RETROK_INSERT },
+   { XK_Home, RETROK_HOME },
+   { XK_End, RETROK_END },
+   { XK_Page_Up, RETROK_PAGEUP },
+   { XK_Page_Down, RETROK_PAGEDOWN },
+   { XK_F1, RETROK_F1 },
+   { XK_F2, RETROK_F2 },
+   { XK_F3, RETROK_F3 },
+   { XK_F4, RETROK_F4 },
+   { XK_F5, RETROK_F5 },
+   { XK_F6, RETROK_F6 },
+   { XK_F7, RETROK_F7 },
+   { XK_F8, RETROK_F8 },
+   { XK_F9, RETROK_F9 },
+   { XK_F10, RETROK_F10 },
+   { XK_F11, RETROK_F11 },
+   { XK_F12, RETROK_F12 },
+   { XK_F13, RETROK_F13 },
+   { XK_F14, RETROK_F14 },
+   { XK_F15, RETROK_F15 },
+   { XK_Num_Lock, RETROK_NUMLOCK },
+   { XK_Caps_Lock, RETROK_CAPSLOCK },
+   { XK_Scroll_Lock, RETROK_SCROLLOCK },
+   { XK_Shift_R, RETROK_RSHIFT },
+   { XK_Shift_L, RETROK_LSHIFT },
+   { XK_Control_R, RETROK_RCTRL },
+   { XK_Control_L, RETROK_LCTRL },
+   { XK_Alt_R, RETROK_RALT },
+   { XK_Alt_L, RETROK_LALT },
+   { XK_Meta_R, RETROK_RMETA },
+   { XK_Meta_L, RETROK_LMETA },
+   { XK_Super_L, RETROK_LSUPER },
+   { XK_Super_R, RETROK_RSUPER },
+   { XK_Mode_switch, RETROK_MODE },
+   { XK_Multi_key, RETROK_COMPOSE },
+   { XK_Help, RETROK_HELP },
+   { XK_Print, RETROK_PRINT },
+   { XK_Sys_Req, RETROK_SYSREQ },
+   { XK_Break, RETROK_BREAK },
+   { XK_Menu, RETROK_MENU },
+   /*{ ?, RETROK_POWER },*/
+   { XK_EuroSign, RETROK_EURO },
+   { XK_Undo, RETROK_UNDO },
+   /*{ ?, RETROK_OEM_102 },*/
+   /* FIXME(shizeeg): RetroArch can't handle these buttons atm.
+    * Do we really need RETROK_KP_INSERT, RETROK_KP_END,
+    * RETROK_KP_DOWN, RETROK_KP_PAGEDOWN ???
+    *
+   { XK_KP_Insert,  RETROK_KP0 },
+   { XK_KP_End,  RETROK_KP1 },
+   { XK_KP_Down,  RETROK_KP2 },
+   { XK_KP_Page_Down,  RETROK_KP3 },*/
+   { XF86XK_Calculator, RETROK_HELP },
 
    { 0, RETROK_UNKNOWN },
 };

Lines 1-9 Link Here

(-)retroarch/files/patch-libretro-common_include_streams_interface__stream.h (-4 / +4 lines)
1	--- libretro-common/include/streams/interface_stream.h.orig 2016-05-02 20:17:12 UTC	1	--- libretro-common/include/streams/interface_stream.h.orig 2018-02-19 12:43:32 UTC
2	+++ libretro-common/include/streams/interface_stream.h	2	+++ libretro-common/include/streams/interface_stream.h
3	@@ -29,6 +29,8 @@	3	@@ -32,6 +32,8 @@
4	#include <retro_common_api.h>
5	#include <boolean.h>
6		4
		5	RETRO_BEGIN_DECLS
		6
7	+#include <sys/types.h>	7	+#include <sys/types.h>
8	+	8	+
9	enum intfstream_type	9	enum intfstream_type

Lines 1-9 Link Here

(-)retroarch/files/patch-libretro-common_net_net__ifinfo.c (-4 / +4 lines)
1	--- libretro-common/net/net_ifinfo.c.orig 2016-07-04 20:02:01 UTC	1	--- libretro-common/net/net_ifinfo.c.orig 2018-12-31 20:08:25 UTC
2	+++ libretro-common/net/net_ifinfo.c	2	+++ libretro-common/net/net_ifinfo.c
3	@@ -44,6 +44,8 @@	3	@@ -50,6 +50,8 @@
		4	#include <netinet/in.h>
		5	#endif
4		6
5	#include <net/net_ifinfo.h>
6
7	+#include <netinet/in.h>	7	+#include <netinet/in.h>
8	+	8	+
9	void net_ifinfo_free(net_ifinfo_t *list)	9	void net_ifinfo_free(net_ifinfo_t *list)

Lines 1-6 Link Here

(-)retroarch/files/patch-libretro-common_rthreads_rthreads.c (-2 / +2 lines)
1	--- libretro-common/rthreads/rthreads.c.orig 2016-07-16 23:05:18 UTC	1	--- libretro-common/rthreads/rthreads.c.orig 2019-05-07 23:56:49 UTC
2	+++ libretro-common/rthreads/rthreads.c	2	+++ libretro-common/rthreads/rthreads.c
3	@@ -57,6 +57,8 @@	3	@@ -67,6 +67,8 @@
4	#include <mach/mach.h>	4	#include <mach/mach.h>
5	#endif	5	#endif
6		6




--- qb/config.libs.sh.orig	2019-05-07 23:56:49 UTC
+++ qb/config.libs.sh
@@ -479,11 +479,7 @@ check_enabled CXX VULKAN vulkan 'The C++ compiler is' 
 check_enabled CXX OPENGL_CORE 'OpenGL core' 'The C++ compiler is' false
 check_enabled THREADS VULKAN vulkan 'Threads are' false
 
-if [ "$HAVE_VULKAN" != "no" ] && [ "$OS" = 'Win32' ]; then
-   HAVE_VULKAN=yes
-else
-   check_lib '' VULKAN -lvulkan vkCreateInstance
-fi
+HAVE_VULKAN=yes
 
 check_pkgconf PYTHON 'python3 python3 python-3.7 python-3.6 python-3.5 python-3.4 python-3.3 python-3.2'
 

Lines 1-14 Link Here

(-)retroarch/files/patch-qb_qb.params.sh (-14 lines)
1	--- qb/qb.params.sh.orig 2016-07-15 20:24:15 UTC
2	+++ qb/qb.params.sh
3	@@ -79,7 +79,10 @@ parse_input() # Parse stuff :V
4	opt_exists "${arg%%=*}" "$1"
5	eval "$opt=\"$val\""
6	;;
7	- -h\|--help) print_help; exit 0;;
8	+ --x-*)
9	+ ;;
10	+ --build*)
11	+ ;;
12	*) echo "Unknown option $1"; exit 1;;
13	esac
14	shift

Lines 3-7 Link Here

(-)retroarch/pkg-plist (-1 / +3 lines)
3	etc/retroarch.cfg	3	etc/retroarch.cfg
4	man/man6/retroarch-cg2glsl.6.gz	4	man/man6/retroarch-cg2glsl.6.gz
5	man/man6/retroarch.6.gz	5	man/man6/retroarch.6.gz
		6	share/applications/retroarch.desktop
		7	share/doc/retroarch/COPYING
		8	share/doc/retroarch/README.md
6	share/pixmaps/retroarch.svg	9	share/pixmaps/retroarch.svg
7	share/applications/retroarch.desktop

Return to bug 227345

Lines 2-11 Link Here

(-)retroarch/Makefile (-38 / +59 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= RetroArch	4	PORTNAME= RetroArch
5	PORTVERSION= 1.3.6	5	PORTVERSION= 1.7.7 # sync with games/libretro-core-info
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	PORTREVISION= 15	7	CATEGORIES= games emulators
8	CATEGORIES= games
9		8
10	MAINTAINER= yuri@FreeBSD.org	9	MAINTAINER= yuri@FreeBSD.org
11	COMMENT= Cross-platform entertainment system based on libretro API	10	COMMENT= Cross-platform entertainment system based on libretro API
Lines 16-73 Link Here
16	LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon \	15	LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon \
17	libdrm.so:graphics/libdrm \	16	libdrm.so:graphics/libdrm \
18	libass.so:multimedia/libass	17	libass.so:multimedia/libass
		18	RUN_DEPENDS= retroarch-assets<=0:games/retroarch-assets
19		19
20	BROKEN_powerpc64= fails to compile: features_cpu.c: undefined reference to __mftb	20	BROKEN_powerpc64= fails to compile: features_cpu.c: undefined reference to __mftb
21		21
22	OPTIONS_DEFINE= FFMPEG OSS JACK PULSEAUDIO ALSA SDL OPENGL OPENAL NETPLAY PYTHON V4L FREETYPE FBO	22	USES= compiler:c++11-lib gmake pkgconfig shebangfix
23	OPTIONS_DEFAULT=OSS PULSEAUDIO SDL OPENGL OPENAL NETPLAY PYTHON V4L FREETYPE FBO # FFMPEG	23	USE_GITHUB= yes
		24	GH_ACCOUNT= libretro
		25	SUB_FILES= pkg-message
		26	HAS_CONFIGURE= yes
		27	CONFIGURE_ARGS+=--global-config-dir=${LOCALBASE}/etc
		28	USE_XORG= x11 xcb xext xinerama xrandr xv xxf86vm
		29	LLD_UNSAFE= yes
		30	CFLAGS= -fPIC
		31	SHEBANG_FILES= libretro-common/glsym/glgen.py libretro-common/glsym/rglgen.py tools/cg2glsl.py tools/vulkan_loader_generator.py
		32
		33	CONFIGURE_ARGS+=--enable-threads --disable-discord
		34	CONFIGURE_ENV+= MAN_DIR=${MANPREFIX}/man
		35
		36	OPTIONS_DEFINE= ALSA FFMPEG FREETYPE JACK OPENAL OPENGL OSS PULSEAUDIO PYTHON QT SDL UDEV V4L WAYLAND
		37	OPTIONS_DEFAULT=FFMPEG FREETYPE OPENAL OPENGL OSS PULSEAUDIO PYTHON QT SDL UDEV V4L WAYLAND
24	FFMPEG_DESC= On-the-fly recording of gameplay with libavcodec	38	FFMPEG_DESC= On-the-fly recording of gameplay with libavcodec
25	NETPLAY_DESC= Peer-to-peer netplay
26	PYTHON_DESC= Script support in shaders	39	PYTHON_DESC= Script support in shaders
27	FBO_DESC= OpenGL render-to-texture	40	QT_DESC= Qt based desktop-style GUI
		41	UDEV_DESC= udev device hotplug support
		42	WAYLAND_DESC= Wayland display support
28		43
29	FFMPEG_BROKEN= fails to build with ffmpeg 4.0	44	ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
		45	ALSA_CONFIGURE_ENABLE= alsa
30	FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg	46	FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg
31	FFMPEG_CONFIGURE_ENABLE=ffmpeg	47	FFMPEG_CONFIGURE_ENABLE=ffmpeg
32	OSS_CONFIGURE_ENABLE= oss	48	FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2
		49	FREETYPE_CONFIGURE_ENABLE= freetype
33	JACK_LIB_DEPENDS= libjack.so:audio/jack	50	JACK_LIB_DEPENDS= libjack.so:audio/jack
34	JACK_CONFIGURE_ENABLE= jack	51	JACK_CONFIGURE_ENABLE= jack
		52	OPENAL_USES= openal:soft
		53	OPENAL_CONFIGURE_ENABLE=al
		54	OPENGL_USES= gl
		55	OPENGL_USE= GL=egl,gbm,gl
		56	OPENGL_CONFIGURE_ENABLE=opengl
		57	OSS_CONFIGURE_ENABLE= oss
35	PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio	58	PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
36	PULSEAUDIO_CONFIGURE_ENABLE= pulse	59	PULSEAUDIO_CONFIGURE_ENABLE= pulse
37	ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib	60	PYTHON_CONFIGURE_ENABLE=python
38	ALSA_CONFIGURE_ENABLE= alsa	61	PYTHON_USES= python:3.6
39	SDL_USE= SDL=sdl2 image2	62	QT_USES= qt:5
		63	QT_USE= QT=concurrent,core,gui,network,widgets
		64	QT_CONFIGURE_ENABLE= qt
		65	SDL_USES= sdl
		66	SDL_USE= SDL=sdl2,image2
40	SDL_CONFIGURE_ON= --disable-sdl --enable-sdl2	67	SDL_CONFIGURE_ON= --disable-sdl --enable-sdl2
41	SDL_CONFIGURE_OFF= --disable-sdl --disable-sdl2	68	SDL_CONFIGURE_OFF= --disable-sdl --disable-sdl2
42	OPENGL_USE= GL=gl,egl,gbm	69	UDEV_LIB_DEPENDS= libudev.so:devel/libudev-devd \
43	OPENGL_CONFIGURE_ENABLE=opengl	70	libepoll-shim.so:devel/libepoll-shim
44	OPENAL_USES= openal:soft	71	UDEV_CFLAGS= -I${LOCALBASE}/include/libepoll-shim
45	OPENAL_CONFIGURE_ENABLE=al	72	UDEV_LDFLAGS= -lepoll-shim
46	NETPLAY_CONFIGURE_ENABLE= netplay	73	UDEV_CONFIGURE_ENABLE= udev
47	PYTHON_CONFIGURE_ENABLE=python
48	PYTHON_USES= python:3.4+
49	V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l	74	V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l
50	V4L_BUILD_DEPENDS= v4l_compat>0:multimedia/v4l_compat	75	V4L_BUILD_DEPENDS= v4l_compat>0:multimedia/v4l_compat
51	V4L_CONFIGURE_ENABLE= v4l2	76	V4L_CONFIGURE_ENABLE= v4l2
52	FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2	77	WAYLAND_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \
53	FREETYPE_CONFIGURE_ENABLE= freetype	78	${LOCALBASE}/include/linux/kd.h:graphics/svgalib
54	FBO_CONFIGURE_ENABLE= fbo	79	WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \
		80	libwayland-server.so:graphics/wayland \
		81	libwayland-egl.so:graphics/mesa-libs
		82	WAYLAND_CONFIGURE_ENABLE= wayland
55		83
56	CFLAGS+= -pthread
57	LDFLAGS+= -pthread
58	CONFIGURE_ARGS+=--enable-threads
59	CONFIGURE_ENV+= MAN_DIR=${MANPREFIX}/man
60
61	USES= compiler:c++11-lib gmake pkgconfig shebangfix
62	USE_GITHUB= yes
63	GH_ACCOUNT= libretro
64	SUB_FILES= pkg-message
65	GNU_CONFIGURE= yes
66	CONFIGURE_ARGS+=--global-config-dir=${LOCALBASE}/etc
67	USE_XORG= x11 xcb xext xinerama xv xxf86vm
68	LLD_UNSAFE= yes
69	SHEBANG_FILES= libretro-common/glsym/glgen.py libretro-common/glsym/rglgen.py tools/cg2glsl.py tools/vulkan_loader_generator.py
70
71	post-patch:	84	post-patch:
72	@${REINPLACE_CMD} -e 's\|<malloc.h>\|<stdlib.h>\|' \	85	@${REINPLACE_CMD} -e 's\|<malloc.h>\|<stdlib.h>\|' \
73	${WRKSRC}/camera/drivers/video4linux2.c \	86	${WRKSRC}/camera/drivers/video4linux2.c \
Lines 88-94 Link Here
88		101
89	post-install:	102	post-install:
90	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/retroarch	103	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/retroarch
91	@${REINPLACE_CMD} -e 's\|# libretro_directory =\|libretro_directory = "${PREFIX}/libexec/libretro"\|' \	104	@${REINPLACE_CMD} \
		105	-e 's\|# libretro_directory =\|libretro_directory = "${PREFIX}/lib/libretro"\|' \
		106	-e 's\|# libretro_info_path =\|libretro_info_path = "${PREFIX}/share/libretro/info"\|' \
		107	-e 's\|# assets_directory =\|assets_directory = "${PREFIX}/share/libretro/assets"\|' \
		108	-e 's\|# video_shader_dir =\|video_shader_dir = "${PREFIX}/share/libretro/shaders"\|' \
		109	-e 's\|# video_filter_dir =\|video_filter_dir = "${PREFIX}/lib/retroarch/filters/video"\|' \
		110	-e 's\|# audio_filter_dir =\|audio_filter_dir = "${PREFIX}/lib/retroarch/filters/audio"\|' \
		111	-e 's\|# joypad_autoconfig_dir =\|joypad_autoconfig_dir = "${PREFIX}/share/retroarch/autoconfig"\|' \
		112	-e 's\|# menu_show_core_updater = true\|menu_show_core_updater = false\|' \
92	${STAGEDIR}${PREFIX}/etc/retroarch.cfg	113	${STAGEDIR}${PREFIX}/etc/retroarch.cfg
93		114
94	.include <bsd.port.mk>	115	.include <bsd.port.mk>

Line 0 Link Here

(-)retroarch/files/patch-gfx_common_x11__common.c (+61 lines)
	1	--- gfx/common/x11_common.c.orig 2019-05-07 23:56:49 UTC
	2	+++ gfx/common/x11_common.c
	3	@@ -422,7 +422,7 @@ bool x11_get_metrics(void *data,
	4	return true;
	5	}
	6
	7	-static void x11_handle_key_event(unsigned keycode, XEvent *event, XIC ic, bool filter)
	8	+static void x11_handle_key_event(XEvent *event, XIC ic, bool filter)
	9	{
	10	int i;
	11	Status status;
	12	@@ -473,9 +473,7 @@ static void x11_handle_key_event(unsigned keycode, XEv
	13	if (keysym >= XK_A && keysym <= XK_Z)
	14	keysym += XK_z - XK_Z;
	15
	16	- /* Get the real keycode,
	17	- that correctly ignores international layouts as windows code does. */
	18	- key = input_keymaps_translate_keysym_to_rk(keycode);
	19	+ key = input_keymaps_translate_keysym_to_rk(keysym);
	20
	21	if (state & ShiftMask)
	22	mod \|= RETROKMOD_SHIFT;
	23	@@ -485,10 +483,10 @@ static void x11_handle_key_event(unsigned keycode, XEv
	24	mod \|= RETROKMOD_CTRL;
	25	if (state & Mod1Mask)
	26	mod \|= RETROKMOD_ALT;
	27	- if (state & Mod2Mask)
	28	- mod \|= RETROKMOD_NUMLOCK;
	29	if (state & Mod4Mask)
	30	mod \|= RETROKMOD_META;
	31	+ if (IsKeypadKey(keysym))
	32	+ mod \|= RETROKMOD_NUMLOCK;
	33
	34	input_keyboard_event(down, key, chars[0], mod, RETRO_DEVICE_KEYBOARD);
	35
	36	@@ -503,16 +501,10 @@ bool x11_alive(void *data)
	37	{
	38	XEvent event;
	39	bool filter = false;
	40	- unsigned keycode = 0;
	41
	42	/* Can get events from older windows. Check this. */
	43	XNextEvent(g_x11_dpy, &event);
	44
	45	- /* IMPORTANT - Get keycode before XFilterEvent
	46	- because the event is localizated after the call */
	47	- keycode = event.xkey.keycode;
	48	- filter = XFilterEvent(&event, g_x11_win);
	49	-
	50	switch (event.type)
	51	{
	52	case ClientMessage:
	53	@@ -587,7 +579,7 @@ bool x11_alive(void *data)
	54	}
	55	case KeyPress:
	56	if (event.xkey.window == g_x11_win)
	57	- x11_handle_key_event(keycode, &event, g_x11_xic, filter);
	58	+ x11_handle_key_event(&event, g_x11_xic, filter);
	59	break;
	60	}
	61	}

Line 0 Link Here

(-)retroarch/files/patch-input_drivers_x11__input.c (+38 lines)
	1	--- input/drivers/x11_input.c.orig 2019-05-07 23:56:49 UTC
	2	+++ input/drivers/x11_input.c
	3	@@ -75,7 +75,7 @@ static void x_input_init(const char joypad_driver)
	4
	5	static bool x_keyboard_pressed(x11_input_t *x11, unsigned key)
	6	{
	7	- int keycode = rarch_keysym_lut[(enum retro_key)key];
	8	+ int keycode = XKeysymToKeycode(x11->display, rarch_keysym_lut[(enum retro_key)key]);
	9	return x11->state[keycode >> 3] & (1 << (keycode & 7));
	10	}
	11
	12	@@ -155,20 +155,23 @@ static int16_t x_pressed_analog(x11_input_t *x11,
	13	unsigned id_plus = 0;
	14	int id_minus_key = 0;
	15	int id_plus_key = 0;
	16	- unsigned keycode = 0;
	17	+ unsigned sym = 0;
	18	+ int keycode = 0;
	19
	20	input_conv_analog_id_to_bind_id(idx, id, &id_minus, &id_plus);
	21
	22	id_minus_key = binds[id_minus].key;
	23	id_plus_key = binds[id_plus].key;
	24
	25	- keycode = rarch_keysym_lut[(enum retro_key)id_minus_key];
	26	+ sym = rarch_keysym_lut[(enum retro_key)id_minus_key];
	27	+ keycode = XKeysymToKeycode(x11->display, sym);
	28	if ( binds[id_minus].valid
	29	&& (id_minus_key < RETROK_LAST)
	30	&& (x11->state[keycode >> 3] & (1 << (keycode & 7))))
	31	pressed_minus = -0x7fff;
	32
	33	- keycode = rarch_keysym_lut[(enum retro_key)id_plus_key];
	34	+ sym = rarch_keysym_lut[(enum retro_key)id_plus_key];
	35	+ keycode = XKeysymToKeycode(x11->display, sym);
	36	if ( binds[id_plus].valid
	37	&& (id_plus_key < RETROK_LAST)
	38	&& (x11->state[keycode >> 3] & (1 << (keycode & 7))))

Line 0 Link Here

(-)retroarch/files/patch-input_input__keymaps.c (+286 lines)
		1	--- input/input_keymaps.c.orig 2019-05-07 23:56:49 UTC
		2	+++ input/input_keymaps.c
		3	@@ -50,7 +50,9 @@
		4	#endif
		5
		6	#ifdef HAVE_X11
		7	-#include "input/include/xfree86_keycodes.h"
		8	+#include <X11/Xlib.h>
		9	+#include <X11/Xutil.h>
		10	+#include <X11/keysym.h>
		11	#endif
		12
		13	#ifdef HAVE_DINPUT
		14	@@ -951,123 +953,156 @@ const struct rarch_key_map rarch_key_map_wiiu[] = {
		15
		16	#ifdef HAVE_X11
		17
		18	-const struct rarch_key_map rarch_key_map_x11[] = {
		19	+#ifndef XF68XK_Calculator
		20	+#define XF86XK_Calculator 0x1008FF1D
		21	+#endif
		22
		23	- { XFVK_ESC, RETROK_ESCAPE },
		24	- { XFVK_FK01, RETROK_F1 },
		25	- { XFVK_FK02, RETROK_F2 },
		26	- { XFVK_FK03, RETROK_F3 },
		27	- { XFVK_FK04, RETROK_F4 },
		28	- { XFVK_FK05, RETROK_F5 },
		29	- { XFVK_FK06, RETROK_F6 },
		30	- { XFVK_FK07, RETROK_F7 },
		31	- { XFVK_FK08, RETROK_F8 },
		32	- { XFVK_FK09, RETROK_F9 },
		33	- { XFVK_FK10, RETROK_F10 },
		34	- { XFVK_FK11, RETROK_F11 },
		35	- { XFVK_FK12, RETROK_F12 },
		36	-
		37	- { XFVK_TLDE, RETROK_BACKQUOTE },
		38	- { XFVK_AE01, RETROK_1 },
		39	- { XFVK_AE02, RETROK_2 },
		40	- { XFVK_AE03, RETROK_3 },
		41	- { XFVK_AE04, RETROK_4 },
		42	- { XFVK_AE05, RETROK_5 },
		43	- { XFVK_AE06, RETROK_6 },
		44	- { XFVK_AE07, RETROK_7 },
		45	- { XFVK_AE08, RETROK_8 },
		46	- { XFVK_AE09, RETROK_9 },
		47	- { XFVK_AE10, RETROK_0 },
		48	- { XFVK_AE11, RETROK_MINUS },
		49	- { XFVK_AE12, RETROK_EQUALS },
		50	- { XFVK_BKSP, RETROK_BACKSPACE },
		51	-
		52	- { XFVK_TAB, RETROK_TAB },
		53	- { XFVK_AD01, RETROK_q },
		54	- { XFVK_AD02, RETROK_w },
		55	- { XFVK_AD03, RETROK_e },
		56	- { XFVK_AD04, RETROK_r },
		57	- { XFVK_AD05, RETROK_t },
		58	- { XFVK_AD06, RETROK_y },
		59	- { XFVK_AD07, RETROK_u },
		60	- { XFVK_AD08, RETROK_i },
		61	- { XFVK_AD09, RETROK_o },
		62	- { XFVK_AD10, RETROK_p },
		63	- { XFVK_AD11, RETROK_LEFTBRACKET },
		64	- { XFVK_AD12, RETROK_RIGHTBRACKET },
65	- { XFVK_RTRN, RETROK_RETURN },
66	-
67	- { XFVK_CAPS, RETROK_CAPSLOCK },
68	- { XFVK_AC01, RETROK_a },
69	- { XFVK_AC02, RETROK_s },
70	- { XFVK_AC03, RETROK_d },
71	- { XFVK_AC04, RETROK_f },
72	- { XFVK_AC05, RETROK_g },
73	- { XFVK_AC06, RETROK_h },
74	- { XFVK_AC07, RETROK_j },
75	- { XFVK_AC08, RETROK_k },
76	- { XFVK_AC09, RETROK_l },
77	- { XFVK_AC10, RETROK_SEMICOLON },
78	- { XFVK_AC11, RETROK_QUOTE },
79	- { XFVK_AC12, RETROK_BACKSLASH },
80	-
81	- { XFVK_LFSH, RETROK_LSHIFT },
82	- { XFVK_AB01, RETROK_z },
83	- { XFVK_AB02, RETROK_x },
84	- { XFVK_AB03, RETROK_c },
85	- { XFVK_AB04, RETROK_v },
86	- { XFVK_AB05, RETROK_b },
87	- { XFVK_AB06, RETROK_n },
88	- { XFVK_AB07, RETROK_m },
89	- { XFVK_AB08, RETROK_COMMA },
90	- { XFVK_AB09, RETROK_PERIOD },
91	- { XFVK_AB10, RETROK_SLASH },
92	- { XFVK_RTSH, RETROK_RSHIFT },
93	-
94	- { XFVK_LALT, RETROK_LALT },
95	- { XFVK_LCTL, RETROK_LCTRL },
96	- { XFVK_SPCE, RETROK_SPACE },
97	- { XFVK_RCTL, RETROK_RCTRL },
98	- { XFVK_RALT, RETROK_RALT },
99	-
100	- { XFVK_LSGT, RETROK_OEM_102 },
101	- { XFVK_MENU, RETROK_MENU },
102	- { XFVK_LWIN, RETROK_LSUPER },
103	- { XFVK_RWIN, RETROK_RSUPER },
104	- { XFVK_CALC, RETROK_HELP },
105	-
106	- { XFVK_PRSC, RETROK_PRINT },
107	- { XFVK_SCLK, RETROK_SCROLLOCK },
108	- { XFVK_PAUS, RETROK_PAUSE },
109	- { XFVK_INS, RETROK_INSERT },
110	- { XFVK_HOME, RETROK_HOME },
111	- { XFVK_PGUP, RETROK_PAGEUP },
112	- { XFVK_DELE, RETROK_DELETE },
113	- { XFVK_END, RETROK_END },
114	- { XFVK_PGDN, RETROK_PAGEDOWN },
115	- { XFVK_UP, RETROK_UP },
116	- { XFVK_LEFT, RETROK_LEFT },
117	- { XFVK_DOWN, RETROK_DOWN },
118	- { XFVK_RGHT, RETROK_RIGHT },
119	-
120	- { XFVK_NMLK, RETROK_NUMLOCK },
121	- { XFVK_KPDV, RETROK_KP_DIVIDE },
122	- { XFVK_KPMU, RETROK_KP_MULTIPLY },
123	- { XFVK_KPSU, RETROK_KP_MINUS },
124	- { XFVK_KP7, RETROK_KP7 },
125	- { XFVK_KP8, RETROK_KP8 },
126	- { XFVK_KP9, RETROK_KP9 },
127	- { XFVK_KPAD, RETROK_KP_PLUS },
128	- { XFVK_KP4, RETROK_KP4 },
129	- { XFVK_KP5, RETROK_KP5 },
130	- { XFVK_KP6, RETROK_KP6 },
131	- { XFVK_KP1, RETROK_KP1 },
132	- { XFVK_KP2, RETROK_KP2 },
133	- { XFVK_KP3, RETROK_KP3 },
134	- { XFVK_KPEN, RETROK_KP_ENTER },
135	- { XFVK_KP0, RETROK_KP0 },
136	- { XFVK_KPDL, RETROK_KP_PERIOD },
137	- { XFVK_KPEQ, RETROK_KP_EQUALS },
138	+const struct rarch_key_map rarch_key_map_x11[] = {
139	+ { XK_BackSpace, RETROK_BACKSPACE },
140	+ { XK_Tab, RETROK_TAB },
141	+ { XK_Clear, RETROK_CLEAR },
142	+ { XK_Return, RETROK_RETURN },
143	+ { XK_Pause, RETROK_PAUSE },
144	+ { XK_Escape, RETROK_ESCAPE },
145	+ { XK_space, RETROK_SPACE },
146	+ { XK_exclam, RETROK_EXCLAIM },
147	+ { XK_quotedbl, RETROK_QUOTEDBL },
148	+ { XK_numbersign, RETROK_HASH },
149	+ { XK_dollar, RETROK_DOLLAR },
150	+ { XK_ampersand, RETROK_AMPERSAND },
151	+ { XK_apostrophe, RETROK_QUOTE },
152	+ { XK_parenleft, RETROK_LEFTPAREN },
153	+ { XK_parenright, RETROK_RIGHTPAREN },
154	+ { XK_asterisk, RETROK_ASTERISK },
155	+ { XK_plus, RETROK_PLUS },
156	+ { XK_comma, RETROK_COMMA },
157	+ { XK_minus, RETROK_MINUS },
158	+ { XK_period, RETROK_PERIOD },
159	+ { XK_slash, RETROK_SLASH },
160	+ { XK_0, RETROK_0 },
161	+ { XK_1, RETROK_1 },
162	+ { XK_2, RETROK_2 },
163	+ { XK_3, RETROK_3 },
164	+ { XK_4, RETROK_4 },
165	+ { XK_5, RETROK_5 },
166	+ { XK_6, RETROK_6 },
167	+ { XK_7, RETROK_7 },
168	+ { XK_8, RETROK_8 },
169	+ { XK_9, RETROK_9 },
170	+ { XK_colon, RETROK_COLON },
171	+ { XK_semicolon, RETROK_SEMICOLON },
172	+ { XK_less, RETROK_LESS },
173	+ { XK_equal, RETROK_EQUALS },
174	+ { XK_greater, RETROK_GREATER },
175	+ { XK_question, RETROK_QUESTION },
176	+ { XK_at, RETROK_AT },
177	+ { XK_bracketleft, RETROK_LEFTBRACKET },
178	+ { XK_backslash, RETROK_BACKSLASH },
179	+ { XK_bracketright, RETROK_RIGHTBRACKET },
180	+ { XK_dead_circumflex, RETROK_CARET },
181	+ { XK_underscore, RETROK_UNDERSCORE },
182	+ { XK_grave, RETROK_BACKQUOTE },
183	+ { XK_a, RETROK_a },
184	+ { XK_b, RETROK_b },
185	+ { XK_c, RETROK_c },
186	+ { XK_d, RETROK_d },
187	+ { XK_e, RETROK_e },
188	+ { XK_f, RETROK_f },
189	+ { XK_g, RETROK_g },
190	+ { XK_h, RETROK_h },
191	+ { XK_i, RETROK_i },
192	+ { XK_j, RETROK_j },
193	+ { XK_k, RETROK_k },
194	+ { XK_l, RETROK_l },
195	+ { XK_m, RETROK_m },
196	+ { XK_n, RETROK_n },
197	+ { XK_o, RETROK_o },
198	+ { XK_p, RETROK_p },
199	+ { XK_q, RETROK_q },
200	+ { XK_r, RETROK_r },
201	+ { XK_s, RETROK_s },
202	+ { XK_t, RETROK_t },
203	+ { XK_u, RETROK_u },
204	+ { XK_v, RETROK_v },
205	+ { XK_w, RETROK_w },
206	+ { XK_x, RETROK_x },
207	+ { XK_y, RETROK_y },
208	+ { XK_z, RETROK_z },
209	+ { XK_Delete, RETROK_DELETE },
210	+ { XK_KP_0, RETROK_KP0 },
211	+ { XK_KP_1, RETROK_KP1 },
212	+ { XK_KP_2, RETROK_KP2 },
213	+ { XK_KP_3, RETROK_KP3 },
214	+ { XK_KP_4, RETROK_KP4 },
215	+ { XK_KP_5, RETROK_KP5 },
216	+ { XK_KP_6, RETROK_KP6 },
217	+ { XK_KP_7, RETROK_KP7 },
218	+ { XK_KP_8, RETROK_KP8 },
219	+ { XK_KP_9, RETROK_KP9 },
220	+ { XK_KP_Decimal, RETROK_KP_PERIOD },
221	+ { XK_KP_Divide, RETROK_KP_DIVIDE },
222	+ { XK_KP_Multiply, RETROK_KP_MULTIPLY },
223	+ { XK_KP_Subtract, RETROK_KP_MINUS },
224	+ { XK_KP_Add, RETROK_KP_PLUS },
225	+ { XK_KP_Enter, RETROK_KP_ENTER },
226	+ { XK_KP_Equal, RETROK_KP_EQUALS },
227	+ { XK_Up, RETROK_UP },
228	+ { XK_Down, RETROK_DOWN },
229	+ { XK_Right, RETROK_RIGHT },
230	+ { XK_Left, RETROK_LEFT },
231	+ { XK_Insert, RETROK_INSERT },
232	+ { XK_Home, RETROK_HOME },
233	+ { XK_End, RETROK_END },
234	+ { XK_Page_Up, RETROK_PAGEUP },
235	+ { XK_Page_Down, RETROK_PAGEDOWN },
236	+ { XK_F1, RETROK_F1 },
237	+ { XK_F2, RETROK_F2 },
238	+ { XK_F3, RETROK_F3 },
239	+ { XK_F4, RETROK_F4 },
240	+ { XK_F5, RETROK_F5 },
241	+ { XK_F6, RETROK_F6 },
242	+ { XK_F7, RETROK_F7 },
243	+ { XK_F8, RETROK_F8 },
244	+ { XK_F9, RETROK_F9 },
245	+ { XK_F10, RETROK_F10 },
246	+ { XK_F11, RETROK_F11 },
247	+ { XK_F12, RETROK_F12 },
248	+ { XK_F13, RETROK_F13 },
249	+ { XK_F14, RETROK_F14 },
250	+ { XK_F15, RETROK_F15 },
251	+ { XK_Num_Lock, RETROK_NUMLOCK },
252	+ { XK_Caps_Lock, RETROK_CAPSLOCK },
253	+ { XK_Scroll_Lock, RETROK_SCROLLOCK },
254	+ { XK_Shift_R, RETROK_RSHIFT },
255	+ { XK_Shift_L, RETROK_LSHIFT },
256	+ { XK_Control_R, RETROK_RCTRL },
257	+ { XK_Control_L, RETROK_LCTRL },
258	+ { XK_Alt_R, RETROK_RALT },
259	+ { XK_Alt_L, RETROK_LALT },
260	+ { XK_Meta_R, RETROK_RMETA },
261	+ { XK_Meta_L, RETROK_LMETA },
262	+ { XK_Super_L, RETROK_LSUPER },
263	+ { XK_Super_R, RETROK_RSUPER },
264	+ { XK_Mode_switch, RETROK_MODE },
265	+ { XK_Multi_key, RETROK_COMPOSE },
266	+ { XK_Help, RETROK_HELP },
267	+ { XK_Print, RETROK_PRINT },
268	+ { XK_Sys_Req, RETROK_SYSREQ },
269	+ { XK_Break, RETROK_BREAK },
270	+ { XK_Menu, RETROK_MENU },
271	+ /{ ?, RETROK_POWER },/
272	+ { XK_EuroSign, RETROK_EURO },
273	+ { XK_Undo, RETROK_UNDO },
274	+ /{ ?, RETROK_OEM_102 },/
275	+ /* FIXME(shizeeg): RetroArch can't handle these buttons atm.
276	+ * Do we really need RETROK_KP_INSERT, RETROK_KP_END,
277	+ * RETROK_KP_DOWN, RETROK_KP_PAGEDOWN ???
278	+ *
279	+ { XK_KP_Insert, RETROK_KP0 },
280	+ { XK_KP_End, RETROK_KP1 },
281	+ { XK_KP_Down, RETROK_KP2 },
282	+ { XK_KP_Page_Down, RETROK_KP3 },*/
283	+ { XF86XK_Calculator, RETROK_HELP },
284
285	{ 0, RETROK_UNKNOWN },
286	};

Line 0 Link Here

(-)retroarch/files/patch-qb_config.libs.sh (+15 lines)
	1	--- qb/config.libs.sh.orig 2019-05-07 23:56:49 UTC
	2	+++ qb/config.libs.sh
	3	@@ -479,11 +479,7 @@ check_enabled CXX VULKAN vulkan 'The C++ compiler is'
	4	check_enabled CXX OPENGL_CORE 'OpenGL core' 'The C++ compiler is' false
	5	check_enabled THREADS VULKAN vulkan 'Threads are' false
	6
	7	-if [ "$HAVE_VULKAN" != "no" ] && [ "$OS" = 'Win32' ]; then
	8	- HAVE_VULKAN=yes
	9	-else
	10	- check_lib '' VULKAN -lvulkan vkCreateInstance
	11	-fi
	12	+HAVE_VULKAN=yes
	13
	14	check_pkgconf PYTHON 'python3 python3 python-3.7 python-3.6 python-3.5 python-3.4 python-3.3 python-3.2'
	15