CVS commit: pkgsrc/emulators/hatari

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Feb 23 13:23:05 UTC 2026

Modified Files:
        pkgsrc/emulators/hatari: Makefile PLIST distinfo
Added Files:
        pkgsrc/emulators/hatari/patches: patch-CMakeLists.txt
Removed Files:
        pkgsrc/emulators/hatari/patches: patch-src_paths.c

Log Message:
hatari: updated to 2.6.1

2.6.1

Emulation improvements:

MegaSTE:

When using cache, only compare 24 lowest bits of address
Don't update cache after a bus/address error

Falcon:

Create a fast ram buffer (_FRB) cookie when running with TT RAM
to fix a problem with floppy disk access

Video:

Add support for STE 224 bytes overscan in medium resolution
Set correct resolution in Shifter when accessing $FF8260 as word
(fix regression in Hatari 2.6.0)

VME for MegaSTE / TT:

VME memory regions should return bus error when no VME board is present

Emulator improvements:

Windows:

Fix: late locale init messes debugger readline history handling

GEMDOS HD:

Fix: caches were no always flushed on writing to emulated memory

Debugger:

Fix: show DEL character as non-printable in memdumps

CPU/FPU settings:

Disallow 68881/68882 FPU in 040/060 mode

Config / SDL GUI:

Default screenshot save directory override option
SDL GUI asks for file name when starting AVI recording
Fit Hatari screen dialog to smallest required size and
log errors on invalid dialog sizes

CLI options:

GEMDOS HD & screenshot dir options accept only existing directories

Fixed demos:

A Letter To Sommarhack by Effect (write word at $FF8260)
Partial fix for Double Rez Trouble by DHS (med res overscan lines)

Fixed programs:

Spectre 3.0 (Hatari v2.6 regression, MegaSTE cache)


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 pkgsrc/emulators/hatari/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/emulators/hatari/PLIST
cvs rdiff -u -r1.28 -r1.29 pkgsrc/emulators/hatari/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/emulators/hatari/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.1 -r0 pkgsrc/emulators/hatari/patches/patch-src_paths.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/hatari/Makefile
diff -u pkgsrc/emulators/hatari/Makefile:1.76 pkgsrc/emulators/hatari/Makefile:1.77
--- pkgsrc/emulators/hatari/Makefile:1.76       Thu Oct 23 20:36:49 2025
+++ pkgsrc/emulators/hatari/Makefile    Mon Feb 23 13:23:05 2026
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.76 2025/10/23 20:36:49 wiz Exp $
+# $NetBSD: Makefile,v 1.77 2026/02/23 13:23:05 adam Exp $
 
-DISTNAME=      hatari-2.4.1
-PKGREVISION=   6
+DISTNAME=      hatari-v2.6.1
+PKGNAME=       ${DISTNAME:S/-v/-/}
 CATEGORIES=    emulators
-MASTER_SITES=  https://www.aydogan.net/distfiles/emulators/
+MASTER_SITES=  https://framagit.org/hatari/hatari/-/archive/v${PKGVERSION_NOREV}/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -11,11 +11,10 @@ HOMEPAGE=   https://hatari.tuxfamily.org/
 COMMENT=       Atari ST emulator
 LICENSE=       gnu-gpl-v2
 
-USE_CMAKE=             yes
-USE_LANGUAGES=         c99
+USE_CC_FEATURES=       c99
+USE_LANGUAGES=         c
 CMAKE_CONFIGURE_ARGS+= -DENABLE_OSX_BUNDLE=OFF
 CMAKE_CONFIGURE_ARGS+= -DMANDIR=${PKGMANDIR}/man1
-CMAKE_CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
 
 REPLACE_PYTHON+=       python-ui/config.py
 REPLACE_PYTHON+=       python-ui/debugui.py
@@ -37,6 +36,7 @@ INSTALLATION_DIRS+=   share/doc/hatari
 
 .include "../../audio/portaudio/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"

Index: pkgsrc/emulators/hatari/PLIST
diff -u pkgsrc/emulators/hatari/PLIST:1.22 pkgsrc/emulators/hatari/PLIST:1.23
--- pkgsrc/emulators/hatari/PLIST:1.22  Thu Mar  2 06:24:33 2023
+++ pkgsrc/emulators/hatari/PLIST       Mon Feb 23 13:23:05 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2023/03/02 06:24:33 charlotte Exp $
+@comment $NetBSD: PLIST,v 1.23 2026/02/23 13:23:05 adam Exp $
 bin/atari-convert-dir
 bin/atari-hd-image
 bin/gst2ascii
@@ -22,6 +22,7 @@ share/doc/hatari/bugs.txt
 share/doc/hatari/compatibility.html
 share/doc/hatari/debugger.html
 share/doc/hatari/emutos.txt
