Browse Source

Update to SDL2 2.32.0

pull/7737/head
Anders Jenbo 1 year ago
parent
commit
348c8230a6
  1. 4
      3rdParty/SDL2/CMakeLists.txt
  2. 2
      Packaging/windows/mingw-prep.sh
  3. 9
      android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
  4. 2
      tools/update_sdl_android_project.sh

4
3rdParty/SDL2/CMakeLists.txt vendored

@ -15,7 +15,7 @@ set(SDL_TEST_ENABLED_BY_DEFAULT OFF)
include(functions/FetchContent_ExcludeFromAll_backport) include(functions/FetchContent_ExcludeFromAll_backport)
include(FetchContent) include(FetchContent)
FetchContent_Declare(SDL2 FetchContent_Declare(SDL2
URL https://github.com/libsdl-org/SDL/releases/download/release-2.30.12/SDL2-2.30.12.tar.gz URL https://github.com/libsdl-org/SDL/releases/download/release-2.32.0/SDL2-2.32.0.tar.gz
URL_HASH SHA256=ac356ea55e8b9dd0b2d1fa27da40ef7e238267ccf9324704850d5d47375b48ea URL_HASH SHA256=f5c2b52498785858f3de1e2996eba3c1b805d08fe168a47ea527c7fc339072d0
) )
FetchContent_MakeAvailable_ExcludeFromAll(SDL2) FetchContent_MakeAvailable_ExcludeFromAll(SDL2)

2
Packaging/windows/mingw-prep.sh

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
SDLDEV_VERS=2.30.12 SDLDEV_VERS=2.32.0
SODIUM_VERS=1.0.20 SODIUM_VERS=1.0.20
# exit when any command fails # exit when any command fails

9
android-project/app/src/main/java/org/libsdl/app/SDLActivity.java

@ -60,8 +60,8 @@ import java.util.Locale;
public class SDLActivity extends Activity implements View.OnSystemUiVisibilityChangeListener { public class SDLActivity extends Activity implements View.OnSystemUiVisibilityChangeListener {
private static final String TAG = "SDL"; private static final String TAG = "SDL";
private static final int SDL_MAJOR_VERSION = 2; private static final int SDL_MAJOR_VERSION = 2;
private static final int SDL_MINOR_VERSION = 30; private static final int SDL_MINOR_VERSION = 32;
private static final int SDL_MICRO_VERSION = 12; private static final int SDL_MICRO_VERSION = 0;
/* /*
// Display InputType.SOURCE/CLASS of events and devices // Display InputType.SOURCE/CLASS of events and devices
// //
@ -311,7 +311,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
mNextNativeState = NativeState.INIT; mNextNativeState = NativeState.INIT;
mCurrentNativeState = NativeState.INIT; mCurrentNativeState = NativeState.INIT;
} }
protected SDLSurface createSDLSurface(Context context) { protected SDLSurface createSDLSurface(Context context) {
return new SDLSurface(context); return new SDLSurface(context);
} }
@ -790,6 +790,9 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
window.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN); window.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
SDLActivity.mFullscreenModeActive = false; SDLActivity.mFullscreenModeActive = false;
} }
if (Build.VERSION.SDK_INT >= 28 /* Android 9 (Pie) */) {
window.getAttributes().layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
}
} }
} else { } else {
Log.e(TAG, "error handling message, getContext() returned no Activity"); Log.e(TAG, "error handling message, getContext() returned no Activity");

2
tools/update_sdl_android_project.sh

@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -euo pipefail set -euo pipefail
SDL_BASE=https://raw.githubusercontent.com/libsdl-org/SDL/release-2.30.12 SDL_BASE=https://raw.githubusercontent.com/libsdl-org/SDL/release-2.32.0
FILES=( FILES=(
HIDDevice.java HIDDevice.java
HIDDeviceBLESteamController.java HIDDeviceBLESteamController.java

Loading…
Cancel
Save