From a8b40672d3094018ca57212d7656322a26a9fe20 Mon Sep 17 00:00:00 2001 From: wiz Date: Mon, 4 Apr 2011 13:42:08 +0000 Subject: Update to 2.3, provided by Olaf 'Rhialto' Seibert in PR 44820, with a slight fix. * Changes in VICE 2.3 ====================== ** General ---------- - Added x64sc, the accurate C64 emulator: * VIC-II emulation rewritten from scratch using results from extensive testing with newly written test programs on real hardware. * Emulation is done on a cycle by cycle basis combined with pixel exact dot clock domain handling. * Accurate handling of all possible in-line splits of VIC-II registers and graphics data. * C64 model and even individual chip revisions can be selected for very detailed emulation of their differences. * Equally accurate PAL, NTSC and PAL-N emulation. We believe x64sc is one of the most accurate C64 emulators at the moment. - Drive improvements, including weak bit emulation. - Major reSID overhaul: * Emulation of all known pipeline delays for full cycle accuracy. * New shift register model based on revectorized die photograps. * Accurate DAC models based on revectorized die photograps. * Emulation of floating waveform DAC input for waveform 0. * Advanced 6581 transistor level filter model based on revectorized die photograps, yielding unprecedented accuracy. - CRT Emulation (former "PAL emulation") is now available regardless of video mode or -chip and works in all emulators. NOTE: Color gamma range changed. You may need to set to 2.200 manually. (ColorGamma=2200) - Added "True aspect ratio" option. - Sound buffer overflows reduced and the error replaced with a warning. - Various monitor improvements (io details, expansion port status ...) - Removed little used Emulator ID feature. - VIA wrap handling rewritten to fix problems with timer 2. - Added autostart option to do LOAD ,8 instead of ,8,1. - RESTORE key presses are now distributed randomly across a frame. - Improved accuracy of CIA interrupts. (6526/6526A selectable) ** C64/C128 changes ------------------- - Cartridge emulation improvements. Many broken cartridges fixed, and the following ones added: * Action Replay 2 * Action Replay 3 * Capture * Diashow Maker * EXOS * Final Cartridge Plus * Freeze Frame * Freeze Machine * Game Killer * MACH 5 * Magic Voice * MMC Replay * Prophet 64 * Snapshot 64 * Super Explode V5 * Super Snapshot - Added emulation of the passthrough port of MMC64, Magic Voice and IEEE488 cartridges. - CIA TOD 50/60 Hz toggle emulation fixed. - Improved 1351/paddles port MUX emulation. ** C64 changes -------------- - Added Drean (PAL-N) emulation. - Fixed bug with autostart mode Inject-to-RAM. It now writes to RAM under I/O correctly. ** C128 changes --------------- - Fixed a bug with autostarting t64 images. ** VIC20 changes ---------------- - Added Vic Flash Plugin cartridge emulation. - Fixed video cache & reverse bug. - Fixed bug in attaching 4kB cartridges. - Fixed autostarting bug, mostly seen with tape images. ** PLUS4 changes ---------------- - Fixed crashes in NTSC mode. - Added v364 speech emulation. ** PET changes -------------- - Added DWW emulation. - Added userport DAC emulation. ** CBM2 changes --------------- - Split 5x0 and 6x0/7x0 settings in the configuration file. ** Unix changes --------------- - (Xaw) The menus can now be operated without holding the mouse button down. Keyboard control is also available (Shift-Alt-Z for left menu, Shift-Alt-X for right menu). - (Xaw) Lightpen/gun support added. - (GTK+) Fixed aspect ratio option added. ** SDL UI changes ----------------- - Added vsid UI, FFMPEG and printer menus. The UI is complete. --- emulators/vice/options.mk | 78 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 61 insertions(+), 17 deletions(-) (limited to 'emulators/vice/options.mk') diff --git a/emulators/vice/options.mk b/emulators/vice/options.mk index a9eb3acf4dc..879dbfb20af 100644 --- a/emulators/vice/options.mk +++ b/emulators/vice/options.mk @@ -1,28 +1,72 @@ -# $NetBSD: options.mk,v 1.5 2010/07/24 09:44:57 wiz Exp $ +# $NetBSD: options.mk,v 1.6 2011/04/04 13:42:08 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.vice -PKG_SUPPORTED_OPTIONS= esound ffmpeg lame gnome +PKG_SUPPORTED_OPTIONS= ffmpeg lame vice-fullscreen vice-hwscaling vice-ethernet +PKG_OPTIONS_REQUIRED_GROUPS = gui +PKG_OPTIONS_GROUP.gui = xaw gnome sdl +PKG_SUGGESTED_OPTIONS= ffmpeg lame vice-fullscreen vice-hwscaling vice-ethernet +PKG_SUGGESTED_OPTIONS+= xaw .include "../../mk/bsd.options.mk" -.if !empty(PKG_OPTIONS:Mesound) -.include "../../audio/esound/buildlink3.mk" -.else -CONFIGURE_ARGS+= --without-esd +.if !empty(PKG_OPTIONS:Mxaw) +. include "../../x11/libXt/buildlink3.mk" +. include "../../x11/libXmu/buildlink3.mk" +. include "../../x11/libXaw/buildlink3.mk" +. include "../../x11/libXpm/buildlink3.mk" +PLIST_SRC += PLIST.x11 .endif -.if !empty(PKG_OPTIONS:Mffmpeg) -CONFIGURE_ARGS+= --enable-ffmpeg -USE_TOOLS+= pkg-config -.include "../../multimedia/ffmpeg/buildlink3.mk" -. if !empty(PKG_OPTIONS:Mlame) -. include "../../audio/lame/buildlink3.mk" +.if !empty(PKG_OPTIONS:Mgnome) +CONFIGURE_ARGS+= --enable-gnomeui +PLIST_SRC+= PLIST.x11 +. include "../../x11/gtk2/buildlink3.mk" +.endif + +.if !empty(PKG_OPTIONS:Msdl) +CONFIGURE_ARGS+= --enable-sdlui +PLIST_SRC+= PLIST.sdl +. include "../../devel/SDL/buildlink3.mk" +.endif + +.if !empty(PKG_OPTIONS:Mvice-fullscreen) +CONFIGURE_ARGS+= --enable-fullscreen +. if !empty(PKG_OPTIONS:Mxaw) +. include "../../x11/libXrandr/buildlink3.mk" +. include "../../x11/libXxf86vm/buildlink3.mk" +. endif +. if !empty(PKG_OPTIONS:Mgnome) +. include "../../x11/libXrandr/buildlink3.mk" +. include "../../x11/libXxf86vm/buildlink3.mk" +. endif +. if !empty(PKG_OPTIONS:Msdl) . endif .endif -.if !empty(PKG_OPTIONS:Mgnome) -CONFIGURE_ARGS+= --enable-gnomeui -USE_TOOLS+= pkg-config -.include "../../x11/gtk2/buildlink3.mk" -.include "../../devel/libgnomeui/buildlink3.mk" +.if !empty(PKG_OPTIONS:Mvice-hwscaling) +. if !empty(PKG_OPTIONS:Mxaw) +. include "../../x11/libXv/buildlink3.mk" +. endif +. if !empty(PKG_OPTIONS:Mgnome) +. include "../../graphics/gtkglext/buildlink3.mk" +. endif +. if !empty(PKG_OPTIONS:Msdl) +. endif +.endif + +.if !empty(PKG_OPTIONS:Mvice-ethernet) +CONFIGURE_ARGS+= --enable-ethernet +. include "../../net/libpcap/buildlink3.mk" +.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/ffmpeg/buildlink3.mk" +.endif +.if !empty(PKG_OPTIONS:Mlame) +#BUILDLINK_DEPMETHOD.lame?= build +. include "../../audio/lame/buildlink3.mk" .endif -- cgit v1.2.3