diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile index 5490cca1c95..1b5e4c827c4 100644 --- a/emulators/vice/Makefile +++ b/emulators/vice/Makefile @@ -1,6 +1,6 @@ COMMENT = versatile Commodore emulator -DISTNAME = vice-3.5 +DISTNAME = vice-3.6.1 CATEGORIES = emulators @@ -32,6 +32,7 @@ CONFIGURE_ARGS += --without-alsa \ --without-pulse \ --disable-lame \ --disable-portaudio \ + --disable-html-docs \ --disable-pdf-docs \ --enable-sdlui2 diff --git a/emulators/vice/distinfo b/emulators/vice/distinfo index 114643f7f9a..8f9872d6603 100644 --- a/emulators/vice/distinfo +++ b/emulators/vice/distinfo @@ -1,2 +1,2 @@ -SHA256 (vice-3.5.tar.gz) = Vrl4+q64solgMr1gTQPDUBACGH7vHKWM7O1A8Rpl3A4= -SIZE (vice-3.5.tar.gz) = 22557578 +SHA256 (vice-3.6.1.tar.gz) = IN+EyFGq8vUABRCSf20xsy8mmRbTUUZcNm3Ar8ncFQw= +SIZE (vice-3.6.1.tar.gz) = 11454300 diff --git a/emulators/vice/patches/patch-configure_ac b/emulators/vice/patches/patch-configure_ac index b21c7b581d1..7eb0f790739 100644 --- a/emulators/vice/patches/patch-configure_ac +++ b/emulators/vice/patches/patch-configure_ac @@ -5,7 +5,7 @@ Index: configure.ac --- configure.ac.orig +++ configure.ac -@@ -24,9 +24,6 @@ dnl This has to happen before any other AC_* calls, so +@@ -34,9 +34,6 @@ dnl This has to happen before any other AC_* calls, so dnl Set VICE's compiler flags (can be overridden by the user) VICE_CPPFLAGS="-I\$(top_srcdir)/src/systemheaderoverride" @@ -14,8 +14,8 @@ Index: configure.ac -VICE_OBJCFLAGS="-g -O3" VICE_LDFLAGS="" - -@@ -2030,8 +2027,6 @@ if test x"$is_unix_x11" = "xyes" -o x"$is_unix_macosx" + dnl Avoid "ar: `u' modifier ignored since `D' is the default (see `U')" warning +@@ -2146,8 +2143,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"],,) -@@ -2615,12 +2610,7 @@ if test x"$enable_lame" = "xyes" ; then +@@ -2598,12 +2593,7 @@ if test x"$enable_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 442e90f6e49..91bb21d0e3c 100644 --- a/emulators/vice/patches/patch-src_Makefile_in +++ b/emulators/vice/patches/patch-src_Makefile_in @@ -4,23 +4,19 @@ those checks as they cause the build to fail. Index: src/Makefile.in --- src/Makefile.in.orig +++ src/Makefile.in -@@ -2457,19 +2457,7 @@ svnversion.h: svnversion.h.indirect +@@ -2295,15 +2295,7 @@ uninstall-am: uninstall-binPROGRAMS - infocontrib.h: $(srcdir)/buildtools/geninfocontrib_h.sh $(top_srcdir)/doc/vice.texi $(srcdir)/buildtools/infocontrib.sed + infocontrib.h: $(srcdir)/buildtools/geninfocontrib_h.sh $(top_srcdir)/doc/vice.texi $(srcdir)/buildtools/infocontrib.sed @echo "generating infocontrib.h" - @if [ "`file --mime-encoding $(srcdir)/buildtools/geninfocontrib_h.sh`" != "$(srcdir)/buildtools/geninfocontrib_h.sh: iso-8859-1" ]; then \ - echo "ERROR: geninfocontrib_h.sh contains content that is not valid iso-8859-x" >&2; \ - false; \ - fi - @$(SHELL) $(srcdir)/buildtools/geninfocontrib_h.sh infocontrib.h <$(top_srcdir)/doc/vice.texi | LC_ALL=C sed -f $(srcdir)/buildtools/infocontrib.sed >infocontrib.h + @$(SHELL) $(srcdir)/buildtools/geninfocontrib_h.sh infocontrib.h <$(top_srcdir)/doc/vice.texi `grep "VICEDATE_YEAR " $(top_srcdir)/src/vicedate.h | cut -d " " -f 3` | LC_ALL=C sed -f $(srcdir)/buildtools/infocontrib.sed >infocontrib.h - @if [ "`file --mime-encoding infocontrib.h`" != "infocontrib.h: iso-8859-1" ]; then \ - echo "ERROR: generated infocontrib.h contains content that is not valid iso-8859-x" >&2; \ -- if [ "$(TRAVIS)" != "" ]; then \ -- echo " but for now allowing travis build to continue. FIXME." >&2; \ -- else \ -- false; \ -- fi; \ +- false; \ - fi + # we need to replace \ and space by "regular" characters, else things break on some shells - # With Travis, using '\\\\' appears to 'fix' the sed error @LC_ALL=C sed -e 's/\\/{/g' -e 's/ /}/g' <$(top_srcdir)/README >./README.tmp diff --git a/emulators/vice/pkg/PLIST b/emulators/vice/pkg/PLIST index 4fcb7e65769..83ebf4658c6 100644 --- a/emulators/vice/pkg/PLIST +++ b/emulators/vice/pkg/PLIST @@ -23,7 +23,7 @@ share/doc/vice/GTK3-debian-frankenvice.md share/doc/vice/Linux-GTK3-Howto.txt share/doc/vice/NetBSD-GTK3-Howto.txt share/doc/vice/NetBSD-howto.txt -share/doc/vice/Readme-GTK3.txt +share/doc/vice/OpenBSD-GTK3-Howto.txt share/doc/vice/Readme-SDL.txt share/doc/vice/Readme-SDL2.txt share/doc/vice/Release-Howto.txt @@ -65,15 +65,21 @@ share/vice/C128/kernalfr share/vice/C128/kernalit share/vice/C128/kernalno share/vice/C128/kernalse +share/vice/C128/palette.vpl share/vice/C128/pc64.vpl share/vice/C128/pepto-ntsc-sony.vpl share/vice/C128/pepto-ntsc.vpl share/vice/C128/pepto-pal.vpl share/vice/C128/pepto-palold.vpl +share/vice/C128/pixcen.vpl share/vice/C128/ptoing.vpl share/vice/C128/rgb.vpl -share/vice/C128/sdl_hotkeys.vkm +share/vice/C128/sdl-hotkeys.vhk share/vice/C128/sdl_pos.vkm +share/vice/C128/sdl_sym.vkm +share/vice/C128/sdl_sym_de.vkm +share/vice/C128/sdl_sym_fr.vkm +share/vice/C128/sdl_v128.vkm share/vice/C128/vdc_comp.vpl share/vice/C128/vdc_deft.vpl share/vice/C128/vice.vpl @@ -96,15 +102,17 @@ share/vice/C64/gskernal share/vice/C64/jpchrgen share/vice/C64/jpkernal share/vice/C64/kernal +share/vice/C64/palette.vpl share/vice/C64/pc64.vpl share/vice/C64/pepto-ntsc-sony.vpl share/vice/C64/pepto-ntsc.vpl share/vice/C64/pepto-pal.vpl 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_hotkeys.vkm -share/vice/C64/sdl_hotkeys_vsid.vkm +share/vice/C64/sdl-hotkeys-vsid.vhk +share/vice/C64/sdl-hotkeys.vhk share/vice/C64/sdl_joymap_ps3.vjm share/vice/C64/sdl_joymap_thec64.vjm share/vice/C64/sdl_keyrah.vkm @@ -113,7 +121,6 @@ share/vice/C64/sdl_keyrah_de.vkm share/vice/C64/sdl_keyrah_retropie.vkm share/vice/C64/sdl_keyrah_retropie_de.vkm share/vice/C64/sdl_pos.vkm -share/vice/C64/sdl_pos_bmc64.vkm share/vice/C64/sdl_pos_ch.vkm share/vice/C64/sdl_pos_da.vkm share/vice/C64/sdl_pos_de.vkm @@ -122,6 +129,7 @@ share/vice/C64/sdl_pos_no.vkm share/vice/C64/sdl_sym.vkm share/vice/C64/sdl_sym_da.vkm 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/sxkernal @@ -133,7 +141,7 @@ share/vice/C64DTV/chargen share/vice/C64DTV/default.vrs share/vice/C64DTV/dtvrom.bin share/vice/C64DTV/kernal -share/vice/C64DTV/sdl_hotkeys.vkm +share/vice/C64DTV/sdl-hotkeys.vhk share/vice/C64DTV/sdl_keyrah.vkm share/vice/C64DTV/sdl_keyrah_combian.vkm share/vice/C64DTV/sdl_keyrah_de.vkm @@ -148,6 +156,7 @@ share/vice/C64DTV/sdl_pos_no.vkm share/vice/C64DTV/sdl_sym.vkm 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/spiff.vpl share/vice/CBM-II/ @@ -170,11 +179,13 @@ share/vice/CBM-II/godot.vpl share/vice/CBM-II/green.vpl share/vice/CBM-II/kernal share/vice/CBM-II/kernal.500 +share/vice/CBM-II/palette.vpl share/vice/CBM-II/pc64.vpl share/vice/CBM-II/pepto-ntsc-sony.vpl share/vice/CBM-II/pepto-ntsc.vpl share/vice/CBM-II/pepto-pal.vpl share/vice/CBM-II/pepto-palold.vpl +share/vice/CBM-II/pixcen.vpl share/vice/CBM-II/ptoing.vpl share/vice/CBM-II/rgb.vpl share/vice/CBM-II/rom128h.vrs @@ -182,7 +193,8 @@ share/vice/CBM-II/rom128l.vrs share/vice/CBM-II/rom256h.vrs share/vice/CBM-II/rom256l.vrs share/vice/CBM-II/rom500.vrs -share/vice/CBM-II/sdl_hotkeys.vkm +share/vice/CBM-II/sdl-hotkeys.vhk +share/vice/CBM-II/sdl_pos.vkm share/vice/CBM-II/sdl_sym.vkm share/vice/CBM-II/vice.vpl share/vice/CBM-II/white.vpl @@ -201,6 +213,12 @@ share/vice/DRIVES/dos2040 share/vice/DRIVES/dos3040 share/vice/DRIVES/dos4040 share/vice/DRIVES/dos9000 +share/vice/GLSL/ +share/vice/GLSL/bicubic-interlaced.frag +share/vice/GLSL/bicubic.frag +share/vice/GLSL/builtin-interlaced.frag +share/vice/GLSL/builtin.frag +share/vice/GLSL/viewport.vert share/vice/PET/ share/vice/PET/amber.vpl share/vice/PET/basic-1.901439-09-05-02-06.bin @@ -234,6 +252,7 @@ share/vice/PET/rom4b40.vrs share/vice/PET/rom4b80.vrs share/vice/PET/rom4g40.vrs share/vice/PET/romsuperpet.vrs +share/vice/PET/sdl-hotkeys.vhk share/vice/PET/sdl_buuk_pos.vkm share/vice/PET/sdl_buuk_pos_de.vkm share/vice/PET/sdl_buuk_sym.vkm @@ -242,7 +261,7 @@ share/vice/PET/sdl_grus_pos.vkm share/vice/PET/sdl_grus_pos_de.vkm share/vice/PET/sdl_grus_sym.vkm share/vice/PET/sdl_grus_sym_de.vkm -share/vice/PET/sdl_hotkeys.vkm +share/vice/PET/sdl_pos.vkm share/vice/PET/sdl_sym.vkm share/vice/PET/waterloo-a000.901898-01.bin share/vice/PET/waterloo-b000.901898-02.bin @@ -262,8 +281,11 @@ share/vice/PLUS4/kernal share/vice/PLUS4/kernal.005 share/vice/PLUS4/kernal.232 share/vice/PLUS4/kernal.364 -share/vice/PLUS4/sdl_hotkeys.vkm +share/vice/PLUS4/sdl-hotkeys.vhk share/vice/PLUS4/sdl_pos.vkm +share/vice/PLUS4/sdl_pos_fr.vkm +share/vice/PLUS4/sdl_sym.vkm +share/vice/PLUS4/sdl_sym_de.vkm share/vice/PLUS4/yape-ntsc.vpl share/vice/PLUS4/yape-pal.vpl share/vice/PRINTER/ @@ -287,16 +309,18 @@ share/vice/SCPU64/default.vrs share/vice/SCPU64/frodo.vpl share/vice/SCPU64/godot.vpl share/vice/SCPU64/jpchrgen +share/vice/SCPU64/palette.vpl share/vice/SCPU64/pc64.vpl share/vice/SCPU64/pepto-ntsc-sony.vpl share/vice/SCPU64/pepto-ntsc.vpl share/vice/SCPU64/pepto-pal.vpl share/vice/SCPU64/pepto-palold.vpl +share/vice/SCPU64/pixcen.vpl share/vice/SCPU64/ptoing.vpl share/vice/SCPU64/rgb.vpl share/vice/SCPU64/scpu64 share/vice/SCPU64/scpu64mem.sym -share/vice/SCPU64/sdl_hotkeys.vkm +share/vice/SCPU64/sdl-hotkeys.vhk share/vice/SCPU64/sdl_keyrah.vkm share/vice/SCPU64/sdl_keyrah_combian.vkm share/vice/SCPU64/sdl_keyrah_de.vkm @@ -311,19 +335,25 @@ share/vice/SCPU64/sdl_pos_no.vkm share/vice/SCPU64/sdl_sym.vkm 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/vice.vpl share/vice/VIC20/ +share/vice/VIC20/PALette.vpl share/vice/VIC20/basic share/vice/VIC20/chargen +share/vice/VIC20/chargen-jp share/vice/VIC20/colodore_vic.vpl share/vice/VIC20/default.vrs share/vice/VIC20/kernal share/vice/VIC20/mike-ntsc.vpl share/vice/VIC20/mike-pal.vpl -share/vice/VIC20/sdl_hotkeys.vkm +share/vice/VIC20/sdl-hotkeys.vhk share/vice/VIC20/sdl_pos.vkm share/vice/VIC20/sdl_pos_fi.vkm +share/vice/VIC20/sdl_pos_fr.vkm +share/vice/VIC20/sdl_sym.vkm +share/vice/VIC20/sdl_sym_de.vkm share/vice/VIC20/vice.vpl share/vice/common/ share/vice/common/C128_1024.svg @@ -332,12 +362,14 @@ 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 @@ -345,6 +377,7 @@ 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 @@ -352,6 +385,7 @@ 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_16.png share/vice/common/PET_24.png @@ -359,40 +393,52 @@ 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/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/gtk3-hotkeys-cartridge-mac.vhk +share/vice/common/gtk3-hotkeys-cartridge.vhk +share/vice/common/gtk3-hotkeys-datasette1-mac.vhk +share/vice/common/gtk3-hotkeys-datasette1.vhk +share/vice/common/gtk3-hotkeys-datasette2-mac.vhk +share/vice/common/gtk3-hotkeys-datasette2.vhk +share/vice/common/gtk3-hotkeys-debug-mac.vhk +share/vice/common/gtk3-hotkeys-debug.vhk +share/vice/common/gtk3-hotkeys-drive-mac.vhk +share/vice/common/gtk3-hotkeys-drive.vhk +share/vice/common/gtk3-hotkeys-fliplist-mac.vhk +share/vice/common/gtk3-hotkeys-fliplist.vhk +share/vice/common/gtk3-hotkeys-help-mac.vhk +share/vice/common/gtk3-hotkeys-help.vhk +share/vice/common/gtk3-hotkeys-settings-mac.vhk +share/vice/common/gtk3-hotkeys-settings.vhk +share/vice/common/gtk3-hotkeys-snapshot-mac.vhk +share/vice/common/gtk3-hotkeys-snapshot.vhk share/vice/common/icon1024x1024.png share/vice/common/vice-logo-black.svg -share/vice/common/vsid.rc -share/vice/common/x128.rc -share/vice/common/x64.rc -share/vice/common/x64dtv.rc -share/vice/common/x64sc.rc -share/vice/common/xcbm2.rc -share/vice/common/xcbm5x0.rc -share/vice/common/xpet.rc -share/vice/common/xplus4.rc -share/vice/common/xscpu64.rc -share/vice/common/xvic.rc