CVS commit: pkgsrc/emulators/x16-emulator

["Jason R Thorpe" <thorpej%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   thorpej
Date:           Wed Oct 16 04:25:33 UTC 2024

Modified Files:
        pkgsrc/emulators/x16-emulator: Makefile distinfo
        pkgsrc/emulators/x16-emulator/patches: patch-Makefile patch-src_main.c

Log Message:
Update to R48 ("Cadmium"):

Features/Fixes
* Emulated VERA SPI clock has been updated to half of the VERA clock speed
  rather than the CPU clock.
* Trace for ROM banks 13-15 (x16edit and Basload) is now supported
  [stefan-b-jakobsson]
* Fixed debug reads from the stack and a few unbounded values in the
  debugger display
* VERA PSG: for the saw and triangle waves, the inverse of the pulse width
  value is XORed with the value of the wave. This is the behavior of VERA
  47.0.2 on hardware. [m00dawg]
* Allow setting the amount of RAM in the web version of the emulator
  [JimmyDansbo]
* Windows 11: Rounded corners should no longer cut off the lower left and
  lower right of the emulator window.
* New memory statistics feature [irmen]
* HostFS: Implement DOS "T"ell command
* Debugger now includes elapsed cpu clocks since the last breakpoint or step
* 65C816: Fixed stack relative indirect address calulation wrongly using the
  direct page [Fulgen301]
* 65C816: high bytes of .X and .Y are now cleared when PLP or RTI set x=1
  [cnelson20]
* 65C816: PEI no longer does improper page wraparound, [dp] indirect modes
  now properly read the address. [Fulgen301]


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/emulators/x16-emulator/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/emulators/x16-emulator/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/emulators/x16-emulator/patches/patch-Makefile
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/emulators/x16-emulator/patches/patch-src_main.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/x16-emulator/Makefile
diff -u pkgsrc/emulators/x16-emulator/Makefile:1.17 pkgsrc/emulators/x16-emulator/Makefile:1.18
--- pkgsrc/emulators/x16-emulator/Makefile:1.17 Sun Apr 21 19:56:10 2024
+++ pkgsrc/emulators/x16-emulator/Makefile      Wed Oct 16 04:25:32 2024
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2024/04/21 19:56:10 thorpej Exp $
+# $NetBSD: Makefile,v 1.18 2024/10/16 04:25:32 thorpej Exp $
 
-DISTNAME=      x16-emulator-47
+DISTNAME=      x16-emulator-48
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=X16Community/}
 GITHUB_PROJECT=        x16-emulator
@@ -11,7 +11,7 @@ HOMEPAGE=     http://commanderx16.com/
 COMMENT=       Emulator for the Commander X16 computer system
 LICENSE=       2-clause-bsd
 
-DEPENDS+=      x16-rom-47{,nb*}:../../emulators/x16-rom
+DEPENDS+=      x16-rom-48{,nb*}:../../emulators/x16-rom
 MAKE_ENV+=     ROM_RELATIVE_PATH=../share/x16/
 MAKE_ENV+=     GIT_REV=${GITHUB_TAG}
 

Index: pkgsrc/emulators/x16-emulator/distinfo
diff -u pkgsrc/emulators/x16-emulator/distinfo:1.10 pkgsrc/emulators/x16-emulator/distinfo:1.11
--- pkgsrc/emulators/x16-emulator/distinfo:1.10 Sun Apr 21 19:56:10 2024
+++ pkgsrc/emulators/x16-emulator/distinfo      Wed Oct 16 04:25:32 2024
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.10 2024/04/21 19:56:10 thorpej Exp $
+$NetBSD: distinfo,v 1.11 2024/10/16 04:25:32 thorpej Exp $
 
