CVS commit: pkgsrc/emulators/vice

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/emulators/vice
From: "Olaf Seibert" <rhialto%netbsd.org@localhost>
Date: Sun, 11 Jan 2026 14:15:04 +0000

Module Name:    pkgsrc
Committed By:   rhialto
Date:           Sun Jan 11 14:15:04 UTC 2026

Modified Files:
        pkgsrc/emulators/vice: Makefile PLIST distinfo options.mk
Added Files:
        pkgsrc/emulators/vice/patches: patch-Makefile.in
            patch-src_arch_gtk3_joystickdrv_joystick_bsd.c
            patch-src_lib_libusbsiddrv_USBSID.cpp
Removed Files:
        pkgsrc/emulators/vice/patches:
            patch-src_arch_gtk3_data_unix_Makefile.in

Log Message:
emulators/vice: update to 3.10

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


To generate a diff of this commit:
cvs rdiff -u -r1.204 -r1.205 pkgsrc/emulators/vice/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/emulators/vice/PLIST
cvs rdiff -u -r1.56 -r1.57 pkgsrc/emulators/vice/distinfo
cvs rdiff -u -r1.18 -r1.19 pkgsrc/emulators/vice/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/emulators/vice/patches/patch-Makefile.in \
    pkgsrc/emulators/vice/patches/patch-src_arch_gtk3_joystickdrv_joystick_bsd.c \
    pkgsrc/emulators/vice/patches/patch-src_lib_libusbsiddrv_USBSID.cpp
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/emulators/vice/patches/patch-src_arch_gtk3_data_unix_Makefile.in

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.204 pkgsrc/emulators/vice/Makefile:1.205
--- pkgsrc/emulators/vice/Makefile:1.204        Wed Jan  7 08:46:53 2026
+++ pkgsrc/emulators/vice/Makefile      Sun Jan 11 14:15:03 2026
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.204 2026/01/07 08:46:53 wiz Exp $
+# $NetBSD: Makefile,v 1.205 2026/01/11 14:15:03 rhialto Exp $
 
-DISTNAME=      vice-3.9
-PKGREVISION=   10
+DISTNAME=      vice-3.10
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=vice-emu/}
 
@@ -22,23 +21,32 @@ USE_CXX_FEATURES+=  c++11
 USE_TOOLS+=            bash gmake pkg-config perl flex yacc
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --enable-ethernet
-CONFIGURE_ARGS+=       --with-lame
+CONFIGURE_ARGS+=       --enable-ipv6
+CONFIGURE_ARGS+=       --enable-new8580filter
+CONFIGURE_ARGS+=       --enable-realdevice
+CONFIGURE_ARGS+=       --enable-rs232
+CONFIGURE_ARGS+=       --disable-catweasel
+CONFIGURE_ARGS+=       --disable-debug
+CONFIGURE_ARGS+=       --disable-debug-threads
+CONFIGURE_ARGS+=       --disable-experimental-devices
+CONFIGURE_ARGS+=       --disable-hardsid
+CONFIGURE_ARGS+=       --disable-midi
+CONFIGURE_ARGS+=       --disable-parsid
+CONFIGURE_ARGS+=       --disable-x64-image
 CONFIGURE_ARGS+=       --with-fastsid
+CONFIGURE_ARGS+=       --with-resid
 CONFIGURE_ARGS+=       --with-flac
 CONFIGURE_ARGS+=       --with-gif
+CONFIGURE_ARGS+=       --with-lame
+CONFIGURE_ARGS+=       --with-libcurl
 CONFIGURE_ARGS+=       --with-mpg123
 CONFIGURE_ARGS+=       --with-png
 CONFIGURE_ARGS+=       --with-vorbis
-CONFIGURE_ARGS+=       --with-zlib
-CONFIGURE_ARGS+=       --with-fastsid
-CONFIGURE_ARGS+=       --with-libcurl
 CONFIGURE_ARGS+=       --without-libieee1284
-CONFIGURE_ARGS+=       --disable-hardsid
-CONFIGURE_ARGS+=       --disable-parsid
-CONFIGURE_ARGS+=       --disable-catweasel
-CONFIGURE_ARGS+=       --disable-midi
 CONFIGURE_ARGS.NetBSD+=        --with-sun
 CONFIGURE_ARGS.NetBSD+=        --without-oss
