CVS commit: pkgsrc/emulators/vice

["Olaf Seibert" <rhialto%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rhialto
Date:           Fri Jan 31 17:49:02 UTC 2025

Modified Files:
        pkgsrc/emulators/vice: Makefile PLIST distinfo options.mk
        pkgsrc/emulators/vice/patches: patch-configure

Log Message:
emulators/vice: update to 3.9

changes: many. The full list is at http://vice-emu.sourceforge.io/NEWS .

There is a new way of screen recording which uses the ffmpeg program and
sockets, instead of the ffmpeg library, which keeps changing its API.
This may or may not work (deadlock), depending on emulator or screen settings.
Using the built-in lossless ZMBV format is a good alternative.


To generate a diff of this commit:
cvs rdiff -u -r1.192 -r1.193 pkgsrc/emulators/vice/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/emulators/vice/PLIST
cvs rdiff -u -r1.55 -r1.56 pkgsrc/emulators/vice/distinfo
cvs rdiff -u -r1.17 -r1.18 pkgsrc/emulators/vice/options.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/emulators/vice/patches/patch-configure

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

Modified files:

Index: pkgsrc/emulators/vice/Makefile
diff -u pkgsrc/emulators/vice/Makefile:1.192 pkgsrc/emulators/vice/Makefile:1.193
--- pkgsrc/emulators/vice/Makefile:1.192        Mon Jan  6 21:49:08 2025
+++ pkgsrc/emulators/vice/Makefile      Fri Jan 31 17:49:02 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.192 2025/01/06 21:49:08 ktnb Exp $
+# $NetBSD: Makefile,v 1.193 2025/01/31 17:49:02 rhialto Exp $
 
-DISTNAME=      vice-3.8
-PKGREVISION=   13
+DISTNAME=      vice-3.9
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=vice-emu/}
 
@@ -17,7 +16,8 @@ NO_BIN_ON_FTP=                ${RESTRICTED}
 NO_SRC_ON_FTP=         ${RESTRICTED}
 
 USE_PKGLOCALEDIR=      yes
-USE_LANGUAGES=         c c++11
+USE_LANGUAGES=         c c++
+USE_CXX_FEATURES+=     c++11
 USE_TOOLS+=            bash gmake pkg-config perl flex yacc
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --enable-ethernet
@@ -45,6 +45,8 @@ CONFIGURE_ENV+=               ac_cv_prog_SVNVERSION=n
 CONFIGURE_ARGS+=       --disable-pdf-docs
 CONFIGURE_ARGS+=       --enable-html-docs
 
+MAKE_ENV+=             BASH_SHELL=${PREFIX}/bin/bash
+
 REQD_DIRS+=            ${PREFIX}/share/vice
 
 DEPENDS+=              dos2unix-[0-9]*:../../converters/dos2unix
@@ -80,5 +82,4 @@ post-install:
 .include "../../graphics/png/buildlink3.mk"
 .include "../../net/libpcap/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
-.include "../../mk/readline.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/emulators/vice/PLIST
diff -u pkgsrc/emulators/vice/PLIST:1.35 pkgsrc/emulators/vice/PLIST:1.36
--- pkgsrc/emulators/vice/PLIST:1.35    Sat Jan  6 15:35:26 2024
+++ pkgsrc/emulators/vice/PLIST Fri Jan 31 17:49:02 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.35 2024/01/06 15:35:26 rhialto Exp $
+@comment $NetBSD: PLIST,v 1.36 2025/01/31 17:49:02 rhialto Exp $
 bin/c1541
 bin/cartconv
 bin/petcat
@@ -100,6 +100,7 @@ share/doc/vice/html/vice_20.html
 share/doc/vice/html/vice_21.html
 share/doc/vice/html/vice_22.html
 share/doc/vice/html/vice_23.html
+share/doc/vice/html/vice_24.html
 share/doc/vice/html/vice_3.html
 share/doc/vice/html/vice_4.html
 share/doc/vice/html/vice_5.html