-BLAKE2s (x16-emulator-47.tar.gz) = 0a1715a3491890d7aef7e1eacaec414272766ce10121281349958e3b456ec7a0
-SHA512 (x16-emulator-47.tar.gz) = 5e7b45f4eb6dfbac223b6f7cfc4d6722e5d1f26c82271eedeab0a62e4f360fc24c912faf3a11bab27c15d18cec078d420835937023b84b5cf0fbf50bf8010139
-Size (x16-emulator-47.tar.gz) = 313027 bytes
-SHA1 (patch-Makefile) = bc5fa340969e56d8eb8f6d8e3d6527ac773a6d31
-SHA1 (patch-src_main.c) = 6b759386bc9e1a87a1b33763cc14da75cd4b755f
+BLAKE2s (x16-emulator-48.tar.gz) = 02d59384fd152eafbcde4724dfdc12ab6dbfa9600cd624c59b520d627eacc949
+SHA512 (x16-emulator-48.tar.gz) = c568951d9ba099621b4ce0c873d3110bec50550491e42dede001b8f2bdee7711f2b6ab97ebd7947d828500452b7b4948eca3ed56bb06f0d9c79de64e86788793
+Size (x16-emulator-48.tar.gz) = 315743 bytes
+SHA1 (patch-Makefile) = 5261cb99ae85b512668374b16e486fbf5579a984
+SHA1 (patch-src_main.c) = 4b2236369509cbb71d01b57d28bdfff1ebd298da

Index: pkgsrc/emulators/x16-emulator/patches/patch-Makefile
diff -u pkgsrc/emulators/x16-emulator/patches/patch-Makefile:1.4 pkgsrc/emulators/x16-emulator/patches/patch-Makefile:1.5
--- pkgsrc/emulators/x16-emulator/patches/patch-Makefile:1.4    Mon Nov 27 03:21:00 2023
+++ pkgsrc/emulators/x16-emulator/patches/patch-Makefile        Wed Oct 16 04:25:32 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-Makefile,v 1.4 2023/11/27 03:21:00 thorpej Exp $
+$NetBSD: patch-Makefile,v 1.5 2024/10/16 04:25:32 thorpej Exp $
 
 Honor CFLAGS/LDFLAGS.
 
@@ -6,10 +6,10 @@ Allow the default location of the X16 RO
 
 Allow GIT_REV to be overridden.
 
---- Makefile.orig      2023-11-06 03:36:56
-+++ Makefile   2023-11-27 03:00:05
-@@ -10,9 +10,9 @@ CFLAGS=-std=c99 -O3 -Wall -Werror -g $(shell $(SDL2CON
-       SDL2CONFIG=sdl2-config
+--- Makefile.orig      2024-10-16 03:56:27.312106336 +0000
++++ Makefile   2024-10-16 03:57:42.190887631 +0000
+@@ -16,9 +16,9 @@ else ifeq ($(OS),Windows_NT)
+       TARGET_WIN32=yes
  endif
  
 -CFLAGS=-std=c99 -O3 -Wall -Werror -g $(shell $(SDL2CONFIG) --cflags) -Isrc/extern/include
@@ -21,7 +21,7 @@ Allow GIT_REV to be overridden.
  
  # build with link time optimization
  ifndef NOLTO
-@@ -30,10 +30,16 @@ X16_OUTPUT=x16emu
+@@ -36,10 +36,16 @@ ifdef TRACE
        CFLAGS+=-D TRACE
  endif
  

Index: pkgsrc/emulators/x16-emulator/patches/patch-src_main.c
diff -u pkgsrc/emulators/x16-emulator/patches/patch-src_main.c:1.2 pkgsrc/emulators/x16-emulator/patches/patch-src_main.c:1.3
--- pkgsrc/emulators/x16-emulator/patches/patch-src_main.c:1.2  Mon Nov 27 03:21:00 2023
+++ pkgsrc/emulators/x16-emulator/patches/patch-src_main.c      Wed Oct 16 04:25:32 2024
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_main.c,v 1.2 2023/11/27 03:21:00 thorpej Exp $
+$NetBSD: patch-src_main.c,v 1.3 2024/10/16 04:25:32 thorpej Exp $
 
 Allow the default location of the X16 ROM to be overridden.
 
---- src/main.c.orig    2023-11-06 03:36:56
-+++ src/main.c 2023-11-27 02:44:32
-@@ -513,9 +513,13 @@ main(int argc, char **argv)
+--- src/main.c.orig    2024-10-16 03:58:55.880047197 +0000
++++ src/main.c 2024-10-16 04:01:17.250721407 +0000
+@@ -570,9 +570,13 @@ main(int argc, char **argv)
  
        char *base_path = SDL_GetBasePath();