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

Update SDL2 on master #7725

Merged
merged 2 commits into from
Feb 8, 2025
Merged

Update SDL2 on master #7725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
518d4ae
Upgrade SDL2 to 2.30.12
AJenbo Feb 8, 2025
865f6b0
Upgrade SDL2 for MSVC
tsunamistate Feb 8, 2025
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 .github/workflows/Windows_MSVC_x64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
- name: Restore or setup vcpkg
uses: lukka/[email protected]
with:
vcpkgGitCommitId: '80d54ff62d528339c626a6fbc3489a7f25956ade'
vcpkgGitCommitId: '74ec888e385d189b42d6b398d0bbaa6f1b1d3b0e'

- name: Fetch test data
run: |
Expand Down
6 changes: 3 additions & 3 deletions 3rdParty/SDL2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ set(SDL_TEST_ENABLED_BY_DEFAULT OFF)

include(functions/FetchContent_ExcludeFromAll_backport)
include(FetchContent)
FetchContent_Declare_ExcludeFromAll(SDL2
URL https://github.com/libsdl-org/SDL/releases/download/release-2.30.10/SDL2-2.30.10.tar.gz
URL_HASH SHA256=f59adf36a0fcf4c94198e7d3d776c1b3824211ab7aeebeb31fe19836661196aa
FetchContent_Declare(SDL2
URL https://github.com/libsdl-org/SDL/releases/download/release-2.30.12/SDL2-2.30.12.tar.gz
URL_HASH SHA256=ac356ea55e8b9dd0b2d1fa27da40ef7e238267ccf9324704850d5d47375b48ea
)
FetchContent_MakeAvailable_ExcludeFromAll(SDL2)
2 changes: 1 addition & 1 deletion Packaging/windows/mingw-prep.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

SDLDEV_VERS=2.30.10
SDLDEV_VERS=2.30.12
SODIUM_VERS=1.0.20

# exit when any command fails
Expand Down
4 changes: 2 additions & 2 deletions android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
private static final String TAG = "SDL";
private static final int SDL_MAJOR_VERSION = 2;
private static final int SDL_MINOR_VERSION = 30;
private static final int SDL_MICRO_VERSION = 10;
private static final int SDL_MICRO_VERSION = 12;
/*
// Display InputType.SOURCE/CLASS of events and devices
//
Expand Down Expand Up @@ -311,7 +311,7 @@ public static void initialize() {
mNextNativeState = NativeState.INIT;
mCurrentNativeState = NativeState.INIT;
}

protected SDLSurface createSDLSurface(Context context) {
return new SDLSurface(context);
}
Expand Down
2 changes: 1 addition & 1 deletion tools/update_sdl_android_project.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -euo pipefail

SDL_BASE=https://raw.githubusercontent.com/libsdl-org/SDL/release-2.30.10
SDL_BASE=https://raw.githubusercontent.com/libsdl-org/SDL/release-2.30.12
FILES=(
HIDDevice.java
HIDDeviceBLESteamController.java
Expand Down
2 changes: 1 addition & 1 deletion vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"bzip2",
"lua"
],
"builtin-baseline": "80d54ff62d528339c626a6fbc3489a7f25956ade",
"builtin-baseline": "74ec888e385d189b42d6b398d0bbaa6f1b1d3b0e",
"features": {
"sdl1": {
"description": "Use SDL1.2 instead of SDL2",
Expand Down
Loading