Merge pull request #178 from OpenBrickProtocolFoundation/update_sdl_2_30_6

Totto16 · web-flow · commit aa170a3151c9 · 2024-09-08T02:17:52.000+02:00
update sdl2 to 2.30.6
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -46,7 +46,7 @@ jobs:
         
       - name: Setup NDK
         run: | 
-          sdkmanager --install "ndk;27.0.12077973"
+          sdkmanager --install "ndk;27.1.12297006"
 
 
       - name: Build native libraries
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -97,7 +97,7 @@ jobs:
         uses: TheMrMilchmann/setup-msvc-dev@v3
         with:
           arch: x64
-          toolset: "14.40"
+          toolset: "14.41"
 
 
       - name: Setup MYSYS2 (Windows)
diff --git a/.github/workflows/installer.yml b/.github/workflows/installer.yml
@@ -36,7 +36,7 @@ jobs:
         uses: TheMrMilchmann/setup-msvc-dev@v3
         with:
           arch: x64
-          toolset: "14.40"
+          toolset: "14.41"
 
       - name: Setup meson
         if: matrix.config.os != 'macos'
diff --git a/platforms/android/app/build.gradle b/platforms/android/app/build.gradle
@@ -248,7 +248,7 @@ android {
     }
 
     compileSdkVersion 34
