atari800: updated to 3.1.0

Version 3.1.0:

General new features:
---------------------
 * More accurate emulation of PAL colours (based on analysis of oscillograms
   of real PAL GTIA output)

 * Improved PAL blending, working on all grayscale pixels and is accurate now
   (can be enabled/disabled in "TV effect" display settings)

 * common sound layer implemented (SDL, JavaNVM, OSS, DOS) with synchro sound.

 * synchronized sound is now supported by both POKEY sound engines.

 * turbo mode (F12) is considerably faster

 * Added cartridge mapping used by "Turbo Hit"/"Atari Blizzard Hit".
 * Added MegaMax 2 MB cartridge mapping.
 * Added read-only support for the 4 MB Flash MegaCart mapping.
 * Added minimal support for The!Cart.

General Fixes:
--------------
 * fixed possible unnecessary cartridge bank switching
 * fixes and clean up in Java port
 * fixed diagnostic cartridge cold start (doesn't send Start+Option)
 * fixed two old bugs in DOS sound (pitch being wrong and sound missing)
 * fixed keyboard not working for ncurses video and OSS sound

7 files changed, 42 insertions, 55 deletions

diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile
index ada649acf7e..f4669f5f592 100644
--- a/emulators/atari800/Makefile
+++ b/emulators/atari800/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.52 2015/04/25 14:20:44 tnn Exp $
+# $NetBSD: Makefile,v 1.53 2017/12/14 22:12:19 adam Exp $
 
-DISTNAME=	atari800-3.0.0
-PKGREVISION=	1
+DISTNAME=	atari800-3.1.0
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=atari800/}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} xf25.zip
 
 MAINTAINER=	adam@NetBSD.org
-HOMEPAGE=	http://atari800.sourceforge.net/
+HOMEPAGE=	https://atari800.github.io/
 COMMENT=	Atari 800, 800XL, 130XE and 5200 emulator
 LICENSE=	gnu-gpl-v2
 
@@ -19,26 +18,28 @@ NO_SRC_ON_FTP=		${RESTRICTED}
 
 WRKSRC=			${WRKDIR}/${DISTNAME}/src
 USE_TOOLS+=		gmake unzip
+CONFIGURE_ARGS+=	--disable-sdltest
+CONFIGURE_ARGS+=	--with-sound=sdl
+CONFIGURE_ARGS+=	--with-video=sdl
 GNU_CONFIGURE=		yes
 
 INSTALLATION_DIRS+=	${PREFIX}/share/atari800
 
-.include "options.mk"
-
 # override HOME to avoid picking up a bad ${HOME}/.atari800 during the build
 MAKE_FLAGS+=	HOME=${WRKSRC}
 
 post-extract:
 	cd ${WRKDIR} && unzip -Lqo ${DISTDIR}/xf25.zip
