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 floppydiff -r1.44 -r1.45 pkgsrc/emulators/hatari/Makefile
(adam)
@@ -1,43 +1,44 @@ | @@ -1,43 +1,44 @@ | |||
1 | # $NetBSD: Makefile,v 1.44 2016/07/09 13:03:46 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.45 2016/11/06 15:39:28 adam Exp $ | |
2 | 2 | |||
3 | DISTNAME= hatari-1.9.0 | 3 | DISTNAME= hatari-2.0.0 | |
4 | CATEGORIES= emulators | 4 | CATEGORIES= emulators | |
5 | MASTER_SITES= http://download.tuxfamily.org/hatari/${PKGVERSION_NOREV}/ | 5 | MASTER_SITES= http://download.tuxfamily.org/hatari/${PKGVERSION_NOREV}/ | |
6 | EXTRACT_SUFX= .tar.bz2 | 6 | EXTRACT_SUFX= .tar.bz2 | |
7 | 7 | |||
8 | MAINTAINER= pkgsrc-users@NetBSD.org | 8 | MAINTAINER= pkgsrc-users@NetBSD.org | |
9 | HOMEPAGE= http://hatari.tuxfamily.org/ | 9 | HOMEPAGE= http://hatari.tuxfamily.org/ | |
10 | COMMENT= Atari ST emulator | 10 | COMMENT= Atari ST emulator | |
11 | LICENSE= gnu-gpl-v2 | 11 | LICENSE= gnu-gpl-v2 | |
12 | 12 | |||
13 | USE_CMAKE= yes | 13 | USE_CMAKE= yes | |
14 | USE_LANGUAGES= c | 14 | USE_LANGUAGES= c | |
15 | CMAKE_ARGS+= -DENABLE_OSX_BUNDLE:BOOL=0 | 15 | CMAKE_ARGS+= -DENABLE_OSX_BUNDLE:BOOL=0 | |
16 | 16 | |||
17 | PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # not yet ported as of 1.7.0 | 17 | PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # not yet ported as of 1.7.0 | |
18 | ||||
18 | REPLACE_PYTHON+= python-ui/config.py | 19 | REPLACE_PYTHON+= python-ui/config.py | |
19 | REPLACE_PYTHON+= python-ui/debugui.py | 20 | REPLACE_PYTHON+= python-ui/debugui.py | |
20 | REPLACE_PYTHON+= python-ui/dialogs.py | 21 | REPLACE_PYTHON+= python-ui/dialogs.py | |
21 | REPLACE_PYTHON+= python-ui/gentypes.py | 22 | REPLACE_PYTHON+= python-ui/gentypes.py | |
22 | REPLACE_PYTHON+= python-ui/hatari.py | 23 | REPLACE_PYTHON+= python-ui/hatari.py | |
23 | REPLACE_PYTHON+= python-ui/hatariui.py | 24 | REPLACE_PYTHON+= python-ui/hatariui.py | |
24 | REPLACE_PYTHON+= python-ui/tests/pygtk-hello-world.py | 25 | REPLACE_PYTHON+= python-ui/tests/pygtk-hello-world.py | |
25 | REPLACE_PYTHON+= python-ui/uihelpers.py | 26 | REPLACE_PYTHON+= python-ui/uihelpers.py | |
26 | REPLACE_PYTHON+= tests/tosboot/tos_tester.py | 27 | REPLACE_PYTHON+= tests/tosboot/tos_tester.py | |
27 | REPLACE_PYTHON+= tools/atari-convert-dir.py | 28 | REPLACE_PYTHON+= tools/atari-convert-dir.py | |
28 | REPLACE_PYTHON+= tools/atari-hd-image.sh | 29 | REPLACE_PYTHON+= tools/atari-hd-image.sh | |
29 | REPLACE_PYTHON+= tools/debugger/hatari_profile.py | 30 | REPLACE_PYTHON+= tools/debugger/hatari_profile.py | |
30 | REPLACE_PYTHON+= tools/debugger/hatari_spinloop.py | 31 | REPLACE_PYTHON+= tools/debugger/hatari_spinloop.py | |
31 | REPLACE_PYTHON+= tools/hconsole/example.py | 32 | REPLACE_PYTHON+= tools/hconsole/example.py | |
32 | REPLACE_PYTHON+= tools/hconsole/hconsole.py | 33 | REPLACE_PYTHON+= tools/hconsole/hconsole.py | |
33 | 34 | |||
34 | INSTALLATION_DIRS+= share/doc/hatari | 35 | INSTALLATION_DIRS+= share/doc/hatari | |
35 | 36 | |||
36 | .include "../../audio/portaudio-devel/buildlink3.mk" | 37 | .include "../../audio/portaudio-devel/buildlink3.mk" | |
37 | .include "../../devel/SDL/buildlink3.mk" | 38 | .include "../../devel/SDL2/buildlink3.mk" | |
38 | .include "../../devel/zlib/buildlink3.mk" | 39 | .include "../../devel/zlib/buildlink3.mk" | |
39 | .include "../../graphics/hicolor-icon-theme/buildlink3.mk" | 40 | .include "../../graphics/hicolor-icon-theme/buildlink3.mk" | |
40 | .include "../../graphics/png/buildlink3.mk" | 41 | .include "../../graphics/png/buildlink3.mk" | |
41 | .include "../../lang/python/application.mk" | 42 | .include "../../lang/python/application.mk" | |
42 | .include "../../sysutils/desktop-file-utils/desktopdb.mk" | 43 | .include "../../sysutils/desktop-file-utils/desktopdb.mk" | |
43 | .include "../../mk/bsd.pkg.mk" | 44 | .include "../../mk/bsd.pkg.mk" |
@@ -1,38 +1,39 @@ | @@ -1,38 +1,39 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.17 2015/11/23 19:40:39 adam Exp $ | 1 | @comment $NetBSD: PLIST,v 1.18 2016/11/06 15:39:28 adam Exp $ | |
2 | bin/atari-convert-dir | 2 | bin/atari-convert-dir | |
3 | bin/atari-hd-image | 3 | bin/atari-hd-image | |
4 | bin/gst2ascii | 4 | bin/gst2ascii | |
5 | bin/hatari | 5 | bin/hatari | |
6 | bin/hatari_profile.py | 6 | bin/hatari_profile.py | |
7 | bin/hatariui | 7 | bin/hatariui | |
8 | bin/hmsa | 8 | bin/hmsa | |
9 | bin/zip2st | 9 | bin/zip2st | |
10 | man/man1/atari-convert-dir.1 | 10 | man/man1/atari-convert-dir.1 | |
11 | man/man1/atari-hd-image.1 | 11 | man/man1/atari-hd-image.1 | |
12 | man/man1/gst2ascii.1 | 12 | man/man1/gst2ascii.1 | |
13 | man/man1/hatari.1 | 13 | man/man1/hatari.1 | |
14 | man/man1/hatari_profile.1 | 14 | man/man1/hatari_profile.1 | |
15 | man/man1/hatariui.1 | 15 | man/man1/hatariui.1 | |
16 | man/man1/hconsole.1 | 16 | man/man1/hconsole.1 | |
17 | man/man1/hmsa.1 | 17 | man/man1/hmsa.1 | |
18 | man/man1/zip2st.1 | 18 | man/man1/zip2st.1 | |
19 | share/applications/hatari.desktop | 19 | share/applications/hatari.desktop | |
20 | share/applications/hatariui.desktop | 20 | share/applications/hatariui.desktop | |
21 | share/doc/hatari/authors.txt | 21 | share/doc/hatari/authors.txt | |
22 | share/doc/hatari/compatibility.html | 22 | share/doc/hatari/compatibility.html | |
23 | share/doc/hatari/emutos.txt | 23 | share/doc/hatari/emutos.txt | |
24 | share/doc/hatari/images/callgraph.png | 24 | share/doc/hatari/images/callgraph.png | |
25 | share/doc/hatari/images/callgraph.svg | 25 | share/doc/hatari/images/callgraph.svg | |
26 | share/doc/hatari/images/cpu.png | |||
26 | share/doc/hatari/images/devices.png | 27 | share/doc/hatari/images/devices.png | |
27 | share/doc/hatari/images/fileselector.png | 28 | share/doc/hatari/images/fileselector.png | |
28 | share/doc/hatari/images/floppydisks.png | 29 | share/doc/hatari/images/floppydisks.png | |
29 | share/doc/hatari/images/harddisks.png | 30 | share/doc/hatari/images/harddisks.png | |
30 | share/doc/hatari/images/joystick.png | 31 | share/doc/hatari/images/joystick.png | |
31 | share/doc/hatari/images/kcachegrind.png | 32 | share/doc/hatari/images/kcachegrind.png | |
32 | share/doc/hatari/images/keyboard.png | 33 | share/doc/hatari/images/keyboard.png | |
33 | share/doc/hatari/images/main.png | 34 | share/doc/hatari/images/main.png | |
34 | share/doc/hatari/images/memory.png | 35 | share/doc/hatari/images/memory.png | |
35 | share/doc/hatari/images/monitor.png | 36 | share/doc/hatari/images/monitor.png | |
36 | share/doc/hatari/images/newfloppy.png | 37 | share/doc/hatari/images/newfloppy.png | |
37 | share/doc/hatari/images/screen.png | 38 | share/doc/hatari/images/screen.png | |
38 | share/doc/hatari/images/sound.png | 39 | share/doc/hatari/images/sound.png |
@@ -1,8 +1,8 @@ | @@ -1,8 +1,8 @@ | |||
1 | $NetBSD: distinfo,v 1.21 2016/04/21 11:31:22 jperkin Exp $ | 1 | $NetBSD: distinfo,v 1.22 2016/11/06 15:39:28 adam Exp $ | |
2 | 2 | |||
3 | SHA1 (hatari-1.9.0.tar.bz2) = a4d4613704573ea4c9f6efc7b10ce0304cc0d514 | 3 | SHA1 (hatari-2.0.0.tar.bz2) = 9764f4a4c568908f614a474459691ddf6c450fd8 | |
4 | RMD160 (hatari-1.9.0.tar.bz2) = 0bc9bd21a81211ebf293911d9aaa5e9cb84c0400 | 4 | RMD160 (hatari-2.0.0.tar.bz2) = 5277b0b9ffc65b7e604669498408f68e5da5ce77 | |
5 | SHA512 (hatari-1.9.0.tar.bz2) = 916138aecbb105729def2f4338415f248f556293e948ac91b2806f743f186d008684299f73ff49a71330ca7a170d5172b0e4c821b55d9d915054529df34d206e | 5 | SHA512 (hatari-2.0.0.tar.bz2) = 61dea83599182d3064772bfdf13a4dbe4b5e641f7aeba2ef1891296b275b1e861ca0ef70c875ea6fe07b45d5c959c60e5f791b9ff0ba7371a56a1502543486f2 | |
6 | Size (hatari-1.9.0.tar.bz2) = 2379016 bytes | 6 | Size (hatari-2.0.0.tar.bz2) = 3899087 bytes | |
7 | SHA1 (patch-aa) = 870a2855a0fc74e22d6222c4df74fcaf21692c75 | 7 | SHA1 (patch-aa) = 4a8b8e9938752fb9f041c5bd81b5bcaa549521e0 | |
8 | SHA1 (patch-ab) = c030a27ce9dcf69190adec80923f23ec8d8ee874 | 8 | SHA1 (patch-ab) = c030a27ce9dcf69190adec80923f23ec8d8ee874 |
@@ -1,21 +1,21 @@ | @@ -1,21 +1,21 @@ | |||
1 | $NetBSD: patch-aa,v 1.3 2016/04/21 11:31:22 jperkin Exp $ | 1 | $NetBSD: patch-aa,v 1.4 2016/11/06 15:39:28 adam Exp $ | |
2 | 2 | |||
3 | Add OF() compat macro. | 3 | Add OF() compat macro. | |
4 | 4 | |||
5 | --- src/includes/unzip.h.orig 2003-03-30 14:39:27.000000000 +0100 | 5 | --- src/includes/unzip.h.orig 2016-11-03 21:25:43.000000000 +0000 | |
6 | +++ src/includes/unzip.h | 6 | +++ src/includes/unzip.h | |
7 | @@ -49,6 +49,14 @@ | 7 | @@ -49,6 +49,14 @@ | |
8 | #ifndef _unz_H | 8 | #if !defined(_unz_H) && defined(HAVE_ZLIB_H) | |
9 | #define _unz_H | 9 | #define _unz_H | |
10 | 10 | |||
11 | +#ifndef OF /* function prototypes */ | 11 | +#ifndef OF /* function prototypes */ | |
12 | +# ifdef STDC | 12 | +# ifdef STDC | |
13 | +# define OF(args) args | 13 | +# define OF(args) args | |
14 | +# else | 14 | +# else | |
15 | +# define OF(args) () | 15 | +# define OF(args) () | |
16 | +# endif | 16 | +# endif | |
17 | +#endif | 17 | +#endif | |
18 | + | 18 | + | |
19 | #ifdef __cplusplus | 19 | #ifdef __cplusplus | |
20 | extern "C" { | 20 | extern "C" { | |
21 | #endif | 21 | #endif |