Skip to content

Commit 059590b

Browse files
committed
atari800 - switch to using github repo and update to v4.1.0
* added automake dependency * update patch - we only change the compiler name to gcc now * params() should be local
1 parent 0972ab6 commit 059590b

File tree

2 files changed

+9
-19
lines changed

2 files changed

+9
-19
lines changed

scriptmodules/emulators/atari800.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,21 @@ rp_module_section="opt"
1717
rp_module_flags="!mali !kms"
1818

1919
function depends_atari800() {
20-
local depends=(libsdl1.2-dev autoconf zlib1g-dev libpng-dev)
20+
local depends=(libsdl1.2-dev autoconf automake zlib1g-dev libpng-dev)
2121
isPlatform "rpi" && depends+=(libraspberrypi-dev)
2222
getDepends "${depends[@]}"
2323
}
2424

2525
function sources_atari800() {
26-
downloadAndExtract "$__archive_url/atari800-4.0.0.tar.gz" "$md_build" --strip-components 1
26+
gitPullOrClone "$md_build" "https://github.com/atari800/atari800.git" ATARI800_4_1_0
2727
if isPlatform "rpi"; then
2828
applyPatch "$md_data/01_rpi_fixes.diff"
2929
fi
3030
}
3131

3232
function build_atari800() {
33-
cd src
34-
autoreconf -v
35-
params=()
33+
local params=()
34+
./autogen.sh
3635
isPlatform "rpi" && params+=(--target=rpi)
3736
./configure --prefix="$md_inst" ${params[@]}
3837
make clean
Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
--- a/src/configure.ac 2018-10-10 18:29:51.126739086 +0100
2-
+++ b/src/configure.ac.new 2018-10-10 18:30:12.246687333 +0100
3-
@@ -141,7 +141,7 @@
1+
diff --git a/configure.ac b/configure.ac
2+
index adb899f..bc9d939 100644
3+
--- a/configure.ac
4+
+++ b/configure.ac
5+
@@ -148,7 +148,7 @@ if [[ "$a8_target" = "ps2" ]]; then
46
fi
57
if [[ "$a8_target" = "rpi" ]]; then
68
[[ -z "$RPI_SDK" ]] && RPI_SDK="/opt/vc"
@@ -9,14 +11,3 @@
911
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"
1012
LDFLAGS="$LDFLAGS -Wl,--unresolved-symbols=ignore-in-shared-libs -L${RPI_SDK}/lib"
1113
fi
12-
@@ -324,8 +324,8 @@
13-
AC_DEFINE(SUPPORTS_PLATFORM_CONFIGSAVE,1,[Save additional config file options.])
14-
AC_DEFINE(SUPPORTS_PLATFORM_PALETTEUPDATE,1,[Update the Palette if it changed.])
15-
AC_DEFINE(PLATFORM_MAP_PALETTE,1,[Platform-specific mapping of RGB palette to display surface.])
16-
- A8_NEED_LIB(GLESv2)
17-
- A8_NEED_LIB(EGL)
18-
+ A8_NEED_LIB(brcmGLESv2)
19-
+ A8_NEED_LIB(brcmEGL)
20-
A8_NEED_LIB(SDL)
21-
A8_NEED_LIB(bcm_host)
22-
OBJS="atari_rpi.o gles2/video.o sdl/main.o sdl/input.o"

0 commit comments

Comments
 (0)