@@ -149,6 +150,7 @@ share/vice/C128/kernalfi
 share/vice/C128/kernalfr
 share/vice/C128/kernalit
 share/vice/C128/kernalno
+share/vice/C128/lemon64.vpl
 share/vice/C128/palette.vpl
 share/vice/C128/palette_6569R1_v1r.vpl
 share/vice/C128/palette_6569R5_v1r.vpl
@@ -217,6 +219,7 @@ share/vice/C64/kernal-901227-02.bin
 share/vice/C64/kernal-901227-03.bin
 share/vice/C64/kernal-901246-01.bin
 share/vice/C64/kernal-906145-02.bin
+share/vice/C64/lemon64.vpl
 share/vice/C64/palette.vpl
 share/vice/C64/palette_6569R1_v1r.vpl
 share/vice/C64/palette_6569R5_v1r.vpl
@@ -232,8 +235,10 @@ share/vice/C64/pepto-palold.vpl
 share/vice/C64/pixcen.vpl
 share/vice/C64/ptoing.vpl
 share/vice/C64/rgb.vpl
+${PLIST.sdl}share/vice/C64/sdl_joymap_keyrah_v3.vjm
 ${PLIST.sdl}share/vice/C64/sdl_joymap_ps3.vjm
 ${PLIST.sdl}share/vice/C64/sdl_joymap_thec64.vjm
+${PLIST.sdl}share/vice/C64/sdl_joymap_xbox360.vjm
 ${PLIST.sdl}share/vice/C64/sdl_keyrah.vkm
 ${PLIST.sdl}share/vice/C64/sdl_keyrah_combian.vkm
 ${PLIST.sdl}share/vice/C64/sdl_keyrah_de.vkm
@@ -510,6 +515,7 @@ ${PLIST.gtk}share/vice/SCPU64/gtk3_sym_s
 ${PLIST.gtk}share/vice/SCPU64/gtk3_sym_tr.vkm
 ${PLIST.gtk}share/vice/SCPU64/gtk3_sym_uk.vkm
 ${PLIST.gtk}share/vice/SCPU64/gtk3_the64_de.vkm
+share/vice/SCPU64/lemon64.vpl
 share/vice/SCPU64/palette.vpl
 share/vice/SCPU64/palette_6569R1_v1r.vpl
 share/vice/SCPU64/palette_6569R5_v1r.vpl
@@ -568,10 +574,13 @@ share/vice/VIC20/kernal.901486-07.bin
 share/vice/VIC20/mike-ntsc.vpl
 share/vice/VIC20/mike-pal.vpl
 ${PLIST.sdl}share/vice/VIC20/sdl_pos.vkm
+${PLIST.sdl}share/vice/VIC20/sdl_pos_de.vkm
 ${PLIST.sdl}share/vice/VIC20/sdl_pos_fi.vkm
 ${PLIST.sdl}share/vice/VIC20/sdl_pos_fr.vkm
+${PLIST.sdl}share/vice/VIC20/sdl_pos_uk.vkm
 ${PLIST.sdl}share/vice/VIC20/sdl_sym.vkm
 ${PLIST.sdl}share/vice/VIC20/sdl_sym_de.vkm
+${PLIST.sdl}share/vice/VIC20/sdl_sym_uk.vkm
 share/vice/VIC20/vice.vpl
 share/vice/common/C128_1024.svg
 share/vice/common/C128_16.png
@@ -612,6 +621,13 @@ share/vice/common/PET_256.svg
 share/vice/common/PET_32.png
 share/vice/common/PET_48.png
 share/vice/common/PET_64.png