-    ndkVersion "27.0.12077973"
+    ndkVersion "27.1.12297006"
     defaultConfig {
         if (buildAsApplication) {
             applicationId "com.github.oopetris"
diff --git a/platforms/android/app/jni/Android.mk b/platforms/android/app/jni/Android.mk
@@ -4,7 +4,7 @@ SUBPROJECTS_PATH :=$(BUILD_PATH)/subprojects
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := SDL2
-LOCAL_SRC_FILES := $(shell find "${SUBPROJECTS_PATH}" -name libsdl2.so)
+LOCAL_SRC_FILES := $(shell find "${SUBPROJECTS_PATH}" -name libSDL2.so)
 include $(PREBUILT_SHARED_LIBRARY)
 
 
diff --git a/platforms/android/app/src/main/java/org/libsdl/app/HIDDeviceManager.java b/platforms/android/app/src/main/java/org/libsdl/app/HIDDeviceManager.java
@@ -277,6 +277,7 @@ private boolean isXboxOneController(UsbDevice usbDevice, UsbInterface usbInterfa
             0x044f, // Thrustmaster
             0x045e, // Microsoft
             0x0738, // Mad Catz
+            0x0b05, // ASUS
             0x0e6f, // PDP
             0x0f0d, // Hori
             0x10f5, // Turtle Beach
@@ -590,7 +591,13 @@ public boolean openDevice(int deviceID) {
                 } else {
                     flags = 0;
                 }
-                mUsbManager.requestPermission(usbDevice, PendingIntent.getBroadcast(mContext, 0, new Intent(HIDDeviceManager.ACTION_USB_PERMISSION), flags));
+                if (Build.VERSION.SDK_INT >= 33 /* Android 14.0 (U) */) {
+                   Intent intent = new Intent(HIDDeviceManager.ACTION_USB_PERMISSION);
+                   intent.setPackage(mContext.getPackageName());
+                   mUsbManager.requestPermission(usbDevice, PendingIntent.getBroadcast(mContext, 0, intent, flags));
+               } else {
+                   mUsbManager.requestPermission(usbDevice, PendingIntent.getBroadcast(mContext, 0, new Intent(HIDDeviceManager.ACTION_USB_PERMISSION), flags));
+               }
             } catch (Exception e) {
                 Log.v(TAG, "Couldn't request permission for USB device " + usbDevice);
                 HIDDeviceOpenResult(deviceID, false);
diff --git a/platforms/android/app/src/main/java/org/libsdl/app/SDL.java b/platforms/android/app/src/main/java/org/libsdl/app/SDL.java
@@ -38,6 +38,10 @@ public static Context getContext() {
     }
 
     public static void loadLibrary(String libraryName) throws UnsatisfiedLinkError, SecurityException, NullPointerException {
+        loadLibrary(libraryName, mContext);
+    }
+
+    public static void loadLibrary(String libraryName, Context context) throws UnsatisfiedLinkError, SecurityException, NullPointerException {
 
         if (libraryName == null) {
             throw new NullPointerException("No library name provided.");
@@ -53,10 +57,10 @@ public static void loadLibrary(String libraryName) throws UnsatisfiedLinkError,
             // To use ReLinker, just add it as a dependency.  For more information, see 
             // https://github.com/KeepSafe/ReLinker for ReLinker's repository.
             //
-            Class<?> relinkClass = mContext.getClassLoader().loadClass("com.getkeepsafe.relinker.ReLinker");
-            Class<?> relinkListenerClass = mContext.getClassLoader().loadClass("com.getkeepsafe.relinker.ReLinker$LoadListener");
-            Class<?> contextClass = mContext.getClassLoader().loadClass("android.content.Context");
-            Class<?> stringClass = mContext.getClassLoader().loadClass("java.lang.String");
+            Class<?> relinkClass = context.getClassLoader().loadClass("com.getkeepsafe.relinker.ReLinker");
+            Class<?> relinkListenerClass = context.getClassLoader().loadClass("com.getkeepsafe.relinker.ReLinker$LoadListener");
+            Class<?> contextClass = context.getClassLoader().loadClass("android.content.Context");
+            Class<?> stringClass = context.getClassLoader().loadClass("java.lang.String");
 
             // Get a 'force' instance of the ReLinker, so we can ensure libraries are reinstalled if 
             // they've changed during updates.
@@ -66,7 +70,7 @@ public static void loadLibrary(String libraryName) throws UnsatisfiedLinkError,
 
             // Actually load the library!
             Method loadMethod = relinkInstanceClass.getDeclaredMethod("loadLibrary", contextClass, stringClass, stringClass, relinkListenerClass);
-            loadMethod.invoke(relinkInstance, mContext, libraryName, null, null);
+            loadMethod.invoke(relinkInstance, context, libraryName, null, null);
         }
         catch (final Throwable e) {
             // Fall back
diff --git a/platforms/android/app/src/main/java/org/libsdl/app/SDLActivity.java b/platforms/android/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 = 3;
+    private static final int SDL_MICRO_VERSION = 6;
 /*
     // Display InputType.SOURCE/CLASS of events and devices
     //
@@ -282,7 +282,7 @@ protected String[] getLibraries() {
     // Load the .so
     public void loadLibraries() {
        for (String lib : getLibraries()) {
-          SDL.loadLibrary(lib);
+          SDL.loadLibrary(lib, this);
        }
     }
 
@@ -777,7 +777,6 @@ public void handleMessage(Message msg) {
                                 int flags = View.SYSTEM_UI_FLAG_FULLSCREEN |
                                         View.SYSTEM_UI_FLAG_HIDE_NAVIGATION |
                                         View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY |
-                                        
                                         View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN |
                                         View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
                                         View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.INVISIBLE;
@@ -997,8 +996,8 @@ public void setOrientationBis(int w, int h, boolean resizable, String hint)
         /* No valid hint, nothing is explicitly allowed */
         if (!is_portrait_allowed && !is_landscape_allowed) {
             if (resizable) {
-                /* All orientations are allowed */
-                req = ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR;
+                /* All orientations are allowed, respecting user orientation lock setting */
+                req = ActivityInfo.SCREEN_ORIENTATION_FULL_USER;
             } else {
                 /* Fixed window and nothing specified. Get orientation from w/h of created window */
                 req = (w > h ? ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE : ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT);
@@ -1007,8 +1006,8 @@ public void setOrientationBis(int w, int h, boolean resizable, String hint)
             /* At least one orientation is allowed */
             if (resizable) {
                 if (is_portrait_allowed && is_landscape_allowed) {
-                    /* hint allows both landscape and portrait, promote to full sensor */
-                    req = ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR;
+                    /* hint allows both landscape and portrait, promote to full user */
+                    req = ActivityInfo.SCREEN_ORIENTATION_FULL_USER;
                 } else {
                     /* Use the only one allowed "orientation" */
                     req = (is_landscape_allowed ? orientation_landscape : orientation_portrait);
diff --git a/platforms/build-3ds.sh b/platforms/build-3ds.sh
@@ -130,13 +130,13 @@ mkdir -p "$SDL_ROOT_DIR"
 
 # build sdl2
 
-export SDL2_SRC_DIR="SDL2-2.30.3"
+export SDL2_SRC_DIR="SDL2-2.30.6"
 
 if [ ! -d "$SDL2_SRC_DIR" ]; then
 
-    wget "https://github.com/libsdl-org/SDL/releases/download/release-2.30.3/SDL2-2.30.3.tar.gz"
-    tar xzf SDL2-2.30.3.tar.gz
-    rm -rf SDL2-2.30.3.tar.gz
+    wget "https://github.com/libsdl-org/SDL/releases/download/release-2.30.6/SDL2-2.30.6.tar.gz"
+    tar xzf SDL2-2.30.6.tar.gz
+    rm -rf SDL2-2.30.6.tar.gz
 
     cd $SDL2_SRC_DIR
 
diff --git a/platforms/build-android.sh b/platforms/build-android.sh
@@ -4,8 +4,8 @@ set -e
 
 mkdir -p toolchains
 
-export NDK_VER_DOWNLOAD="r27"
-export NDK_VER_DESC="r27"
+export NDK_VER_DOWNLOAD="r27b"
+export NDK_VER_DESC="r27b"
 
 export BASE_PATH="$PWD/toolchains/android-ndk-$NDK_VER_DESC"
 export ANDROID_NDK_HOME="$BASE_PATH"
diff --git a/subprojects/cpp-httplib.wrap b/subprojects/cpp-httplib.wrap
@@ -1,11 +1,11 @@
 [wrap-file]
-directory = cpp-httplib-0.15.3
-source_url = https://github.com/yhirose/cpp-httplib/archive/refs/tags/v0.15.3.tar.gz
-source_filename = cpp-httplib-0.15.3.tar.gz
-source_hash = 2121bbf38871bb2aafb5f7f2b9b94705366170909f434428352187cb0216124e
-source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/cpp-httplib_0.15.3-1/cpp-httplib-0.15.3.tar.gz
-wrapdb_version = 0.15.3-1
-diff_files = cpp-httplib-0.15.3_mingw.diff
+directory = cpp-httplib-0.17.1
+source_url = https://github.com/yhirose/cpp-httplib/archive/refs/tags/v0.17.1.tar.gz
+source_filename = cpp-httplib-0.17.1.tar.gz
+source_hash = 044c5a233da242e981d9543dd136a5945e0549c5641a0373934db88bbd192f41
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/cpp-httplib_0.17.1-1/cpp-httplib-0.17.1.tar.gz
+wrapdb_version = 0.17.1-1
+diff_files = cpp-httplib-0.17.1_mingw.diff
 
 [provide]
 cpp-httplib = cpp_httplib_dep
diff --git a/subprojects/freetype2.wrap b/subprojects/freetype2.wrap
@@ -1,10 +1,10 @@
 [wrap-file]
-directory = freetype-2.13.2
-source_url = https://download.savannah.gnu.org/releases/freetype/freetype-2.13.2.tar.xz
-source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/freetype2_2.13.2-1/freetype-2.13.2.tar.xz
-source_filename = freetype-2.13.2.tar.xz
-source_hash = 12991c4e55c506dd7f9b765933e62fd2be2e06d421505d7950a132e4f1bb484d
-wrapdb_version = 2.13.2-1
+directory = freetype-2.13.3
+source_url = https://download.savannah.gnu.org/releases/freetype/freetype-2.13.3.tar.xz
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/freetype2_2.13.3-1/freetype-2.13.3.tar.xz
+source_filename = freetype-2.13.3.tar.xz
+source_hash = 0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289
+wrapdb_version = 2.13.3-1
 
 [provide]
 freetype2 = freetype_dep
diff --git a/subprojects/nativefiledialog-extended.wrap b/subprojects/nativefiledialog-extended.wrap
@@ -1,13 +1,13 @@
 [wrap-file]
-directory = nativefiledialog-extended-1.1.1
-source_url = https://github.com/btzy/nativefiledialog-extended/archive/refs/tags/v1.1.1.tar.gz
-source_filename = nativefiledialog-extended-1.1.1.tar.gz
-source_hash = 8cce60cb9c046a6fb86a86e7f71d95017dd3353e1596180a6c60f5592f7cc0cb
-patch_filename = nativefiledialog-extended_1.1.1-2_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/nativefiledialog-extended_1.1.1-2/get_patch
-patch_hash = 4827040c94ddb3646316060a20ef51a0fa8d551a418a6aafb822bb4979f01f94
-source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/nativefiledialog-extended_1.1.1-2/nativefiledialog-extended-1.1.1.tar.gz
-wrapdb_version = 1.1.1-2
+directory = nativefiledialog-extended-1.2.1
+source_url = https://github.com/btzy/nativefiledialog-extended/archive/refs/tags/v1.2.1.tar.gz
+source_filename = nativefiledialog-extended-1.2.1.tar.gz
+source_hash = 443697a857c4efacbe08cdaf5182724fa9d9b9a79b8feff2a1601bde1df46b07
+patch_filename = nativefiledialog-extended_1.2.1-1_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/nativefiledialog-extended_1.2.1-1/get_patch
+patch_hash = 044a2e881d874d55a892b61cf553aa7678d1c0f06cfaeb39a1b43f34ca976b09
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/nativefiledialog-extended_1.2.1-1/nativefiledialog-extended-1.2.1.tar.gz
+wrapdb_version = 1.2.1-1
 
 [provide]
 nativefiledialog-extended = nfde_dep
diff --git a/subprojects/packagefiles/SDL2-2.30.6_android.diff b/subprojects/packagefiles/SDL2-2.30.6_android.diff
diff --git a/subprojects/packagefiles/cpp-httplib-0.17.1_mingw.diff b/subprojects/packagefiles/cpp-httplib-0.17.1_mingw.diff
diff --git a/subprojects/sdl2.wrap b/subprojects/sdl2.wrap
@@ -1,14 +1,14 @@
 [wrap-file]
-directory = SDL2-2.30.3
-source_url = https://github.com/libsdl-org/SDL/releases/download/release-2.30.3/SDL2-2.30.3.tar.gz
-source_filename = SDL2-2.30.3.tar.gz
-source_hash = 820440072f8f5b50188c1dae104f2ad25984de268785be40c41a099a510f0aec
-patch_filename = sdl2_2.30.3-3_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/sdl2_2.30.3-3/get_patch
-patch_hash = 58db4d525787a2f0585cc5256b3cf3ef1150ff7a100bd2e8995b478c7ee55e5f
-source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/sdl2_2.30.3-3/SDL2-2.30.3.tar.gz
-wrapdb_version = 2.30.3-3
-diff_files = SDL2-2.30.3_android.diff
+directory = SDL2-2.30.6
+source_url = https://github.com/libsdl-org/SDL/releases/download/release-2.30.6/SDL2-2.30.6.tar.gz
+source_filename = SDL2-2.30.6.tar.gz
+source_hash = c6ef64ca18a19d13df6eb22df9aff19fb0db65610a74cc81dae33a82235cacd4
+patch_filename = sdl2_2.30.6-2_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/sdl2_2.30.6-2/get_patch
+patch_hash = aa9f6a4947b07510c2ea84fb457e965bebe5a5deeb9f5059fbcf10dfe6b76d1f
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/sdl2_2.30.6-2/SDL2-2.30.6.tar.gz
+wrapdb_version = 2.30.6-2
+diff_files = SDL2-2.30.6_android.diff
 
 [provide]
 sdl2 = sdl2_dep

Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,7 @@ android {`
`248`	`248`	`}`
`249`	`249`
`250`	`250`	`compileSdkVersion 34`
`251`		`- ndkVersion "27.0.12077973"`
	`251`	`+ ndkVersion "27.1.12297006"`
`252`	`252`	`defaultConfig {`
`253`	`253`	`if (buildAsApplication) {`
`254`	`254`	`applicationId "com.github.oopetris"`