diff --git a/.github/workflows/Windows_MSVC_x64.yml b/.github/workflows/Windows_MSVC_x64.yml index 5255a0571..6c35e1179 100644 --- a/.github/workflows/Windows_MSVC_x64.yml +++ b/.github/workflows/Windows_MSVC_x64.yml @@ -42,7 +42,7 @@ jobs: - name: Restore or setup vcpkg uses: lukka/run-vcpkg@v11.5 with: - vcpkgGitCommitId: '1318ab14aae14db20085441cd71366891a9c9d0c' + vcpkgGitCommitId: '29b2ea2d4b6197e66ef346e62ccbba35b55b7de5' - name: Fetch test data run: | diff --git a/3rdParty/SDL2/CMakeLists.txt b/3rdParty/SDL2/CMakeLists.txt index 5e65e9106..cee197950 100644 --- a/3rdParty/SDL2/CMakeLists.txt +++ b/3rdParty/SDL2/CMakeLists.txt @@ -15,7 +15,7 @@ set(SDL_TEST_ENABLED_BY_DEFAULT OFF) include(functions/FetchContent_MakeAvailableExcludeFromAll) include(FetchContent) FetchContent_Declare(SDL2 - URL https://github.com/libsdl-org/SDL/releases/download/release-2.30.5/SDL2-2.30.5.tar.gz - URL_HASH SHA256=f374f3fa29c37dfcc20822d4a7d7dc57e58924d1a5f2ad511bfab4c8193de63b + URL https://github.com/libsdl-org/SDL/releases/download/release-2.30.7/SDL2-2.30.7.tar.gz + URL_HASH SHA256=2508c80438cd5ff3bbeb8fe36b8f3ce7805018ff30303010b61b03bb83ab9694 ) FetchContent_MakeAvailableExcludeFromAll(SDL2) diff --git a/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java b/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java index 3c0734abb..2114311f1 100644 --- a/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java +++ b/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java @@ -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 = 5; + private static final int SDL_MICRO_VERSION = 7; /* // Display InputType.SOURCE/CLASS of events and devices // @@ -89,7 +89,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh | InputDevice.SOURCE_CLASS_POSITION | InputDevice.SOURCE_CLASS_TRACKBALL); - if (s2 != 0) cls += "Some_Unknown"; + if (s2 != 0) cls += "Some_Unkown"; s2 = s_copy & InputDevice.SOURCE_ANY; // keep source only, no class; @@ -163,7 +163,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh if (s == FLAG_TAINTED) src += " FLAG_TAINTED"; s2 &= ~FLAG_TAINTED; - if (s2 != 0) src += " Some_Unknown"; + if (s2 != 0) src += " Some_Unkown"; Log.v(TAG, prefix + "int=" + s_copy + " CLASS={" + cls + " } source(s):" + src); } diff --git a/vcpkg.json b/vcpkg.json index a8511b1b8..86982b1c2 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -7,7 +7,7 @@ "simpleini", "lua" ], - "builtin-baseline": "1318ab14aae14db20085441cd71366891a9c9d0c", + "builtin-baseline": "29b2ea2d4b6197e66ef346e62ccbba35b55b7de5", "features": { "sdl1": { "description": "Use SDL1.2 instead of SDL2",