From 1d22142ac19459219cb3e20f32fe5c4155fe19c4 Mon Sep 17 00:00:00 2001 From: dillo Date: Thu, 29 Jun 2006 22:56:34 +0000 Subject: 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. --- emulators/vice/Makefile | 5 +-- emulators/vice/distinfo | 18 ++++---- emulators/vice/patches/patch-aa | 18 ++++---- emulators/vice/patches/patch-ab | 6 +-- emulators/vice/patches/patch-ac | 95 +++++++++-------------------------------- emulators/vice/patches/patch-ad | 13 +++--- emulators/vice/patches/patch-af | 15 ++++--- 7 files changed, 60 insertions(+), 110 deletions(-) (limited to 'emulators') diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile index 1f84360046e..bee6f63ef1a 100644 --- a/emulators/vice/Makefile +++ b/emulators/vice/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.66 2006/04/17 13:46:23 wiz Exp $ +# $NetBSD: Makefile,v 1.67 2006/06/29 22:56:34 dillo Exp $ # -DISTNAME= vice-1.18 -PKGREVISION= 4 +DISTNAME= vice-1.19 CATEGORIES= emulators MASTER_SITES= ftp://ftp.zimmers.net/pub/cbm/crossplatform/emulators/VICE/ \ http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/ diff --git a/emulators/vice/distinfo b/emulators/vice/distinfo index 418cc3bbaa8..f4ef348ebac 100644 --- a/emulators/vice/distinfo +++ b/emulators/vice/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.23 2006/03/31 16:47:44 jlam Exp $ +$NetBSD: distinfo,v 1.24 2006/06/29 22:56:34 dillo Exp $ -SHA1 (vice-1.18.tar.gz) = f37015c28d226057ce8e48bfdbeb18f1d707e343 -RMD160 (vice-1.18.tar.gz) = 58dbebb2e5942a94865cd24c22d2243be103d15c -Size (vice-1.18.tar.gz) = 4733819 bytes -SHA1 (patch-aa) = fa152c1d14aad31c0b50fe96c83b4e5cfa06de5f -SHA1 (patch-ab) = e9cebe89629f2dacb500695e4205cc33fab18bfe -SHA1 (patch-ac) = 78b47925355731bd7ab9f99a56d7430204c7617f -SHA1 (patch-ad) = 9f26a52a0f60658b147ad62a8cadc37ddd99fe04 +SHA1 (vice-1.19.tar.gz) = 8620d891fa9de29eb21e334f3c7c8254e89e80a9 +RMD160 (vice-1.19.tar.gz) = d0a62750c30e3cf8645117a8e8536a8061c260ea +Size (vice-1.19.tar.gz) = 4796181 bytes +SHA1 (patch-aa) = 8e1a8b661e1e4f6847c8a0495308ad3e0c2f6dcd +SHA1 (patch-ab) = 12657561998b724c39699c380290e7333365d300 +SHA1 (patch-ac) = 0a0c1da41d5dc7cb322f1a6a62023c0bad1419f2 +SHA1 (patch-ad) = 5c1510a66d775b8a5a1b0a7d596aa111218993be SHA1 (patch-ae) = 9528bc0da7af5a0c74f5f0d2a8bf30b71802850c -SHA1 (patch-af) = c7aef30587e36c6f83daab29f76528f49846aa22 +SHA1 (patch-af) = 524913b7bc753dafde909bb26ace8f0500be14d5 diff --git a/emulators/vice/patches/patch-aa b/emulators/vice/patches/patch-aa index 08cf6020f47..ddacbcb70dc 100644 --- a/emulators/vice/patches/patch-aa +++ b/emulators/vice/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.4 2003/09/28 10:41:21 kristerw Exp $ ---- src/arch/unix/types.h.orig Sun Sep 28 12:29:23 2003 -+++ src/arch/unix/types.h Sun Sep 28 12:31:06 2003 -@@ -60,7 +60,8 @@ - /* Maximum value of a CLOCK. */ +$NetBSD: patch-aa,v 1.5 2006/06/29 22:56:34 dillo Exp $ + +--- src/arch/unix/types.h.orig 2005-12-23 23:29:54.000000000 +0100 ++++ src/arch/unix/types.h +@@ -61,7 +61,7 @@ typedef DWORD CLOCK; #define CLOCK_MAX (~((CLOCK)0)) --#if defined(__GNUC__) && defined(__i386__) && !defined(NO_REGPARM) -+/* GCC 2.95 has code gen problems with regparam(). */ -+#if defined(__GNUC__) && (__GNUC__ > 2) && defined(__i386__) && !defined(NO_REGPARM) + #if defined(__GNUC__) && defined(__i386__) && !defined(NO_REGPARM) +-#if defined(__NETBSD__) ++#if defined(__NetBSD__) + #if (__GNUC__ > 2) #define REGPARM1 __attribute__((regparm(1))) #define REGPARM2 __attribute__((regparm(2))) - #define REGPARM3 __attribute__((regparm(3))) diff --git a/emulators/vice/patches/patch-ab b/emulators/vice/patches/patch-ab index d950d5bc045..ddcc51d6070 100644 --- a/emulators/vice/patches/patch-ab +++ b/emulators/vice/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.6 2004/08/31 15:53:09 dillo Exp $ +$NetBSD: patch-ab,v 1.7 2006/06/29 22:56:34 dillo Exp $ ---- src/arch/unix/archdep.h.orig 2004-06-19 22:29:01.000000000 +0200 +--- src/arch/unix/archdep.h.orig 2005-03-28 21:10:20.000000000 +0200 +++ src/arch/unix/archdep.h -@@ -85,8 +85,8 @@ +@@ -96,8 +96,8 @@ extern const char *archdep_home_path(void); /* Define the default system directory (where the ROMs are). */ diff --git a/emulators/vice/patches/patch-ac b/emulators/vice/patches/patch-ac index 94263ea32fc..a93000fe57b 100644 --- a/emulators/vice/patches/patch-ac +++ b/emulators/vice/patches/patch-ac @@ -1,104 +1,49 @@ -$NetBSD: patch-ac,v 1.14 2005/12/11 22:46:50 dillo Exp $ +$NetBSD: patch-ac,v 1.15 2006/06/29 22:56:34 dillo Exp $ ---- src/sounddrv/soundsun.c.orig 2005-07-24 23:17:09.000000000 +0200 +--- src/sounddrv/soundsun.c.orig 2005-12-23 23:29:54.000000000 +0100 +++ src/sounddrv/soundsun.c -@@ -61,8 +61,11 @@ static int sun_bufferspace(void); - - static int sun_fd = -1; +@@ -63,7 +63,7 @@ static int sun_fd = -1; static int sun_8bit = 0; -+static int sun_channels = 1; + static int sun_channels = 1; static int sun_bufsize = 0; +-#if !defined(__NETBSD__) +#if !defined(__NetBSD__) static int sun_written = 0; -+#endif + #endif - static int toulaw8(SWORD data) - { -@@ -104,8 +107,10 @@ static int sun_init(const char *param, i +@@ -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 - - 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; + #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; - 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); + #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 - - while (sun_bufferspace() < 0) - usleep(5000); -@@ -172,7 +183,7 @@ static int sun_write(SWORD *pbuf, size_t + #endif - 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) +@@ -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; - } - - + #endif + sun_channels = 1; diff --git a/emulators/vice/patches/patch-ad b/emulators/vice/patches/patch-ad index 1694d0d100b..a3a00650de4 100644 --- a/emulators/vice/patches/patch-ad +++ b/emulators/vice/patches/patch-ad @@ -1,13 +1,16 @@ -$NetBSD: patch-ad,v 1.9 2004/07/30 20:32:01 kristerw Exp $ +$NetBSD: patch-ad,v 1.10 2006/06/29 22:56:34 dillo Exp $ ---- src/arch/unix/x11/vidmode.c.orig Fri Jul 30 21:56:16 2004 -+++ src/arch/unix/x11/vidmode.c Fri Jul 30 21:56:33 2004 -@@ -74,7 +74,7 @@ +--- src/arch/unix/x11/vidmode.c.orig 2005-12-23 23:29:54.000000000 +0100 ++++ src/arch/unix/x11/vidmode.c +@@ -75,11 +75,7 @@ int vidmode_init(void) &vm_modes)) { log_error(vidmode_log, _("Error getting video mode information - disabling vidmode extension.")); vm_available = 0; +-#if !defined(__NETBSD__) - return -1; -+ return 0; +-#else + return 0; +-#endif } for (i = 0; i < vm_mode_count; i++) { diff --git a/emulators/vice/patches/patch-af b/emulators/vice/patches/patch-af index 4a0f434d707..065ffb35052 100644 --- a/emulators/vice/patches/patch-af +++ b/emulators/vice/patches/patch-af @@ -1,13 +1,16 @@ -$NetBSD: patch-af,v 1.5 2005/11/18 20:44:55 kristerw Exp $ +$NetBSD: patch-af,v 1.6 2006/06/29 22:56:34 dillo Exp $ ---- src/arch/unix/x11/video.c.orig 2005-11-18 20:57:10.000000000 +0100 -+++ src/arch/unix/x11/video.c 2005-11-18 20:57:47.000000000 +0100 -@@ -204,7 +204,7 @@ +--- src/arch/unix/x11/video.c.orig 2006-01-02 01:04:55.000000000 +0100 ++++ src/arch/unix/x11/video.c +@@ -210,11 +210,7 @@ int video_init_cmdline_options(void) /* ------------------------------------------------------------------------- */ --static GC _video_gc; -+GC _video_gc; +-#if !defined(__NETBSD__) + static GC _video_gc; +-#else +-GC _video_gc; +-#endif static void (*_refresh_func)(); /* This is set to 1 if the Shared Memory Extensions can actually be used. */ -- cgit v1.2.3