From baf3af7881d75617f354f124c7563f48a5c0ccd2 Mon Sep 17 00:00:00 2001 From: kristerw Date: Sun, 25 Feb 2001 19:35:52 +0000 Subject: Update to 1.6. Changes since 1.5: ** C64 changes - Fixed REU snapshot bug. - Added Warpspeed and Dinamic cartridge support. - Fixed a bug in NTSC sprite timing. - Pitfall 2 cartridge works again. - Added a symbol file for the built-in monitor which allows moni- toring of ROM sections (use 'll "c64mem.sym"' inside the monitor) ** C128 changes - The Z80 emulation is almost complete now. ** VIC20 changes - Fixed geometry settings. Games that enlarge the screen work now. ** Drive changes - The drive emulation can also read error information from a 40 track D64 image now. - Fixed a bug in vdrive BAM allocation. ** Unix changes - ESD and aRts sound support has been added. ** C1541 changes - Commands to read/write GEOS formatted disks have been added. --- emulators/vice/Makefile | 6 +++--- emulators/vice/files/md5 | 4 ++-- emulators/vice/files/patch-sum | 6 +++--- emulators/vice/patches/patch-ab | 4 ++-- emulators/vice/patches/patch-ac | 32 +++++++++++++++----------------- emulators/vice/pkg/DESCR | 5 ++--- emulators/vice/pkg/PLIST | 27 ++++++++++++++++----------- 7 files changed, 43 insertions(+), 41 deletions(-) diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile index 59d57e08640..a478e562c4c 100644 --- a/emulators/vice/Makefile +++ b/emulators/vice/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.14 2001/02/17 18:38:33 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2001/02/25 19:35:52 kristerw Exp $ -DISTNAME= vice-1.5 +DISTNAME= vice-1.6 CATEGORIES= emulators MASTER_SITES= ftp://ftp.funet.fi/pub/cbm/firmware/computers/c64/ \ ftp://ftp.funet.fi/pub/cbm/crossplatform/emulators/VICE/ @@ -9,7 +9,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ kernal.4064.901246-01.bin \ kernal.sx.251104-04.bin -MAINTAINER= root@garbled.net +MAINTAINER= kristerw@netbsd.org HOMEPAGE= http://www.cs.cmu.edu/~dsladic/vice/vice.html COMMENT= Emulator for C64, C128, CBM-II, PET, and VIC20 diff --git a/emulators/vice/files/md5 b/emulators/vice/files/md5 index 7fb8ca0819a..af7087ee64f 100644 --- a/emulators/vice/files/md5 +++ b/emulators/vice/files/md5 @@ -1,6 +1,6 @@ -$NetBSD: md5,v 1.5 2000/08/27 14:08:32 wiz Exp $ +$NetBSD: md5,v 1.6 2001/02/25 19:35:52 kristerw Exp $ -MD5 (vice-1.5.tar.gz) = cbb32e2773383eb5fed588870729a3a3 +MD5 (vice-1.6.tar.gz) = b948d3bf066c0d5f4e851305b661cb65 MD5 (64gs.390852-01.bin) = 049e657afafbdd802e8c6a4f88f3d730 MD5 (kernal.4064.901246-01.bin) = da92801e3a03b005b746a4dd0b639c7c MD5 (kernal.sx.251104-04.bin) = 187b8c713b51931e070872bd390b472a diff --git a/emulators/vice/files/patch-sum b/emulators/vice/files/patch-sum index 00440b3a8ad..34fbbf3806e 100644 --- a/emulators/vice/files/patch-sum +++ b/emulators/vice/files/patch-sum @@ -1,5 +1,5 @@ -$NetBSD: patch-sum,v 1.5 2000/08/27 14:08:33 wiz Exp $ +$NetBSD: patch-sum,v 1.6 2001/02/25 19:35:52 kristerw Exp $ -MD5 (patch-ab) = cd1c9d2234a11a065620b05b730966f5 -MD5 (patch-ac) = 4f78c99e5da98c5344cb75cb71520c16 +MD5 (patch-ab) = 8a71db36b9308be130328a0fd9986230 +MD5 (patch-ac) = 76ff8733f638cbef407353307626e0a3 MD5 (patch-ad) = 238e2f75e54ac47a68538be8f75bf366 diff --git a/emulators/vice/patches/patch-ab b/emulators/vice/patches/patch-ab index 22e54ef531f..5a4abb32f4a 100644 --- a/emulators/vice/patches/patch-ab +++ b/emulators/vice/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.4 2000/08/27 14:08:35 wiz Exp $ +$NetBSD: patch-ab,v 1.5 2001/02/25 19:35:52 kristerw Exp $ --- src/arch/unix/archdep.h.orig Tue Nov 16 16:19:50 1999 +++ src/arch/unix/archdep.h @@ -12,4 +12,4 @@ $NetBSD: patch-ab,v 1.4 2000/08/27 14:08:35 wiz Exp $ +#define DOCDIR PREFIX "/share/doc/vice" #define VICEUSERDIR ".vice" - extern const char *archdep_home_path(void); + /* Printer default devices. */ diff --git a/emulators/vice/patches/patch-ac b/emulators/vice/patches/patch-ac index da67619d268..b70e6f47111 100644 --- a/emulators/vice/patches/patch-ac +++ b/emulators/vice/patches/patch-ac @@ -1,17 +1,15 @@ -$NetBSD: patch-ac,v 1.6 2000/08/27 14:08:35 wiz Exp $ - ---- configure.orig Tue Jul 25 00:02:45 2000 -+++ configure -@@ -4565,6 +4565,8 @@ - - SOUND_DRIVERS="" +--- configure.orig Mon Dec 11 23:28:18 2000 ++++ configure Sat Feb 24 19:57:37 2001 +@@ -4706,6 +4706,8 @@ + SOUND_DRIVERS="$SOUND_DRIVERS soundsdl.o" + fi - if test "x$is_dos" != "xyes"; then +# we don't want to find OSS emulation, let's use NetBSD's own interface +if false; then for ac_hdr in linux/soundcard.h machine/soundcard.h do -@@ -4605,6 +4607,7 @@ + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +@@ -4745,6 +4747,7 @@ echo "$ac_t""no" 1>&6 fi done @@ -19,16 +17,16 @@ $NetBSD: patch-ac,v 1.6 2000/08/27 14:08:35 wiz Exp $ for ac_hdr in dmedia/audio.h do -@@ -5776,7 +5779,7 @@ +@@ -5826,7 +5829,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lreadline $LIBS" +LIBS="-ledit -ltermcap $LIBS" cat > conftest.$ac_ext <&6 @@ -37,25 +35,25 @@ $NetBSD: patch-ac,v 1.6 2000/08/27 14:08:35 wiz Exp $ else echo "$ac_t""no" 1>&6 -@@ -6310,7 +6313,7 @@ +@@ -6360,7 +6363,7 @@ # For Solaris; some versions of Sun CC require a space after -R and # others require no space. Words are not sufficient . . . . case "`(uname -sr) 2>/dev/null`" in - "SunOS 5"*) + "SunOS 5"*|"NetBSD "*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 - echo "configure:6316: checking whether -R must be followed by a space" >&5 + echo "configure:6366: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" -@@ -7362,7 +7365,7 @@ +@@ -7412,7 +7415,7 @@ fi - +if false; then echo $ac_n "checking for XpmCreatePixmapFromData in -lXpm""... $ac_c" 1>&6 - echo "configure:7368: checking for XpmCreatePixmapFromData in -lXpm" >&5 + echo "configure:7418: checking for XpmCreatePixmapFromData in -lXpm" >&5 ac_lib_var=`echo Xpm'_'XpmCreatePixmapFromData | sed 'y%./+-%__p_%'` -@@ -7407,7 +7410,7 @@ +@@ -7457,7 +7460,7 @@ else echo "$ac_t""no" 1>&6 fi diff --git a/emulators/vice/pkg/DESCR b/emulators/vice/pkg/DESCR index 635567da297..0d0e2b1b80d 100644 --- a/emulators/vice/pkg/DESCR +++ b/emulators/vice/pkg/DESCR @@ -13,6 +13,5 @@ and does so efficiently. Please do not expect the VIC20, C128 and PET emulators to be as good as the C64 one, as they are still under construction. -The current version emulates the C64, the C128 (save the 80 columns -screen, 2MHz and C64 mode), the VIC20, the CBM-II line (B128, B256), -and all the PET models. +The current version emulates the C64, the C128, the VIC20, the CBM-II +line (B128, B256), and all the PET models. diff --git a/emulators/vice/pkg/PLIST b/emulators/vice/pkg/PLIST index 00439a642ea..eb5b6793a14 100644 --- a/emulators/vice/pkg/PLIST +++ b/emulators/vice/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2000/12/11 23:20:48 wiz Exp $ +@comment $NetBSD: PLIST,v 1.8 2001/02/25 19:35:53 kristerw Exp $ bin/c1541 bin/petcat bin/vsid @@ -39,20 +39,21 @@ share/doc/html/vice/vice_toc.html share/doc/vice/64doc.txt share/doc/vice/Evaluation share/doc/vice/PETdoc.txt +share/doc/vice/Readme.beos share/doc/vice/Readme.dos +share/doc/vice/Win32-Howto.txt share/doc/vice/cbm_basic_tokens.txt share/doc/vice/drive_info.txt share/doc/vice/mon.txt share/doc/vice/serial.txt -share/doc/vice/Win32-Howto.txt share/vice/C128/basic -share/vice/C128/chargen share/vice/C128/c64s.vpl share/vice/C128/ccs64.vpl -share/vice/C128/frodo.vpl +share/vice/C128/chargen share/vice/C128/default.vkm share/vice/C128/default.vpl share/vice/C128/default.vrs +share/vice/C128/frodo.vpl share/vice/C128/godot.vpl share/vice/C128/kernal share/vice/C128/os2.vkm @@ -60,25 +61,26 @@ share/vice/C128/pc64.vpl share/vice/C128/position.vkm share/vice/C128/vdc_deft.vpl share/vice/C128/z80bios -share/vice/C64/4064.vrs -share/vice/C64/64gs.vrs share/vice/C64/basic -share/vice/C64/basic.64gs share/vice/C64/c64s.vpl -share/vice/C64/chargen share/vice/C64/ccs64.vpl +share/vice/C64/chargen share/vice/C64/default.vkm share/vice/C64/default.vpl share/vice/C64/default.vrs share/vice/C64/frodo.vpl share/vice/C64/godot.vpl share/vice/C64/kernal -share/vice/C64/kernal.4064 -share/vice/C64/kernal.64gs -share/vice/C64/kernal.sx64 share/vice/C64/os2.vkm +share/vice/C64/os2_sym.vkm share/vice/C64/pc64.vpl share/vice/C64/position.vkm +share/vice/C64/4064.vrs +share/vice/C64/64gs.vrs +share/vice/C64/basic.64gs +share/vice/C64/kernal.4064 +share/vice/C64/kernal.64gs +share/vice/C64/kernal.sx64 share/vice/C64/sx64.vrs share/vice/CBM-II/amber.vpl share/vice/CBM-II/basic.128 @@ -88,6 +90,7 @@ share/vice/CBM-II/chargen.600 share/vice/CBM-II/chargen.700 share/vice/CBM-II/default.vpl share/vice/CBM-II/kernal +share/vice/CBM-II/os2.vkm share/vice/CBM-II/rom128h.vrs share/vice/CBM-II/rom128l.vrs share/vice/CBM-II/rom256h.vrs @@ -121,6 +124,8 @@ share/vice/PET/graphics.vkm share/vice/PET/kernal1 share/vice/PET/kernal2 share/vice/PET/kernal4 +share/vice/PET/os2.vkm +share/vice/PET/os2_40.vkm share/vice/PET/posg_de.vkm share/vice/PET/rom1g.vrs share/vice/PET/rom2b.vrs -- cgit v1.2.3