Merge pull request #232 from OpenBrickProtocolFoundation/maintenance_and_update_dependencies

Maintenance and update dependencies

Author: Totto16

.github/workflows/build.yml

@@ -109,7 +109,7 @@ jobs:
         uses: TheMrMilchmann/setup-msvc-dev@v3
         with:
           arch: x64
-          toolset: '14.43'
+          toolset: '14.44'
 
       - name: Setup MSYS2 (Windows)
         if: matrix.config.os == 'windows' && ( matrix.config.environment == 'mingw' || matrix.config.environment == 'ucrt' )
@@ -135,19 +135,8 @@ jobs:
         uses: Totto16/msys2-install-packages-pinned@v1
         with:
           msystem: ${{matrix.config.environment == 'mingw' && 'MINGW64' || 'UCRT64'}}
-          # gcc-libs 14 don't provbide the virtual package cc-libs, only gcc-libs 15 (see https://github.com/msys2/MINGW-packages/commit/9fa882f7eb6f639780a13df016497a93e45544ac) provide it, so until we use gcc 15, nghttp3 < 1.10.1 needs to be used (see https://github.com/msys2/MINGW-packages/commit/16b7f94772f29f1c207764701d863d266a5de64c) since 1.10.1 needs cc-libs and not gcc-libs. The newest version matching that constraint is 1.9.0
-          # for the other pavckages see https://github.com/msys2/MINGW-packages/commit/62308009e77d772a126313626b194e503b0e5135
           install: |
-            nghttp3=1.9
-            SDL2=2.32.4
-            aom=3.12.0
-            curl=8.13.0
-            gnutls=3.8.8
-            libarchive=3.7.9
-            mpg123=1.32.9
-            ngtcp2=1.12.0
-            python=3.12.9-4
-            gcc=14 gcc-libs=!
+            gcc=15 gcc-libs=!
 
       - name: Setup Clang (Linux) (libc++)
         if: matrix.config.os == 'ubuntu' && matrix.config.use-clang == true && matrix.config.use-clang_stdlib

.github/workflows/windows_installer.yml

@@ -23,7 +23,7 @@ jobs:
         uses: TheMrMilchmann/setup-msvc-dev@v3
         with:
           arch: x64
-          toolset: '14.43'
+          toolset: '14.44'
 
       - name: Setup meson
         run: |

platforms/android/app/build.gradle