+CONFIGURE_ARGS.NetBSD+=        --without-portaudio
+CONFIGURE_ARGS.NetBSD+=        --without-sdlsound
 
 # Avoid build changes if these programs are installed
 CONFIGURE_ENV+=                ac_cv_prog_SVN=no
@@ -53,8 +61,6 @@ REQD_DIRS+=           ${PREFIX}/share/vice
 DEPENDS+=              dos2unix-[0-9]*:../../converters/dos2unix
 TOOL_DEPENDS+=         xa65-[0-9]*:../../devel/xa65
 
-REPLACE_BASH+=         src/arch/gtk3/data/unix/mkdesktopfile.sh
-
 SUBST_CLASSES+=                prefix
 SUBST_STAGE.prefix=    post-configure
 SUBST_FILES.prefix+=   doc/vice.texi
@@ -67,8 +73,8 @@ INSTALLATION_DIRS+=   share/doc/vice/html/
 # Install html equivalent of vice.pdf.
 post-install:
        ${RM} -f ${DESTDIR}${PREFIX}/share/applications/mimeinfo.cache
-       cd ${DESTDIR}${PREFIX} && ${MV} etc/xdg/menus/applications-merged/vice-org-vice-org.menu share/vice/ || :
-       cd ${DESTDIR}${PREFIX} && ${RMDIR} -r etc || :
+       cd ${DESTDIR}${PREFIX} && ${RM} -rf etc || :
+       cd ${DESTDIR}${PREFIX}/share/ && chmod a+rX icons || :
        cd ${WRKSRC}/doc/html && ${CP} -r fonts images vice_*.html *.css \
                COPYING \
                ${DESTDIR}${PREFIX}/share/doc/vice/html/

Index: pkgsrc/emulators/vice/PLIST
diff -u pkgsrc/emulators/vice/PLIST:1.36 pkgsrc/emulators/vice/PLIST:1.37
--- pkgsrc/emulators/vice/PLIST:1.36    Fri Jan 31 17:49:02 2025
+++ pkgsrc/emulators/vice/PLIST Sun Jan 11 14:15:03 2026
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.36 2025/01/31 17:49:02 rhialto Exp $
+@comment $NetBSD: PLIST,v 1.37 2026/01/11 14:15:03 rhialto Exp $
 bin/c1541
 bin/cartconv
 bin/petcat
 bin/vsid
 bin/x128
-bin/x64
+${PLIST.x64}bin/x64
 bin/x64dtv
 bin/x64sc
 bin/xcbm2
@@ -13,18 +13,18 @@ bin/xpet
 bin/xplus4
 bin/xscpu64
 bin/xvic
-${PLIST.desktop}share/applications/vice-org-vsid.desktop
-${PLIST.desktop}share/applications/vice-org-x128.desktop
-${PLIST.desktop}${PLIST.x64}share/applications/vice-org-x64.desktop
-${PLIST.desktop}share/applications/vice-org-x64dtv.desktop
-${PLIST.desktop}share/applications/vice-org-x64sc.desktop
-${PLIST.desktop}share/applications/vice-org-xcbm2.desktop
-${PLIST.desktop}share/applications/vice-org-xcbm5x0.desktop
-${PLIST.desktop}share/applications/vice-org-xpet.desktop
-${PLIST.desktop}share/applications/vice-org-xplus4.desktop
-${PLIST.desktop}share/applications/vice-org-xscpu64.desktop
-${PLIST.desktop}share/applications/vice-org-xvic.desktop
-${PLIST.desktop}share/desktop-directories/vice-org-vice-org.directory
+${PLIST.desktop}share/applications/vsid.desktop
+${PLIST.desktop}share/applications/x128.desktop
+${PLIST.desktop}${PLIST.x64}share/applications/x64.desktop
+${PLIST.desktop}share/applications/x64dtv.desktop
+${PLIST.desktop}share/applications/x64sc.desktop
+${PLIST.desktop}share/applications/xcbm2.desktop
+${PLIST.desktop}share/applications/xcbm5x0.desktop
+${PLIST.desktop}share/applications/xpet.desktop
+${PLIST.desktop}share/applications/xplus4.desktop
+${PLIST.desktop}share/applications/xscpu64.desktop
+${PLIST.desktop}share/applications/xvic.desktop
+@comment ${PLIST.desktop}share/desktop-directories/vice-org.directory
 ${PLIST.sdl1}share/doc/vice/Readme-SDL.txt
 ${PLIST.sdl2}share/doc/vice/Readme-SDL2.txt
 share/doc/vice/html/COPYING
