diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile index ebe8baf5dbf..e7438c2a070 100644 --- a/emulators/vice/Makefile +++ b/emulators/vice/Makefile @@ -1,6 +1,6 @@ COMMENT = versatile Commodore emulator -DISTNAME = vice-3.9 +DISTNAME = vice-3.10 CATEGORIES = emulators @@ -10,7 +10,7 @@ HOMEPAGE = https://vice-emu.sourceforge.io/ PERMIT_PACKAGE = Yes WANTLIB += ${COMPILER_LIBCXX} SDL2 SDL2_image c iconv intl m png -WANTLIB += z +WANTLIB += usb-1.0 z COMPILER = base-clang ports-gcc base-gcc @@ -20,6 +20,7 @@ BUILD_DEPENDS = devel/xa \ converters/dos2unix LIB_DEPENDS = devel/gettext,-runtime \ + devel/libusb1 \ devel/sdl2 \ devel/sdl2-image \ graphics/png diff --git a/emulators/vice/distinfo b/emulators/vice/distinfo index 47f3a65e249..6008ac7f8bd 100644 --- a/emulators/vice/distinfo +++ b/emulators/vice/distinfo @@ -1,2 +1,2 @@ -SHA256 (vice-3.9.tar.gz) = QCArY0VeJrh+zGPrWlIyLG+j9XyrEqzwwifPn02uw3A= -SIZE (vice-3.9.tar.gz) = 14249159 +SHA256 (vice-3.10.tar.gz) = jlusGMvLnxkjgK0++IH4eQ9bdcQdez2mXYMZhdhk1tE= +SIZE (vice-3.10.tar.gz) = 14366175 diff --git a/emulators/vice/patches/patch-configure_ac b/emulators/vice/patches/patch-configure_ac index cf2afd679e0..81f0eb2a124 100644 --- a/emulators/vice/patches/patch-configure_ac +++ b/emulators/vice/patches/patch-configure_ac @@ -15,7 +15,7 @@ Index: configure.ac VICE_LDFLAGS="" dnl Avoid "ar: `u' modifier ignored since `D' is the default (see `U')" warning -@@ -2224,8 +2221,6 @@ if test x"$is_unix_x11" = "xyes" -o x"$is_unix_macosx" +@@ -2239,8 +2236,6 @@ if test x"$is_unix_x11" = "xyes" -o x"$is_unix_macosx" LIBS="-lsocket $LIBS"],,) AC_CHECK_LIB(bsd, gethostbyname,[ NETPLAY_LIBS="-lbsd $NETPLAY_LIBS"; LIBS="-lbsd $LIBS"],,) @@ -24,7 +24,7 @@ Index: configure.ac AC_CHECK_LIB(inet, gethostbyname,[ NETPLAY_LIBS="-linet $NETPLAY_LIBS"; LIBS="-linet $LIBS"],,) -@@ -2713,12 +2708,7 @@ if test x"$with_lame" = "xyes" ; then +@@ -2614,12 +2609,7 @@ if test x"$with_lame" = "xyes" ; then CFLAGS="$old_CFLAGS" fi diff --git a/emulators/vice/patches/patch-src_Makefile_in b/emulators/vice/patches/patch-src_Makefile_in index 98272174d84..34657e6b66a 100644 --- a/emulators/vice/patches/patch-src_Makefile_in +++ b/emulators/vice/patches/patch-src_Makefile_in @@ -4,7 +4,7 @@ those checks as they cause the build to fail. Index: src/Makefile.in --- src/Makefile.in.orig +++ src/Makefile.in -@@ -2358,15 +2358,7 @@ uninstall-am: uninstall-binPROGRAMS +@@ -2348,15 +2348,7 @@ uninstall-am: uninstall-binPROGRAMS infocontrib.h: $(srcdir)/buildtools/geninfocontrib_h.sh $(top_srcdir)/doc/vice.texi $(srcdir)/buildtools/infocontrib.sed @echo "generating infocontrib.h" diff --git a/emulators/vice/patches/patch-src_c64dtv_c64dtv-stubs_c b/emulators/vice/patches/patch-src_c64dtv_c64dtv-stubs_c deleted file mode 100644 index 81ded6f40b0..00000000000 --- a/emulators/vice/patches/patch-src_c64dtv_c64dtv-stubs_c +++ /dev/null @@ -1,21 +0,0 @@ -Fix duplicate symbols issues. - -Index: src/c64dtv/c64dtv-stubs.c ---- src/c64dtv/c64dtv-stubs.c.orig -+++ src/c64dtv/c64dtv-stubs.c -@@ -313,15 +313,3 @@ void rtc58321a_start_clock(rtc_58321a_t *context) - { - } - --int rsuser_resources_init(void) --{ -- return -1; --} --int rsuser_cmdline_options_init(void) --{ -- return -1; --} --int parallel_cable_cpu_resources_init(void) --{ -- return -1; --} diff --git a/emulators/vice/patches/patch-src_c64dtv_c64dtviec_c b/emulators/vice/patches/patch-src_c64dtv_c64dtviec_c deleted file mode 100644 index ce33e139703..00000000000 --- a/emulators/vice/patches/patch-src_c64dtv_c64dtviec_c +++ /dev/null @@ -1,17 +0,0 @@ -Fix duplicate symbols issues. - -Index: src/c64dtv/c64dtviec.c ---- src/c64dtv/c64dtviec.c.orig -+++ src/c64dtv/c64dtviec.c -@@ -113,11 +113,3 @@ void plus4tcbm_update_pc(uint8_t byte, unsigned int dn - { - } - --void parallel_cable_drive_write(int port, uint8_t data, int handshake, unsigned int dnr) --{ --} -- --uint8_t parallel_cable_drive_read(int port, int handshake) --{ -- return 0; --} diff --git a/emulators/vice/patches/patch-src_cbm2_cbm2-stubs_c b/emulators/vice/patches/patch-src_cbm2_cbm2-stubs_c deleted file mode 100644 index b7e373573b9..00000000000 --- a/emulators/vice/patches/patch-src_cbm2_cbm2-stubs_c +++ /dev/null @@ -1,17 +0,0 @@ -Fix duplicate symbols issues. - -Index: src/cbm2/cbm2-stubs.c ---- src/cbm2/cbm2-stubs.c.orig -+++ src/cbm2/cbm2-stubs.c -@@ -71,11 +71,3 @@ int parallel_cable_cpu_resources_init(void) - return -1; - } - --int rsuser_cmdline_options_init(void) --{ -- return -1; --} --int rsuser_resources_init(void) --{ -- return -1; --} diff --git a/emulators/vice/patches/patch-src_lib_libusbsiddrv_USBSID_cpp b/emulators/vice/patches/patch-src_lib_libusbsiddrv_USBSID_cpp new file mode 100644 index 00000000000..6cb69ea9c4a --- /dev/null +++ b/emulators/vice/patches/patch-src_lib_libusbsiddrv_USBSID_cpp @@ -0,0 +1,19 @@ +Cherry-picked from: https://sourceforge.net/p/vice-emu/code/46028/ + +Index: src/lib/libusbsiddrv/USBSID.cpp +--- src/lib/libusbsiddrv/USBSID.cpp.orig ++++ src/lib/libusbsiddrv/USBSID.cpp +@@ -37,7 +37,12 @@ using namespace std; + static inline uint8_t* us_alloc(size_t alignment, size_t size) + { + #if defined(__US_LINUX_COMPILE) +- return (uint8_t*)aligned_alloc(alignment, size); ++ #ifdef HAVE_ALIGNED_ALLOC ++ return (uint8_t*)aligned_alloc(alignment, size); ++ #else ++ (void)alignment; ++ return (uint8_t*)malloc(size); ++ #endif + #elif defined(__US_WINDOWS_COMPILE) + return (uint8_t*)_aligned_malloc(size, alignment); + #else diff --git a/emulators/vice/patches/patch-src_pet_pet-stubs_c b/emulators/vice/patches/patch-src_pet_pet-stubs_c deleted file mode 100644 index 6c571de51cf..00000000000 --- a/emulators/vice/patches/patch-src_pet_pet-stubs_c +++ /dev/null @@ -1,18 +0,0 @@ -Fix duplicate symbols issues. - -Index: src/pet/pet-stubs.c ---- src/pet/pet-stubs.c.orig -+++ src/pet/pet-stubs.c -@@ -163,11 +163,4 @@ int parallel_cable_cpu_resources_init(void) - { - return -1; - } --int rsuser_cmdline_options_init(void) --{ -- return -1; --} --int rsuser_resources_init(void) --{ -- return -1; --} -+ diff --git a/emulators/vice/pkg/PLIST b/emulators/vice/pkg/PLIST index 05a132904ad..db3e22f85ff 100644 --- a/emulators/vice/pkg/PLIST +++ b/emulators/vice/pkg/PLIST @@ -24,7 +24,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 @@ -112,6 +111,8 @@ share/vice/C64/pepto-palold.vpl share/vice/C64/pixcen.vpl share/vice/C64/ptoing.vpl share/vice/C64/rgb.vpl +share/vice/C64/sdl_c64p.vkm +share/vice/C64/sdl_joymap_8bitdo_6b.vjm share/vice/C64/sdl_joymap_keyrah_v3.vjm share/vice/C64/sdl_joymap_ps3.vjm share/vice/C64/sdl_joymap_thec64.vjm @@ -135,8 +136,11 @@ share/vice/C64/sdl_sym_de.vkm share/vice/C64/sdl_sym_fr.vkm share/vice/C64/sdl_sym_it.vkm share/vice/C64/sdl_sym_nl.vkm +share/vice/C64/sdl_sym_no_pi_4-500_bmc64.vkm share/vice/C64/sdl_sym_tr.vkm share/vice/C64/sdl_sym_uk.vkm +share/vice/C64/sdl_sym_uk_pi_4-500_bmc64.vkm +share/vice/C64/sdl_sym_us_pi_4-500_bmc64.vkm share/vice/C64/the64.vpl share/vice/C64/vice.vpl share/vice/C64DTV/ @@ -146,6 +150,8 @@ share/vice/C64DTV/chargen-901225-01.bin share/vice/C64DTV/default.vrs share/vice/C64DTV/dtvrom.bin share/vice/C64DTV/kernal-901227-03.bin +share/vice/C64DTV/sdl_c64p.vkm +share/vice/C64DTV/sdl_joymap_8bitdo_6b.vjm share/vice/C64DTV/sdl_keyrah.vkm share/vice/C64DTV/sdl_keyrah_combian.vkm share/vice/C64DTV/sdl_keyrah_de.vkm @@ -164,8 +170,11 @@ share/vice/C64DTV/sdl_sym_da.vkm share/vice/C64DTV/sdl_sym_de.vkm share/vice/C64DTV/sdl_sym_fr.vkm share/vice/C64DTV/sdl_sym_nl.vkm +share/vice/C64DTV/sdl_sym_no_pi_4-500_bmc64.vkm share/vice/C64DTV/sdl_sym_tr.vkm share/vice/C64DTV/sdl_sym_uk.vkm +share/vice/C64DTV/sdl_sym_uk_pi_4-500_bmc64.vkm +share/vice/C64DTV/sdl_sym_us_pi_4-500_bmc64.vkm share/vice/C64DTV/spiff.vpl share/vice/CBM-II/ share/vice/CBM-II/amber.vpl @@ -209,6 +218,7 @@ share/vice/CBM-II/rom256l.vrs share/vice/CBM-II/rom500.vrs share/vice/CBM-II/sdl_pos.vkm share/vice/CBM-II/sdl_sym.vkm +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 @@ -348,6 +358,8 @@ share/vice/SCPU64/ptoing.vpl share/vice/SCPU64/rgb.vpl share/vice/SCPU64/scpu64 share/vice/SCPU64/scpu64mem.sym +share/vice/SCPU64/sdl_c64p.vkm +share/vice/SCPU64/sdl_joymap_8bitdo_6b.vjm share/vice/SCPU64/sdl_keyrah.vkm share/vice/SCPU64/sdl_keyrah_combian.vkm share/vice/SCPU64/sdl_keyrah_de.vkm @@ -366,8 +378,11 @@ share/vice/SCPU64/sdl_sym_da.vkm share/vice/SCPU64/sdl_sym_de.vkm share/vice/SCPU64/sdl_sym_fr.vkm share/vice/SCPU64/sdl_sym_nl.vkm +share/vice/SCPU64/sdl_sym_no_pi_4-500_bmc64.vkm share/vice/SCPU64/sdl_sym_tr.vkm share/vice/SCPU64/sdl_sym_uk.vkm +share/vice/SCPU64/sdl_sym_uk_pi_4-500_bmc64.vkm +share/vice/SCPU64/sdl_sym_us_pi_4-500_bmc64.vkm share/vice/SCPU64/the64.vpl share/vice/SCPU64/vice.vpl share/vice/VIC20/ @@ -392,82 +407,15 @@ share/vice/VIC20/sdl_sym_de.vkm share/vice/VIC20/sdl_sym_uk.vkm share/vice/VIC20/vice.vpl share/vice/common/ -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 -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 +share/vice/common/vice-vsid_256.png +share/vice/common/vice-x128_256.png +share/vice/common/vice-x64_256.png +share/vice/common/vice-x64dtv_256.png +share/vice/common/vice-xcbm2_256.png +share/vice/common/vice-xpet_256.png +share/vice/common/vice-xplus4_256.png +share/vice/common/vice-xscpu64_256.png +share/vice/common/vice-xvic_256.png share/vice/hotkeys/ share/vice/hotkeys/hotkeys-cartridge.vhk share/vice/hotkeys/hotkeys-datasette.vhk