diff options
| author | dreamsyntax <dreamsyntax@gmail.com> | 2024-11-16 20:52:08 -0700 |
|---|---|---|
| committer | dreamsyntax <dreamsyntax@gmail.com> | 2024-11-16 21:34:30 -0700 |
| commit | f642cd465828e3f70b0ef5f992c5e1389c307c9a (patch) | |
| tree | 794ea84345ce95ad6510800ff67dc57aa7f3a855 | |
| parent | 050f5dfff65424138da07b7e3fab58cc22ed908a (diff) | |
Externals: Update SDL to 2.30.9
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Externals/SDL/CMakeLists.txt | 2 | ||||
| m--------- | Externals/SDL/SDL | 0 | ||||
| -rw-r--r-- | Flatpak/SDL2/SDL2.json | 21 | ||||
| -rw-r--r-- | Flatpak/org.DolphinEmu.dolphin-emu.yml | 3 |
5 files changed, 26 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 636d5473e3..3495e3b2b3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/Externals/SDL/CMakeLists.txt b/Externals/SDL/CMakeLists.txt index c30d8ae979..185f1ed930 100644 --- a/Externals/SDL/CMakeLists.txt +++ b/Externals/SDL/CMakeLists.txt @@ -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}") diff --git a/Externals/SDL/SDL b/Externals/SDL/SDL -Subproject ba2f78a0069118a6c583f1fbf1420144ffa35ba +Subproject c98c4fbff6d8f3016a3ce6685bf8f43433c3efc diff --git a/Flatpak/SDL2/SDL2.json b/Flatpak/SDL2/SDL2.json new file mode 100644 index 0000000000..4c1821b742 --- /dev/null +++ b/Flatpak/SDL2/SDL2.json @@ -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"] +} diff --git a/Flatpak/org.DolphinEmu.dolphin-emu.yml b/Flatpak/org.DolphinEmu.dolphin-emu.yml index 7afef2504d..a1266b5df5 100644 --- a/Flatpak/org.DolphinEmu.dolphin-emu.yml +++ b/Flatpak/org.DolphinEmu.dolphin-emu.yml @@ -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: |