@@ -110,6 +110,42 @@ share/doc/vice/html/vice_8.html
 share/doc/vice/html/vice_9.html
 share/doc/vice/html/vice_foot.html
 share/doc/vice/html/vice_toc.html
+${PLIST.desktop}share/icons/hicolor/256x256/apps/vice-vsid.png
+${PLIST.desktop}share/icons/hicolor/256x256/apps/vice-x128.png
+${PLIST.desktop}share/icons/hicolor/256x256/apps/vice-x64.png
+${PLIST.desktop}share/icons/hicolor/256x256/apps/vice-x64dtv.png
+${PLIST.desktop}share/icons/hicolor/256x256/apps/vice-xcbm2.png
+${PLIST.desktop}share/icons/hicolor/256x256/apps/vice-xpet.png
+${PLIST.desktop}share/icons/hicolor/256x256/apps/vice-xplus4.png
+${PLIST.desktop}share/icons/hicolor/256x256/apps/vice-xscpu64.png
+${PLIST.desktop}share/icons/hicolor/256x256/apps/vice-xvic.png
+${PLIST.desktop}share/icons/hicolor/32x32/apps/vice-vsid.png
+${PLIST.desktop}share/icons/hicolor/32x32/apps/vice-x128.png
+${PLIST.desktop}share/icons/hicolor/32x32/apps/vice-x64.png
+${PLIST.desktop}share/icons/hicolor/32x32/apps/vice-x64dtv.png
+${PLIST.desktop}share/icons/hicolor/32x32/apps/vice-xcbm2.png
+${PLIST.desktop}share/icons/hicolor/32x32/apps/vice-xpet.png
+${PLIST.desktop}share/icons/hicolor/32x32/apps/vice-xplus4.png
+${PLIST.desktop}share/icons/hicolor/32x32/apps/vice-xscpu64.png
+${PLIST.desktop}share/icons/hicolor/32x32/apps/vice-xvic.png
+${PLIST.desktop}share/icons/hicolor/48x48/apps/vice-vsid.png
+${PLIST.desktop}share/icons/hicolor/48x48/apps/vice-x128.png
+${PLIST.desktop}share/icons/hicolor/48x48/apps/vice-x64.png
+${PLIST.desktop}share/icons/hicolor/48x48/apps/vice-x64dtv.png
+${PLIST.desktop}share/icons/hicolor/48x48/apps/vice-xcbm2.png
+${PLIST.desktop}share/icons/hicolor/48x48/apps/vice-xpet.png
+${PLIST.desktop}share/icons/hicolor/48x48/apps/vice-xplus4.png
+${PLIST.desktop}share/icons/hicolor/48x48/apps/vice-xscpu64.png
+${PLIST.desktop}share/icons/hicolor/48x48/apps/vice-xvic.png
+${PLIST.desktop}share/icons/hicolor/64x64/apps/vice-vsid.png
+${PLIST.desktop}share/icons/hicolor/64x64/apps/vice-x128.png
+${PLIST.desktop}share/icons/hicolor/64x64/apps/vice-x64.png
+${PLIST.desktop}share/icons/hicolor/64x64/apps/vice-x64dtv.png
+${PLIST.desktop}share/icons/hicolor/64x64/apps/vice-xcbm2.png
+${PLIST.desktop}share/icons/hicolor/64x64/apps/vice-xpet.png
+${PLIST.desktop}share/icons/hicolor/64x64/apps/vice-xplus4.png
+${PLIST.desktop}share/icons/hicolor/64x64/apps/vice-xscpu64.png
+${PLIST.desktop}share/icons/hicolor/64x64/apps/vice-xvic.png
 share/vice/C128/basic64-901226-01.bin
 share/vice/C128/basichi-318019-04.bin
 share/vice/C128/basiclo-318018-04.bin
@@ -118,7 +154,6 @@ share/vice/C128/c64s.vpl
 share/vice/C128/ccs64.vpl
 share/vice/C128/chargen-315079-01.bin
 share/vice/C128/chargen-325078-02.bin
-share/vice/C128/chargen-325167-01.bin
 share/vice/C128/chargen-325167-02.bin
 share/vice/C128/chargen-325173-01D.bin
 share/vice/C128/chargen-325181-01.bin
