Changes 1.0.0:

* Add Opus Discovery disk interface support
* Wii support
* Many improvements to Win32 UI, including an installer
* Support weak data in +3 disk images
* NTSC Spectrum support
* Add support for flipping disk images in single sided drives
* Add support for automatically merging both both disk images where
  they are in separate files named with the text [Ss]ide[ _][abAB12]
* Switch to using Blip_Buffer (by Shay Green) for improved beeper and
  AY output
* Allow beeper and AY volumes to be set
* Enable Beta 128 interface in 48K and TC2048 machines
* Add emulation of the Fuller Audio Box
* Allow sound to run from 2% speed up
* Add emulation of the Melodik and similar 48K-compatible AY interfaces
  that use the 128K sound ports
* Add support for Pentagon 1024SL v2.2 16 colour modek
* Implement GTK+ drag and drop support
* Better support for international keyboards
* Allow svgalib UI to use full range of bit depths and scalers
* Allow GTK+ scalers to set window size in GTK+ UI
* Allow selection of "TV speaker" or "beeper"-style sound output
* Allow hot-key switching between full-screen and windowed mode in SDL UI

6 files changed, 69 insertions, 21 deletions

diff --git a/emulators/fuse/Makefile b/emulators/fuse/Makefile
index 5aec18e7982..ee250c165b9 100644
--- a/emulators/fuse/Makefile
+++ b/emulators/fuse/Makefile
@@ -1,19 +1,20 @@
-# $NetBSD: Makefile,v 1.33 2010/11/15 22:56:55 abs Exp $
+# $NetBSD: Makefile,v 1.34 2010/12/20 20:53:47 adam Exp $
 
-DISTNAME=	fuse-0.10.0.2
-PKGREVISION=	4
+DISTNAME=	fuse-1.0.0
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fuse-emulator/}
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://fuse-emulator.sourceforge.net/
 COMMENT=	ZX Spectrum Emulator
+LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_TOOLS+=		perl pkg-config
 GNU_CONFIGURE=		yes
 
+CPPFLAGS+=		-DDEVOSSAUDIO=\"${DEVOSSAUDIO}\"
 LIBS+=			${LIBOSSAUDIO}
 
 .include "options.mk"
diff --git a/emulators/fuse/PLIST b/emulators/fuse/PLIST
index d32f4c1624d..9374e0d98aa 100644
--- a/emulators/fuse/PLIST
+++ b/emulators/fuse/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2009/06/14 17:51:04 joerg Exp $
+@comment $NetBSD: PLIST,v 1.9 2010/12/20 20:53:47 adam Exp $
 bin/fuse
 man/man1/fuse.1
 share/fuse/128-0.rom
@@ -17,6 +17,7 @@ share/fuse/if1-1.rom
 share/fuse/if1-2.rom
 share/fuse/keyboard.scr
 share/fuse/microdrive.bmp
+share/fuse/opus.rom
 share/fuse/plus2-0.rom
 share/fuse/plus2-1.rom
 share/fuse/plus3-0.rom
@@ -36,6 +37,7 @@ share/fuse/tape_16.szx
 share/fuse/tape_2048.szx
 share/fuse/tape_2068.szx
 share/fuse/tape_48.szx
+share/fuse/tape_48_ntsc.szx
 share/fuse/tape_pentagon.szx
 share/fuse/tape_plus2.szx
 share/fuse/tape_plus2a.szx
diff --git a/emulators/fuse/distinfo b/emulators/fuse/distinfo
index 8c9cc2693d6..e7116ad9ca0 100644
--- a/emulators/fuse/distinfo
+++ b/emulators/fuse/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.13 2009/01/16 13:17:24 adam Exp $
+$NetBSD: distinfo,v 1.14 2010/12/20 20:53:47 adam Exp $
 
