From c2aa93372d59989093d4505418526029c130e5d2 Mon Sep 17 00:00:00 2001 From: nia Date: Sat, 18 Jan 2020 21:33:13 +0000 Subject: [PATCH] atari800: Update to 4.2.0. Nice. Version 4.2.0 (2019/12/28) - released at SILK New Features: raw Pokey registers recording by Ivo van Poorten new platform supported: FireBee optional hiding of hidden files/folders in the UI file selector libatari800 (Atari800 as a library) by Rob McMullen R: device (many years old feature) enabled by default Fixes: proper check if SDL joysticks are found (fixes #58) Portrait mode for Android (related to #41) RMW for Pokey Improved BASIC LST file loading (#55) ROM OS path changes handled better (#15) improved "Find ROM images" - now Atari800 reboots if necessary (#15) fixed an old bug which caused freezing in the UI on Falcon New command line options: -pokeyrec and its children -atari_files (#29) -saved_files (#29) -kbdjoy0 -kbdjoy1 -nokbdjoy0 -nokbdjoy1 (#29) Plus many Atari Falcon specific fixes and improvements by Mikro. This should be the most complete and bug-free Atari Falcon release in years, so enjoy! :) --- emulators/atari800/Makefile | 20 +++++------ emulators/atari800/PLIST | 15 +++++--- emulators/atari800/distinfo | 21 +++++------ emulators/atari800/patches/patch-configure | 35 ++++++++++++++++--- .../atari800/patches/patch-src_rdevice.c | 18 ++++++++++ 5 files changed, 78 insertions(+), 31 deletions(-) create mode 100644 emulators/atari800/patches/patch-src_rdevice.c diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile index f77bb522cab7..ca91d2c3642f 100644 --- a/emulators/atari800/Makefile +++ b/emulators/atari800/Makefile @@ -1,23 +1,20 @@ -# $NetBSD: Makefile,v 1.55 2019/05/05 10:12:59 adam Exp $ +# $NetBSD: Makefile,v 1.56 2020/01/18 21:33:13 nia Exp $ -DISTNAME= atari800-4.1.0-src +DISTNAME= atari800-4.2.0-src PKGNAME= ${DISTNAME:S/-src//} CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=atari800/} +MASTER_SITES= ${MASTER_SITE_GITHUB:=atari800/} +MASTER_SITES+= http://www.emulators.com/freefile/ EXTRACT_SUFX= .tgz -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} xf25.zip +DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} pcxf380.zip +GITHUB_PROJECT= atari800 +GITHUB_RELEASE= ATARI800_${PKGVERSION_NOREV:S/./_/g} MAINTAINER= adam@NetBSD.org HOMEPAGE= https://atari800.github.io/ COMMENT= Atari 800, 800XL, 130XE and 5200 emulator LICENSE= gnu-gpl-v2 -RESTRICTED= copyrighted ROM images -NO_BIN_ON_CDROM= ${RESTRICTED} -NO_BIN_ON_FTP= ${RESTRICTED} -NO_SRC_ON_CDROM= ${RESTRICTED} -NO_SRC_ON_FTP= ${RESTRICTED} - WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} USE_TOOLS+= gmake unzip CONFIGURE_ARGS+= --disable-sdltest @@ -37,7 +34,7 @@ SUBST_FILES.cfg-path= src/cfg.c SUBST_SED.cfg-path= -e 's,"/etc,"${PREFIX}/share/atari800,g' post-extract: - cd ${WRKDIR} && unzip -Lqo ${DISTDIR}/xf25.zip + cd ${WRKDIR} && unzip -Lqo ${DISTDIR}/pcxf380.zip sed -e 's,@PREFIX@,${PREFIX},g' ${FILESDIR}/atari800.cfg \ >${WRKSRC}/atari800.cfg @@ -47,7 +44,6 @@ post-install: .include "../../devel/SDL/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" -.include "../../mk/oss.buildlink3.mk" .include "../../mk/readline.buildlink3.mk" .include "../../mk/termcap.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/atari800/PLIST b/emulators/atari800/PLIST index be4e5553aa72..444586b57f87 100644 --- a/emulators/atari800/PLIST +++ b/emulators/atari800/PLIST @@ -1,17 +1,22 @@ -@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:51:01 joerg Exp $ +@comment $NetBSD: PLIST,v 1.5 2020/01/18 21:33:13 nia Exp $ bin/atari800 man/man1/atari800.1 +share/atari800/advent1.atr +share/atari800/analog51.xfd +share/atari800/analog52.xfd share/atari800/atari800.cfg share/atari800/ataribas.rom share/atari800/atariosb.rom share/atari800/atarixl.rom -share/atari800/demos1.xfd -share/atari800/demos2.xfd +share/atari800/comdem51.xfd +share/atari800/demos.xfd share/atari800/dos25.xfd -share/atari800/mydos45d.atr +share/atari800/games5.atr +share/atari800/mydos45d.xfd +share/atari800/startrek.xfd share/doc/atari800/COPYING share/doc/atari800/INSTALL share/doc/atari800/NEWS share/doc/atari800/README -share/doc/atari800/README.1ST +share/doc/atari800/README.TXT share/doc/atari800/USAGE diff --git a/emulators/atari800/distinfo b/emulators/atari800/distinfo index b7fe98f1415d..32e1a6c0ff73 100644 --- a/emulators/atari800/distinfo +++ b/emulators/atari800/distinfo @@ -1,12 +1,13 @@ -$NetBSD: distinfo,v 1.24 2019/05/05 10:12:59 adam Exp $ +$NetBSD: distinfo,v 1.25 2020/01/18 21:33:13 nia Exp $ -SHA1 (atari800-4.1.0-src.tgz) = 70ef4211602be5b5003f361b32f31ad8df01942e -RMD160 (atari800-4.1.0-src.tgz) = 8d665a11cb51760cfacc5015752846b3dd4d524b -SHA512 (atari800-4.1.0-src.tgz) = 0eb5f072683c142b8baa30bd646cef58e1015ec85151446cbce408c7c063fb65560bc250a0da8dede8500fd273737a15325e89cdd7ea75df78d957999bd16a03 -Size (atari800-4.1.0-src.tgz) = 6784763 bytes -SHA1 (xf25.zip) = e65923fd3a4845c1c72d1677db0fda969187eb42 -RMD160 (xf25.zip) = e3960898223dd4d1b9a9cc5cfb1251bd726ea5a7 -SHA512 (xf25.zip) = 306612fc2af41ed10d76103af83e141cfd8bd3ba2ea3cbd1d0b81d4d5b0108c06948a5c626648c8a2424536757a42a3f8b9af1fb63fa3c31096447ffed0f9923 -Size (xf25.zip) = 188942 bytes -SHA1 (patch-configure) = bd13b2352f6f3bf847639427bc707e63fecc406f +SHA1 (atari800-4.2.0-src.tgz) = ce9d56d4f4dee439215ac5b044f3a9756b9f63e0 +RMD160 (atari800-4.2.0-src.tgz) = bc8b8c953fe2d1c2907c625beff8427967c74adb +SHA512 (atari800-4.2.0-src.tgz) = 1236a8e05bf878e4514ae8e9f1556e0961a7f11ff0333eef415af455d217f712d5c6ededdd343dff6ba1aab777e19997bf9ecb859408187d69fc141301ecba31 +Size (atari800-4.2.0-src.tgz) = 7047710 bytes +SHA1 (pcxf380.zip) = b9b7b8e3536dd6ffced473b00b54f9a274004004 +RMD160 (pcxf380.zip) = e3061a54b6e9c88379f4366b2ccad3cf3b8e5270 +SHA512 (pcxf380.zip) = 98181f0f3a30edcadb3c704dc4afda06708da3982a378e31a47d6b7ac8d3f8661753843de8fc8e599970ee9adf5f94f08213447d0c2dd75486a07f9d98ade78c +Size (pcxf380.zip) = 590041 bytes +SHA1 (patch-configure) = cbc99c9073186335148cdaf06bd1f77aabd33e94 +SHA1 (patch-src_rdevice.c) = a6ec9f45c5f27704a47e306496213615a9bb5f09 SHA1 (patch-src_sound__oss.c) = 73b51491aee42e5657584bd8b58127e9cd8e5d87 diff --git a/emulators/atari800/patches/patch-configure b/emulators/atari800/patches/patch-configure index e35b75a19a08..b22458a11186 100644 --- a/emulators/atari800/patches/patch-configure +++ b/emulators/atari800/patches/patch-configure @@ -1,10 +1,10 @@ -$NetBSD: patch-configure,v 1.2 2019/05/05 10:12:59 adam Exp $ +$NetBSD: patch-configure,v 1.3 2020/01/18 21:33:13 nia Exp $ Compatibility fixes. ---- configure.orig 2019-04-14 08:27:50.000000000 +0000 +--- configure.orig 2019-12-28 17:00:31.000000000 +0000 +++ configure -@@ -9050,10 +9050,7 @@ $as_echo "#define SUPPORTS_PLATFORM_TIME +@@ -9143,10 +9143,7 @@ $as_echo "#define SUPPORTS_PLATFORM_TIME LIBS="$LIBS $SDL_LIBS" CPPFLAGS="$CPPFLAGS $SDL_CFLAGS" if [ "$a8_host" = "win" ]; then @@ -15,7 +15,16 @@ Compatibility fixes. fi a8_use_sdl=yes -@@ -10114,10 +10111,7 @@ $as_echo "#define SUPPORTS_PLATFORM_TIME +@@ -9527,7 +9524,7 @@ fi + + + +-if [ "$a8_target" == "libatari800" ]; then ++if [ "$a8_target" = "libatari800" ]; then + WANT_NEW_CYCLE_EXACT=yes + WANT_VERY_SLOW=no + WANT_CRASH_MENU=no +@@ -10245,10 +10242,7 @@ $as_echo "#define SUPPORTS_PLATFORM_TIME LIBS="$LIBS $SDL_LIBS" CPPFLAGS="$CPPFLAGS $SDL_CFLAGS" if [ "$a8_host" = "win" ]; then @@ -26,3 +35,21 @@ Compatibility fixes. fi a8_use_sdl=yes +@@ -10621,7 +10615,7 @@ $as_echo "#define VOICEBOX 1" >>confdefs + fi + + +- if [ "$with_sound" == "libatari800" ]; then ++ if [ "$with_sound" = "libatari800" ]; then + WANT_SOUND_CALLBACK=no + WANT_CONSOLE_SOUND=yes + WANT_SERIO_SOUND=yes +@@ -10985,7 +10979,7 @@ $as_echo "#define POKEYREC 1" >>confdefs + + fi + +-if [ "$WANT_POKEYREC" == "yes" ]; then ++if [ "$WANT_POKEYREC" = "yes" ]; then + # Check whether --enable-largefile was given. + if test "${enable_largefile+set}" = set; then : + enableval=$enable_largefile; diff --git a/emulators/atari800/patches/patch-src_rdevice.c b/emulators/atari800/patches/patch-src_rdevice.c new file mode 100644 index 000000000000..5d57e80a548c --- /dev/null +++ b/emulators/atari800/patches/patch-src_rdevice.c @@ -0,0 +1,18 @@ +$NetBSD: patch-src_rdevice.c,v 1.1 2020/01/18 21:33:13 nia Exp $ + +These are not architecture-specific. + +--- src/rdevice.c.orig 2019-12-28 17:00:29.000000000 +0000 ++++ src/rdevice.c +@@ -820,9 +820,9 @@ static void open_connection(char * addre + #if defined(R_SERIAL) && !defined(DREAMCAST) + #ifdef __linux__ + #define TTY_DEV_NAME "/dev/ttyS0" /* Linux */ +-#elif defined (__NetBSD__) && defined(__i386__) ++#elif defined (__NetBSD__) + #define TTY_DEV_NAME "/dev/tty00" /* NetBSD/x86 */ +-#elif defined (__FreeBSD__) && defined(__i386__) ++#elif defined (__FreeBSD__) + #define TTY_DEV_NAME "/dev/ttyd1" /* FreeBSD/x86 */ + #elif defined (__sun__) + #define TTY_DEV_NAME "/dev/ttya" /* Solaris */