CVS commit: pkgsrc/emulators

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

Module Name:    pkgsrc
Committed By:   thorpej
Date:           Sun Apr 21 19:56:10 UTC 2024

Modified Files:
        pkgsrc/emulators/x16-emulator: Makefile distinfo
        pkgsrc/emulators/x16-rom: Makefile distinfo
        pkgsrc/emulators/x16-rom/patches: patch-Makefile
Removed Files:
        pkgsrc/emulators/x16-emulator/patches: patch-src_cartridge.c
            patch-src_rendertext.c

Log Message:
Update the Commander X16 emulator and ROM to verison R47.  This is a major
release with several features and fixes, including 65C816 CPU support in
the emulator and KERNAL.  Due to a change in the ROM signature location
(to avoid conflict with the 65C816 vector table), both the emulator and
ROM must be updated together, even if you don't intend to use 65C816
support in the emulator.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/emulators/x16-emulator/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/emulators/x16-emulator/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/emulators/x16-emulator/patches/patch-src_cartridge.c
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/emulators/x16-emulator/patches/patch-src_rendertext.c
cvs rdiff -u -r1.6 -r1.7 pkgsrc/emulators/x16-rom/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/emulators/x16-rom/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/emulators/x16-rom/patches/patch-Makefile

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.16 pkgsrc/emulators/x16-emulator/Makefile:1.17
--- pkgsrc/emulators/x16-emulator/Makefile:1.16 Sat Apr  6 08:05:20 2024
+++ pkgsrc/emulators/x16-emulator/Makefile      Sun Apr 21 19:56:10 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2024/04/06 08:05:20 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2024/04/21 19:56:10 thorpej Exp $
 
-DISTNAME=      x16-emulator-46
-PKGREVISION=   2
+DISTNAME=      x16-emulator-47
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=X16Community/}
 GITHUB_PROJECT=        x16-emulator
@@ -12,7 +11,7 @@ HOMEPAGE=     http://commanderx16.com/
 COMMENT=       Emulator for the Commander X16 computer system
 LICENSE=       2-clause-bsd
 
-DEPENDS+=      x16-rom-46{,nb*}:../../emulators/x16-rom
+DEPENDS+=      x16-rom-47{,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.9 pkgsrc/emulators/x16-emulator/distinfo:1.10
--- pkgsrc/emulators/x16-emulator/distinfo:1.9  Mon Nov 27 04:17:30 2023
+++ pkgsrc/emulators/x16-emulator/distinfo      Sun Apr 21 19:56:10 2024
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.9 2023/11/27 04:17:30 thorpej Exp $
+$NetBSD: distinfo,v 1.10 2024/04/21 19:56:10 thorpej Exp $
 
-BLAKE2s (x16-emulator-46.tar.gz) = ec4ec0c0155843c4c7be5ce103794b02973b31aae3c8af8cc5fade765453a78d
-SHA512 (x16-emulator-46.tar.gz) = d5e2ac7db8dbb710dd400a31e5c4b0d426c7284d899df3a7814c25ca15a4cbe546dbf986223e833f6526a7981c785bbebe47729c79d03a35928c5f72c985d86e
-Size (x16-emulator-46.tar.gz) = 300653 bytes
+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_cartridge.c) = 463f4a9edb44c259f28ab9646cc7204e3a810bdd
 SHA1 (patch-src_main.c) = 6b759386bc9e1a87a1b33763cc14da75cd4b755f
-SHA1 (patch-src_rendertext.c) = 86de0b05e64602c861342e9bd41c30f1401b46f6

Index: pkgsrc/emulators/x16-rom/Makefile
diff -u pkgsrc/emulators/x16-rom/Makefile:1.6 pkgsrc/emulators/x16-rom/Makefile:1.7
--- pkgsrc/emulators/x16-rom/Makefile:1.6       Sun Apr 21 19:09:21 2024
+++ pkgsrc/emulators/x16-rom/Makefile   Sun Apr 21 19:56:10 2024
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2024/04/21 19:09:21 thorpej Exp $
+# $NetBSD: Makefile,v 1.7 2024/04/21 19:56:10 thorpej Exp $
 