+share/vice/common/PetMe.ttf
+share/vice/common/PetMe128.ttf
+share/vice/common/PetMe1282Y.ttf
+share/vice/common/PetMe2X.ttf
+share/vice/common/PetMe2Y.ttf
+share/vice/common/PetMe64.ttf
+share/vice/common/PetMe642Y.ttf
 share/vice/common/Plus4_1024.svg
 share/vice/common/Plus4_16.png
 share/vice/common/Plus4_24.png
@@ -643,16 +659,16 @@ share/vice/common/VIC20_64.png
 share/vice/common/icon1024x1024.png
 share/vice/common/vice-logo-black.svg
 ${PLIST.gtk}share/vice/common/vice.gresource
-share/vice/hotkeys/hotkeys-cartridge.vhk
-share/vice/hotkeys/hotkeys-datasette.vhk
-share/vice/hotkeys/hotkeys-debug.vhk
-share/vice/hotkeys/hotkeys-drive.vhk
-share/vice/hotkeys/hotkeys-fliplist.vhk
-share/vice/hotkeys/hotkeys-help.vhk
-share/vice/hotkeys/hotkeys-settings.vhk
-share/vice/hotkeys/hotkeys-snapshot.vhk
-share/vice/hotkeys/hotkeys-vsid.vhk
-share/vice/hotkeys/hotkeys-winvice-legacy.vhk
-share/vice/hotkeys/hotkeys.vhk
+${PLIST.gui}share/vice/hotkeys/hotkeys-cartridge.vhk
+${PLIST.gui}share/vice/hotkeys/hotkeys-datasette.vhk
+${PLIST.gui}share/vice/hotkeys/hotkeys-debug.vhk
+${PLIST.gui}share/vice/hotkeys/hotkeys-drive.vhk
+${PLIST.gui}share/vice/hotkeys/hotkeys-fliplist.vhk
+${PLIST.gui}share/vice/hotkeys/hotkeys-help.vhk
+${PLIST.gui}share/vice/hotkeys/hotkeys-settings.vhk
+${PLIST.gui}share/vice/hotkeys/hotkeys-snapshot.vhk
+${PLIST.gui}share/vice/hotkeys/hotkeys-vsid.vhk
+${PLIST.gui}share/vice/hotkeys/hotkeys-winvice-legacy.vhk
+${PLIST.gui}share/vice/hotkeys/hotkeys.vhk
 ${PLIST.desktop}share/vice/vice-org-vice-org.menu
 ${PLIST.gtk}@pkgdir etc/xdg/menus/applications-merged

Index: pkgsrc/emulators/vice/distinfo
diff -u pkgsrc/emulators/vice/distinfo:1.55 pkgsrc/emulators/vice/distinfo:1.56
--- pkgsrc/emulators/vice/distinfo:1.55 Sat Jan  6 15:35:26 2024
+++ pkgsrc/emulators/vice/distinfo      Fri Jan 31 17:49:02 2025
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.55 2024/01/06 15:35:26 rhialto Exp $
+$NetBSD: distinfo,v 1.56 2025/01/31 17:49:02 rhialto Exp $
 
-BLAKE2s (vice-3.8.tar.gz) = bf92bbeaa67bd633bb5a0b85f63b571b241e3c53ab9aebb0db0d43590dfff441
-SHA512 (vice-3.8.tar.gz) = fe644667736c32386b62af53314a95bf510c75d476eaab14b4c37693f2f57d6815126ab3db2f0cb11300c1a4a07c29b3f25210800ce97a673a0460ab59d0ebba
-Size (vice-3.8.tar.gz) = 13564021 bytes
-SHA1 (patch-configure) = afa9b0022985c5828dea1496e84117c4866e8d3a
+BLAKE2s (vice-3.9.tar.gz) = 9ce624e0149ecff19f75a57db2dfff50329140293d291e0791db7d806e91fb31
+SHA512 (vice-3.9.tar.gz) = 4a349dfe3e4310f1799cc705dffd01243df5b6ecfdb05b5f2ca3213fe6468831735dd3abcd6a34627e8ac2202bcb8ab617b81224c5a41cd83782868dd70b1fb8
+Size (vice-3.9.tar.gz) = 14249159 bytes
+SHA1 (patch-Makefile.in) = f9c411fb2f4a8d5cf40c7cccdd36a6e4bc18529b
+SHA1 (patch-configure) = 136475ca14acc6fe9fe1eb44cf0f5308e5fc7c0a
 SHA1 (patch-src_arch_gtk3_actions-help.c) = 136fa108e999dbb98362a2e80a5389710f60290e
 SHA1 (patch-src_arch_gtk3_data_unix_Makefile.in) = c233ac070f00d0210f469466c4250c8b2cdfdc5c

