Version 2.0.0 (2016-11-04)

---------------------------
Emulation:
- Machine:
  - Support for MegaST & MegaSTE machines added
    (this also replaces the Real Time Clock / RTC option, since this chip
    is only available on the Mega machines)
  - The general purpose registers of the TT SCU are now correctly emulated
    (this fixes the problem with AHDI not finding any partitions during boot)
- HD:
  - Fix: Disable GEMDOS opcodes after GEMDOS drive is disabled
  - Fix: GEMDOS HD can now be initialized multiple times,
    e.g. when running EmuTOS RAM image from a normal TOS
  - Fix: WORD access to IDE data register at 0xf00002
  - Fix: '*.*' pattern with GEMDOS HD should match also files
    without extension
- Video:
  - Full rewrite of the GLUE state machine, including support for the
    4 wakeup states in STF mode, as well as more accurate video timings
    (hbl, timer b, top/bottom and left/right removal, mixing 50/60/71 Hz
    lines)
  - Correctly shows the last 8 pixels for STE 224 byte overscan
  - Fix: reading video counter $FF8205/07/09 after modifying it
    while display is ON
  - Fix: location of the video counter's restart when screen runs at 60 Hz
  - TT: sync ST & TT color registers immediately on write, handle
    palette bank setting correctly, fix duochrome colors
  - Falcon: handle byte access special case for ST color registers
  - Falcon: border color support also in HiColor
  - better hbl/timer b interrupts when CPU runs at 16/32 MHz
- Sound:
  - Special cases for STE DMA sound when start address = end address
  - Increase STE DMA volume when compared to the YM2149 volume
  - Greatly improve Falcon DMA sound
- CPU:
  - use WinUAE CPU for STF/STE mode too, not just Falcon (old CPU core
    is considered deprecated)
  - improved IACK and simultaneous interrupts
  - access IO regs on 2 cycle boundaries when possible
  - More accurate 68060 mode (instructions from previous CPU versions
    removed in 68060 aren't accepted/emulated anymore)
  - Misc bus error / IO mem register handling fixes for TT & Falcon
    (e.g. add TT DIP switch register handler)
- Blitter:
  - Better bus arbitration when blitter is started
  - Don't cause bus error when accessing regions causing CPU bus error
- Fixes to DSP addressing
- Floppy:
  - Fix the value of the WPT bit when inserting/ejecting a write protected
    floppy

4 files changed, 15 insertions, 13 deletions

diff --git a/emulators/hatari/Makefile b/emulators/hatari/Makefile
index 9a1a8ca6a88..7ca23c886b9 100644
--- a/emulators/hatari/Makefile
+++ b/emulators/hatari/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.44 2016/07/09 13:03:46 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2016/11/06 15:39:28 adam Exp $
 
-DISTNAME=	hatari-1.9.0
+DISTNAME=	hatari-2.0.0
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.tuxfamily.org/hatari/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tar.bz2
@@ -15,6 +15,7 @@ USE_LANGUAGES=		c
 CMAKE_ARGS+=		-DENABLE_OSX_BUNDLE:BOOL=0
 
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 # not yet ported as of 1.7.0
+
 REPLACE_PYTHON+=	python-ui/config.py
 REPLACE_PYTHON+=	python-ui/debugui.py
 REPLACE_PYTHON+=	python-ui/dialogs.py
@@ -34,7 +35,7 @@ REPLACE_PYTHON+=	tools/hconsole/hconsole.py
 INSTALLATION_DIRS+=	share/doc/hatari
 
 .include "../../audio/portaudio-devel/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
+.include "../../devel/SDL2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/emulators/hatari/PLIST b/emulators/hatari/PLIST
index b389d4d9998..4be5a1bf7ad 100644
--- a/emulators/hatari/PLIST
+++ b/emulators/hatari/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2015/11/23 19:40:39 adam Exp $
+@comment $NetBSD: PLIST,v 1.18 2016/11/06 15:39:28 adam Exp $
 bin/atari-convert-dir
 bin/atari-hd-image
 bin/gst2ascii
@@ -23,6 +23,7 @@ share/doc/hatari/compatibility.html
 share/doc/hatari/emutos.txt
 share/doc/hatari/images/callgraph.png
 share/doc/hatari/images/callgraph.svg
+share/doc/hatari/images/cpu.png
 share/doc/hatari/images/devices.png
 share/doc/hatari/images/fileselector.png
 share/doc/hatari/images/floppydisks.png
diff --git a/emulators/hatari/distinfo b/emulators/hatari/distinfo
index 3b5fcc9e647..c206d8a53f5 100644
--- a/emulators/hatari/distinfo
+++ b/emulators/hatari/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.21 2016/04/21 11:31:22 jperkin Exp $
+$NetBSD: distinfo,v 1.22 2016/11/06 15:39:28 adam Exp $
 
-SHA1 (hatari-1.9.0.tar.bz2) = a4d4613704573ea4c9f6efc7b10ce0304cc0d514
-RMD160 (hatari-1.9.0.tar.bz2) = 0bc9bd21a81211ebf293911d9aaa5e9cb84c0400
-SHA512 (hatari-1.9.0.tar.bz2) = 916138aecbb105729def2f4338415f248f556293e948ac91b2806f743f186d008684299f73ff49a71330ca7a170d5172b0e4c821b55d9d915054529df34d206e
-Size (hatari-1.9.0.tar.bz2) = 2379016 bytes
-SHA1 (patch-aa) = 870a2855a0fc74e22d6222c4df74fcaf21692c75
+SHA1 (hatari-2.0.0.tar.bz2) = 9764f4a4c568908f614a474459691ddf6c450fd8
+RMD160 (hatari-2.0.0.tar.bz2) = 5277b0b9ffc65b7e604669498408f68e5da5ce77
+SHA512 (hatari-2.0.0.tar.bz2) = 61dea83599182d3064772bfdf13a4dbe4b5e641f7aeba2ef1891296b275b1e861ca0ef70c875ea6fe07b45d5c959c60e5f791b9ff0ba7371a56a1502543486f2
+Size (hatari-2.0.0.tar.bz2) = 3899087 bytes
+SHA1 (patch-aa) = 4a8b8e9938752fb9f041c5bd81b5bcaa549521e0
 SHA1 (patch-ab) = c030a27ce9dcf69190adec80923f23ec8d8ee874
diff --git a/emulators/hatari/patches/patch-aa b/emulators/hatari/patches/patch-aa
index 753b9b09c2d..1cd7a67a1ca 100644
--- a/emulators/hatari/patches/patch-aa
+++ b/emulators/hatari/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.3 2016/04/21 11:31:22 jperkin Exp $
+$NetBSD: patch-aa,v 1.4 2016/11/06 15:39:28 adam Exp $
 
 Add OF() compat macro.
 
---- src/includes/unzip.h.orig	2003-03-30 14:39:27.000000000 +0100
+--- src/includes/unzip.h.orig	2016-11-03 21:25:43.000000000 +0000
 +++ src/includes/unzip.h
 @@ -49,6 +49,14 @@
- #ifndef _unz_H
+ #if !defined(_unz_H) && defined(HAVE_ZLIB_H)
  #define _unz_H
  
 +#ifndef OF /* function prototypes */