From d64c5405211d4c26cb49301f4f66849b4f51ac34 Mon Sep 17 00:00:00 2001 From: wiz Date: Fri, 14 Jun 2013 20:53:04 +0000 Subject: Update to 1.1.1: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2013-05-24 Philip Kendall * Fuse 1.1.1 released. * Distribute PORTING,hacking/valgrind.supp,sound/wiisound.c, tests/success.{mgt.bz2,opd} and ui/wii/wiimouse.h (Stuart Brady). * Add ChangeLog entries for 1.0.0.1 and 1.0.0.1a (Fredrick Meunier). * Release correct version of source files. 2013-05-19 Philip Kendall * Fuse 1.1.0 released. * Remove ROMs that there is no formal permission to distribute. * New features: * Add Spectranet ethernet interface emulation (Philip Kendall). * Add SpeccyBoot ethernet interface emulation (Patrik Persson). * Add SpecDrum sound interface emulation (Jon Mitchell). * Add DISCiPLE disk interface emulation (Stuart Brady). Sinclair Network emulation is not provided, and the interface is not available under 128K emulation in this release. * Support reading PZX files (Fredrick Meunier). * Add support for POK files (Sergio Baldoví). * Add recording of movies to FMF files (Gergely Szasz). * Add GTK+ 3 compatibility (Sergio Baldoví). * Emulation core improvements: * Add support for ABC AY stereo (Stuart Brady). * Correct feedback in AY noise generator (Patrik Rak). * MIC bit only isn't enough to drive the speaker (Fredrick Meunier). * Mirror Interface 1 ROM to the second 8Kb of ROM as in the real interface (Fredrick Meunier, with thanks to mcleod_ideafix and zx81). * Support the Beta interface setting to not auto-boot the interface on 48K machines (ketmar). * Machine specific improvements: * Read and write all potential 1024k worth of memory pages from a snap (ketmar and Fredrick Meunier). * Initialise the Pentagon 1024k memory ports from a snapshot (ketmar and Fredrick Meunier). * Restore the paged state of the Beta ROM when loading Pentagon 128k/512k/1024k snapshots (ketmar and Fredrick Meunier). * Debugger improvements: * Disassemble ED 4D as RETI (Simon Owen). * Add IM, IFF1 and IFF2 setting and getting to the debugger (Alex Badea). * Miscellaneous improvements: * Many improvements to Win32 UI and installer (Sergio Baldoví). * Allow the use of the SDL joystick code in the GTK+ and Xlib UIs (Sergio Baldoví). * Add current machine name to GTK+ and Win32 statusbars (Sergio Baldoví). * Allow the drag and drop of files from KDE (Dolphin/Konqueror) (Sergio Baldoví, with thanks to Diondeville). * Add a statusbar for the xlib UI (Gergely Szasz). * Extend supported symbol characters on SDL and xlib UIs (Sergio Baldoví). * Support for the TZX set signal level block (Fredrick Meunier). * Drop support for GLib and GTK+ version 1.x (Alberto Garcia and Sergio Baldoví). * Support setting late timings from snapshots (Fredrick Meunier). * Various other minor bugfixes. --- emulators/fuse/Makefile | 6 +++--- emulators/fuse/PLIST | 5 ++++- emulators/fuse/distinfo | 14 +++++++------- emulators/fuse/patches/patch-ab | 27 --------------------------- emulators/fuse/patches/patch-ad | 14 +++++++------- emulators/fuse/patches/patch-configure | 15 +++++++++++++++ emulators/fuse/patches/patch-screenshot.c | 10 +++++----- 7 files changed, 41 insertions(+), 50 deletions(-) delete mode 100644 emulators/fuse/patches/patch-ab create mode 100644 emulators/fuse/patches/patch-configure diff --git a/emulators/fuse/Makefile b/emulators/fuse/Makefile index 31e2a0fe44c..59000050e13 100644 --- a/emulators/fuse/Makefile +++ b/emulators/fuse/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.54 2013/06/06 12:54:18 wiz Exp $ +# $NetBSD: Makefile,v 1.55 2013/06/14 20:53:04 wiz Exp $ -DISTNAME= fuse-1.0.0.1a -PKGREVISION= 14 +DISTNAME= fuse-1.1.1 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fuse-emulator/} @@ -18,6 +17,7 @@ LIBS+= ${LIBOSSAUDIO} .include "options.mk" +BUILDLINK_API_DEPENDS.libspectrum+= libspectrum>=1.1.1 .include "../../emulators/libspectrum/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/emulators/fuse/PLIST b/emulators/fuse/PLIST index 41a2e6a0553..43aa8dd6479 100644 --- a/emulators/fuse/PLIST +++ b/emulators/fuse/PLIST @@ -1,12 +1,14 @@ -@comment $NetBSD: PLIST,v 1.10 2011/12/17 15:11:25 wiz Exp $ +@comment $NetBSD: PLIST,v 1.11 2013/06/14 20:53:04 wiz Exp $ bin/fuse man/man1/fuse.1 share/fuse/128-0.rom share/fuse/128-1.rom share/fuse/48.rom share/fuse/cassette.bmp +share/fuse/disciple.rom share/fuse/disk_plus3.szx share/fuse/keyboard.scr +share/fuse/menu_data.ui share/fuse/microdrive.bmp share/fuse/plus2-0.rom share/fuse/plus2-1.rom @@ -22,6 +24,7 @@ share/fuse/plus3e-3.rom share/fuse/plusd.rom share/fuse/se-0.rom share/fuse/se-1.rom +share/fuse/speccyboot-1.4.rom share/fuse/tape_128.szx share/fuse/tape_16.szx share/fuse/tape_2048.szx diff --git a/emulators/fuse/distinfo b/emulators/fuse/distinfo index 03f2f345517..d275fc9700c 100644 --- a/emulators/fuse/distinfo +++ b/emulators/fuse/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.16 2011/12/17 15:11:25 wiz Exp $ +$NetBSD: distinfo,v 1.17 2013/06/14 20:53:04 wiz Exp $ -SHA1 (fuse-1.0.0.1a.tar.gz) = 041bebe475d61c63d6a21fcebc649683f065dfe0 -RMD160 (fuse-1.0.0.1a.tar.gz) = 9dd0950ee38807b91daf213847fae9bb8bd18eb4 -Size (fuse-1.0.0.1a.tar.gz) = 1527185 bytes +SHA1 (fuse-1.1.1.tar.gz) = 92dc42bf9e8d26c42858059d59d522255041ab5d +RMD160 (fuse-1.1.1.tar.gz) = 5bb00bf401050101fe2da3ec9a7f9ccc3069e82c +Size (fuse-1.1.1.tar.gz) = 1881332 bytes SHA1 (patch-aa) = 68d610ec43b220400e7781ae84327926c9d5c498 -SHA1 (patch-ab) = 2b31b3727de1a843fe4ebc75856c008e38b27f66 SHA1 (patch-ac) = 356002f998673f4a5ac2a78285e3bd7b1139be64 -SHA1 (patch-ad) = 923a79ddf440614cfb2f8f3be4a5f188154add02 -SHA1 (patch-screenshot.c) = 0c0e7e768a683a16ecfa3dbc83cc57125414a50f +SHA1 (patch-ad) = bdd8fab4de20b906128d3c19b9faffcbc6781e50 +SHA1 (patch-configure) = 7108d14dec459121301f93bf797671408861beb3 +SHA1 (patch-screenshot.c) = e09bf2cd264bf66bed57a41b623c1fa20e216c6b diff --git a/emulators/fuse/patches/patch-ab b/emulators/fuse/patches/patch-ab deleted file mode 100644 index 1033690ad58..00000000000 --- a/emulators/fuse/patches/patch-ab +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-ab,v 1.5 2010/12/20 20:53:47 adam Exp $ - ---- ui/gtk/gtkmouse.c.orig 2010-12-20 19:58:23.000000000 +0000 -+++ ui/gtk/gtkmouse.c -@@ -32,8 +32,10 @@ - #include "ui/ui.h" - - /* For XWarpPointer *only* - see below */ -+#ifndef GDK_WINDOWING_QUARTZ - #include - #include -+#endif - - /* GDK1 bits */ - #ifndef GDK_GRAB_SUCCESS -@@ -53,9 +55,11 @@ gtkmouse_reset_pointer( void ) - * For Win32, use SetCursorPos() -- see sdpGtkWarpPointer() at - * http://k3d.cvs.sourceforge.net/k3d/projects/sdplibs/sdpgtk/sdpgtkutility.cpp?view=markup - */ -+#ifndef GDK_WINDOWING_QUARTZ - XWarpPointer( GDK_WINDOW_XDISPLAY( gtkui_drawing_area->window ), None, - GDK_WINDOW_XWINDOW( gtkui_drawing_area->window ), - 0, 0, 0, 0, 128, 128 ); -+#endif - } - - gboolean diff --git a/emulators/fuse/patches/patch-ad b/emulators/fuse/patches/patch-ad index 9bf23d6d53d..a7aed269cc8 100644 --- a/emulators/fuse/patches/patch-ad +++ b/emulators/fuse/patches/patch-ad @@ -1,13 +1,13 @@ -$NetBSD: patch-ad,v 1.1 2010/12/20 20:53:47 adam Exp $ +$NetBSD: patch-ad,v 1.2 2013/06/14 20:53:04 wiz Exp $ ---- ui/gtk/Makefile.in.orig 2010-12-20 20:19:38.000000000 +0000 +--- ui/gtk/Makefile.in.orig 2013-05-24 20:56:08.000000000 +0000 +++ ui/gtk/Makefile.in -@@ -256,7 +256,7 @@ libuigtk_la_SOURCES = binary.c \ - statusbar.c \ - stock.c - +@@ -314,7 +314,7 @@ libuigtk_la_SOURCES = binary.c browse.c + gtkmouse.c gtkui.c keysyms.c memory.c menu_data.c options.c \ + picture.c pixmaps.c pokefinder.c pokemem.c rollback.c roms.c \ + statusbar.c stock.c $(am__append_1) -libuigtk_la_LIBADD = @GTK_LIBS@ -lX11 +libuigtk_la_LIBADD = @GTK_LIBS@ BUILT_SOURCES = keysyms.c \ menu_data.c \ - options.c \ + menu_data.ui \ diff --git a/emulators/fuse/patches/patch-configure b/emulators/fuse/patches/patch-configure new file mode 100644 index 00000000000..4abe969116c --- /dev/null +++ b/emulators/fuse/patches/patch-configure @@ -0,0 +1,15 @@ +$NetBSD: patch-configure,v 1.1 2013/06/14 20:53:04 wiz Exp $ + +Fix unportable test(1) construct. + +--- configure.orig 2013-06-14 20:38:14.000000000 +0000 ++++ configure +@@ -17868,7 +17868,7 @@ if test "$desktopdir" = yes; then + else + DESKTOP_DATADIR="$datadir" + fi +- if test "$desktopdir" == yes; then ++ if test "$desktopdir" = yes; then + DESKTOP_DATADIR_TRUE= + DESKTOP_DATADIR_FALSE='#' + else diff --git a/emulators/fuse/patches/patch-screenshot.c b/emulators/fuse/patches/patch-screenshot.c index b43df0b2599..3db8952b2b2 100644 --- a/emulators/fuse/patches/patch-screenshot.c +++ b/emulators/fuse/patches/patch-screenshot.c @@ -1,14 +1,14 @@ -$NetBSD: patch-screenshot.c,v 1.1 2011/02/27 12:33:56 adam Exp $ +$NetBSD: patch-screenshot.c,v 1.2 2013/06/14 20:53:04 wiz Exp $ Include Zlib header. ---- screenshot.c.orig 2011-02-27 12:30:57.000000000 +0000 +--- screenshot.c.orig 2013-05-16 20:26:23.000000000 +0000 +++ screenshot.c -@@ -48,6 +48,7 @@ +@@ -47,6 +47,7 @@ #ifdef USE_LIBPNG +#include #include - - static int get_rgb32_data( libspectrum_byte *rgb32_data, size_t stride, + #ifdef HAVE_ZLIB_H + #include -- cgit v1.2.3