Fixed sound.c compilation, added options.mk with SDL interface as an option

4 files changed, 38 insertions, 6 deletions

diff --git a/emulators/fuse/Makefile b/emulators/fuse/Makefile
index 7214d8a8259..d9b814e31a2 100644
--- a/emulators/fuse/Makefile
+++ b/emulators/fuse/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2006/04/17 13:46:23 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2007/03/24 15:51:41 adam Exp $
 
 DISTNAME=	fuse-0.7.0
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fuse-emulator/}
 
@@ -11,13 +11,13 @@ COMMENT=	ZX Spectrum Emulator
 
 USE_TOOLS+=		perl pkg-config
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-gtk2
 LIBS+=	${LIBOSSAUDIO}
 
+.include "options.mk"
+
 .include "../../emulators/libspectrum/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
 
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/fuse/PLIST b/emulators/fuse/PLIST
index b614e203308..cd18be69f52 100644
--- a/emulators/fuse/PLIST
+++ b/emulators/fuse/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/07/20 13:12:15 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2007/03/24 15:51:41 adam Exp $
 bin/fuse
 man/man1/fuse.1
 share/fuse/128-0.rom
@@ -19,11 +19,11 @@ share/fuse/plus3-0.rom
 share/fuse/plus3-1.rom
 share/fuse/plus3-2.rom
 share/fuse/plus3-3.rom
+share/fuse/plus3disk.bmp
 share/fuse/plus3e-0.rom
 share/fuse/plus3e-1.rom
 share/fuse/plus3e-2.rom
 share/fuse/plus3e-3.rom
-share/fuse/plus3disk.bmp
 share/fuse/se-0.rom
 share/fuse/se-1.rom
 share/fuse/tape_128.z80
diff --git a/emulators/fuse/options.mk b/emulators/fuse/options.mk
new file mode 100644
index 00000000000..1719007385a
--- /dev/null
+++ b/emulators/fuse/options.mk
@@ -0,0 +1,17 @@
+# $NetBSD: options.mk,v 1.1 2007/03/24 15:51:41 adam Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.fuse
+PKG_SUPPORTED_OPTIONS=	sdl gtk
+PKG_SUGGESTED_OPTIONS=	gtk
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mgtk)
+CONFIGURE_ARGS+=	--with-gtk2
+.include "../../x11/gtk2/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Msdl)
+CONFIGURE_ARGS+=	--with-sdl
+.include "../../devel/SDL/buildlink3.mk"
+.endif
diff --git a/emulators/fuse/patches/patch-ac b/emulators/fuse/patches/patch-ac
new file mode 100644
index 00000000000..86a26942cc1
--- /dev/null
+++ b/emulators/fuse/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1 2007/03/24 15:51:41 adam Exp $
+
+--- sound.c.orig	2007-03-24 16:24:10.000000000 +0100
++++ sound.c
+@@ -58,8 +58,8 @@ int sound_stereo=0;		/* true for stereo 
+ int sound_stereo_ay_abc=0;	/* (AY stereo) true for ABC stereo, else ACB */
+ int sound_stereo_ay_narrow=0;	/* (AY stereo) true for narrow AY st. sep. */
+ 
+-static int sound_stereo_ay=0;	/* local copy of settings_current.stereo_ay */
+-static int sound_stereo_beeper=0;   /* and settings_current.stereo_beeper */
++int sound_stereo_ay=0;	/* local copy of settings_current.stereo_ay */
++int sound_stereo_beeper=0;   /* and settings_current.stereo_beeper */
+ 
+ 
+ /* assume all three tone channels together match the beeper volume (ish).