head 1.20; access; symbols pkgsrc-2013Q2:1.20.0.8 pkgsrc-2013Q2-base:1.20 pkgsrc-2012Q4:1.20.0.6 pkgsrc-2012Q4-base:1.20 pkgsrc-2011Q4:1.20.0.4 pkgsrc-2011Q4-base:1.20 pkgsrc-2011Q2:1.20.0.2 pkgsrc-2011Q2-base:1.20 pkgsrc-2011Q1:1.19.0.2 pkgsrc-2011Q1-base:1.19 pkgsrc-2009Q4:1.17.0.16 pkgsrc-2009Q4-base:1.17 pkgsrc-2008Q4:1.17.0.14 pkgsrc-2008Q4-base:1.17 pkgsrc-2008Q3:1.17.0.12 pkgsrc-2008Q3-base:1.17 cube-native-xorg:1.17.0.10 cube-native-xorg-base:1.17 pkgsrc-2008Q2:1.17.0.8 pkgsrc-2008Q2-base:1.17 pkgsrc-2008Q1:1.17.0.6 pkgsrc-2008Q1-base:1.17 pkgsrc-2007Q4:1.17.0.4 pkgsrc-2007Q4-base:1.17 pkgsrc-2007Q3:1.17.0.2 pkgsrc-2007Q3-base:1.17 pkgsrc-2007Q2:1.16.0.4 pkgsrc-2007Q2-base:1.16 pkgsrc-2007Q1:1.16.0.2 pkgsrc-2007Q1-base:1.16 pkgsrc-2006Q4:1.15.0.6 pkgsrc-2006Q4-base:1.15 pkgsrc-2006Q3:1.15.0.4 pkgsrc-2006Q3-base:1.15 pkgsrc-2006Q2:1.15.0.2 pkgsrc-2006Q2-base:1.15 pkgsrc-2006Q1:1.14.0.4 pkgsrc-2006Q1-base:1.14 pkgsrc-2005Q4:1.14.0.2 pkgsrc-2005Q4-base:1.14 pkgsrc-2005Q3:1.13.0.10 pkgsrc-2005Q3-base:1.13 pkgsrc-2005Q2:1.13.0.8 pkgsrc-2005Q2-base:1.13 pkgsrc-2005Q1:1.13.0.6 pkgsrc-2005Q1-base:1.13 pkgsrc-2004Q4:1.13.0.4 pkgsrc-2004Q4-base:1.13 pkgsrc-2004Q3:1.13.0.2 pkgsrc-2004Q3-base:1.13 pkgsrc-2004Q2:1.12.0.6 pkgsrc-2004Q2-base:1.12 pkgsrc-2004Q1:1.12.0.4 pkgsrc-2004Q1-base:1.12 pkgsrc-2003Q4:1.12.0.2 pkgsrc-2003Q4-base:1.12 netbsd-1-6:1.11.0.8 netbsd-1-6-RELEASE-base:1.11 pkgviews:1.11.0.4 pkgviews-base:1.11 buildlink2:1.11.0.2 buildlink2-base:1.11 netbsd-1-5-PATCH003:1.10 netbsd-1-5-PATCH001:1.8 netbsd-1-5-RELEASE:1.6 netbsd-1-4-PATCH003:1.6 netbsd-1-4-PATCH002:1.5 comdex-fall-1999:1.3 netbsd-1-4-PATCH001:1.2 netbsd-1-4-RELEASE:1.1 netbsd-1-3-PATCH003:1.1; locks; strict; comment @# @; 1.20 date 2011.04.04.13.42.08; author wiz; state dead; branches; next 1.19; 1.19 date 2011.01.24.14.58.41; author wiz; state Exp; branches 1.19.2.1; next 1.18; 1.18 date 2011.01.14.11.38.38; author wiz; state Exp; branches; next 1.17; 1.17 date 2007.08.30.12.23.01; author wiz; state dead; branches; next 1.16; 1.16 date 2007.02.07.19.43.29; author wiz; state Exp; branches; next 1.15; 1.15 date 2006.06.29.22.56.34; author dillo; state Exp; branches; next 1.14; 1.14 date 2005.12.11.22.46.50; author dillo; state Exp; branches; next 1.13; 1.13 date 2004.07.16.22.59.11; author kristerw; state Exp; branches; next 1.12; 1.12 date 2002.09.07.09.17.14; author kristerw; state dead; branches; next 1.11; 1.11 date 2002.04.22.21.02.11; author kristerw; state Exp; branches; next 1.10; 1.10 date 2001.10.02.20.04.33; author jlam; state Exp; branches; next 1.9; 1.9 date 2001.08.01.22.16.46; author kristerw; state Exp; branches; next 1.8; 1.8 date 2001.02.26.22.13.35; author tron; state Exp; branches; next 1.7; 1.7 date 2001.02.25.19.35.52; author kristerw; state Exp; branches; next 1.6; 1.6 date 2000.08.27.14.08.35; author wiz; state Exp; branches; next 1.5; 1.5 date 2000.02.08.11.37.55; author tron; state Exp; branches; next 1.4; 1.4 date 2000.02.08.03.44.18; author wiz; state Exp; branches; next 1.3; 1.3 date 99.07.27.08.38.37; author mycroft; state Exp; branches; next 1.2; 1.2 date 99.05.18.08.45.49; author tv; state Exp; branches; next 1.1; 1.1 date 98.09.06.23.47.29; author garbled; state Exp; branches; next ; 1.19.2.1 date 2011.04.16.21.27.34; author spz; state dead; branches; next ; desc @@ 1.20 log @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. @ text @$NetBSD: patch-ac,v 1.19 2011/01/24 14:58:41 wiz Exp $ Fix build with png-1.5. https://sourceforge.net/tracker/index.php?func=detail&aid=3164781&group_id=223021&atid=1057617 --- src/gfxoutputdrv/pngdrv.c.orig 2009-08-09 17:23:44.000000000 +0000 +++ src/gfxoutputdrv/pngdrv.c @@@@ -31,6 +31,7 @@@@ #include #include +#include #include "archdep.h" #include "gfxoutput.h" @@@@ -76,7 +77,7 @@@@ static int pngdrv_open(screenshot_t *scr return -1; } - if (setjmp(screenshot->gfxoutputdrv_data->png_ptr->jmpbuf)) { + if (setjmp(png_jmpbuf(screenshot->gfxoutputdrv_data->png_ptr))) { png_destroy_write_struct(&(screenshot->gfxoutputdrv_data->png_ptr), &(screenshot->gfxoutputdrv_data->info_ptr)); lib_free(sdata); @@@@ -99,10 +100,10 @@@@ static int pngdrv_open(screenshot_t *scr png_init_io(sdata->png_ptr, sdata->fd); png_set_compression_level(sdata->png_ptr, Z_BEST_COMPRESSION); - sdata->info_ptr->width = screenshot->width; - sdata->info_ptr->height= screenshot->height; - sdata->info_ptr->bit_depth = 8; - sdata->info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA; + png_set_IHDR(sdata->png_ptr, sdata->info_ptr, screenshot->width, + screenshot->height, 8, PNG_COLOR_TYPE_RGB_ALPHA, + PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, + PNG_FILTER_TYPE_DEFAULT); png_write_info(sdata->png_ptr, sdata->info_ptr); @ 1.19 log @Add upstream bug report URL. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.18 2011/01/14 11:38:38 wiz Exp $ @ 1.19.2.1 log @Pullup ticket #3410 - requested by wiz emulators/vice: build fix for NetBSD 5 Revisions pulled up: - emulators/vice/DESCR 1.2 - emulators/vice/Makefile 1.89-1.90 - emulators/vice/PLIST 1.23 - emulators/vice/PLIST.sdl 1.1 - emulators/vice/PLIST.x11 1.1 - emulators/vice/distinfo 1.38 - emulators/vice/options.mk 1.6 - emulators/vice/patches/patch-aa 1.11 - emulators/vice/patches/patch-ab 1.11 - emulators/vice/patches/patch-ac deleted - emulators/vice/patches/patch-ad deleted ----------------------------------------------------------------------------- Module Name: pkgsrc Committed By: wiz Date: Mon Apr 4 13:42:08 UTC 2011 Modified Files: pkgsrc/emulators/vice: DESCR Makefile PLIST distinfo options.mk pkgsrc/emulators/vice/patches: patch-aa patch-ab Added Files: pkgsrc/emulators/vice: PLIST.sdl PLIST.x11 Removed Files: pkgsrc/emulators/vice/patches: patch-ac patch-ad Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 pkgsrc/emulators/vice/DESCR cvs rdiff -u -r1.88 -r1.89 pkgsrc/emulators/vice/Makefile cvs rdiff -u -r1.22 -r1.23 pkgsrc/emulators/vice/PLIST cvs rdiff -u -r0 -r1.1 pkgsrc/emulators/vice/PLIST.sdl \ pkgsrc/emulators/vice/PLIST.x11 cvs rdiff -u -r1.37 -r1.38 pkgsrc/emulators/vice/distinfo cvs rdiff -u -r1.5 -r1.6 pkgsrc/emulators/vice/options.mk cvs rdiff -u -r1.10 -r1.11 pkgsrc/emulators/vice/patches/patch-aa \ pkgsrc/emulators/vice/patches/patch-ab cvs rdiff -u -r1.19 -r0 pkgsrc/emulators/vice/patches/patch-ac cvs rdiff -u -r1.14 -r0 pkgsrc/emulators/vice/patches/patch-ad ----------------------------------------------------------------------------- Module Name: pkgsrc Committed By: tron Date: Sat Apr 16 11:05:33 UTC 2011 Modified Files: pkgsrc/emulators/vice: Makefile Log Message: Fix build problem under NetBSD/i386 current. To generate a diff of this commit: cvs rdiff -u -r1.89 -r1.90 pkgsrc/emulators/vice/Makefile @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.19 2011/01/24 14:58:41 wiz Exp $ @ 1.18 log @Fix build with png-1.5. @ text @d1 1 a1 1 $NetBSD$ d4 1 @ 1.17 log @Update to 1.22: * Changes in VICE 1.22 ====================== ** C128 changes --------------- - Added 2 MHz mode support (experimental). - The cursor keys are mapped differently in C64-mode now. - Fixed C64-mode autostart support. ** VIC20 changes ---------------- - Improved the sound emulation where the 'volume change click' is concerned, and normalized the audio output level. ** VIC-II --------- - The VIC-II border mode can be selected now (normal, full, debug). - Some sprite fixes needed for Krestage 3 demo. ** Drive changes ---------------- - Improved drive LED emulation. ** Unix changes --------------- - Fixed the "black screen" bug caused by some X11 library security update. - Fixed the usb support for bsd based platforms. - Changed the preferred libdir and docdir for netbsd and freebsd. - Xaw/XRandR fullscreen mode is supposed to work. ** C1541 changes ---------------- - Fixed some unlynx bugs. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.16 2007/02/07 19:43:29 wiz Exp $ d3 36 a38 11 --- src/sounddrv/soundsun.c.orig 2006-08-06 15:54:56.000000000 +0000 +++ src/sounddrv/soundsun.c @@@@ -204,7 +204,7 @@@@ static void sun_close(void) sun_fd = -1; sun_8bit = 0; sun_bufsize = 0; -#if !defined(__NETBSD__) +#if !defined(__NetBSD__) sun_written = 0; #endif sun_channels = 1; @ 1.16 log @Update to 1.20: * Changes in VICE 1.20 ====================== ** General ---------- - New GP2X port. - New AmigaOS3, AmigaOS4, MorphOS and AROS (x86/ppc) ports. - Mac OSX X11 port is included in the main distribution now. - Fixed some unusual CPU opcodes. ** C64 changes -------------- - Fixed some longstanding RMW to IO area VIC-II DMA timing bug. - Added Mikro Assembler, Dela EP7x8, Dela EP256 and Rex EP256 cart support. - Fixed the KCS cart emulation. - Added swiftlink and turbo232 support. - Added +256k memory expansion support. - Added I/O source read collision detection support, making simultanious use of multiple expansions possible, like on the real machine. - Fixed the RR-net address decoding and REU compatibility. - Fixed a problem with traps using the SX Kernal ROM. - Some IDE64 ultimax bug has been fixed. ** PET changes -------------- - Added 128kb REU memory expansion support. ** PLUS4 changes ---------------- - Added 256k csory memory expansion support. - Added 256k, 1024k and 4096k hannes memory expansion support. ** Unix changes --------------- - Gnome1 is no longer supported. - Gnome2 is now supported - everthing except the Image preview with CBM font should work. - Gnome 2 port supports dimmable drive LED now. - Added experimental ParSID support. - Added support for minix3. - Fixed some compile problems with the ffmpeg library. ** MS-Windows changes --------------------- - Added experimental ParSID support. ** MS-DOS changes ----------------- - Added experimental ParSID support. ** Mac OSX X11 changes ---------------------- - Added support for Intel build. - Added USB joystick support. ** Miscellaneous changes ------------------------ - Added support for more 3rd party basic extenders to petcat. - Added a c64/c128 cartridge conversion program (cartconv). - Added binary distribution (package) creation functionality. - Fixed a bug in the trap emulation with caused programs probing devices on the IEC bus to fail. - Lots of small fixes to the monitor. @ text @d1 1 a1 1 $NetBSD$ @ 1.15 log @Update to 1.19: - Fixed "RESTORE key works only once" bug. - Fixed compilation with GCC4. - [C64] Fixed an opcode execute problem with the +60k expansion. - [C64] New c64 256k expansion support. - [VIC-II] Fixed switch from idle state to display state. - [VIC-II] Added missing DEN bit scrolling feature. - The experimental netplay feature has been extended to the Unix platforms for testing. - Added IPV6 support to netplay. - Fixed crash if settings are saved. - Fixed some Gnome1 annoyances (popup menus in status bar) - Rework of gnome save media (screenshot) dialog - Xaw Statusbar fixes and improvements (new buttons for recording). - Added various new screenshot formats. - Improved the image content lister to display at least the first part of a circular directory listing. - Made the tape routines able to cope with non-standard header sizes. XXX: should use SUBST framework instead of home-grown code. Updated during freeze to fix gcc4 compile problems, okayed by wiz. @ text @d3 1 a3 1 --- src/sounddrv/soundsun.c.orig 2005-12-23 23:29:54.000000000 +0100 a4 36 @@@@ -63,7 +63,7 @@@@ static int sun_fd = -1; static int sun_8bit = 0; static int sun_channels = 1; static int sun_bufsize = 0; -#if !defined(__NETBSD__) +#if !defined(__NetBSD__) static int sun_written = 0; #endif @@@@ -107,7 +107,7 @@@@ static int sun_init(const char *param, i int st; struct audio_info info; -#if !defined(__NETBSD__) +#if !defined(__NetBSD__) /* No stereo capability. */ *channels = 1; #endif @@@@ -142,7 +142,7 @@@@ static int sun_init(const char *param, i log_message(LOG_DEFAULT, "Playing 8 bit ulaw at 8000Hz"); } sun_bufsize = (*fragsize)*(*fragnr); -#if !defined(__NETBSD__) +#if !defined(__NetBSD__) sun_written = 0; #endif sun_channels = *channels; @@@@ -171,7 +171,7 @@@@ static int sun_write(SWORD *pbuf, size_t if (now <= 0) return 1; } -#if !defined(__NETBSD__) +#if !defined(__NetBSD__) sun_written += nr; #endif @ 1.14 log @Improve sun sound driver on NetBSD to support stereo and not to rely on counting of played samples, which can get out of sync. This may work on other platforms too, but I cannot test it. Update to 1.18: - Fixed a bug that caused the emulator to crash after 72 minutes. - Added internal zlib and lpng support if no native libraries are found at compile time. - Fixed video recording frame rate in NTSC mode. - [C64] Added Structured Basic, Comal 80 and Ross cart support. - [C64] Fixed the improper detaching of certain types of carts. - [C64] The +60K expansion base address is now selectable for compatibility with the oldest version of the expansion. - [C128] Improved the VDC emulation. - Added support for more 3rd party basic extenders to petcat. - Compiling for QNX 6.x works now (binary package is available). - [C64] Binary packages for Solaris machines are available. - [C64] Added full GeoRAM memory expansion support with sizes from 64KB to 4MB. - [C64] Added full RamCart memory expansion support. - [C64] Added full +60K memory expansion support. - [C64] Correct REU values after reset. - [C128] Added full GeoRAM memory expansion support with sizes from 64KB to 4MB. - [C128] Added RamCart memory expansion support without the read-only option. - [C128] Fixed some C64 mode bugs. - [C128] Correct REU values after reset. - New dutch translation. - Language support has been extended to include commandline-options. - BSD platform problems with using the sounduss and soundsun driver have been fixed. - Problems compiling with older versions of libpng have been fixed. - Problems with MAXPATHLEN and PATH_MAX when compiling have been fixed. - New ALSA sound driver. - Fixed some compile errors if GCC4 is used. - Added support for more analog joysticks. - Userport RS232 emulation should work as expected now. @ text @d3 1 a3 1 --- src/sounddrv/soundsun.c.orig 2005-07-24 23:17:09.000000000 +0200 d5 1 a5 3 @@@@ -61,8 +61,11 @@@@ static int sun_bufferspace(void); static int sun_fd = -1; d7 1 a7 1 +static int sun_channels = 1; d9 1 d12 1 a12 1 +#endif d14 1 a14 3 static int toulaw8(SWORD data) { @@@@ -104,8 +107,10 @@@@ static int sun_init(const char *param, i d18 1 d22 2 a23 18 +#endif if (!param) { if (getenv("AUDIODEV")) @@@@ -118,7 +123,7 @@@@ static int sun_init(const char *param, i return 1; AUDIO_INITINFO(&info); info.play.sample_rate = *speed; - info.play.channels = 1; + info.play.channels = *channels; info.play.precision = 16; info.play.encoding = AUDIO_ENCODING_LINEAR; st = ioctl(sun_fd, AUDIO_SETINFO, &info); @@@@ -133,10 +138,14 @@@@ static int sun_init(const char *param, i goto fail; sun_8bit = 1; *speed = 8000; + *channels = 1; d27 1 d30 3 a32 14 +#endif + sun_channels = *channels; return 0; fail: close(sun_fd); @@@@ -155,14 +164,16 @@@@ static int sun_write(SWORD *pbuf, size_t total = nr; } else - total = nr*sizeof(SWORD); + total = nr*sizeof(SWORD)*sun_channels; for (i = 0; i < total; i += now) { now = write(sun_fd, (char *)pbuf + i, total - i); d36 1 d39 1 a39 5 +#endif while (sun_bufferspace() < 0) usleep(5000); @@@@ -172,7 +183,7 @@@@ static int sun_write(SWORD *pbuf, size_t d41 1 a41 23 static int sun_bufferspace(void) { - int st; + int st, size; struct audio_info info; /* ioctl(fd, AUDIO_GET_STATUS, &info) yields number of played samples in info.play.samples. */ @@@@ -180,10 +191,11 @@@@ static int sun_bufferspace(void) if (st < 0) return -1; #if defined(__NetBSD__) - if (!sun_8bit) - return sun_bufsize - (sun_written - info.play.samples / sizeof(SWORD)); -#endif + size = (sun_8bit ? 1 : 2) * sun_channels; + return sun_bufsize - info.play.seek / size; +#else return sun_bufsize - (sun_written - info.play.samples); +#endif } static void sun_close(void) @@@@ -192,7 +204,10 @@@@ static void sun_close(void) d45 1 d48 2 a49 5 +#endif + sun_channels = 1; } @ 1.13 log @Do not install cbm-directory-charset.fon -- it is needed for win32 only, and it makes the mkfontscale in NetBSD 2.0 dump core (PR xsrc/25587). Bump PKGREVISION. @ text @d3 100 a102 8 --- data/fonts/Makefile.in.orig Sat Jul 17 00:15:03 2004 +++ data/fonts/Makefile.in Sat Jul 17 00:15:14 2004 @@@@ -219,7 +219,6 @@@@ fontsdir = $(prefix)/lib/vice/fonts fonts_DATA = \ - cbm-directory-charset.fon \ vice-cbm.bdf @ 1.12 log @Update emulators/vice to version 1.10. Changes since vice-1.9 include: ** General - The keyboard handling has been reworked. In most ports the keys can be assigned by *.vkm files. - Fixed display bugs during warp mode. - The autostart function prepares the drive with last accessed track, sector and buffer data now. - The opcode fetch of the 65xx CPU emulation is more accurate now. ** C64 changes - A processor port bug has been fixed, so IWM Diamonds works again. - Fixed a bug in the Retro Replay emulation. - Added support for IDE64 interface emulation. ** C128 changes - Added DIN charset support. - Added support for second color bank. ** VIC20 changes - Access to unconnected address space has been fixed. ** VIC-II - $d016 xsmooth emulation is cycle exact now! - Many small bugs in the VIC-II emulation have been fixed. - Accessing unconnected address space returns last phi1 data read by the VIC-II now. - Fixed bug loading a snapshot image with sprites enabled. ** Drive changes - Implemented firmware ROM mirrors. ** Tape changes - The image content lister lists the contents of TAP images too. @ text @d1 12 a12 21 $NetBSD: patch-ac,v 1.11 2002/04/22 21:02:11 kristerw Exp $ --- configure.orig Fri Apr 19 22:01:43 2002 +++ configure Mon Apr 22 21:04:42 2002 @@@@ -4879,7 +4879,7 @@@@ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lreadline $LIBS" +LIBS="-lreadline -ltermcap $LIBS" cat > conftest.$ac_ext <&6 - READLINE="" LIBS="-lreadline $LIBS" + READLINE="" LIBS="-lreadline -ltermcap $LIBS" else echo "$ac_t""no" 1>&6 fi @ 1.11 log @Update vice to version 1.9. Changes since vice-1.7 include: ** C64 changes - The REU is emulated cycle exact now. - Added support for Retro Replay cartridge. - Fixed a CIA timer emulation bug. - Frankie goes to Hollywood may work now. ** C128 changes - VDC has been improved a lot (but not ready for RFO now). - Fixed a stupid bug in the Z80 emulation. - Fixed $ff01-$ff04 MMU register access. - Added support for C64 type cartridges. ** VIC-II - Fast PAL emulation has been added. - Added VIC-II reengineered palette. - Added also command line switches for: brightness, contrast, saturation, gamma - New style luminance signals - Using internal/external palette - Various fixes to make more demos work. ** Drive changes - True drive emulation is default now. - A reset during autostart restores true drive emulation if enabled before. - Relaxed disk change timing a bit and fixed the sync bit. More programs will recognise the disk change now. - Odd sized d64 images are supported now. ** General - Real PAL filter emulation. @ text @d1 1 a1 1 $NetBSD$ @ 1.10 log @Strongly-buildlink emulators/vice and mark as USE_BUILDLINK_ONLY. Make this package work with XF4. Based on work by Thomas Klausner (wiz) sent in private e-mail. @ text @d2 3 a4 4 --- configure.orig Mon Jul 23 14:08:13 2001 +++ configure @@@@ -5834,7 +5834,7 @@@@ d11 1 a11 1 #line 5840 "configure" d13 1 a13 1 @@@@ -5862,7 +5862,7 @@@@ d21 1 a21 1 @ 1.9 log @Update vice to 1.7. Changes in VICE 1.7 =================== ** C64 changes - REU support has been rewritten to support different types and images. - Fixed a processor emulation bug which caused a crash in Summer Games II. - Fixed a snapshot bug causing Castles of Dr. Creep to quit after the snapshot has been restored. ** C128 changes - REU support has been rewritten to support different types and images. - Added support for internal and external function ROM images. - Tape emulation has been added. - Added register 26 support to VDC emulation to make LUnix work. - Support for the CAPS key has been added. - There is a limited C64 mode now. ** VIC20 changes - VIC video emulation now almost cycle exact (try vimm or vvv demos) NTSC video mode is supported. ** CBM-II changes - Implemented a C510 (aka P128) emulation, using the existing VIC-II emulation. - Fix a couple of bugs in the CBM-II emulation (C610-C720). ** Drive changes - Implemented experimental DOS1 (670 blocks free) support with CBM 2040 emulation. - The read-only bit of the 1581 disk drive is emulated now. ** Unix changes - Added preliminary (beta) DGA2 support. - French translation; Credits to Eric (meepmeep). - Datasette control UI. - Zlib is used for reading compressed images. @ text @d2 4 a5 38 --- configure.orig Mon Jul 23 20:08:13 2001 +++ configure Wed Aug 1 23:24:36 2001 @@@@ -4714,6 +4714,8 @@@@ SOUND_DRIVERS="$SOUND_DRIVERS soundsdl.o" fi +# 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 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` @@@@ -4753,6 +4755,7 @@@@ echo "$ac_t""no" 1>&6 fi done +fi for ac_hdr in dmedia/audio.h do @@@@ -5300,7 +5303,7 @@@@ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lesd $SOUND_LIBS $LIBS" +LIBS="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lesd $SOUND_LIBS $LIBS" cat > conftest.$ac_ext <&6 @@@@ -5834,7 +5837,7 @@@@ d10 1 a10 1 +LIBS="-ledit -ltermcap $LIBS" d14 1 a14 1 @@@@ -5862,7 +5865,7 @@@@ d19 1 a19 1 + READLINE="" LIBS="-ledit -ltermcap $LIBS" a22 26 @@@@ -6449,7 +6452,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:6455: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" @@@@ -7501,7 +7504,7 @@@@ fi - +if false; then echo $ac_n "checking for XpmCreatePixmapFromData in -lXpm""... $ac_c" 1>&6 echo "configure:7507: checking for XpmCreatePixmapFromData in -lXpm" >&5 ac_lib_var=`echo Xpm'_'XpmCreatePixmapFromData | sed 'y%./+-%__p_%'` @@@@ -7545,6 +7548,7 @@@@ else echo "$ac_t""no" 1>&6 +fi fi @ 1.8 log @Fix build of "esound" driver. @ text @d2 3 a4 4 --- configure.orig Mon Dec 11 23:28:18 2000 +++ configure Mon Feb 26 23:03:01 2001 @@@@ -4706,6 +4706,8 @@@@ d13 1 a13 1 @@@@ -4745,6 +4747,7 @@@@ d21 10 a30 1 @@@@ -5326,7 +5329,7 @@@@ d39 1 a39 1 @@@@ -5826,7 +5829,7 @@@@ d44 1 a44 1 +LIBS="-ledit -ltermcap $LIBS" d46 1 a46 1 #line 5832 "configure" d48 1 a48 1 @@@@ -5854,7 +5857,7 @@@@ d57 1 a57 1 @@@@ -6360,7 +6363,7 @@@@ d64 1 a64 1 echo "configure:6366: checking whether -R must be followed by a space" >&5 d66 1 a66 1 @@@@ -7412,7 +7415,7 @@@@ d73 1 a73 1 echo "configure:7418: checking for XpmCreatePixmapFromData in -lXpm" >&5 d75 2 a76 1 @@@@ -7457,7 +7460,7 @@@@ d79 1 a80 2 - +fi d82 1 a82 2 if test x"$MISSING_X_LIBS" != "x"; then echo @ 1.7 log @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. @ text @d1 2 d4 1 a4 1 +++ configure Sat Feb 24 19:57:37 2001 d22 9 @ 1.6 log @Update to 1.5. Changes since 1.2: ** General changes - Screenshots can be saved now. - Fixed slowdown bug with flickering drive led. ** C128 changes - The Z80 emulation has been improved. CP/M will boot now. - The VDC can display flashing and reverse text attributes now. ** C64 changes - Fixed crash caused by VIC-II memory corruption. - Expert cartridge is emulated now. - Some NTSC fixes. Now the border looks a bit small, but most NTSC programs should work. - Fixed CIA TOD initialization. - Super Snapshot V5 and REX fastload carts are emulated now. - The REU emulation has been improved. - Sprites in non-visible parts of the screen should not crash the emulator anymore. - A sprite snapshot bug has been fixed. ** VIC20 changes - Fixed VIC crash. - Fixed VIC display bug. ** Unix changes - Palette changes work better now. - Added support for gettext based national language support. Initial german translation for Unix based UIs is provided. - NTSC timing is correct now (100% 60fps). - The emulator keeps running when menus are used. - Fixed some crashs and memory leaks in the XAW file selector widget. - New GNOME port of VICE. (not activated in package) - G64 images can be created now. ** Drive changes - Fixed a bug in the 1581 true drive emulation that prevented the use as drive #9. - Fixed a bug in the 8050 vdrive emulaton. - Fixed a bug that caused drive #8 to be diabled if file system access for drive #11 is disabled and all disks are detached. - Fixed IEC initialization bug that broke true drive emulation. - D71 BAM calculation has been fixed. - A drive RAM expansion is available now. - New 2040, 3040 and 4040 disk drive support. ** Tape changes - Now saving TAPs should work for big endian machines too. ** Miscellaneous changes - The REU can be used with Super Snapshot 5 or Expert Cartridge. - The monitor "z" command has been fixed. - Fixed some tape counter bugs. - Fixed a crash with ZIP archives. - Fixed a bug that prevented writing to gzipped disk images. - Fixed a crash if the image content lister is used on disk images with many files. - There is some experimental read only REL file support in the vdrive emulation now. @ text @d1 5 a5 7 $NetBSD$ --- configure.orig Tue Jul 25 00:02:45 2000 +++ configure @@@@ -4565,6 +4565,8 @@@@ SOUND_DRIVERS="" a6 1 if test "x$is_dos" != "xyes"; then d11 2 a12 1 @@@@ -4605,6 +4607,7 @@@@ d20 1 a20 1 @@@@ -5776,7 +5779,7 @@@@ d27 1 a27 1 #line 5782 "configure" d29 1 a29 1 @@@@ -5804,7 +5807,7 @@@@ d38 1 a38 1 @@@@ -6310,7 +6313,7 @@@@ d45 1 a45 1 echo "configure:6316: checking whether -R must be followed by a space" >&5 d47 1 a47 1 @@@@ -7362,7 +7365,7 @@@@ d54 1 a54 1 echo "configure:7368: checking for XpmCreatePixmapFromData in -lXpm" >&5 d56 1 a56 1 @@@@ -7407,7 +7410,7 @@@@ @ 1.5 log @Complete "readline" to "edit" library transition so that this package works on ELF systems. @ text @d3 3 a5 3 --- configure.orig Wed Nov 24 00:41:27 1999 +++ configure Tue Feb 8 12:22:00 2000 @@@@ -3990,6 +3990,8 @@@@ d9 1 d14 1 a14 2 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` @@@@ -4029,6 +4031,7 @@@@ d22 1 a22 1 @@@@ -5195,7 +5198,7 @@@@ d29 1 a29 1 #line 5201 "configure" d31 1 a31 1 @@@@ -5223,7 +5226,7 @@@@ d40 1 a40 1 @@@@ -5590,7 +5593,7 @@@@ d47 1 a47 1 echo "configure:5596: checking whether -R must be followed by a space" >&5 d49 1 a49 1 @@@@ -6642,7 +6645,7 @@@@ d56 1 a56 1 echo "configure:6648: checking for XpmCreatePixmapFromData in -lXpm" >&5 d58 1 a58 1 @@@@ -6687,7 +6690,7 @@@@ @ 1.4 log @vice updated to 1.2. Now compiles with SUN audio system, instead of OSS. From the ChangeLog (changes since 1.0): * Changes in VICE 1.2 ===================== ** C64 changes --------------- - Epyx Fastload and Westermann Learning Cartridges are supported now. ** C128 changes --------------- - The VDC hardware cursor has been implemented. - The machine can boot up in Z80 mode now. However CP/M does not work currently. ** PET changes --------------- - The CRTC emulation has been made pretty cycle-exact. You can now use timed raster effects. ** CBM-II changes --------------- - The CRTC emulation has been made pretty cycle-exact. You can now use timed raster effects. ** Drive changes ---------------- - D64 images with error codes are supported now. - The virtual drive emulation can process filenames containing zero bytes now.- The virtual drive commandline parser has been improved. - The fsdevice and the virtual drive emulation support memory read commands now. - Invalid scratch commands do not crash the fsdevice emulation. ** Unix changes --------------- - C64/C128 NTSC support (experimental). ** MS-DOS changes ----------------- - VDC grafic mode does not crash the emulator any more. ** MS-Windows changes --------------------- - New mouse emulation. - C64/C128 NTSC support (experimental). - The datasette status is displayed now. - Changing the palette works on-the-fly now. - A new VIC20 settings dialog. ** OS/2 changes --------------- - Sound, drive and joystick settings are implemented now. * Changes in VICE 1.1 ===================== ** General changes ------------------ - The datasette emulation supports saving to TAP images now. - Autostarting TAP tape images has been improved. - A command line option feeding the keyboard buffer on startup has been added. ** C64 changes --------------- - Fixed a bug in the REU emulation. GoDot now works. - Atomic Power cartridge is supported now. ** C128 changes --------------- - 80 column screen is emulated now. Currently the hardware cursor is missing, but Infocom adventures and GEOS128 work. - REU emulation is available now. - Fixed an IO banking bug. ** VIC20 changes ---------------- - New datasette emulation. - True 1581 emulation works now. ** PET changes -------------- - New datasette emulation. ** CBM-II changes ----------------- - New datasette emulation. ** Drive changes ---------------- - New 8050, 8250 and SFD1001 emulation using D80 and D82 disk images. - The virtual drive emulation, image contents lister and monitor block commands fully support G64 disk images. ** C1541 changes ---------------- - G64 disk image format is fully supported now. ** Unix changes --------------- - A dialog for creating empty disk images has been added. - The name of currently attached disk images is displayed now. - The disk image flip list can be maintained by a separate menu by clicking on the status bar. ** MS-Windows changes --------------------- - Run/Stop key is also present at ESC key, but it's still present at CAPS/LOCK, altough the latter doesn't work on Win98 with German and French keyboard layouts. - There is a disk/tape image contents lister now. - The RESTORE key is present now (PAGE UP). - Browse button in the device manager dialog works now. ** Miscellaneous changes ------------------------ - The `$xx' feature for specifying hexcodes on the command-line now works correctly. - Some P00 wildcard bug has been fixed. - An image content lister crash has been fixed. * Changes in VICE 1.0a ====================== ** MS-DOS changes ----------------- - x64 does not crash on start-up anymore. - Calling the emulator from a relative path works again. - 1541-II firmware is found now. @ text @d3 2 a4 2 --- ./configure.orig Wed Nov 24 00:41:27 1999 +++ ./configure Tue Feb 8 04:04:41 2000 d22 9 @ 1.3 log @ELF rpath issues. @ text @d3 20 a22 21 --- configure.orig Sat Apr 24 14:11:32 1999 +++ configure Tue Jul 27 04:35:03 1999 @@@@ -4841,14 +4841,14 @@@@ if test x"$with_readline" != "xno" ; then READLINE="" unset ac_cv_lib_readline_readline - echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 -echo "configure:4846: checking for readline in -lreadline" >&5 + echo $ac_n "checking for readline in -ledit""... $ac_c" 1>&6 +echo "configure:4846: checking for readline in -ledit" >&5 ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lreadline $LIBS" +LIBS="-ledit -ltermcap $LIBS" cat > conftest.$ac_ext <&5 d40 1 a40 1 @@@@ -6295,7 +6295,7 @@@@ d47 1 a47 1 echo "configure:6301: checking for XpmCreatePixmapFromData in -lXpm" >&5 d49 1 a49 1 @@@@ -6340,7 +6340,7 @@@@ @ 1.2 log @Update to 1.0, clean up, remove xpm dependency and check (...only used for window icon when iconified), and add third party configs for 4064, SX-64, and C64 Game System. @ text @d4 1 a4 1 +++ configure Tue May 18 01:55:08 1999 d32 9 @ 1.1 log @New pkg for vice-0.15.0 an emulator for C64, C128, PET and VIC20's @ text @d2 31 a32 4 --- Makefile.in.orig Sun Sep 6 11:36:17 1998 +++ Makefile.in Sun Sep 6 11:37:05 1998 @@@@ -37,7 +37,7 @@@@ DISTDIR = d34 1 a34 4 pkgdatadir = $(datadir)/@@PACKAGE@@ -pkglibdir = $(libdir)/@@PACKAGE@@ +pkglibdir = $(datadir)/@@PACKAGE@@ pkgincludedir = $(includedir)/@@PACKAGE@@ d36 14 a49 1 top_builddir = . @