-DISTNAME=      x16-rom-46
+DISTNAME=      x16-rom-47
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=X16Community/}
 GITHUB_PROJECT=        x16-rom

Index: pkgsrc/emulators/x16-rom/distinfo
diff -u pkgsrc/emulators/x16-rom/distinfo:1.5 pkgsrc/emulators/x16-rom/distinfo:1.6
--- pkgsrc/emulators/x16-rom/distinfo:1.5       Mon Nov 27 03:21:00 2023
+++ pkgsrc/emulators/x16-rom/distinfo   Sun Apr 21 19:56:10 2024
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2023/11/27 03:21:00 thorpej Exp $
+$NetBSD: distinfo,v 1.6 2024/04/21 19:56:10 thorpej Exp $
 
-BLAKE2s (x16-rom-46.tar.gz) = 3efd6965342935fb5d588038cf11df869c9eeedd38eb7cd88c21aff0aa564606
-SHA512 (x16-rom-46.tar.gz) = 2eb9a9e4f2cf86e71897e900bfa528f79a3e9e8bedc5bcc25868c3508afc85cdd087a39be37d1ceab7441b3d91553e0056a67efcd575dfa11fda468f9065181a
-Size (x16-rom-46.tar.gz) = 899784 bytes
-SHA1 (patch-Makefile) = cea4a06b0545215ceec4ed36eb84534737ec2f5f
+BLAKE2s (x16-rom-47.tar.gz) = c29eab4d5a705f65ab4d34985647f6a08fbe0012a149bc516568957cdfda4516
+SHA512 (x16-rom-47.tar.gz) = a97f69196c6661dd1b6f7b0475bbf2e31e2bd90f3ed6802eff6c8bcd7d575e9039a539e3595166509bdc50233285a9bb90ea5b80df156ff4e25635c8bba7c78f
+Size (x16-rom-47.tar.gz) = 1028489 bytes
+SHA1 (patch-Makefile) = cf435cc24179c54ccbc2c607d8a6970e30d79521

Index: pkgsrc/emulators/x16-rom/patches/patch-Makefile
diff -u pkgsrc/emulators/x16-rom/patches/patch-Makefile:1.1 pkgsrc/emulators/x16-rom/patches/patch-Makefile:1.2
--- pkgsrc/emulators/x16-rom/patches/patch-Makefile:1.1 Mon Nov 27 03:21:00 2023
+++ pkgsrc/emulators/x16-rom/patches/patch-Makefile     Sun Apr 21 19:56:10 2024
@@ -1,20 +1,16 @@
-$NetBSD: patch-Makefile,v 1.1 2023/11/27 03:21:00 thorpej Exp $
+$NetBSD: patch-Makefile,v 1.2 2024/04/21 19:56:10 thorpej Exp $
 
 Allow the git revision to be overridden.
 
---- Makefile.orig      2023-11-06 03:34:39
-+++ Makefile   2023-11-27 03:12:47
-@@ -336,10 +336,16 @@ $(GIT_SIGNATURE): FORCE
-       rm -rf $(BUILD_DIR)
-       $(MAKE) -C codex clean
+--- Makefile.orig      2024-04-21 19:28:08.260002442 +0000
++++ Makefile   2024-04-21 19:29:10.060382341 +0000
+@@ -352,8 +352,12 @@ clean:
  
+ $(GIT_SIGNATURE): FORCE
+       @mkdir -p $(BUILD_DIR)
 +ifdef GIT_REV
-+$(GIT_SIGNATURE): FORCE
-+      @mkdir -p $(BUILD_DIR)
 +      /bin/echo -n ${GIT_REV} | tr '[:lower:]' '[:upper:]' > $(GIT_SIGNATURE)
 +else
- $(GIT_SIGNATURE): FORCE
-       @mkdir -p $(BUILD_DIR)
        git diff --quiet && /bin/echo -n $$( (git rev-parse --short=8 HEAD || /bin/echo "00000000") | tr '[:lower:]' '[:upper:]') > $(GIT_SIGNATURE) \
        || /bin/echo -n $$( /bin/echo -n $$(git rev-parse --short=7 HEAD || echo "0000000") | tr '[:lower:]' '[:upper:]'; /bin/echo -n '+') > $(GIT_SIGNATURE)
 +endif