Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Externals: Update SDL to 2.30.9 #13191

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+27 −3
Open

Externals: Update SDL to 2.30.9 #13191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ if(UNIX)
endif()

if(ENABLE_SDL)
dolphin_find_optional_system_library(SDL2 Externals/SDL 2.30.6)
dolphin_find_optional_system_library(SDL2 Externals/SDL 2.30.9)
endif()

if(ENABLE_ANALYTICS)
Expand Down
2 changes: 1 addition & 1 deletion Externals/SDL/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ option(SDL_TEST "Build the SDL2_test library" OFF)
option(SDL_TEST_ENABLED_BY_DEFAULT "" OFF)

# SDL fails to clean up old headers after version upgrades, so do that manually
set(EXPECTED_SDL_REVISION "SDL-release-2.30.6-0")
set(EXPECTED_SDL_REVISION "SDL-release-2.30.9-0")
if (EXISTS "${CMAKE_CURRENT_BINARY_DIR}/SDL/include/SDL2/SDL_revision.h")
file(READ "${CMAKE_CURRENT_BINARY_DIR}/SDL/include/SDL2/SDL_revision.h" ACTUAL_SDL_REVISION)
if (NOT "${ACTUAL_SDL_REVISION}" MATCHES "${EXPECTED_SDL_REVISION}")
Expand Down
2 changes: 1 addition & 1 deletion Externals/SDL/SDL
Open in desktop
Submodule SDL updated 86 files
+62 −0 .github/actions/setup-ninja/action.yml
+406 −0 .github/workflows/release.yml
+1 −0 .gitignore
+5 −2 CMakeLists.txt
+1 −1 Makefile.os2
+1 −1 Makefile.w32
+0 −16 VisualC/SDL/SDL.vcxproj
+4 −2 VisualC/pkg-support/cmake/sdl2-config.cmake
+2 −2 Xcode/SDL/Info-Framework.plist
+6 −6 Xcode/SDL/SDL.xcodeproj/project.pbxproj
+1 −1 Xcode/SDL/pkg-support/SDL.info
+3 −3 android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
+642 −0 build-scripts/build-release.py
+18 −0 build-scripts/cmake-toolchain-mingw64-i686.cmake
+18 −0 build-scripts/cmake-toolchain-mingw64-x86_64.cmake
+41 −0 build-scripts/create-release.py
+26 −0 cmake/test/CMakeLists.txt
+9 −0 cmake/test/sdltest.c
+1 −1 configure
+1 −1 configure.ac
+1 −1 include/SDL_audio.h
+1 −0 include/SDL_hints.h
+1 −1 include/SDL_stdinc.h
+1 −1 include/SDL_version.h
+4 −0 include/SDL_vulkan.h
+18 −0 mingw/pkg-support/INSTALL.txt
+28 −0 mingw/pkg-support/Makefile
+2 −2 mingw/pkg-support/cmake/sdl2-config-version.cmake
+2 −2 mingw/pkg-support/cmake/sdl2-config.cmake
+3 −1 src/SDL_assert.c
+0 −2 src/audio/aaudio/SDL_aaudio.c
+1 −1 src/audio/aaudio/SDL_aaudiofuncs.h
+7 −1 src/audio/emscripten/SDL_emscriptenaudio.c
+6 −2 src/audio/pulseaudio/SDL_pulseaudio.c
+6 −0 src/audio/wasapi/SDL_wasapi.c
+2 −1 src/file/SDL_rwops.c
+2 −20 src/joystick/SDL_gamecontroller.c
+2 −2 src/joystick/SDL_gamecontrollerdb.h
+11 −0 src/joystick/SDL_joystick.c
+3 −0 src/joystick/SDL_joystick_c.h
+1 −1 src/joystick/controller_list.h
+5 −0 src/joystick/darwin/SDL_iokitjoystick.c
+35 −8 src/joystick/hidapi/SDL_hidapi_ps3.c
+1 −0 src/joystick/hidapi/SDL_hidapi_ps4.c
+1 −0 src/joystick/hidapi/SDL_hidapi_ps5.c
+15 −38 src/joystick/hidapi/SDL_hidapi_xbox360.c
+5 −2 src/joystick/hidapi/SDL_hidapi_xboxone.c
+7 −0 src/joystick/hidapi/SDL_hidapijoystick.c
+1 −0 src/joystick/hidapi/SDL_hidapijoystick_c.h
+7 −2 src/joystick/iphoneos/SDL_mfijoystick.m
+2 −0 src/joystick/usb_ids.h
+9 −0 src/joystick/windows/SDL_rawinputjoystick.c
+3 −3 src/joystick/windows/SDL_windowsjoystick.c
+6 −4 src/joystick/windows/SDL_xinputjoystick.c
+4 −4 src/main/windows/version.rc
+2 −0 src/render/vitagxm/SDL_render_vita_gxm.c
+2 −0 src/render/vitagxm/SDL_render_vita_gxm_memory.c
+1 −1 src/render/vitagxm/SDL_render_vita_gxm_tools.c
+1 −1 src/sensor/android/SDL_androidsensor.c
+17 −9 src/stdlib/SDL_string.c
+19 −48 src/video/SDL_blit_0.c
+8 −12 src/video/SDL_blit_A.c
+24 −0 src/video/SDL_video.c
+23 −5 src/video/cocoa/SDL_cocoaopengl.m
+5 −1 src/video/emscripten/SDL_emscriptenevents.c
+1 −1 src/video/emscripten/SDL_emscriptenframebuffer.c
+1 −1 src/video/emscripten/SDL_emscriptenmouse.c
+9 −5 src/video/kmsdrm/SDL_kmsdrmdyn.c
+3 −0 src/video/kmsdrm/SDL_kmsdrmdyn.h
+1 −1 src/video/kmsdrm/SDL_kmsdrmopengles.c
+12 −7 src/video/kmsdrm/SDL_kmsdrmsym.h
+87 −48 src/video/kmsdrm/SDL_kmsdrmvideo.c
+2 −2 src/video/vita/SDL_vitatouch.c
+18 −2 src/video/wayland/SDL_waylandevents.c
+1 −0 src/video/wayland/SDL_waylandmouse.c
+21 −5 src/video/wayland/SDL_waylandopengles.c
+27 −84 src/video/wayland/SDL_waylandwindow.c
+1 −0 src/video/wayland/SDL_waylandwindow.h
+2 −1 src/video/x11/SDL_x11events.c
+6 −4 src/video/x11/SDL_x11mouse.c
+3 −1 src/video/x11/SDL_x11vulkan.c
+3 −4 test/CMakeLists.txt
+12 −0 test/testautomation_stdlib.c
+22 −7 test/testdrawchessboard.c
+8 −7 test/testthread.c
+6 −5 test/torturethread.c
21 changes: 21 additions & 0 deletions Flatpak/SDL2/SDL2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"name": "SDL2",
"buildsystem": "autotools",
"config-opts": ["--disable-static"],
"sources": [
{
"type": "dir",
"path": "../../Externals/SDL/SDL"
}
],
"cleanup": [ "/bin/sdl2-config",
"/include",
"/lib/libSDL2.la",
"/lib/libSDL2main.a",
"/lib/libSDL2main.la",
"/lib/libSDL2_test.a",
"/lib/libSDL2_test.la",
"/lib/cmake",
"/share/aclocal",
"/lib/pkgconfig"]
}
3 changes: 3 additions & 0 deletions Flatpak/org.DolphinEmu.dolphin-emu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ modules:
url: https://github.com/Unrud/xdg-screensaver-shim/archive/0.0.2.tar.gz
sha256: 0ed2a69fe6ee6cbffd2fe16f85116db737f17fb1e79bfb812d893cf15c728399

# build the vendored SDL2 from Externals until the runtime gets 2.30.9
- SDL2/SDL2.json

- name: dolphin-emu
buildsystem: cmake-ninja
config-opts:
Expand Down