Merge pull request #161 from Gemba/fix_gmloader_scriptmodule

Fixes for current droidports/gmloader

Author: Exarkuniv

scriptmodules/ports/gmloader.sh

@@ -12,53 +12,82 @@
 
 rp_module_id="gmloader"
 rp_module_desc="GMLoader - play GameMaker Studio games for Android on non-Android operating systems"
-rp_module_help="ROM Extensions: .apk .APK\n\nIncludes free games Maldita Castilla and Spelunky Classic HD. Use launch scripts as template for additional games."
-rp_module_repo="git https://github.com/JohnnyonFlame/droidports.git master faf3970"
+rp_module_help="ROM Extensions: .apk .APK\n\nIncludes free games Maldita Castilla and Spelunky Classic HD. Use a launch script (e.g. 'Spelunky Classic HD.sh') as template for additional games."
+rp_module_repo="git https://github.com/JohnnyonFlame/droidports.git master"
 rp_module_licence="GPL3 https://raw.githubusercontent.com/JohnnyonFlame/droidports/master/LICENSE.md"
 rp_module_section="exp"
-rp_module_flags="!all rpi4"
+rp_module_flags="!all rpi4 rpi3"
 
 function depends_gmloader() {
     getDepends libopenal-dev libfreetype6-dev zlib1g-dev libbz2-dev libpng-dev libzip-dev libsdl2-image-dev cmake
 }
 
 function sources_gmloader() {
     gitPullOrClone
-    # group config dirs in parent gmloader dir
-    applyPatch "$md_data/01_config_dir.patch"
+    applyPatch "$md_data/01_sdl_retropie_exit_emu.patch"
+    applyPatch "$md_data/02_sdl_disable_mouse_cursor.patch"
 }
 
 function build_gmloader() {
-    mkdir build && cd build
+    mkdir build
+    cd build
     cmake -DCMAKE_BUILD_TYPE=Release -DPLATFORM=linux -DPORT=gmloader ..
     make
     md_ret_require="$md_build/build/gmloader"
 }
 
 function install_gmloader() {
-    md_ret_files=('build/gmloader')
+    md_ret_files=(
+        'build/gmloader'
+        'LICENSE.md'
+        'README.md'
+    )
 }
 
 function configure_gmloader() {
-    local apkdir="$romdir/ports/droidports"
+    local apk_dir="$romdir/ports/droidports"
     local maldita_url="https://locomalito.com/juegos/Maldita_Castilla_ouya.apk"
-    local spelunky_url="https://github.com/yancharkin/SpelunkyClassicHD/releases/download/1.1.7/spelunky_classic_hd-android.apk"
-    local maldita_file="$apkdir/$(basename ${maldita_url})"
-    local spelunky_file="$apkdir/$(basename ${spelunky_url})"
-    local am2r_file="$apkdir/am2r_155.apk"
+    local spelunky_url="https://github.com/yancharkin/SpelunkyClassicHD/releases/download/1.1.7-optimized/spelunky_classic_hd-android-armv7.apk"
 
     if [[ "$md_mode" == "install" ]]; then
-        mkUserDir "$apkdir"
-        [[ ! -f "$maldita_file" ]] && download "$maldita_url" "$apkdir"
-        [[ ! -f "$spelunky_file" ]] && download "$spelunky_url" "$apkdir"
+        mkUserDir "$apk_dir"
+        local dl_url
+        for dl_url in "$maldita_url" "$spelunky_url"; do
+            local apk_file="$apk_dir/$(basename ${dl_url})"
+            if [[ ! -f "$apk_file" ]]; then
+                download "$dl_url" "$apk_dir"
+                chown $user:$user "$apk_file"
+            fi
+        done
+
+        local libcpp_eabi="libc++_shared.so"
+        if [[ ! -f "$md_inst/$libcpp_eabi" ]]; then
+            downloadAndExtract "https://chromium.googlesource.com/android_ndk.git/+archive/refs/heads/main/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a.tar.gz" "$md_inst" "$libcpp_eabi"
+            strip -s "$md_inst/$libcpp_eabi"
+        fi
+
+        # Launcher: Change to install folder as failsafe to load libc++_shared.so
+        # sibling to gmloader binary for APKs which do not bundle the lib
+        cat >"$md_inst/gmlauncher.sh" << _EOF_
+#! /usr/bin/env bash
+cd "$md_inst"
+ROM="\$1"
+fn="\${ROM##*/}"
+BASENAME="\${fn%.*}"
+GMLOADER_SAVEDIR="$home/.config/gmloader/\$BASENAME/" ./gmloader "\$ROM"
+_EOF_
+        chmod a+x "$md_inst/gmlauncher.sh"
     fi
 
-    addPort "$md_id" "droidports" "Maldita Castilla" "$md_inst/gmloader %ROM%" "$maldita_file"
-    addPort "$md_id" "droidports" "Spelunky Classic HD" "$md_inst/gmloader %ROM%" "$spelunky_file"
+    local maldita_file="$apk_dir/$(basename ${maldita_url})"
+    local spelunky_file="$apk_dir/$(basename ${spelunky_url})"
+    addPort "$md_id" "droidports" "Maldita Castilla" "$md_inst/gmlauncher.sh %ROM%" "$maldita_file"
+    addPort "$md_id" "droidports" "Spelunky Classic HD" "$md_inst/gmlauncher.sh %ROM%" "$spelunky_file"
 
+    local am2r_file="$apk_dir/am2r_155.apk"
     if [[ -f "$am2r_file" || "$md_mode" == "remove" ]]; then
-        addPort "$md_id" "droidports" "AM2R - Another Metroid 2 Remake" "$md_inst/gmloader %ROM%" "$am2r_file"
+        addPort "$md_id" "droidports" "AM2R - Another Metroid 2 Remake" "$md_inst/gmlauncher.sh %ROM%" "$am2r_file"
     fi
 
     moveConfigDir "$home/.config/gmloader" "$md_conf_root/droidports"
-}
+}