+share/doc/hatari/hatari-ui.html
 share/doc/hatari/hconsole/release-notes.txt
 share/doc/hatari/images/callgraph.png
 share/doc/hatari/images/callgraph.svg
@@ -31,6 +32,17 @@ share/doc/hatari/images/devices.png
 share/doc/hatari/images/fileselector.png
 share/doc/hatari/images/floppydisks.png
 share/doc/hatari/images/harddisks.png
+share/doc/hatari/images/hatari-ui-0.7.png
+share/doc/hatari/images/hatari-ui-0.9.png
+share/doc/hatari/images/hatari-ui-debug.png
+share/doc/hatari/images/hatari-ui-input.png
+share/doc/hatari/images/hatari-ui-noembed.png
+share/doc/hatari/images/hatari-ui-peripherals.png
+share/doc/hatari/images/hatari-ui-quit.png
+share/doc/hatari/images/hatari-ui-setup-edit.png
+share/doc/hatari/images/hatari-ui-setup.png
+share/doc/hatari/images/hatari-ui-speed.png
+share/doc/hatari/images/hatari-ui-trace.png
 share/doc/hatari/images/joystick.png
 share/doc/hatari/images/kcachegrind.png
 share/doc/hatari/images/keyboard.png
@@ -59,7 +71,6 @@ share/hatari/hconsole/example-commands
 share/hatari/hconsole/example-debugger
 share/hatari/hconsole/example.py
 share/hatari/hconsole/hconsole.py
-share/hatari/tos.img
 share/icons/hicolor/128x128/apps/hatari.png
 share/icons/hicolor/128x128/mimetypes/application-vnd.fastcopy-disk-image.png
 share/icons/hicolor/128x128/mimetypes/application-vnd.msa-disk-image.png

Index: pkgsrc/emulators/hatari/distinfo
diff -u pkgsrc/emulators/hatari/distinfo:1.28 pkgsrc/emulators/hatari/distinfo:1.29
--- pkgsrc/emulators/hatari/distinfo:1.28       Thu Mar  2 06:24:33 2023
+++ pkgsrc/emulators/hatari/distinfo    Mon Feb 23 13:23:05 2026
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.28 2023/03/02 06:24:33 charlotte Exp $
+$NetBSD: distinfo,v 1.29 2026/02/23 13:23:05 adam Exp $
 
-BLAKE2s (hatari-2.4.1.tar.bz2) = 7617ee03a00a614c2b95cd72218f2178df1f5e132b4f732c32f1a099f0a34cfb
-SHA512 (hatari-2.4.1.tar.bz2) = 90c555150b0fa86b88e4ba3360384edf6afa05d45b82b3260853178b77fd542da6f31bd2e80c8307380fff9c61f0230545ec987e6e74b8c3d708bc5ef5ca8f42
-Size (hatari-2.4.1.tar.bz2) = 4446656 bytes
+BLAKE2s (hatari-v2.6.1.tar.bz2) = eeedb5cba6895eabadc8aab9889a67066e2ff5136c931838fcbc201765d5c6c9
+SHA512 (hatari-v2.6.1.tar.bz2) = c025334e32b84431dff96761876f5f078a7f175e22181e9357c17bb3871aa0d7626495bb1ad4fa0c6d94d22b5d045df5fcd99d5cdb089c911ce77a4f42a6448c
+Size (hatari-v2.6.1.tar.bz2) = 2128063 bytes
+SHA1 (patch-CMakeLists.txt) = ea8add332df88cbcf830c3cb16fc3c7076527f85
 SHA1 (patch-src_cpu_fpp__native.c) = 065c67d7c018cc1d1161b0a7d131e8bf66f74d8b
-SHA1 (patch-src_paths.c) = 9f547b97d18c676b5038d5349a35d46821a37d73

Added files:

Index: pkgsrc/emulators/hatari/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/emulators/hatari/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Mon Feb 23 13:23:05 2026
+++ pkgsrc/emulators/hatari/patches/patch-CMakeLists.txt        Mon Feb 23 13:23:05 2026
@@ -0,0 +1,17 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2026/02/23 13:23:05 adam Exp $
+
+Don't build universal binary on Darwin.
+
+--- CMakeLists.txt.orig        2026-02-23 11:31:25.155888710 +0000
++++ CMakeLists.txt
+@@ -6,10 +6,6 @@ if(NOT CMAKE_BUILD_TYPE)
+       set(CMAKE_BUILD_TYPE Release)
+ endif(NOT CMAKE_BUILD_TYPE)
+ 
+-if(APPLE AND CMAKE_BUILD_TYPE STREQUAL "Release")
+-      set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "Target architectures")
+-      set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13" CACHE STRING "Target minimum macOS version")
+-endif(APPLE AND CMAKE_BUILD_TYPE STREQUAL "Release")
+ 
+ project(Hatari C)
+ enable_testing()