Merge pull request #3845 from cmitu/sdl12-compat-backend

backends: add SDL1.2 Compat backend

Author: joolswills

scriptmodules/emulators/atari800.sh

@@ -15,7 +15,7 @@ rp_module_help="ROM Extensions: .a52 .bas .bin .car .xex .atr .xfd .dcm .atr.gz
 rp_module_licence="GPL2 https://raw.githubusercontent.com/atari800/atari800/master/COPYING"
 rp_module_repo="git https://github.com/atari800/atari800.git ATARI800_5_2_0"
 rp_module_section="opt"
-rp_module_flags="sdl1 !mali"
+rp_module_flags="sdl1"
 
 function depends_atari800() {
     local depends=(libsdl1.2-dev autoconf automake zlib1g-dev libpng-dev)
@@ -94,6 +94,9 @@ function configure_atari800() {
     # if we are on fkms, use the sdl1 dispmanx backend by default for good performance without using X11/opengl
     isPlatform kms && isPlatform "dispmanx" && _backend_set_atari800 "dispmanx"
 
+    # when no dispmanx is available, but still on KMS, use 'sdl12-compat' and go through SDL2
+    isPlatform "kms" && ! isPlatform "dispmanx" _&& _backend_set_atari800 "sdl12-compat"
+
     # this is split out so we can call it via _backend_set_atari800
     _add_emulators_atari800
     addSystem "atari800"

scriptmodules/emulators/capricerpi.sh

@@ -15,7 +15,7 @@ rp_module_help="ROM Extensions: .cdt .cpc .dsk\n\nCopy your Amstrad CPC games to
 rp_module_licence="GPL2 https://raw.githubusercontent.com/KaosOverride/CapriceRPI/master/COPYING.txt"
 rp_module_repo="git https://github.com/KaosOverride/CapriceRPI.git master"
 rp_module_section="opt"
-rp_module_flags="sdl1 !all videocore"
+rp_module_flags="sdl1"
 
 function depends_capricerpi() {
     getDepends libsdl1.2-dev libsdl-image1.2-dev libsdl-ttf2.0-dev zlib1g-dev libpng-dev
@@ -44,4 +44,8 @@ function configure_capricerpi() {
 
     addEmulator 0 "$md_id" "amstradcpc" "$md_inst/capriceRPI %ROM%"
     addSystem "amstradcpc"
+
+    [[ $mode == "remove" ]] && return
+    # use sdl12-compat backend on KMS
+    ! isPlatform "dispmanx" && isPlatform "kms" && setBackend "$md_id" "sdl12-compat"
 }

scriptmodules/emulators/fbzx.sh

@@ -15,7 +15,7 @@ rp_module_help="ROM Extensions: .sna .szx .z80 .tap .tzx .gz .udi .mgt .img .trd
 rp_module_licence="GPL3 https://raw.githubusercontent.com/rastersoft/fbzx/master/COPYING"
 rp_module_repo="git https://github.com/rastersoft/fbzx :_get_branch_fbzx"
 rp_module_section="opt"
-rp_module_flags="sdl1 !mali !kms"
+rp_module_flags="sdl1"
 
 function _get_branch_fbzx() {
     local branch
@@ -55,4 +55,6 @@ function configure_fbzx() {
 
     addEmulator 0 "$md_id" "zxspectrum" "pushd $md_inst/share; $md_inst/bin/fbzx -fs %ROM%; popd"
     addSystem "zxspectrum"
+
+    ! isPlatform "dispmanx" && isPlatform "kms" && setBackend "$md_id" "sdl12-compat"
 }

scriptmodules/emulators/fuse.sh

@@ -63,6 +63,9 @@ function configure_fuse() {
     # default to dispmanx backend
     isPlatform "dispmanx" && _backend_set_fuse "dispmanx"
 
+    # without dispmanx, but with KMS, then use sdl12-compat
+    ! isPlatform "dispmanx" && isPlatform "kms" && _backend_set_fuse "sdl12-compat"
+
     local script="$romdir/zxspectrum/+Start Fuse.sh"
     cat > "$script" << _EOF_
 #!/bin/bash

scriptmodules/emulators/linapple.sh

@@ -60,6 +60,7 @@ function configure_linapple() {
     done
 
     isPlatform "dispmanx" && setBackend "$md_id" "dispmanx"
+    ! isPlatform "dispmanx" && isPlatform "kms" && setBackend "$md_id" "sdl12-compat"
 
     mkUserDir "$md_conf_root/apple2"
     moveConfigDir "$home/.linapple" "$md_conf_root/apple2"

scriptmodules/emulators/osmose.sh

@@ -15,7 +15,7 @@ rp_module_help="ROM Extensions: .bin .gg .sms .zip\nCopy your Game Gear roms to
 rp_module_licence="GPL2 https://raw.githubusercontent.com/RetroPie/osmose-rpi/master/license.txt"
 rp_module_repo="git https://github.com/RetroPie/osmose-rpi.git master"
 rp_module_section="opt"
-rp_module_flags="!mali !kms"
+rp_module_flags="!mali sdl1"
 
 function depends_osmose() {
     getDepends libsdl1.2-dev
@@ -48,4 +48,6 @@ function configure_osmose() {
     addEmulator 0 "$md_id" "mastersystem" "$md_inst/osmose %ROM% -tv -fs"
     addSystem "gamegear"
     addSystem "mastersystem"
+
+    [[ $mode == "configure" ]] && isPlatform "kms" && setBackend "$md_id" "sdl12-compat"
 }

scriptmodules/ports/openbor.sh

@@ -48,6 +48,7 @@ function configure_openbor() {
 
     mkRomDir "ports/$md_id"
     isPlatform "dispmanx" && setBackend "$md_id" "dispmanx"
+    ! isPlatform "dispmanx" && isPlatform "kms" && setBackend "$md_id" "sdl12-compat"
 
     cat >"$md_inst/openbor.sh" << _EOF_
 #!/bin/bash

scriptmodules/ports/xrick.sh

@@ -15,7 +15,7 @@ rp_module_help="Install the xrick data.zip to $romdir/ports/xrick/data.zip"
 rp_module_licence="GPL https://raw.githubusercontent.com/RetroPie/xrick/master/README"
 rp_module_repo="git https://github.com/RetroPie/xrick.git master"
 rp_module_section="opt"
-rp_module_flags="sdl1 !mali"
+rp_module_flags="sdl1"
 
 function depends_xrick() {
     getDepends libsdl1.2-dev libsdl-mixer1.2-dev libsdl-image1.2-dev zlib1g
@@ -43,14 +43,15 @@ function configure_xrick() {
 
     [[ "$md_mode" == "remove" ]] && return
 
+    ln -sf "$romdir/ports/xrick/data.zip" "$md_inst/data.zip"
     # set dispmanx by default on rpi with fkms
     isPlatform "dispmanx" && ! isPlatform "videocore" && setBackend "$md_id" "dispmanx"
-
-    ln -sf "$romdir/ports/xrick/data.zip" "$md_inst/data.zip"
+    # on KMS and without dispmanx, use sdl12-compat
+    ! isPlatform "dispmanx" && isPlatform "kms" && setBackend "$md_id" "sdl12-compat"
 
     local file="$md_inst/xrick.sh"
     cat >"$file" << _EOF_
-#!/bin/bash
+#!/usr/bin/env bash
 pushd "$md_inst"
 ./xrick "\$@"
 popd

scriptmodules/supplementary/backends.sh

@@ -18,6 +18,9 @@ function _list_backends() {
     local id="$1"
     backends=()
 
+    # skip the 'depends' packages
+    [[ ${__mod_info[$id/section]} == "depends" ]] && return 1
+
     local flags="${__mod_info[$id/flags]}"
     local sdl
     if isPlatform "videocore" && hasFlag "$flags" "sdl1-videocore"; then
@@ -35,6 +38,7 @@ function _list_backends() {
     if [[ "$sdl" == "sdl1" ]]; then
         backends["default"]="SDL1 Framebuffer driver"
         isPlatform "dispmanx" && backends["dispmanx"]="SDL1 DispmanX driver"
+        isPlatform "kms" && ! isPlatform "dispmanx" && backends["sdl12-compat"]="SDL1 Compat driver"
     elif [[ "$sdl" == "sdl2" ]]; then
         if isPlatform "videocore"; then
             default="SDL2 videocore driver"
@@ -109,6 +113,9 @@ function gui_configure_backends() {
                     continue
                 fi
             fi
+            if [[ "$choice" == "sdl12-compat" ]] && ! rp_isInstalled "sdl12-compat"; then
+                rp_callModule "sdl12-compat" _auto_
+            fi
             local func="_backend_set_$id"
             if fnExists "$func"; then
                 rp_callModule "$id" _backend_set "$choice" 1

scriptmodules/supplementary/runcommand/runcommand.sh

@@ -1062,6 +1062,9 @@ function config_backend() {
                 fi
                 COMMAND="SDL1_VIDEODRIVER=dispmanx $COMMAND"
                 ;;
+            sdl12-compat)
+                COMMAND="LD_PRELOAD=\"$ROOTDIR/supplementary/sdl12-compat/libSDL-1.2.so.0\" $COMMAND"
+                ;;
             x11)
                 XINIT=1
                 XINIT_WM=1