-	sed -e 's,@PREFIX@,${PREFIX},g' <${FILESDIR}/atari800.cfg \
+	sed -e 's,@PREFIX@,${PREFIX},g' ${FILESDIR}/atari800.cfg \
 		>${WRKSRC}/atari800.cfg
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/*.rom ${WRKDIR}/*.xfd ${WRKDIR}/*.atr \
 		${WRKSRC}/atari800.cfg ${DESTDIR}${PREFIX}/share/atari800/
 
-.include "../../mk/readline.buildlink3.mk"
+.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/distinfo b/emulators/atari800/distinfo
index 2edf95b0941..415d778bb72 100644
--- a/emulators/atari800/distinfo
+++ b/emulators/atari800/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.20 2017/03/23 17:06:49 joerg Exp $
+$NetBSD: distinfo,v 1.21 2017/12/14 22:12:19 adam Exp $
 
-SHA1 (atari800-3.0.0.tar.gz) = 24dca4580805d2c1d6aa28a2b440c552a2dd171f
-RMD160 (atari800-3.0.0.tar.gz) = 705e132d8f0e8a17f520a011fe6074bc27a6de20
-SHA512 (atari800-3.0.0.tar.gz) = 516afead4c03481afe426b4a8a9d0d71d95b1cfc02714372da694e885aee47c76296e7776220bb527a439c5d464a25408edc149dc4d6b6f042fd21061b420388
-Size (atari800-3.0.0.tar.gz) = 1480143 bytes
+SHA1 (atari800-3.1.0.tar.gz) = d81d57ae8cc14169521e3738d3ac1b2e18a95080
+RMD160 (atari800-3.1.0.tar.gz) = 8644aec61b8f9084d7ced672236d779bee1fedcc
+SHA512 (atari800-3.1.0.tar.gz) = c8f035c9be000c67dd854a14a236d165e6e2d30b5138f8772c6ea5c5290b0410525570e3ed9dcb2f9bcb129f97a36e6eef5993f0a5ad3cc993c6b59b127bcabe
+Size (atari800-3.1.0.tar.gz) = 1492289 bytes
 SHA1 (xf25.zip) = e65923fd3a4845c1c72d1677db0fda969187eb42
 RMD160 (xf25.zip) = e3960898223dd4d1b9a9cc5cfb1251bd726ea5a7
 SHA512 (xf25.zip) = 306612fc2af41ed10d76103af83e141cfd8bd3ba2ea3cbd1d0b81d4d5b0108c06948a5c626648c8a2424536757a42a3f8b9af1fb63fa3c31096447ffed0f9923
 Size (xf25.zip) = 188942 bytes
-SHA1 (patch-aa) = 2bd0dc856397aec91f01ad3ab0f3835d6e062aed
-SHA1 (patch-ab) = 23062b3f9f858914c668b522e2a76d068dd24abf
 SHA1 (patch-ac) = 28a10768c6214cbe3cad9006916dbfa28b70eb96
-SHA1 (patch-ad) = 1567687cd851d606616aa35dc36a4e63e839181a
+SHA1 (patch-cfg.c) = c8f22ca08b4fad2c24886dc8132c7269331b4f39
+SHA1 (patch-configure) = 9ad06b6a273b8efe6c628e40cde7ce4e304675cd
 SHA1 (patch-rdevice.c) = 9c17f7e600db506e7e6e9f1f3780e66b404813be
+SHA1 (patch-sound__oss.c) = 7318f96c460bbd9cb116401328e2368ce7be29ab
diff --git a/emulators/atari800/options.mk b/emulators/atari800/options.mk
deleted file mode 100644
index 68d85aabeb9..00000000000
--- a/emulators/atari800/options.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: options.mk,v 1.6 2013/05/19 07:35:56 adam Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.atari800
-PKG_SUPPORTED_OPTIONS=	sdl x11
-PKG_SUGGESTED_OPTIONS=	sdl
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mx11)
-CONFIGURE_ARGS+=	--target=x11
-.include "../../x11/libX11/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Msdl)
-CONFIGURE_ARGS+=	--target=default
-CONFIGURE_ARGS+=	--with-video=sdl
-.include "../../devel/SDL/buildlink3.mk"
-.endif
diff --git a/emulators/atari800/patches/patch-aa b/emulators/atari800/patches/patch-aa
deleted file mode 100644
index 3ebcbcea77d..00000000000
--- a/emulators/atari800/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2013/05/19 07:35:56 adam Exp $
-
---- sound_oss.c.orig	2011-11-16 18:01:37.000000000 +0000
-+++ sound_oss.c
-@@ -40,7 +40,7 @@
- #include "sound.h"
- #include "util.h"
- 
--static const char * const dspname = "/dev/dsp";
-+static const char * const dspname = DEVOSSAUDIO;
- static int dsprate = 22050;
- 
- static int sound_enabled = TRUE;
diff --git a/emulators/atari800/patches/patch-ab b/emulators/atari800/patches/patch-cfg.c
index c9004ab1264..9e1d812454d 100644
--- a/emulators/atari800/patches/patch-ab
+++ b/emulators/atari800/patches/patch-cfg.c
@@ -1,8 +1,10 @@
-$NetBSD: patch-ab,v 1.9 2013/05/19 07:35:56 adam Exp $
+$NetBSD: patch-cfg.c,v 1.1 2017/12/14 22:12:19 adam Exp $
 
---- cfg.c.orig	2011-04-18 01:47:48.000000000 +0000
+Provide PkgSrc path for the configuration file.
+
+--- cfg.c.orig	2014-04-05 19:40:14.000000000 +0000
 +++ cfg.c
-@@ -64,7 +64,7 @@ void CFG_FindROMImages(const char *direc
+@@ -68,7 +68,7 @@ int CFG_save_on_exit = FALSE;
  #endif
  
  #ifndef SYSTEM_WIDE_CFG_FILE
diff --git a/emulators/atari800/patches/patch-ad b/emulators/atari800/patches/patch-configure
index d0865340eac..be22594b29f 100644
--- a/emulators/atari800/patches/patch-ad
+++ b/emulators/atari800/patches/patch-configure
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.8 2013/05/19 07:35:56 adam Exp $
+$NetBSD: patch-configure,v 1.1 2017/12/14 22:12:19 adam Exp $
 
 Compatibility fixes.
 
---- configure.orig	2013-03-03 15:58:11.000000000 +0000
+--- configure.orig	2014-04-12 14:00:06.000000000 +0000
 +++ configure
-@@ -7347,11 +7347,8 @@ $as_echo "#define SDL 1" >>confdefs.h
+@@ -7577,11 +7577,8 @@ $as_echo "#define SUPPORTS_PLATFORM_TIME
              LIBS="$LIBS $SDL_LIBS"
              CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
              if [ "$a8_host" = "win" ]; then
@@ -16,7 +16,7 @@ Compatibility fixes.
              fi
              a8_use_sdl=yes
  
-@@ -8259,11 +8256,8 @@ $as_echo "#define SDL 1" >>confdefs.h
+@@ -8512,11 +8509,8 @@ $as_echo "#define SUPPORTS_PLATFORM_TIME
              LIBS="$LIBS $SDL_LIBS"
              CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
              if [ "$a8_host" = "win" ]; then
@@ -28,7 +28,7 @@ Compatibility fixes.
              fi
              a8_use_sdl=yes
  
-@@ -8601,7 +8595,7 @@ $as_echo "#define IDE 1" >>confdefs.h
+@@ -8870,7 +8864,7 @@ $as_echo "#define IDE 1" >>confdefs.h
  
      fi
  
diff --git a/emulators/atari800/patches/patch-sound__oss.c b/emulators/atari800/patches/patch-sound__oss.c
new file mode 100644
index 00000000000..70837e2e900
--- /dev/null
+++ b/emulators/atari800/patches/patch-sound__oss.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-sound__oss.c,v 1.1 2017/12/14 22:12:19 adam Exp $
+
+Do not hard-code sound device.
+
+--- sound_oss.c.orig	2013-12-15 23:17:45.000000000 +0000
++++ sound_oss.c
+@@ -36,7 +36,7 @@
+ 
+ #define DEBUG 0
+ 
+-static const char * const dspname = "/dev/dsp";
++static const char * const dspname = DEVOSSAUDIO;
+ 
+ static int dsp_fd;
+