Merge pull request RetroPie#3784 from cmitu/amiberry-5.6.2-pi5

amiberry: bump version and enable for Pi5
cmitu · Nov 13, 2023 · 729aa72 · 729aa72
2 parents 2a28955 + 9d2aa00
commit 729aa72
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/scriptmodules/emulators/amiberry.sh b/scriptmodules/emulators/amiberry.sh
@@ -13,9 +13,9 @@ rp_module_id="amiberry"
 rp_module_desc="Amiga emulator with JIT support (forked from uae4arm)"
 rp_module_help="ROM Extension: .adf .chd .ipf .lha .zip\n\nCopy your Amiga games to $romdir/amiga\n\nCopy the required BIOS files\nkick13.rom\nkick20.rom\nkick31.rom\nto $biosdir/amiga"
 rp_module_licence="GPL3 https://raw.githubusercontent.com/BlitterStudio/amiberry/master/LICENSE"
-rp_module_repo="git https://github.com/BlitterStudio/amiberry v5.6.1"
+rp_module_repo="git https://github.com/BlitterStudio/amiberry v5.6.2"
 rp_module_section="opt"
-rp_module_flags="!all arm rpi3 rpi4"
+rp_module_flags="!all arm rpi3 rpi4 rpi5"
 
 function _update_hook_amiberry() {
     local rom

diff --git a/scriptmodules/emulators/atari800.sh b/scriptmodules/emulators/atari800.sh
@@ -19,7 +19,7 @@ rp_module_flags="sdl1 !mali"
 
 function depends_atari800() {
     local depends=(libsdl1.2-dev autoconf automake zlib1g-dev libpng-dev)
-    isPlatform "rpi" && depends+=(libraspberrypi-dev)
+    isPlatform "videocore" && depends+=(libraspberrypi-dev)
     getDepends "${depends[@]}"
 }
 
@@ -57,7 +57,7 @@ function _add_emulators_atari800() {
                 params+=("-video-accel")
             fi
             ;;
-        default|x11*)
+        default|x11|sdl12-compat*)
             # if backend is set to sdl1 default and we are on kms, we need to set fullscreen
             # and add width/height params to be filled out by runcommand or else it won't fill the screen
             isPlatform "kms" && params+=("-fullscreen" "-fs-width %XRES%" "-fs-height %YRES%")

diff --git a/scriptmodules/emulators/fuse.sh b/scriptmodules/emulators/fuse.sh
@@ -60,9 +60,12 @@ function configure_fuse() {
     mkUserDir "$md_conf_root/zxspectrum"
     moveConfigFile "$home/.fuserc" "$md_conf_root/zxspectrum/.fuserc"
 
-    # default to dispmanx backend
+    # default to dispmanx backend when available
     isPlatform "dispmanx" && _backend_set_fuse "dispmanx"
 
+    # default to sdl12-compat on kms and dispmanx is not available
+    isPlatform "kms" && ! isPlatform "dispmanx" && _backend_set_fuse "sdl12-compat"
+
     local script="$romdir/zxspectrum/+Start Fuse.sh"
     cat > "$script" << _EOF_
 #!/bin/bash