Merge pull request #2842 from joolswills/atari800_git

atari800 - switch to using github repo and update to v4.1.0

Author: joolswills

scriptmodules/emulators/atari800.sh

@@ -17,22 +17,21 @@ rp_module_section="opt"
 rp_module_flags="!mali !kms"
 
 function depends_atari800() {
-    local depends=(libsdl1.2-dev autoconf zlib1g-dev libpng-dev)
+    local depends=(libsdl1.2-dev autoconf automake zlib1g-dev libpng-dev)
     isPlatform "rpi" && depends+=(libraspberrypi-dev)
     getDepends "${depends[@]}"
 }
 
 function sources_atari800() {
-    downloadAndExtract "$__archive_url/atari800-4.0.0.tar.gz" "$md_build" --strip-components 1
+    gitPullOrClone "$md_build" "https://github.com/atari800/atari800.git" ATARI800_4_1_0
     if isPlatform "rpi"; then
         applyPatch "$md_data/01_rpi_fixes.diff"
     fi
 }
 
 function build_atari800() {
-    cd src
-    autoreconf -v
-    params=()
+    local params=()
+    ./autogen.sh
     isPlatform "rpi" && params+=(--target=rpi)
     ./configure --prefix="$md_inst" ${params[@]}
     make clean
@@ -49,16 +48,22 @@ function configure_atari800() {
     mkRomDir "atari800"
     mkRomDir "atari5200"
 
-    mkUserDir "$md_conf_root/atari800"
+    if [[ "$md_mode" == "install" ]]; then
+        mkUserDir "$md_conf_root/atari800"
+
+        # move old config if exists to new location
+        if [[ -f "$md_conf_root/atari800.cfg" ]]; then
+            mv "$md_conf_root/atari800.cfg" "$md_conf_root/atari800/atari800.cfg"
+        fi
+        moveConfigFile "$home/.atari800.cfg" "$md_conf_root/atari800/atari800.cfg"
 
-    # move old config if exists to new location
-    if [[ -f "$md_conf_root/atari800.cfg" ]]; then
-        mv "$md_conf_root/atari800.cfg" "$md_conf_root/atari800/atari800.cfg"
+        # copy launch script (used for unpacking archives)
+        sed "s#EMULATOR#/bin/$md_id#" "$scriptdir/scriptmodules/$md_type/atari800/atari800.sh" >"$md_inst/$md_id.sh"
+        chmod a+x "$md_inst/$md_id.sh"
     fi
-    moveConfigFile "$home/.atari800.cfg" "$md_conf_root/atari800/atari800.cfg"
 
-    addEmulator 1 "atari800" "atari800" "$md_inst/bin/atari800 %ROM%"
-    addEmulator 1 "atari800" "atari5200" "$md_inst/bin/atari800 %ROM%"
+    addEmulator 1 "atari800" "atari800" "$md_inst/atari800.sh %ROM%"
+    addEmulator 1 "atari800" "atari5200" "$md_inst/atari800.sh %ROM%"
     addSystem "atari800"
     addSystem "atari5200"
 }

scriptmodules/emulators/atari800/01_rpi_fixes.diff

@@ -1,6 +1,8 @@
---- a/src/configure.ac	2018-10-10 18:29:51.126739086 +0100
-+++ b/src/configure.ac.new	2018-10-10 18:30:12.246687333 +0100
-@@ -141,7 +141,7 @@
+diff --git a/configure.ac b/configure.ac
+index adb899f..bc9d939 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -148,7 +148,7 @@ if [[ "$a8_target" = "ps2" ]]; then
  fi
  if [[ "$a8_target" = "rpi" ]]; then
      [[ -z "$RPI_SDK" ]] && RPI_SDK="/opt/vc"
@@ -9,14 +11,3 @@
      CFLAGS="$CFLAGS -I${RPI_SDK}/include -I${RPI_SDK}/include/SDL -I${RPI_SDK}/include/interface/vmcs_host/linux -I${RPI_SDK}/include/interface/vcos/pthreads"
      LDFLAGS="$LDFLAGS -Wl,--unresolved-symbols=ignore-in-shared-libs -L${RPI_SDK}/lib"
  fi
-@@ -324,8 +324,8 @@
-         AC_DEFINE(SUPPORTS_PLATFORM_CONFIGSAVE,1,[Save additional config file options.])
-         AC_DEFINE(SUPPORTS_PLATFORM_PALETTEUPDATE,1,[Update the Palette if it changed.])
-         AC_DEFINE(PLATFORM_MAP_PALETTE,1,[Platform-specific mapping of RGB palette to display surface.])
--        A8_NEED_LIB(GLESv2)
--        A8_NEED_LIB(EGL)
-+        A8_NEED_LIB(brcmGLESv2)
-+        A8_NEED_LIB(brcmEGL)
-         A8_NEED_LIB(SDL)
-         A8_NEED_LIB(bcm_host)
-         OBJS="atari_rpi.o gles2/video.o sdl/main.o sdl/input.o"

scriptmodules/emulators/atari800/atari800.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+emulator="./EMULATOR"
+rom="$1"
+
+pushd "${0%/*}" >/dev/null
+
+if [[ -z "$rom" ]]; then
+    "$emulator"
+else
+    source "../../lib/archivefuncs.sh"
+
+    archiveExtract "$rom" ".a52 .atr .bas .bin .car .dcm .xex .xfd"
+
+    # check successful extraction and if we have at least one file
+    if [[ $? == 0 ]]; then
+        rom="${arch_files[0]}"
+    fi
+
+    "$emulator" "$rom"
+    archiveCleanup
+fi
+
+popd