46768830ae
Now x11-packages repository will use original names for packages. For example, libgtk2 now will be provided as gtk2, libgtk3 will be available as gtk3, libsdl - as sdl. List of changed packages: libatk --> atk libglu --> glu libgtk2 --> gtk2 libgtk3 --> gtk3 libmesa --> mesa libsdl --> sdl libsdl2 --> sdl2 libsdl-net --> sdl-net riscvemu-sdl --> riscvemu xorg-xvfb --> xorg-server-xvfb List of dependent packages (should be rebuilt with new deps): dosbox, emacs-x, galculator, geany, libepoxy, mtpaint, qemu-system-x86_64, the-powder-toy, tigervnc, wireshark-gtk, xarchiver. Note: depending on which packages are installed, it may be necessary to upgrade with 'apt dist-upgrade'.
39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
diff -uNr SDL2-2.0.8/src/joystick/SDL_gamecontroller.c SDL2-2.0.8.mod/src/joystick/SDL_gamecontroller.c
|
|
--- SDL2-2.0.8/src/joystick/SDL_gamecontroller.c 2018-03-01 18:34:42.000000000 +0200
|
|
+++ SDL2-2.0.8.mod/src/joystick/SDL_gamecontroller.c 2018-09-07 16:13:56.473571477 +0300
|
|
@@ -33,9 +33,6 @@
|
|
#include "../events/SDL_events_c.h"
|
|
#endif
|
|
|
|
-#if defined(__ANDROID__)
|
|
-#include "SDL_system.h"
|
|
-#endif
|
|
|
|
|
|
#define SDL_CONTROLLER_PLATFORM_FIELD "platform:"
|
|
@@ -926,15 +923,6 @@
|
|
mapping = s_pXInputMapping;
|
|
}
|
|
#endif
|
|
-#if defined(__ANDROID__)
|
|
- if (!mapping && SDL_SYS_IsDPAD_DeviceIndex(device_index)) {
|
|
- SDL_bool existing;
|
|
- char mapping_string[1024];
|
|
- SDL_snprintf(mapping_string, sizeof(mapping_string), "none,%s,a:b0,b:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,", name);
|
|
- mapping = SDL_PrivateAddMappingForGUID(guid, mapping_string,
|
|
- &existing, SDL_CONTROLLER_MAPPING_PRIORITY_DEFAULT);
|
|
- }
|
|
-#endif /* __ANDROID__ */
|
|
SDL_UnlockJoysticks();
|
|
return mapping;
|
|
}
|
|
@@ -1194,8 +1182,6 @@
|
|
#ifdef CONTROLLER_MAPPING_FILE
|
|
#define STRING(X) SDL_STRINGIFY_ARG(X)
|
|
return SDL_strlcpy(path, STRING(CONTROLLER_MAPPING_FILE), size) < size;
|
|
-#elif defined(__ANDROID__)
|
|
- return SDL_snprintf(path, size, "%s/controller_map.txt", SDL_AndroidGetInternalStoragePath()) < size;
|
|
#else
|
|
return SDL_FALSE;
|
|
#endif
|