@@ -159,19 +159,19 @@ String getVersion() {
 
         if (versionResult.getV3() != 0) {
             throw new Exception(
-                    'An error occured while trying to detect the version: process exited with exit code: ' +
+                    'An error occurred while trying to detect the version: process exited with exit code: ' +
                             versionResult.getV3() +
                             ' and stderr:\n' +
                             versionResult.getV2().join("\n")
             );
         }
 
         if (versionResult.getV2() != null && !versionResult.getV2().isEmpty()) {
-            throw new Exception('An error occured while trying to detect the version (code 1): ' + versionResult.getV2().join("\n"));
+            throw new Exception('An error occurred while trying to detect the version (code 1): ' + versionResult.getV2().join("\n"));
         }
 
         if (versionResult.getV1() == null || versionResult.getV1().size() != 1) {
-            throw new Exception('An error occured while trying to detect the version (code 2): ' + versionResult.getV1().join("\n"));
+            throw new Exception('An error occurred while trying to detect the version (code 2): ' + versionResult.getV1().join("\n"));
         }
 
         String version = versionResult.getV1()[0];
@@ -182,7 +182,7 @@ String getVersion() {
 
         for (version1 in versions) {
             if (version != version1) {
-                throw new Exception("Recievd two versions, that didn't match: " + version1 + " != " + version);
+                throw new Exception("Received two versions, that didn't match: " + version1 + " != " + version);
             }
         }
 
@@ -192,7 +192,7 @@ String getVersion() {
 
 
     if (versions.size() == 0) {
-        throw new Exception("ERROR: at least one version has to be detected (at least one abi has to be returend by 'getAndroidABIs()')");
+        throw new Exception("ERROR: at least one version has to be detected (at least one abi has to be returned by 'getAndroidABIs()')");
     }
 
     // we guarantee, that every string in there is the same, and that it has at least one entry 
@@ -224,7 +224,81 @@ Boolean shouldBuildUniversalApk(List<String> abisToUse) {
 
     return true;
 
+}
+
+
+/**
+ * get the meson build type
+ * @return String
+ */
+String getMesonBuildType() {
+    List<String> abis = getAndroidABIs();
+    List<String> buildtypes = new ArrayList<String>();
+
+    for (abi in abis) {
+        File abiDir = getABIDir(abi);
+
+        Tuple3<List<String>, List<String>, Integer> buildtypeResult = executePipeline(Arrays.asList(
+                Arrays.asList("meson", "introspect", "--buildoptions", abiDir.getAbsolutePath()),
+                Arrays.asList("jq", "-r", ".[] | select(.name == \"buildtype\") | .value")
+        ));
+
+        if (buildtypeResult.getV3() != 0) {
+            throw new Exception(
+                    'An error occurred while trying to detect the buildtype: process exited with exit code: ' +
+                            buildtypeResult.getV3() +
+                            ' and stderr:\n' +
+                            buildtypeResult.getV2().join("\n")
+            );
+        }
+
+        if (buildtypeResult.getV2() != null && !buildtypeResult.getV2().isEmpty()) {
+            throw new Exception('An error occurred while trying to detect the buildtype (code 1): ' + buildtypeResult.getV2().join("\n"));
+        }
+
+        if (buildtypeResult.getV1() == null || buildtypeResult.getV1().size() != 1) {
+            throw new Exception('An error occurred while trying to detect the buildtype (code 2): ' + buildtypeResult.getV1().join("\n"));
+        }
+
+        String buildtype = buildtypeResult.getV1()[0];
 
+        if (buildtype == "") {
+            throw new Exception("Auto detection of buildtype returned invalid buildtype: '" + version + "'");
+        }
+
+        for (buildtype1 in buildtypes) {
+            if (buildtype != buildtype1) {
+                throw new Exception("Received two buildtypes, that didn't match: " + buildtype1 + " != " + buildtype);
+            }
+        }
+
+        buildtypes.add(buildtype);
+
+    }
+
+
+    if (buildtypes.size() == 0) {
+        throw new Exception("ERROR: at least one buildtype has to be detected (at least one abi has to be returned by 'getAndroidABIs()')");
+    }
+
+    // we guarantee, that every string in there is the same, and that it has at least one entry 
+    return buildtypes[0];
+
+}
+
+/**
+ * Returns the aar file for discord
+ * @return File
+ */
+File getDiscordLib() {
+    String target = getMesonBuildType() == 'release' ? 'release' : 'debug'
+    String path = "../../../../subprojects/discord_social_sdk/lib/" + target + "/discord_partner_sdk.aar";
+    File file = project.file(project.getLayout().getBuildDirectory().file(path));
+    if(!file.exists()){
+        throw new Exception("ERROR: discord aar is not present at the location we expected it to be!")
+    }
+
+    return file;
 }
 
 
@@ -315,4 +389,5 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation files(getDiscordLib())
 }

platforms/android/app/jni/Android.mk

@@ -62,6 +62,12 @@ LOCAL_SRC_FILES := $(shell find "${SUBPROJECTS_PATH}" -name libfmt.so)
 include $(PREBUILT_SHARED_LIBRARY)
 
 
+include $(CLEAR_VARS)
+LOCAL_MODULE := spdlog
+LOCAL_SRC_FILES := $(shell find "${SUBPROJECTS_PATH}" -name libspdlog.so)
+include $(PREBUILT_SHARED_LIBRARY)
+
+
 include $(CLEAR_VARS)
 LOCAL_MODULE := keyutils
 LOCAL_SRC_FILES := $(shell find "${SUBPROJECTS_PATH}" -name libkeyutils.so)
@@ -99,7 +105,7 @@ include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := main
-LOCAL_SHARED_LIBRARIES := SDL2 sdl2_ttf freetype png16 sdl2_mixer vorbis vorbisfile ogg sdl2_image fmt keyutils oopetris_core oopetris_recordings oopetris_graphics oopetris
+LOCAL_SHARED_LIBRARIES := SDL2 sdl2_ttf freetype png16 sdl2_mixer vorbis vorbisfile ogg sdl2_image fmt spdlog keyutils oopetris_core oopetris_recordings oopetris_graphics oopetris
 LOCAL_LDLIBS := -ldl -lGLESv1_CM -lGLESv2 -lOpenSLES -llog -landroid
 LOCAL_LDFLAGS := -Wl,--no-undefined
 include $(BUILD_SHARED_LIBRARY)

platforms/android/app/src/main/AndroidManifest.xml

@@ -62,7 +62,7 @@
     <application android:label="@string/app_name"
         android:icon="@mipmap/ic_launcher"
         android:allowBackup="true"
-        android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+        android:theme="@style/AppTheme"
         android:hardwareAccelerated="true" >
 
         <!-- Example of setting SDL hints from AndroidManifest.xml:

platforms/android/app/src/main/java/com/github/oopetris/MainActivity.java

@@ -1,10 +1,17 @@
 package com.github.oopetris;
 
 import org.libsdl.app.SDLActivity;
+import com.discord.socialsdk.DiscordSocialSdkInit;
+import android.os.Bundle;
 
-/**
- * A sample wrapper class that just calls SDLActivity 
- */
+public class MainActivity extends SDLActivity { 
 
-public class MainActivity extends SDLActivity { }
+    // Setup
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        DiscordSocialSdkInit.setEngineActivity(this);
+    }
+
+}
 

platforms/android/app/src/main/java/org/libsdl/app/SDLActivity.java

@@ -60,8 +60,8 @@
 public class SDLActivity extends Activity implements View.OnSystemUiVisibilityChangeListener {
     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 = 6;
+    private static final int SDL_MINOR_VERSION = 32;
+    private static final int SDL_MICRO_VERSION = 8;
 /*
     // Display InputType.SOURCE/CLASS of events and devices
     //
@@ -89,7 +89,7 @@ public static void debugSource(int sources, String prefix) {
                 | InputDevice.SOURCE_CLASS_POSITION
                 | InputDevice.SOURCE_CLASS_TRACKBALL);
 
-        if (s2 != 0) cls += "Some_Unkown";
+        if (s2 != 0) cls += "Some_Unknown";
 
         s2 = s_copy & InputDevice.SOURCE_ANY; // keep source only, no class;
 
@@ -163,7 +163,7 @@ public static void debugSource(int sources, String prefix) {
         if (s == FLAG_TAINTED) src += " FLAG_TAINTED";
         s2 &= ~FLAG_TAINTED;
 
-        if (s2 != 0) src += " Some_Unkown";
+        if (s2 != 0) src += " Some_Unknown";
 
         Log.v(TAG, prefix + "int=" + s_copy + " CLASS={" + cls + " } source(s):" + src);
     }
@@ -791,6 +791,9 @@ public void handleMessage(Message msg) {
                                 window.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
                                 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 {
                         Log.e(TAG, "error handling message, getContext() returned no Activity");

platforms/android/app/src/main/res/values/styles.xml

@@ -1,8 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="android:Theme.Holo.Light.DarkActionBar">
+    <style name="AppTheme" parent="android:Theme.NoTitleBar.Fullscreen">
         <!-- Customize your theme here. -->
     </style>
-
 </resources>

platforms/build-3ds.sh

@@ -156,6 +156,13 @@ APP_ROMFS='$ROMFS'
 
 EOF
 
+# source dependency version information
+
+SCRIPT_DIR="$(realpath "$(dirname -- "${BASH_SOURCE[0]}")")"
+
+# shellcheck source=./platforms/versions.sh
+source "$SCRIPT_DIR/versions.sh"
+
 ## build sdl2 and libraries (ttf, mixer, image)
 
 export SDL_TOP_BUILD_DIR="SDL2_local_build_3ds"
@@ -173,15 +180,15 @@ mkdir -p "$SDL_ROOT_DIR"
 
 # build sdl2
 
-export SDL2_SRC_DIR="SDL2-2.30.6"
+export SDL2_SRC_DIR="SDL2-${SDL_3DS_VERSION}"
 
 if [ ! -d "$SDL2_SRC_DIR" ]; then
 
-    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
+    wget "https://github.com/libsdl-org/SDL/releases/download/release-${SDL_3DS_VERSION}/SDL2-${SDL_3DS_VERSION}.tar.gz"
+    tar xzf "SDL2-${SDL_3DS_VERSION}.tar.gz"
+    rm -rf "SDL2-${SDL_3DS_VERSION}.tar.gz"
 
-    cd $SDL2_SRC_DIR
+    cd "$SDL2_SRC_DIR"
 
     cmake -S. "-B$SDL_BUILD_DIR" -DCMAKE_TOOLCHAIN_FILE="$DEVKITPRO/cmake/3DS.cmake" -DCMAKE_BUILD_TYPE=Release "-DCMAKE_INSTALL_PREFIX=$SDL_ROOT_DIR/"
     cmake --build "$SDL_BUILD_DIR"
@@ -195,13 +202,13 @@ export SDL_CMAKE_DIR="$SDL_ROOT_DIR/lib/cmake/SDL2"
 
 # build sdl2_ttf
 
-export SDL2_TTF_SRC_DIR="SDL2_ttf-2.22.0"
+export SDL2_TTF_SRC_DIR="SDL2_ttf-${SDL_TTF_3DS_VERSION}"
 
 if [ ! -d "$SDL2_TTF_SRC_DIR" ]; then
 
-    wget "https://github.com/libsdl-org/SDL_ttf/releases/download/release-2.22.0/SDL2_ttf-2.22.0.tar.gz"
-    tar xzf SDL2_ttf-2.22.0.tar.gz
-    rm -rf SDL2_ttf-2.22.0.tar.gz
+    wget "https://github.com/libsdl-org/SDL_ttf/releases/download/release-${SDL_TTF_3DS_VERSION}/SDL2_ttf-${SDL_TTF_3DS_VERSION}.tar.gz"
+    tar xzf "SDL2_ttf-${SDL_TTF_3DS_VERSION}.tar.gz"
+    rm -rf "SDL2_ttf-${SDL_TTF_3DS_VERSION}.tar.gz"
 
     cd $SDL2_TTF_SRC_DIR
 
@@ -215,13 +222,13 @@ fi
 
 # build sdl2_mixer
 
-export SDL2_MIXER_SRC_DIR="SDL2_mixer-2.8.0"
+export SDL2_MIXER_SRC_DIR="SDL2_mixer-${SDL_MIXER_3DS_VERSION}"
 
 if [ ! -d "$SDL2_MIXER_SRC_DIR" ]; then
 
-    wget "https://github.com/libsdl-org/SDL_mixer/releases/download/release-2.8.0/SDL2_mixer-2.8.0.tar.gz"
-    tar xzf SDL2_mixer-2.8.0.tar.gz
-    rm -rf SDL2_mixer-2.8.0.tar.gz
+    wget "https://github.com/libsdl-org/SDL_mixer/releases/download/release-${SDL_MIXER_3DS_VERSION}/SDL2_mixer-${SDL_MIXER_3DS_VERSION}.tar.gz"
+    tar xzf "SDL2_mixer-${SDL_MIXER_3DS_VERSION}.tar.gz"
+    rm -rf "SDL2_mixer-${SDL_MIXER_3DS_VERSION}.tar.gz"
 
     cd $SDL2_MIXER_SRC_DIR
 
@@ -235,13 +242,13 @@ fi
 
 # build sdl2_image
 
-export SDL2_IMAGE_SRC_DIR="SDL2_image-2.8.2"
+export SDL2_IMAGE_SRC_DIR="SDL2_image-${SDL_IMAGE_3DS_VERSION}"
 
 if [ ! -d "$SDL2_IMAGE_SRC_DIR" ]; then
 
-    wget "https://github.com/libsdl-org/SDL_image/releases/download/release-2.8.2/SDL2_image-2.8.2.tar.gz"
-    tar xzf SDL2_image-2.8.2.tar.gz
-    rm -rf SDL2_image-2.8.2.tar.gz
+    wget "https://github.com/libsdl-org/SDL_image/releases/download/release-${SDL_IMAGE_3DS_VERSION}/SDL2_image-${SDL_IMAGE_3DS_VERSION}.tar.gz"
+    tar xzf "SDL2_image-${SDL_IMAGE_3DS_VERSION}.tar.gz"
+    rm -rf "SDL2_image-${SDL_IMAGE_3DS_VERSION}.tar.gz"
 
     cd $SDL2_IMAGE_SRC_DIR