git: 2f8be656de81 - main - emulators/vice: update to 3.10
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 25 Dec 2025 19:17:57 UTC
The branch main has been updated by dinoex:
URL: https://cgit.FreeBSD.org/ports/commit/?id=2f8be656de8158afe57f124347b38af9421cba9a
commit 2f8be656de8158afe57f124347b38af9421cba9a
Author: Dirk Meyer <dinoex@FreeBSD.org>
AuthorDate: 2025-12-25 19:17:46 +0000
Commit: Dirk Meyer <dinoex@FreeBSD.org>
CommitDate: 2025-12-25 19:17:46 +0000
emulators/vice: update to 3.10
---
emulators/vice/Makefile | 12 +-
emulators/vice/distinfo | 6 +-
emulators/vice/files/patch-doc_vice.texi | 37 -----
.../patch-src_arch_gtk3_data_unix_Makefile.in | 11 --
.../patch-src_arch_gtk3_joystickdrv_joystick_bsd.c | 33 ++++
.../vice/files/patch-src_c64dtv_c64dtv-stubs.c | 15 --
emulators/vice/files/patch-src_c64dtv_c64dtviec.c | 15 --
emulators/vice/files/patch-src_cbm2_cbm2-stubs.c | 15 --
emulators/vice/files/patch-src_pet_pet-stubs.c | 16 --
emulators/vice/pkg-plist | 176 ++++++++++-----------
10 files changed, 130 insertions(+), 206 deletions(-)
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 2d0b5c5bb2d8..01f62b9f438b 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -1,6 +1,5 @@
PORTNAME= vice
-PORTVERSION= 3.9
-PORTREVISION= 1
+PORTVERSION= 3.10
CATEGORIES= emulators
MASTER_SITES= SF/vice-emu/releases
@@ -37,6 +36,8 @@ USE_XORG= xpm ice sm xext xv xt x11 xmu xxf86vm
USE_XORG+= xrender xinerama xi xrandr xcursor xcomposite xdamage xfixes
HAS_CONFIGURE= yes
MAKE_ENV+= XDG_DATA_DIRS=${STAGEDIR}${PREFIX}/share
+MAKE_ENV+= XDG_UTILS_INSTALL_MODE=system
+MAKE_ARGS+= DESKTOP_PREFIX=${PREFIX}
CFLAGS+= -fcommon
CONFIGURE_ARGS+= --prefix=${PREFIX} \
--with-lame \
@@ -105,9 +106,10 @@ pre-configure:
${REINPLACE_CMD} -e 's| doc||' ${WRKSRC}/Makefile.in
.endif
-# workaround for xdg-desktop-menu
-pre-install-GTK3UI-on:
- ${MKDIR} ${STAGEDIR}/${PREFIX}/share/desktop-directories
+pre-install:
+.if ${PORT_OPTIONS:MGTK3UI}
+ ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor
+.endif
post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/emulators/vice/distinfo b/emulators/vice/distinfo
index 2540dbdda830..06bb0b1ec87c 100644
--- a/emulators/vice/distinfo
+++ b/emulators/vice/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1735379833
-SHA256 (vice-3.9.tar.gz) = 40202b63455e26b87ecc63eb5a52322c6fa3f57cab12acf0c227cf9f4daec370
-SIZE (vice-3.9.tar.gz) = 14249159
+TIMESTAMP = 1766604191
+SHA256 (vice-3.10.tar.gz) = 8e5bac18cbcb9f192380ad3ef881f8790f5b75c41d7b3da65d831985d864d6d1
+SIZE (vice-3.10.tar.gz) = 14366175
diff --git a/emulators/vice/files/patch-doc_vice.texi b/emulators/vice/files/patch-doc_vice.texi
deleted file mode 100644
index a416ce2c42bb..000000000000
--- a/emulators/vice/files/patch-doc_vice.texi
+++ /dev/null
@@ -1,37 +0,0 @@
---- doc/vice.texi.orig 2018-12-19 23:41:08 UTC
-+++ doc/vice.texi
-@@ -1552,8 +1552,8 @@ System files can still be installed in a
- specify a complete path instead of just a file name. For example, if
- you specify @file{./kernal} as the kernal image name, the kernal image
- will be loaded from the current directory. This can be done by using
--command-line options or by modifying resource values (@pxref{Resource
--files}).
-+command-line options or by modifying
-+resource values (@pxref{Resource files}).
-
- @menu
- * ROM files:: Files containing dumps of the original ROMs.
-@@ -11775,8 +11775,9 @@ character cell, the 8 colour bits are us
- @subsection Changing screen colors
-
- It is also possible to choose what color set is used for the emulation
--window. This is done by specifying a palette file name (@pxref{Palette
--files}) in the @code{PaletteName} resource. The menu provides the
-+window. This is done by specifying a palette file
-+name (@pxref{Palette files}) in the @code{PaletteName}
-+resource. The menu provides the
- following values:
-
- @itemize @bullet
-@@ -12204,8 +12205,9 @@ xcbm5x0: (510)
- @subsection Changing screen colors
-
- It is also possible to choose what color set is used for the emulation
--window. This is done by specifying a palette file name (@pxref{Palette
--files}) in the @code{PaletteName} resource. The menu provides the
-+window. This is done by specifying a palette file name
-+(@pxref{Palette files}) in the @code{PaletteName}
-+resource. The menu provides the
- following values:
-
- @itemize @bullet
diff --git a/emulators/vice/files/patch-src_arch_gtk3_data_unix_Makefile.in b/emulators/vice/files/patch-src_arch_gtk3_data_unix_Makefile.in
deleted file mode 100644
index 451734fa448f..000000000000
--- a/emulators/vice/files/patch-src_arch_gtk3_data_unix_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/arch/gtk3/data/unix/Makefile.in.orig 2023-12-24 17:42:17 UTC
-+++ src/arch/gtk3/data/unix/Makefile.in
-@@ -732,7 +732,7 @@ uninstall-am:
- @INSTALL_DESKTOP_FILES_TRUE@@MACOS_COMPILE_FALSE@@UNIX_COMPILE_TRUE@ "SID_1024.svg"
-
- @INSTALL_DESKTOP_FILES_TRUE@@MACOS_COMPILE_FALSE@@UNIX_COMPILE_TRUE@install-data-hook: $(VICE_DIR_FILE) $(VICE_DESKTOP_FILES)
--@INSTALL_DESKTOP_FILES_TRUE@@MACOS_COMPILE_FALSE@@UNIX_COMPILE_TRUE@ $(XDG_DESKTOP_MENU) install "$(VICE_DIR_FILE)" $(VICE_DESKTOP_FILES)
-+@INSTALL_DESKTOP_FILES_TRUE@@MACOS_COMPILE_FALSE@@UNIX_COMPILE_TRUE@ $(XDG_DESKTOP_MENU) install --mode system "$(VICE_DIR_FILE)" $(VICE_DESKTOP_FILES)
- @INSTALL_DESKTOP_FILES_TRUE@@MACOS_COMPILE_FALSE@@UNIX_COMPILE_TRUE@ $(XDG_DESKTOP_MENU) forceupdate
- @INSTALL_DESKTOP_FILES_TRUE@@MACOS_COMPILE_FALSE@@UNIX_COMPILE_TRUE@ @echo " "
- @INSTALL_DESKTOP_FILES_TRUE@@MACOS_COMPILE_FALSE@@UNIX_COMPILE_TRUE@ @echo "* Remember that for desktop updates to show up, you may have to log off and on,"
diff --git a/emulators/vice/files/patch-src_arch_gtk3_joystickdrv_joystick_bsd.c b/emulators/vice/files/patch-src_arch_gtk3_joystickdrv_joystick_bsd.c
new file mode 100644
index 000000000000..23315b9c617f
--- /dev/null
+++ b/emulators/vice/files/patch-src_arch_gtk3_joystickdrv_joystick_bsd.c
@@ -0,0 +1,33 @@
+--- 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,
diff --git a/emulators/vice/files/patch-src_c64dtv_c64dtv-stubs.c b/emulators/vice/files/patch-src_c64dtv_c64dtv-stubs.c
deleted file mode 100644
index 25ab5b3c983e..000000000000
--- a/emulators/vice/files/patch-src_c64dtv_c64dtv-stubs.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/c64dtv/c64dtv-stubs.c.orig 2024-12-24 19:12:44 UTC
-+++ src/c64dtv/c64dtv-stubs.c
-@@ -313,6 +313,7 @@ void rtc58321a_start_clock(rtc_58321a_t *context)
- {
- }
-
-+#if 0
- int rsuser_resources_init(void)
- {
- return -1;
-@@ -325,3 +326,4 @@ int parallel_cable_cpu_resources_init(void)
- {
- return -1;
- }
-+#endif
diff --git a/emulators/vice/files/patch-src_c64dtv_c64dtviec.c b/emulators/vice/files/patch-src_c64dtv_c64dtviec.c
deleted file mode 100644
index 32588176c80f..000000000000
--- a/emulators/vice/files/patch-src_c64dtv_c64dtviec.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/c64dtv/c64dtviec.c.orig 2024-12-24 19:12:44 UTC
-+++ src/c64dtv/c64dtviec.c
-@@ -113,6 +113,7 @@ void plus4tcbm_update_pc(uint8_t byte, unsigned int dn
- {
- }
-
-+#if 0
- void parallel_cable_drive_write(int port, uint8_t data, int handshake, unsigned int dnr)
- {
- }
-@@ -121,3 +122,4 @@ uint8_t parallel_cable_drive_read(int port, int handsh
- {
- return 0;
- }
-+#endif
diff --git a/emulators/vice/files/patch-src_cbm2_cbm2-stubs.c b/emulators/vice/files/patch-src_cbm2_cbm2-stubs.c
deleted file mode 100644
index edaeeb48a35e..000000000000
--- a/emulators/vice/files/patch-src_cbm2_cbm2-stubs.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/cbm2/cbm2-stubs.c.orig 2024-12-24 19:12:44 UTC
-+++ src/cbm2/cbm2-stubs.c
-@@ -71,6 +71,7 @@ int parallel_cable_cpu_resources_init(void)
- return -1;
- }
-
-+#if 0
- int rsuser_cmdline_options_init(void)
- {
- return -1;
-@@ -79,3 +80,4 @@ int rsuser_resources_init(void)
- {
- return -1;
- }
-+#endif
diff --git a/emulators/vice/files/patch-src_pet_pet-stubs.c b/emulators/vice/files/patch-src_pet_pet-stubs.c
deleted file mode 100644
index 19a39b73ebdd..000000000000
--- a/emulators/vice/files/patch-src_pet_pet-stubs.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/pet/pet-stubs.c.orig 2024-12-24 19:12:44 UTC
-+++ src/pet/pet-stubs.c
-@@ -163,6 +163,8 @@ int parallel_cable_cpu_resources_init(void)
- {
- return -1;
- }
-+
-+#if 0
- int rsuser_cmdline_options_init(void)
- {
- return -1;
-@@ -171,3 +173,4 @@ int rsuser_resources_init(void)
- {
- return -1;
- }
-+#endif
diff --git a/emulators/vice/pkg-plist b/emulators/vice/pkg-plist
index 76c039288609..5cbf1d890989 100644
--- a/emulators/vice/pkg-plist
+++ b/emulators/vice/pkg-plist
@@ -12,18 +12,53 @@ bin/xpet
bin/xplus4
bin/xscpu64
bin/xvic
-%%GTK3UI%%share/applications/vice-org-x64sc.desktop
-%%GTK3UI%%share/applications/vice-org-x64dtv.desktop
-%%GTK3UI%%share/applications/vice-org-xscpu64.desktop
-%%GTK3UI%%share/applications/vice-org-x128.desktop
-%%GTK3UI%%share/applications/vice-org-xvic.desktop
-%%GTK3UI%%share/applications/vice-org-xplus4.desktop
-%%GTK3UI%%share/applications/vice-org-xpet.desktop
-%%GTK3UI%%share/applications/vice-org-xcbm5x0.desktop
-%%GTK3UI%%share/applications/vice-org-xcbm2.desktop
-%%GTK3UI%%share/applications/vice-org-vsid.desktop
-%%GTK3UI%%share/applications/vice-org-x64.desktop
-%%GTK3UI%%share/desktop-directories/vice-org-vice-org.directory
+%%GTK3UI%%share/applications/x64sc.desktop
+%%GTK3UI%%share/applications/x64dtv.desktop
+%%GTK3UI%%share/applications/xscpu64.desktop
+%%GTK3UI%%share/applications/x128.desktop
+%%GTK3UI%%share/applications/xvic.desktop
+%%GTK3UI%%share/applications/xplus4.desktop
+%%GTK3UI%%share/applications/xpet.desktop
+%%GTK3UI%%share/applications/xcbm5x0.desktop
+%%GTK3UI%%share/applications/xcbm2.desktop
+%%GTK3UI%%share/applications/vsid.desktop
+%%GTK3UI%%share/applications/x64.desktop
+%%GTK3UI%%share/icons/hicolor/256x256/apps/vice-vsid.png
+%%GTK3UI%%share/icons/hicolor/256x256/apps/vice-x128.png
+%%GTK3UI%%share/icons/hicolor/256x256/apps/vice-x64.png
+%%GTK3UI%%share/icons/hicolor/256x256/apps/vice-x64dtv.png
+%%GTK3UI%%share/icons/hicolor/256x256/apps/vice-xcbm2.png
+%%GTK3UI%%share/icons/hicolor/256x256/apps/vice-xpet.png
+%%GTK3UI%%share/icons/hicolor/256x256/apps/vice-xplus4.png
+%%GTK3UI%%share/icons/hicolor/256x256/apps/vice-xscpu64.png
+%%GTK3UI%%share/icons/hicolor/256x256/apps/vice-xvic.png
+%%GTK3UI%%share/icons/hicolor/32x32/apps/vice-vsid.png
+%%GTK3UI%%share/icons/hicolor/32x32/apps/vice-x128.png
+%%GTK3UI%%share/icons/hicolor/32x32/apps/vice-x64.png
+%%GTK3UI%%share/icons/hicolor/32x32/apps/vice-x64dtv.png
+%%GTK3UI%%share/icons/hicolor/32x32/apps/vice-xcbm2.png
+%%GTK3UI%%share/icons/hicolor/32x32/apps/vice-xpet.png
+%%GTK3UI%%share/icons/hicolor/32x32/apps/vice-xplus4.png
+%%GTK3UI%%share/icons/hicolor/32x32/apps/vice-xscpu64.png
+%%GTK3UI%%share/icons/hicolor/32x32/apps/vice-xvic.png
+%%GTK3UI%%share/icons/hicolor/48x48/apps/vice-vsid.png
+%%GTK3UI%%share/icons/hicolor/48x48/apps/vice-x128.png
+%%GTK3UI%%share/icons/hicolor/48x48/apps/vice-x64.png
+%%GTK3UI%%share/icons/hicolor/48x48/apps/vice-x64dtv.png
+%%GTK3UI%%share/icons/hicolor/48x48/apps/vice-xcbm2.png
+%%GTK3UI%%share/icons/hicolor/48x48/apps/vice-xpet.png
+%%GTK3UI%%share/icons/hicolor/48x48/apps/vice-xplus4.png
+%%GTK3UI%%share/icons/hicolor/48x48/apps/vice-xscpu64.png
+%%GTK3UI%%share/icons/hicolor/48x48/apps/vice-xvic.png
+%%GTK3UI%%share/icons/hicolor/64x64/apps/vice-vsid.png
+%%GTK3UI%%share/icons/hicolor/64x64/apps/vice-x128.png
+%%GTK3UI%%share/icons/hicolor/64x64/apps/vice-x64.png
+%%GTK3UI%%share/icons/hicolor/64x64/apps/vice-x64dtv.png
+%%GTK3UI%%share/icons/hicolor/64x64/apps/vice-xcbm2.png
+%%GTK3UI%%share/icons/hicolor/64x64/apps/vice-xpet.png
+%%GTK3UI%%share/icons/hicolor/64x64/apps/vice-xplus4.png
+%%GTK3UI%%share/icons/hicolor/64x64/apps/vice-xscpu64.png
+%%GTK3UI%%share/icons/hicolor/64x64/apps/vice-xvic.png
%%DATADIR%%/C128/basic64-901226-01.bin
%%DATADIR%%/C128/basichi-318019-04.bin
%%DATADIR%%/C128/basiclo-318018-04.bin
@@ -32,7 +67,6 @@ bin/xvic
%%DATADIR%%/C128/ccs64.vpl
%%DATADIR%%/C128/chargen-315079-01.bin
%%DATADIR%%/C128/chargen-325078-02.bin
-%%DATADIR%%/C128/chargen-325167-01.bin
%%DATADIR%%/C128/chargen-325167-02.bin
%%DATADIR%%/C128/chargen-325173-01D.bin
%%DATADIR%%/C128/chargen-325181-01.bin
@@ -149,8 +183,12 @@ bin/xvic
%%DATADIR%%/C64/pixcen.vpl
%%DATADIR%%/C64/ptoing.vpl
%%DATADIR%%/C64/rgb.vpl
+%%SDLUI2%%%%DATADIR%%/C64/sdl_c64p.vkm
+%%SDLUI2%%%%DATADIR%%/C64/sdl_joymap_8bitdo_6b.vjm
+%%SDLUI2%%%%DATADIR%%/C64/sdl_joymap_keyrah_v3.vjm
%%SDLUI2%%%%DATADIR%%/C64/sdl_joymap_thec64.vjm
%%SDLUI2%%%%DATADIR%%/C64/sdl_joymap_ps3.vjm
+%%SDLUI2%%%%DATADIR%%/C64/sdl_joymap_xbox360.vjm
%%SDLUI2%%%%DATADIR%%/C64/sdl_keyrah.vkm
%%SDLUI2%%%%DATADIR%%/C64/sdl_keyrah_combian.vkm
%%SDLUI2%%%%DATADIR%%/C64/sdl_keyrah_de.vkm
@@ -170,8 +208,11 @@ bin/xvic
%%SDLUI2%%%%DATADIR%%/C64/sdl_sym_fr.vkm
%%SDLUI2%%%%DATADIR%%/C64/sdl_sym_it.vkm
%%SDLUI2%%%%DATADIR%%/C64/sdl_sym_nl.vkm
+%%SDLUI2%%%%DATADIR%%/C64/sdl_sym_no_pi_4-500_bmc64.vkm
%%SDLUI2%%%%DATADIR%%/C64/sdl_sym_tr.vkm
%%SDLUI2%%%%DATADIR%%/C64/sdl_sym_uk.vkm
+%%SDLUI2%%%%DATADIR%%/C64/sdl_sym_uk_pi_4-500_bmc64.vkm
+%%SDLUI2%%%%DATADIR%%/C64/sdl_sym_us_pi_4-500_bmc64.vkm
%%DATADIR%%/C64/the64.vpl
%%DATADIR%%/C64/vice.vpl
%%DATADIR%%/C64DTV/c64mem.sym
@@ -201,6 +242,8 @@ bin/xvic
%%GTK3UI%%%%DATADIR%%/C64DTV/gtk3_sym_uk.vkm
%%GTK3UI%%%%DATADIR%%/C64DTV/gtk3_the64_de.vkm
%%DATADIR%%/C64DTV/kernal-901227-03.bin
+%%SDLUI2%%%%DATADIR%%/C64DTV/sdl_c64p.vkm
+%%SDLUI2%%%%DATADIR%%/C64DTV/sdl_joymap_8bitdo_6b.vjm
%%SDLUI2%%%%DATADIR%%/C64DTV/sdl_keyrah.vkm
%%SDLUI2%%%%DATADIR%%/C64DTV/sdl_keyrah_combian.vkm
%%SDLUI2%%%%DATADIR%%/C64DTV/sdl_keyrah_de.vkm
@@ -219,8 +262,11 @@ bin/xvic
%%SDLUI2%%%%DATADIR%%/C64DTV/sdl_sym_de.vkm
%%SDLUI2%%%%DATADIR%%/C64DTV/sdl_sym_fr.vkm
%%SDLUI2%%%%DATADIR%%/C64DTV/sdl_sym_nl.vkm
+%%SDLUI2%%%%DATADIR%%/C64DTV/sdl_sym_no_pi_4-500_bmc64.vkm
%%SDLUI2%%%%DATADIR%%/C64DTV/sdl_sym_tr.vkm
%%SDLUI2%%%%DATADIR%%/C64DTV/sdl_sym_uk.vkm
+%%SDLUI2%%%%DATADIR%%/C64DTV/sdl_sym_uk_pi_4-500_bmc64.vkm
+%%SDLUI2%%%%DATADIR%%/C64DTV/sdl_sym_us_pi_4-500_bmc64.vkm
%%DATADIR%%/C64DTV/spiff.vpl
%%DATADIR%%/CBM-II/amber.vpl
%%DATADIR%%/CBM-II/basic-901235+6-02.bin
@@ -267,6 +313,7 @@ bin/xvic
%%DATADIR%%/CBM-II/rom500.vrs
%%SDLUI2%%%%DATADIR%%/CBM-II/sdl_pos.vkm
%%SDLUI2%%%%DATADIR%%/CBM-II/sdl_sym.vkm
+%%SDLUI2%%%%DATADIR%%/CBM-II/sdl_sym_de.vkm
%%DATADIR%%/CBM-II/the64.vpl
%%DATADIR%%/CBM-II/vice.vpl
%%DATADIR%%/CBM-II/white.vpl
@@ -445,6 +492,8 @@ bin/xvic
%%DATADIR%%/SCPU64/rgb.vpl
%%DATADIR%%/SCPU64/scpu64
%%DATADIR%%/SCPU64/scpu64mem.sym
+%%SDLUI2%%%%DATADIR%%/SCPU64/sdl_c64p.vkm
+%%SDLUI2%%%%DATADIR%%/SCPU64/sdl_joymap_8bitdo_6b.vjm
%%SDLUI2%%%%DATADIR%%/SCPU64/sdl_keyrah.vkm
%%SDLUI2%%%%DATADIR%%/SCPU64/sdl_keyrah_combian.vkm
%%SDLUI2%%%%DATADIR%%/SCPU64/sdl_keyrah_de.vkm
@@ -463,8 +512,11 @@ bin/xvic
%%SDLUI2%%%%DATADIR%%/SCPU64/sdl_sym_de.vkm
%%SDLUI2%%%%DATADIR%%/SCPU64/sdl_sym_fr.vkm
%%SDLUI2%%%%DATADIR%%/SCPU64/sdl_sym_nl.vkm
+%%SDLUI2%%%%DATADIR%%/SCPU64/sdl_sym_no_pi_4-500_bmc64.vkm
%%SDLUI2%%%%DATADIR%%/SCPU64/sdl_sym_tr.vkm
%%SDLUI2%%%%DATADIR%%/SCPU64/sdl_sym_uk.vkm
+%%SDLUI2%%%%DATADIR%%/SCPU64/sdl_sym_uk_pi_4-500_bmc64.vkm
+%%SDLUI2%%%%DATADIR%%/SCPU64/sdl_sym_us_pi_4-500_bmc64.vkm
%%DATADIR%%/SCPU64/the64.vpl
%%DATADIR%%/SCPU64/vice.vpl
%%DATADIR%%/VIC20/PALette.vpl
@@ -486,88 +538,34 @@ bin/xvic
%%DATADIR%%/VIC20/mike-ntsc.vpl
%%DATADIR%%/VIC20/mike-pal.vpl
%%SDLUI2%%%%DATADIR%%/VIC20/sdl_pos.vkm
+%%SDLUI2%%%%DATADIR%%/VIC20/sdl_pos_de.vkm
%%SDLUI2%%%%DATADIR%%/VIC20/sdl_pos_fr.vkm
%%SDLUI2%%%%DATADIR%%/VIC20/sdl_pos_fi.vkm
+%%SDLUI2%%%%DATADIR%%/VIC20/sdl_pos_uk.vkm
%%SDLUI2%%%%DATADIR%%/VIC20/sdl_sym.vkm
%%SDLUI2%%%%DATADIR%%/VIC20/sdl_sym_de.vkm
+%%SDLUI2%%%%DATADIR%%/VIC20/sdl_sym_uk.vkm
%%DATADIR%%/VIC20/vice.vpl
-%%DATADIR%%/common/C128_1024.svg
-%%DATADIR%%/common/C128_16.png
-%%DATADIR%%/common/C128_24.png
-%%DATADIR%%/common/C128_256.png
-%%DATADIR%%/common/C128_32.png
-%%DATADIR%%/common/C128_48.png
-%%DATADIR%%/common/C128_64.png
-%%DATADIR%%/common/C64_1024.svg
-%%DATADIR%%/common/C64_16.png
-%%DATADIR%%/common/C64_24.png
-%%DATADIR%%/common/C64_256.png
-%%DATADIR%%/common/C64_32.png
-%%DATADIR%%/common/C64_48.png
-%%DATADIR%%/common/C64_64.png
-%%DATADIR%%/common/C64_Pro_Mono-STYLE.ttf
-%%DATADIR%%/common/CBM_Logo.svg
-%%DATADIR%%/common/CBM2_1024.svg
-%%DATADIR%%/common/CBM2_16.png
-%%DATADIR%%/common/CBM2_24.png
-%%DATADIR%%/common/CBM2_256.png
-%%DATADIR%%/common/CBM2_32.png
-%%DATADIR%%/common/CBM2_48.png
-%%DATADIR%%/common/CBM2_64.png
-%%DATADIR%%/common/DTV_1024.svg
-%%DATADIR%%/common/DTV_16.png
-%%DATADIR%%/common/DTV_24.png
-%%DATADIR%%/common/DTV_256.png
-%%DATADIR%%/common/DTV_32.png
-%%DATADIR%%/common/DTV_48.png
-%%DATADIR%%/common/DTV_64.png
-%%DATADIR%%/common/Icon-128@2x.png
-%%DATADIR%%/common/PET_16.png
-%%DATADIR%%/common/PET_24.png
-%%DATADIR%%/common/PET_256.png
-%%DATADIR%%/common/PET_256.svg
-%%DATADIR%%/common/PET_32.png
-%%DATADIR%%/common/PET_48.png
-%%DATADIR%%/common/PET_64.png
-%%DATADIR%%/common/PetMe.ttf
-%%DATADIR%%/common/PetMe128.ttf
-%%DATADIR%%/common/PetMe1282Y.ttf
-%%DATADIR%%/common/PetMe2X.ttf
-%%DATADIR%%/common/PetMe2Y.ttf
-%%DATADIR%%/common/PetMe64.ttf
-%%DATADIR%%/common/PetMe642Y.ttf
-%%DATADIR%%/common/Plus4_1024.svg
-%%DATADIR%%/common/Plus4_16.png
-%%DATADIR%%/common/Plus4_24.png
-%%DATADIR%%/common/Plus4_256.png
-%%DATADIR%%/common/Plus4_32.png
-%%DATADIR%%/common/Plus4_48.png
-%%DATADIR%%/common/Plus4_64.png
-%%DATADIR%%/common/SCPU_1024.svg
-%%DATADIR%%/common/SCPU_16.png
-%%DATADIR%%/common/SCPU_24.png
-%%DATADIR%%/common/SCPU_256.png
-%%DATADIR%%/common/SCPU_32.png
-%%DATADIR%%/common/SCPU_48.png
-%%DATADIR%%/common/SCPU_64.png
-%%DATADIR%%/common/SID_1024.svg
-%%DATADIR%%/common/SID_16.png
-%%DATADIR%%/common/SID_24.png
-%%DATADIR%%/common/SID_256.png
-%%DATADIR%%/common/SID_32.png
-%%DATADIR%%/common/SID_48.png
-%%DATADIR%%/common/SID_64.png
-%%DATADIR%%/common/VIC20_1024.svg
-%%DATADIR%%/common/VIC20_16.png
-%%DATADIR%%/common/VIC20_24.png
-%%DATADIR%%/common/VIC20_256.png
-%%DATADIR%%/common/VIC20_32.png
-%%DATADIR%%/common/VIC20_48.png
-%%DATADIR%%/common/VIC20_64.png
-%%DATADIR%%/common/icon1024x1024.png
+%%GTK3UI%%%%DATADIR%%/common/C64_Pro_Mono-STYLE.ttf
+%%GTK3UI%%%%DATADIR%%/common/CBM_Logo.svg
+%%GTK3UI%%%%DATADIR%%/common/PetMe.ttf
+%%GTK3UI%%%%DATADIR%%/common/PetMe128.ttf
+%%GTK3UI%%%%DATADIR%%/common/PetMe1282Y.ttf
+%%GTK3UI%%%%DATADIR%%/common/PetMe2X.ttf
+%%GTK3UI%%%%DATADIR%%/common/PetMe2Y.ttf
+%%GTK3UI%%%%DATADIR%%/common/PetMe64.ttf
+%%GTK3UI%%%%DATADIR%%/common/PetMe642Y.ttf
%%GTK3UI%%%%DATADIR%%/common/vice.gresource
-%%DATADIR%%/common/vice-logo-black.svg
-%%DATADIR%%/common/PET_1024.svg
+%%GTK3UI%%%%DATADIR%%/common/vice-logo-black.svg
+%%SDLUI2%%%%DATADIR%%/common/vice-vsid_256.png
+%%SDLUI2%%%%DATADIR%%/common/vice-x128_256.png
+%%SDLUI2%%%%DATADIR%%/common/vice-x64_256.png
+%%SDLUI2%%%%DATADIR%%/common/vice-x64dtv_256.png
+%%SDLUI2%%%%DATADIR%%/common/vice-xcbm2_256.png
+%%SDLUI2%%%%DATADIR%%/common/vice-xpet_256.png
+%%SDLUI2%%%%DATADIR%%/common/vice-xplus4_256.png
+%%SDLUI2%%%%DATADIR%%/common/vice-xscpu64_256.png
+%%SDLUI2%%%%DATADIR%%/common/vice-xvic_256.png
%%GTK3UI%%%%DATADIR%%/hotkeys/hotkeys-cartridge.vhk
%%GTK3UI%%%%DATADIR%%/hotkeys/hotkeys-datasette.vhk
%%GTK3UI%%%%DATADIR%%/hotkeys/hotkeys-debug.vhk