@@ -235,6 +270,8 @@ 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_c64p.vkm
+${PLIST.sdl}share/vice/C64/sdl_joymap_8bitdo_6b.vjm
 ${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
@@ -258,8 +295,11 @@ ${PLIST.sdl}share/vice/C64/sdl_sym_de.vk
 ${PLIST.sdl}share/vice/C64/sdl_sym_fr.vkm
 ${PLIST.sdl}share/vice/C64/sdl_sym_it.vkm
 ${PLIST.sdl}share/vice/C64/sdl_sym_nl.vkm
+${PLIST.sdl}share/vice/C64/sdl_sym_no_pi_4-500_bmc64.vkm
 ${PLIST.sdl}share/vice/C64/sdl_sym_tr.vkm
 ${PLIST.sdl}share/vice/C64/sdl_sym_uk.vkm
+${PLIST.sdl}share/vice/C64/sdl_sym_uk_pi_4-500_bmc64.vkm
+${PLIST.sdl}share/vice/C64/sdl_sym_us_pi_4-500_bmc64.vkm
 share/vice/C64/the64.vpl
 share/vice/C64/vice.vpl
 share/vice/C64DTV/basic-901226-01.bin
@@ -289,6 +329,8 @@ ${PLIST.gtk}share/vice/C64DTV/gtk3_sym_t
 ${PLIST.gtk}share/vice/C64DTV/gtk3_sym_uk.vkm
 ${PLIST.gtk}share/vice/C64DTV/gtk3_the64_de.vkm
 share/vice/C64DTV/kernal-901227-03.bin
+${PLIST.sdl}share/vice/C64DTV/sdl_c64p.vkm
+${PLIST.sdl}share/vice/C64DTV/sdl_joymap_8bitdo_6b.vjm
 ${PLIST.sdl}share/vice/C64DTV/sdl_keyrah.vkm
 ${PLIST.sdl}share/vice/C64DTV/sdl_keyrah_combian.vkm
 ${PLIST.sdl}share/vice/C64DTV/sdl_keyrah_de.vkm
@@ -307,8 +349,11 @@ ${PLIST.sdl}share/vice/C64DTV/sdl_sym_da
 ${PLIST.sdl}share/vice/C64DTV/sdl_sym_de.vkm
 ${PLIST.sdl}share/vice/C64DTV/sdl_sym_fr.vkm
 ${PLIST.sdl}share/vice/C64DTV/sdl_sym_nl.vkm
+${PLIST.sdl}share/vice/C64DTV/sdl_sym_no_pi_4-500_bmc64.vkm
 ${PLIST.sdl}share/vice/C64DTV/sdl_sym_tr.vkm
 ${PLIST.sdl}share/vice/C64DTV/sdl_sym_uk.vkm
+${PLIST.sdl}share/vice/C64DTV/sdl_sym_uk_pi_4-500_bmc64.vkm
+${PLIST.sdl}share/vice/C64DTV/sdl_sym_us_pi_4-500_bmc64.vkm
 share/vice/C64DTV/spiff.vpl
 share/vice/CBM-II/amber.vpl
 share/vice/CBM-II/basic-901235+6-02.bin
@@ -355,6 +400,7 @@ share/vice/CBM-II/rom256l.vrs
 share/vice/CBM-II/rom500.vrs
 ${PLIST.sdl}share/vice/CBM-II/sdl_pos.vkm
 ${PLIST.sdl}share/vice/CBM-II/sdl_sym.vkm
+${PLIST.sdl}share/vice/CBM-II/sdl_sym_de.vkm
 share/vice/CBM-II/the64.vpl
 share/vice/CBM-II/vice.vpl
 share/vice/CBM-II/white.vpl
@@ -533,6 +579,8 @@ share/vice/SCPU64/ptoing.vpl
 share/vice/SCPU64/rgb.vpl
 share/vice/SCPU64/scpu64
 share/vice/SCPU64/scpu64mem.sym
+${PLIST.sdl}share/vice/SCPU64/sdl_c64p.vkm
+${PLIST.sdl}share/vice/SCPU64/sdl_joymap_8bitdo_6b.vjm
 ${PLIST.sdl}share/vice/SCPU64/sdl_keyrah.vkm
 ${PLIST.sdl}share/vice/SCPU64/sdl_keyrah_combian.vkm
 ${PLIST.sdl}share/vice/SCPU64/sdl_keyrah_de.vkm
@@ -551,8 +599,11 @@ ${PLIST.sdl}share/vice/SCPU64/sdl_sym_da
 ${PLIST.sdl}share/vice/SCPU64/sdl_sym_de.vkm
 ${PLIST.sdl}share/vice/SCPU64/sdl_sym_fr.vkm
 ${PLIST.sdl}share/vice/SCPU64/sdl_sym_nl.vkm
+${PLIST.sdl}share/vice/SCPU64/sdl_sym_no_pi_4-500_bmc64.vkm
 ${PLIST.sdl}share/vice/SCPU64/sdl_sym_tr.vkm
 ${PLIST.sdl}share/vice/SCPU64/sdl_sym_uk.vkm
+${PLIST.sdl}share/vice/SCPU64/sdl_sym_uk_pi_4-500_bmc64.vkm
+${PLIST.sdl}share/vice/SCPU64/sdl_sym_us_pi_4-500_bmc64.vkm
 share/vice/SCPU64/the64.vpl
 share/vice/SCPU64/vice.vpl
 share/vice/VIC20/PALette.vpl
@@ -582,83 +633,26 @@ ${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
-share/vice/common/C128_24.png
-share/vice/common/C128_256.png
-share/vice/common/C128_32.png
-share/vice/common/C128_48.png
-share/vice/common/C128_64.png
-share/vice/common/C64_1024.svg
-share/vice/common/C64_16.png
-share/vice/common/C64_24.png
-share/vice/common/C64_256.png
-share/vice/common/C64_32.png
-share/vice/common/C64_48.png
-share/vice/common/C64_64.png
-share/vice/common/C64_Pro_Mono-STYLE.ttf
-share/vice/common/CBM2_1024.svg
-share/vice/common/CBM2_16.png
-share/vice/common/CBM2_24.png
-share/vice/common/CBM2_256.png
-share/vice/common/CBM2_32.png
-share/vice/common/CBM2_48.png
-share/vice/common/CBM2_64.png
-share/vice/common/CBM_Logo.svg
-share/vice/common/DTV_1024.svg
-share/vice/common/DTV_16.png
-share/vice/common/DTV_24.png
-share/vice/common/DTV_256.png
-share/vice/common/DTV_32.png
-share/vice/common/DTV_48.png
-share/vice/common/DTV_64.png
-share/vice/common/Icon-128%2x.png@localhost
-share/vice/common/PET_1024.svg
-share/vice/common/PET_16.png
-share/vice/common/PET_24.png
-share/vice/common/PET_256.png
-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
-share/vice/common/Plus4_256.png
-share/vice/common/Plus4_32.png
-share/vice/common/Plus4_48.png
-share/vice/common/Plus4_64.png
-share/vice/common/SCPU_1024.svg
-share/vice/common/SCPU_16.png
-share/vice/common/SCPU_24.png
-share/vice/common/SCPU_256.png
-share/vice/common/SCPU_32.png
-share/vice/common/SCPU_48.png
-share/vice/common/SCPU_64.png
-share/vice/common/SID_1024.svg
-share/vice/common/SID_16.png
-share/vice/common/SID_24.png
-share/vice/common/SID_256.png
-share/vice/common/SID_32.png
-share/vice/common/SID_48.png
-share/vice/common/SID_64.png
-share/vice/common/VIC20_1024.svg
-share/vice/common/VIC20_16.png
-share/vice/common/VIC20_24.png
-share/vice/common/VIC20_256.png
-share/vice/common/VIC20_32.png
-share/vice/common/VIC20_48.png
-share/vice/common/VIC20_64.png
-share/vice/common/icon1024x1024.png
-share/vice/common/vice-logo-black.svg
+${PLIST.gtk}share/vice/common/C64_Pro_Mono-STYLE.ttf
+${PLIST.gtk}share/vice/common/CBM_Logo.svg
+${PLIST.gtk}share/vice/common/PetMe.ttf
+${PLIST.gtk}share/vice/common/PetMe128.ttf
+${PLIST.gtk}share/vice/common/PetMe1282Y.ttf
+${PLIST.gtk}share/vice/common/PetMe2X.ttf
+${PLIST.gtk}share/vice/common/PetMe2Y.ttf
+${PLIST.gtk}share/vice/common/PetMe64.ttf
+${PLIST.gtk}share/vice/common/PetMe642Y.ttf
+${PLIST.gtk}share/vice/common/vice-logo-black.svg
 ${PLIST.gtk}share/vice/common/vice.gresource
+${PLIST.sdl}share/vice/common/vice-vsid_256.png
+${PLIST.sdl}share/vice/common/vice-x128_256.png
+${PLIST.sdl}share/vice/common/vice-x64_256.png
+${PLIST.sdl}share/vice/common/vice-x64dtv_256.png
+${PLIST.sdl}share/vice/common/vice-xcbm2_256.png
+${PLIST.sdl}share/vice/common/vice-xpet_256.png
+${PLIST.sdl}share/vice/common/vice-xplus4_256.png
+${PLIST.sdl}share/vice/common/vice-xscpu64_256.png
+${PLIST.sdl}share/vice/common/vice-xvic_256.png
 ${PLIST.gui}share/vice/hotkeys/hotkeys-cartridge.vhk
 ${PLIST.gui}share/vice/hotkeys/hotkeys-datasette.vhk
 ${PLIST.gui}share/vice/hotkeys/hotkeys-debug.vhk
@@ -670,5 +664,3 @@ ${PLIST.gui}share/vice/hotkeys/hotkeys-s
 ${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.56 pkgsrc/emulators/vice/distinfo:1.57
--- pkgsrc/emulators/vice/distinfo:1.56 Fri Jan 31 17:49:02 2025
+++ pkgsrc/emulators/vice/distinfo      Sun Jan 11 14:15:03 2026
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.56 2025/01/31 17:49:02 rhialto Exp $
+$NetBSD: distinfo,v 1.57 2026/01/11 14:15:03 rhialto Exp $
 
-BLAKE2s (vice-3.9.tar.gz) = 9ce624e0149ecff19f75a57db2dfff50329140293d291e0791db7d806e91fb31
-SHA512 (vice-3.9.tar.gz) = 4a349dfe3e4310f1799cc705dffd01243df5b6ecfdb05b5f2ca3213fe6468831735dd3abcd6a34627e8ac2202bcb8ab617b81224c5a41cd83782868dd70b1fb8
-Size (vice-3.9.tar.gz) = 14249159 bytes
+BLAKE2s (vice-3.10.tar.gz) = 86764f30449f2e0f8014e7701a3e33358f4de81e2e14d950ca55bdb8981e5c4d
+SHA512 (vice-3.10.tar.gz) = 5cddbb09080d39fad7690e8c178af40a5834377e201252c112816e2a9af5b4afd1ed090fdd19217dd36c8d18f7c633fda1ee6efc1322334bbe13ba4866435f97
+Size (vice-3.10.tar.gz) = 14366175 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
+SHA1 (patch-src_arch_gtk3_joystickdrv_joystick_bsd.c) = 835726091dde5b6759e7a5e0f9c0d41024de4d3e
+SHA1 (patch-src_lib_libusbsiddrv_USBSID.cpp) = 94782f0a04d856b604d9144b9ca619b8c2364e6f

Index: pkgsrc/emulators/vice/options.mk
diff -u pkgsrc/emulators/vice/options.mk:1.18 pkgsrc/emulators/vice/options.mk:1.19
--- pkgsrc/emulators/vice/options.mk:1.18       Fri Jan 31 17:49:02 2025
+++ pkgsrc/emulators/vice/options.mk    Sun Jan 11 14:15:03 2026
@@ -1,10 +1,10 @@
-# $NetBSD: options.mk,v 1.18 2025/01/31 17:49:02 rhialto Exp $
+# $NetBSD: options.mk,v 1.19 2026/01/11 14:15:03 rhialto Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.vice
-PKG_SUPPORTED_OPTIONS=         ffmpeg vice-x64 vice-cpuhistory pulseaudio alsa
+PKG_SUPPORTED_OPTIONS=         vice-x64 vice-cpuhistory pulseaudio alsa
 PKG_OPTIONS_REQUIRED_GROUPS=   gui
 PKG_OPTIONS_GROUP.gui=         gtk3 sdl sdl2 vice-headless
-PKG_SUGGESTED_OPTIONS=         gtk3 ffmpeg
+PKG_SUGGESTED_OPTIONS=         gtk3
 
 .include "../../mk/bsd.options.mk"
 
@@ -16,27 +16,25 @@ PLIST.gtk=          yes
 PLIST.gui=             yes
 TOOL_DEPENDS+=         glib2-tools>=2.56:../../devel/glib2-tools
 
+.  include "../../x11/gtk3/buildlink3.mk"
+.  include "../../graphics/glew/buildlink3.mk"
+
+# Let gtk3 include desktop files and icons.
 CONFIGURE_ARGS+=       --enable-desktop-files
 PLIST.desktop=         yes
 TOOL_DEPENDS+=         xdg-utils-[0-9]*:../../misc/xdg-utils
-
-.  include "../../x11/gtk3/buildlink3.mk"
-.  include "../../graphics/glew/buildlink3.mk"
+TOOL_DEPENDS+=         desktop-file-utils-[0-9]*:../../sysutils/desktop-file-utils
+MAKE_FLAGS+=           DESKTOP_PREFIX=${PREFIX}
 
 # XXX work around misc/xdg-utils being completely broken;
 #     the post-install target moves the *.menu file around.
 XDG_CONFIG_DIR=                ${PREFIX}/etc/xdg
 XDG_DATA_DIR=          ${PREFIX}/share
-MAKE_ENV+=             XDG_CONFIG_DIRS="${DESTDIR}${XDG_CONFIG_DIR}"
-MAKE_ENV+=             XDG_DATA_DIRS="${DESTDIR}${XDG_DATA_DIR}"
+MAKE_ENV+=             XDG_UTILS_INSTALL_MODE=user
 MAKE_ENV+=             XDG_UTILS_DEBUG_LEVEL=999
 INSTALLATION_DIRS+=    ${XDG_CONFIG_DIR}/menus/applications-merged
 INSTALLATION_DIRS+=    ${XDG_DATA_DIR}/applications
 INSTALLATION_DIRS+=    ${XDG_DATA_DIR}/desktop-directories
-MAKE_DIRS+=            ${PKG_SYSCONFBASE}/xdg/menus/applications-merged
-
-CONF_FILES+=   ${PREFIX}/share/vice/vice-org-vice-org.menu \
-               ${PKG_SYSCONFBASE}/xdg/menus/applications-merged/vice-org-vice-org.menu
 
 BUILD_DEFS+=   PKG_SYSCONFBASE
 
@@ -65,14 +63,6 @@ PLIST.gui=           yes
 CONFIGURE_ARGS+=       --enable-headlessui
 .endif
 
-# If desired, ffmpeg and lame can be build-time-only dependencies,
-# since they are loaded dynamically only.
-.if !empty(PKG_OPTIONS:Mffmpeg)
-#BUILDLINK_DEPMETHOD.ffmpeg?=  build
-CONFIGURE_ARGS+=       --enable-ffmpeg
-.  include "../../multimedia/ffmpeg4/buildlink3.mk"
-.endif
-
 # Building x64 is deprecated, in favour of x64sc (but that is slower).
 .if !empty(PKG_OPTIONS:Mvice-x64)
 CONFIGURE_ARGS+=       --enable-x64

Added files:

Index: pkgsrc/emulators/vice/patches/patch-Makefile.in
diff -u /dev/null pkgsrc/emulators/vice/patches/patch-Makefile.in:1.1
--- /dev/null   Sun Jan 11 14:15:04 2026
+++ pkgsrc/emulators/vice/patches/patch-Makefile.in     Sun Jan 11 14:15:03 2026
@@ -0,0 +1,19 @@
+$NetBSD: patch-Makefile.in,v 1.1 2026/01/11 14:15:03 rhialto Exp $
+
+Some scripts use bash extensions.
+
+--- src/Makefile.in.orig       2025-01-09 14:28:43.451628620 +0000
++++ src/Makefile.in
+@@ -2381,10 +2381,10 @@ infocontrib.h: $(srcdir)/buildtools/geni
+ 
+ # also update the version/date in the readme
+ # FIXME: this is not the exact right place for this
+-      @$(SHELL) $(srcdir)/buildtools/updatereadme.sh $(top_srcdir)/README $(top_srcdir)/configure.ac $(top_srcdir)/src/vicedate.h
++      @$(BASH_SHELL) $(srcdir)/buildtools/updatereadme.sh $(top_srcdir)/README $(top_srcdir)/configure.ac $(top_srcdir)/src/vicedate.h
+ # also update the version/date in the index.html
+ # FIXME: this is not the exact right place for this
+-      @$(SHELL) $(srcdir)/buildtools/updateindex.sh $(top_srcdir)/doc/html/index.html $(top_srcdir)/configure.ac $(top_srcdir)/src/vicedate.h
++      @$(BASH_SHELL) $(srcdir)/buildtools/updateindex.sh $(top_srcdir)/doc/html/index.html $(top_srcdir)/configure.ac $(top_srcdir)/src/vicedate.h
+ 
+ .PHONY: vsid-all vsid-program
+ vsid-all:
Index: pkgsrc/emulators/vice/patches/patch-src_arch_gtk3_joystickdrv_joystick_bsd.c
diff -u /dev/null pkgsrc/emulators/vice/patches/patch-src_arch_gtk3_joystickdrv_joystick_bsd.c:1.1
--- /dev/null   Sun Jan 11 14:15:04 2026
+++ pkgsrc/emulators/vice/patches/patch-src_arch_gtk3_joystickdrv_joystick_bsd.c        Sun Jan 11 14:15:04 2026
@@ -0,0 +1,38 @@
+$NetBSD: patch-src_arch_gtk3_joystickdrv_joystick_bsd.c,v 1.1 2026/01/11 14:15:04 rhialto Exp $
+
+Avoid use-after-free.
+Taken from https://sourceforge.net/p/vice-emu/patches/419/
+
+--- src/arch/gtk3/joystickdrv/joystick_bsd.c.orig      2025-12-24 18:51:33 UTC
++++ src/arch/gtk3/joystickdrv/joystick_bsd.c
+@@ -643,18 +643,20 @@ void joystick_arch_init(void)
+         joydev = scan_device(node);
+         if (joydev != NULL) {
+             joy_priv_t *priv;
++            char *backup_name;
+ 
+             log_message(bsd_joy_log, "%s: %s", joydev->node, joydev->name);
+ 
+             /* scan axes, buttons and hats */
+             if (scan_inputs(joydev)) {
+                 /* OK: try to register */
++                backup_name = lib_strdup(joydev->name);
+                 if (!joystick_device_register(joydev)) {
+                     /* failure */
++                    /* joydev is already destroyed */
+                     log_warning(bsd_joy_log,
+                                 "failed to register device %s (\"%s\")",
+-                                joydev->node, joydev->name);
+-                    joystick_device_free(joydev);
++                                node, backup_name);
+                 } else {
+                     priv = joydev->priv;
+                     /* allocate arrays for previous input states */
+@@ -665,6 +667,7 @@ void joystick_arch_init(void)
+                     priv->prev_hats    = lib_calloc((size_t)joydev->num_hats,
+                                                     sizeof *priv->prev_hats);
+                 }
++                lib_free(backup_name);
+             } else {
+                 /* failure while scanning: log and free invalid device */
+                 log_warning(bsd_joy_log,
Index: pkgsrc/emulators/vice/patches/patch-src_lib_libusbsiddrv_USBSID.cpp
diff -u /dev/null pkgsrc/emulators/vice/patches/patch-src_lib_libusbsiddrv_USBSID.cpp:1.1
--- /dev/null   Sun Jan 11 14:15:04 2026
+++ pkgsrc/emulators/vice/patches/patch-src_lib_libusbsiddrv_USBSID.cpp Sun Jan 11 14:15:04 2026
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_lib_libusbsiddrv_USBSID.cpp,v 1.1 2026/01/11 14:15:04 rhialto Exp $
+
+NetBSD's pthread_setname_np() has 3 arguments.
+
+--- src/lib/libusbsiddrv/USBSID.cpp.orig       2025-12-25 21:07:32.102050718 +0000
++++ src/lib/libusbsiddrv/USBSID.cpp
+@@ -619,7 +619,9 @@ unsigned char USBSID_Class::USBSID_Read(
+ void* USBSID_Class::USBSID_Thread(void)
+ { /* Only starts when threaded == true */
+   USBDBG(stdout, "[USBSID] Thread starting\r\n");
+-  #ifdef _GNU_SOURCE
++  #if defined(__NetBSD__)
++  pthread_setname_np(pthread_self(), "USBSID Thread", NULL);
++  #elif defined(_GNU_SOURCE)
+   pthread_setname_np(pthread_self(), "USBSID Thread");
+   #endif
+   pthread_detach(pthread_self());

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index