scriptmodules/ports/gmloader/01_config_dir.patch

@@ -0,0 +1,18 @@
+diff --git a/ports/gmloader/sdl2_media.c b/ports/gmloader/sdl2_media.c
+index c5533b1..8be9dc4 100644
+--- a/ports/gmloader/sdl2_media.c
++++ b/ports/gmloader/sdl2_media.c
+@@ -371,6 +372,13 @@ int update_input()
+         if (slot < 0 || slot >= ARRAY_SIZE(yoyo_gamepads))
+             continue;
+ 
++        if (SDL_GameControllerGetButton(controller->controller, SDL_CONTROLLER_BUTTON_START)
++                && (SDL_GameControllerGetButton(controller->controller, SDL_CONTROLLER_BUTTON_BACK)
++                || SDL_GameControllerGetButton(controller->controller, SDL_CONTROLLER_BUTTON_GUIDE))) {
++            // Mimic RetroPie 'Start+Select' or 'Start+Hotkey' behaviour: Quit Emulator
++            return 0;
++        }
++
+         uint8_t new_states[16] = {};
+         int k = 0;
+         new_states[k++] = SDL_GameControllerGetButton(controller->controller, SDL_CONTROLLER_BUTTON_A);

scriptmodules/ports/gmloader/01_sdl_retropie_exit_emu.patch

@@ -0,0 +1,12 @@
+diff --git a/ports/gmloader/sdl2_media.c b/ports/gmloader/sdl2_media.c
+index c5533b1..91361b0 100644
+--- a/ports/gmloader/sdl2_media.c
++++ b/ports/gmloader/sdl2_media.c
+@@ -63,6 +63,7 @@ int init_display(int w, int h)
+                return 0;
+        }
+ 
++    SDL_ShowCursor(SDL_DISABLE);
+     SDL_GL_MakeCurrent(sdl_win, sdl_ctx);
+     SDL_GL_SetSwapInterval(1); //Forced vsync, booo
+     SDL_GL_SwapWindow(sdl_win); //Workaround for missing first frame