Merge pull request #3849 from cmitu/quasi88-sdl2

quasi88: switch upstream repository, upgrade to 0.7.1

Author: joolswills

scriptmodules/emulators/quasi88.sh

@@ -12,27 +12,36 @@
 rp_module_id="quasi88"
 rp_module_desc="NEC PC-8801 emulator"
 rp_module_help="ROM Extensions: .d88 .88d .cmt .t88\n\nCopy your pc88 games to to $romdir/pc88\n\nCopy bios files FONT.ROM, N88.ROM, N88KNJ1.ROM, N88KNJ2.ROM, and N88SUB.ROM to $biosdir/pc88"
-rp_module_repo="file $__archive_url/quasi88-0.6.4.tgz"
+rp_module_repo="git https://github.com/winterheart/quasi88.git master"
+rp_module_licence="BSD https://raw.githubusercontent.com/winterheart/quasi88/master/LICENSE.txt"
 rp_module_section="exp"
-rp_module_flags="sdl1 !mali !kms"
+rp_module_flags="sdl2"
 
 function depends_quasi88() {
-    getDepends libsdl1.2-dev
+    getDepends cmake libsdl2-dev libfmt-dev libspdlog-dev
 }
 
 function sources_quasi88() {
-    downloadAndExtract "$md_repo_url" "$md_build" --strip-components 1
-    applyPatch "$md_data/01_fixes.diff"
+    gitPullOrClone
+    applyPatch "$md_data/01_cmake.diff"
 }
 
 function build_quasi88() {
-    make X11_VERSION= SDL_VERSION=1 clean
-    make X11_VERSION= SDL_VERSION=1 ARCH=linux SOUND_SDL=1 USE_OLD_MAME_SOUND=1 USE_FMGEN=1 ROMDIR="$biosdir/pc88" DISKDIR="$romdir/pc88" TAPEDIR="$romdir/pc88"
-    md_ret_require="$md_build/quasi88.sdl"
+    rm -fr build
+    mkdir -p build && pushd build
+    cmake -DROMDIR="$biosdir/pc88" -DDISKDIR="$romdir/pc88" -DTAPEDIR="$romdir/pc88" ..
+    make
+    popd
 }
 
 function install_quasi88() {
-    make X11_VERSION= SDL_VERSION=1 BINDIR="$md_inst" install
+    md_ret_files=(
+        "build/quasi88.sdl"
+        "document"
+        "LICENSE.txt"
+        "README.md"
+        "ChangeLog.md"
+    )
 }
 
 function configure_quasi88() {
@@ -42,4 +51,23 @@ function configure_quasi88() {
 
     addEmulator 1 "$md_id" "pc88" "$md_inst/quasi88.sdl -f6 IMAGE-NEXT1 -f7 IMAGE-NEXT2 -f8 NOWAIT -f9 ROMAJI -f10 NUMLOCK -fullscreen %ROM%"
     addSystem "pc88"
+
+    [[ "$mode" == "remove" ]] && return
+
+    # add a minimal configuration file
+    local conf="$md_conf_root/pc88/quasi88.ini"
+    if [[ ! -f "$conf" ]]; then
+cat > "$conf" << EOF
+-auto_mouse
+-nostatus
+-double
+-english
+-use_joy
+-verbose 1
+-romdir "$biosdir/pc88"
+-diskdir "$romdir/pc88"
+-tapedir "$romdir/pc88"
+EOF
+    chown $user:$user "$conf"
+    fi
 }

scriptmodules/emulators/quasi88/01_cmake.diff

@@ -0,0 +1,21 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 83c52bc..98deb4f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -229,7 +229,7 @@ if(ENABLE_SDL)
+ 	add_definitions(-DQUASI88_SDL)
+ 	find_package(SDL2 CONFIG REQUIRED)
+ 
+-	list(APPEND SDL_LIBS SDL2::SDL2 SDL2::SDL2main)
++	list(APPEND SDL_LIBS ${SDL2_LIBRARIES})
+ 	list(APPEND SDL_INCLUDES
+ 		src/SDL
+ 	)
+@@ -257,6 +257,7 @@ if(ENABLE_SDL)
+ 	)
+ 	target_include_directories(${PROJECT_NAME}.sdl PRIVATE ${SDL_INCLUDES})
+ 	target_link_libraries(${PROJECT_NAME}.sdl ${COMMON_LIBS} ${SDL_LIBS})
++	target_link_libraries(${PROJECT_NAME}.sdl $<$<AND:$<CXX_COMPILER_ID:GNU>,$<VERSION_LESS:$<CXX_COMPILER_VERSION>,9.0>>:stdc++fs>)
+ 
+ 	#### macOS needs rpath set if using a Framework
+ 	if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")