Index: pkgsrc/emulators/vice/options.mk
diff -u pkgsrc/emulators/vice/options.mk:1.17 pkgsrc/emulators/vice/options.mk:1.18
--- pkgsrc/emulators/vice/options.mk:1.17       Sat Jan  6 15:35:26 2024
+++ pkgsrc/emulators/vice/options.mk    Fri Jan 31 17:49:02 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.17 2024/01/06 15:35:26 rhialto Exp $
+# $NetBSD: options.mk,v 1.18 2025/01/31 17:49:02 rhialto Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.vice
 PKG_SUPPORTED_OPTIONS=         ffmpeg vice-x64 vice-cpuhistory pulseaudio alsa
@@ -8,11 +8,12 @@ PKG_SUGGESTED_OPTIONS=                gtk3 ffmpeg
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=   gtk sdl sdl1 sdl2 x64 desktop
+PLIST_VARS+=   gui gtk sdl sdl1 sdl2 x64 desktop
 
 .if !empty(PKG_OPTIONS:Mgtk3)
 CONFIGURE_ARGS+=       --enable-gtk3ui
 PLIST.gtk=             yes
+PLIST.gui=             yes
 TOOL_DEPENDS+=         glib2-tools>=2.56:../../devel/glib2-tools
 
 CONFIGURE_ARGS+=       --enable-desktop-files
@@ -46,6 +47,7 @@ BUILD_DEFS+=  PKG_SYSCONFBASE
 CONFIGURE_ARGS+=       --enable-sdl1ui
 PLIST.sdl=             yes
 PLIST.sdl1=            yes
+PLIST.gui=             yes
 .  include "../../devel/SDL/buildlink3.mk"
 .  include "../../graphics/SDL_image/buildlink3.mk"
 .endif
@@ -54,6 +56,7 @@ PLIST.sdl1=           yes
 CONFIGURE_ARGS+=       --enable-sdl2ui
 PLIST.sdl=             yes
 PLIST.sdl2=            yes
+PLIST.gui=             yes
 .  include "../../devel/SDL2/buildlink3.mk"
 .  include "../../graphics/SDL2_image/buildlink3.mk"
 .endif

Index: pkgsrc/emulators/vice/patches/patch-configure
diff -u pkgsrc/emulators/vice/patches/patch-configure:1.6 pkgsrc/emulators/vice/patches/patch-configure:1.7
--- pkgsrc/emulators/vice/patches/patch-configure:1.6   Sat Dec 31 18:30:00 2022
+++ pkgsrc/emulators/vice/patches/patch-configure       Fri Jan 31 17:49:02 2025
@@ -1,11 +1,11 @@
-$NetBSD: patch-configure,v 1.6 2022/12/31 18:30:00 rhialto Exp $
+$NetBSD: patch-configure,v 1.7 2025/01/31 17:49:02 rhialto Exp $
 
 1. Ignore the option --enable-option-checking instead of erroring,
    it's the default anyway.
 
 --- configure.orig     2022-12-27 23:57:16.000000000 +0000
 +++ configure
-@@ -26048,6 +26048,8 @@ do
+@@ -25973,6 +25973,8 @@ do
    argcheck=`echo "$argcheck" | sed 's/=.*//'`
    argvalid=yes
    case $argcheck in #(