-SHA1 (fuse-0.10.0.2.tar.gz) = 1d43619a92f2557666a165af5d0b5eca87497d55
-RMD160 (fuse-0.10.0.2.tar.gz) = d6f3f8b10669573b62be38dcc63b35add743e0fe
-Size (fuse-0.10.0.2.tar.gz) = 1579106 bytes
+SHA1 (fuse-1.0.0.tar.gz) = 9bf164ca069a0b599002c49b56a1d30519e2aac0
+RMD160 (fuse-1.0.0.tar.gz) = 32d9249266f6083a8cb565ef7b4a5f26b9fa6d5e
+Size (fuse-1.0.0.tar.gz) = 1628751 bytes
 SHA1 (patch-aa) = 68d610ec43b220400e7781ae84327926c9d5c498
-SHA1 (patch-ab) = 20fd52776ad73385d7fc33cfaca4b6d047dfe1d6
+SHA1 (patch-ab) = 2b31b3727de1a843fe4ebc75856c008e38b27f66
+SHA1 (patch-ac) = 356002f998673f4a5ac2a78285e3bd7b1139be64
+SHA1 (patch-ad) = 923a79ddf440614cfb2f8f3be4a5f188154add02
diff --git a/emulators/fuse/patches/patch-ab b/emulators/fuse/patches/patch-ab
index 3f351d66bff..1033690ad58 100644
--- a/emulators/fuse/patches/patch-ab
+++ b/emulators/fuse/patches/patch-ab
@@ -1,13 +1,27 @@
-$NetBSD: patch-ab,v 1.4 2008/12/04 07:40:20 adam Exp $
+$NetBSD: patch-ab,v 1.5 2010/12/20 20:53:47 adam Exp $
 
---- sound/Makefile.in.orig	2008-12-03 20:17:17.000000000 +0100
-+++ sound/Makefile.in
-@@ -83,7 +83,7 @@ CFLAGS = @CFLAGS@
- COMPAT_OSNAME = @COMPAT_OSNAME@
- COMPAT_SUBDIR = @COMPAT_SUBDIR@
- CPP = @CPP@
--CPPFLAGS = @CPPFLAGS@
-+CPPFLAGS = @CPPFLAGS@ -DDEVOSSAUDIO=\"${DEVOSSAUDIO}\"
- CXX = @CXX@
- CXXCPP = @CXXCPP@
- CXXDEPMODE = @CXXDEPMODE@
+--- 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 <gdk/gdkx.h>
+ #include <X11/Xlib.h>
++#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-ac b/emulators/fuse/patches/patch-ac
new file mode 100644
index 00000000000..1f748445958
--- /dev/null
+++ b/emulators/fuse/patches/patch-ac
@@ -0,0 +1,16 @@
+$NetBSD: patch-ac,v 1.3 2010/12/20 20:53:47 adam Exp $
+
+--- ui/gtk/gtkui.c.orig	2010-12-20 20:17:04.000000000 +0000
++++ ui/gtk/gtkui.c
+@@ -28,8 +28,10 @@
+ #include <stdio.h>
+ 
+ #include <gdk/gdkkeysyms.h>
+-#include <gdk/gdkx.h>
+ #include <gtk/gtk.h>
++#ifndef GDK_WINDOWING_QUARTZ
++#include <gdk/gdkx.h>
++#endif
+ 
+ #include <glib.h>
+ 
diff --git a/emulators/fuse/patches/patch-ad b/emulators/fuse/patches/patch-ad
new file mode 100644
index 00000000000..9bf23d6d53d
--- /dev/null
+++ b/emulators/fuse/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2010/12/20 20:53:47 adam Exp $
+
+--- ui/gtk/Makefile.in.orig	2010-12-20 20:19:38.000000000 +0000
++++ ui/gtk/Makefile.in
+@@ -256,7 +256,7 @@ libuigtk_la_SOURCES = binary.c \
+ 		     statusbar.c \
+ 		     stock.c
+ 
+-libuigtk_la_LIBADD = @GTK_LIBS@ -lX11 
++libuigtk_la_LIBADD = @GTK_LIBS@
+ BUILT_SOURCES = keysyms.c \
+ 		menu_data.c \
+ 		options.c \