od: Fix sdl2 joystick translator driver

1. Add `JoystickGetDevicePath` needed from SDL2 2.23.1. See libsdl-org/SDL@e551384 2. Run autogen.sh for the new `--enable-joystick-translator` to be supported. Signed-off-by: Gleb Mazovetskiy <[email protected]>
OpenDingux · Oct 30, 2023 · 77e11e0 · 77e11e0
1 parent 5f2f74a
commit 77e11e0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/board/opendingux/package/sdl2/sdl2.mk b/board/opendingux/package/sdl2/sdl2.mk
@@ -1,2 +1,6 @@
 SDL2_CONF_OPTS += --enable-joystick-translator
 SDL2_AUTORECONF = YES
+define SDL2_RUN_AUTOGEN
+	cd $(@D) && PATH=$(BR_PATH) ./autogen.sh
+endef
+SDL2_PRE_CONFIGURE_HOOKS += SDL2_RUN_AUTOGEN
diff --git a/board/opendingux/patches/sdl2/0001-SDL_joystick-Add-translator-joystick-driver.patch b/board/opendingux/patches/sdl2/0001-SDL_joystick-Add-translator-joystick-driver.patch
@@ -276,7 +276,7 @@ new file mode 100644
 index 0000000..75e3f6e
 --- /dev/null
 +++ b/src/joystick/translator/SDL_translator.c
-@@ -0,0 +1,492 @@
+@@ -0,0 +1,499 @@
 +/*
 +  Simple DirectMedia Layer
 +  Copyright (C) 2021 Paul Cercueil <[email protected]>
@@ -743,12 +743,19 @@ index 0000000..75e3f6e
 +    return SDL_Unsupported();
 +}
 +
++static const char *
++TRANSLATOR_JoystickGetDevicePath(int device_index)
++{
++    return NULL;
++}
++
 +SDL_JoystickDriver SDL_TRANSLATOR_JoystickDriver =
 +{
 +    TRANSLATOR_JoystickInit,
 +    TRANSLATOR_JoystickGetCount,
 +    TRANSLATOR_JoystickDetect,
 +    TRANSLATOR_JoystickGetDeviceName,
++    TRANSLATOR_JoystickGetDevicePath,
 +    TRANSLATOR_JoystickGetDevicePlayerIndex,
 +    TRANSLATOR_JoystickSetDevicePlayerIndex,
 +    TRANSLATOR_JoystickGetDeviceGUID,