Update libspectrum, fuse, and fuse-utils to 1.1.0

Highlights:
* fuse-utils:
  - new tool fmfconv to convert movies recorded with fuse
* fuse:
  - new ROMs Speccyboot 1.4 and DISCiPLE
  - drop ROMs without clear redistribution rights
    (128p, 256s, Gluck, IF1, Opus, TrDOS)
  - support PZX and POK files
  - GTK+ 3 compatibility

11 files changed, 65 insertions, 47 deletions

diff --git a/emulators/fuse-utils/Makefile b/emulators/fuse-utils/Makefile
index af2e6f0c019e..b6a1085370df 100644
--- a/emulators/fuse-utils/Makefile
+++ b/emulators/fuse-utils/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	fuse-utils
-PORTVERSION=	1.0.0
+PORTVERSION=	1.1.0
 CATEGORIES=	emulators
 MASTER_SITES=	SF/fuse-emulator/${PORTNAME}/${PORTVERSION}
 
@@ -20,25 +20,35 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libspectrum-prefix=${LOCALBASE} \
 		--with-local-prefix=${LOCALBASE}
 
-MAN1=	createhdf.1 fuse-utils.1 listbasic.1 raw2hdf.1 rzxcheck.1 rzxdump.1 rzxtool.1 scl2trd.1 snap2tzx.1 snapconv.1 tapeconv.1 tzxlist.1 profile2map.1
+MAN1=	createhdf.1 fmfconv.1 fuse-utils.1 listbasic.1 raw2hdf.1 rzxcheck.1 \
+	rzxdump.1 rzxtool.1 scl2trd.1 snap2tzx.1 snapconv.1 tapeconv.1 \
+	tzxlist.1 profile2map.1
 
-OPTIONS_DEFINE=	AUDIOFILE DOCS
+OPTIONS_DEFINE=	AUDIOTOOLS DOCS
+OPTIONS_DEFAULT=	AUDIOTOOLS
 
-AUDIOFILE_DESC=	Build audio <-> tape utilities
-
-OPTIONS_DEFAULT=	AUDIOFILE
+AUDIOTOOLS_DESC=	Build audio <-> tape utilities
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MAUDIOFILE}
+.if ${PORT_OPTIONS:MAUDIOTOOLS}
+CONFIGURE_ARGS+=--with-audiofile
 LIB_DEPENDS+=	audiofile:${PORTSDIR}/audio/libaudiofile
-PLIST_SUB=	AUDIOFILE=""
+PLIST_SUB=	AUDIOTOOLS=""
 MAN1+=		audio2tape.1 tape2wav.1
 .else
 CONFIGURE_ARGS+=--without-audiofile
-PLIST_SUB=	AUDIOFILE="@comment "
+PLIST_SUB=	AUDIOTOOLS="@comment "
 .endif
 
+# FIXME no way to specify ffmpeg1 paths to configure script
+#.if ${PORT_OPTIONS:MFFMPEG}
+#LIB_DEPENDS+=	avformat1:${PORTSDIR}/multimedia/ffmpeg1
+#CONFIGURE_ARGS+=--with-ffmpeg
+#.else
+CONFIGURE_ARGS+=--without-ffmpeg
+#.endif
+
 .if ${PORT_OPTIONS:MDOCS}
 post-install:
 	@${MKDIR} ${DOCSDIR}
diff --git a/emulators/fuse-utils/distinfo b/emulators/fuse-utils/distinfo
index f0f90e2ff874..08aeef1a4ada 100644
--- a/emulators/fuse-utils/distinfo
+++ b/emulators/fuse-utils/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fuse-utils-1.0.0.tar.gz) = 39f110d9760b84ecd23ab4a7ad777db6480b470f1c6435889a125abb302de104
-SIZE (fuse-utils-1.0.0.tar.gz) = 415310
+SHA256 (fuse-utils-1.1.0.tar.gz) = 750d6d8d7f78365bb98e91c3e41c7f85c4963218f2d5f5ce85803f4321e3fa5e
+SIZE (fuse-utils-1.1.0.tar.gz) = 500840
diff --git a/emulators/fuse-utils/pkg-plist b/emulators/fuse-utils/pkg-plist
index 6c433cad6035..ff86106edc17 100644
--- a/emulators/fuse-utils/pkg-plist
+++ b/emulators/fuse-utils/pkg-plist
@@ -1,5 +1,6 @@
-%%AUDIOFILE%%bin/audio2tape
+%%AUDIOTOOLS%%bin/audio2tape
 bin/createhdf
+bin/fmfconv
 bin/listbasic
 bin/profile2map
 bin/raw2hdf
@@ -9,7 +10,7 @@ bin/rzxtool
 bin/scl2trd
 bin/snap2tzx
 bin/snapconv
-%%AUDIOFILE%%bin/tape2wav
+%%AUDIOTOOLS%%bin/tape2wav
 bin/tapeconv
 bin/tzxlist
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
diff --git a/emulators/fuse/Makefile b/emulators/fuse/Makefile
index fbe0d0d58cdd..f0a070600403 100644
--- a/emulators/fuse/Makefile
+++ b/emulators/fuse/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	fuse
-PORTVERSION=	1.0.0.1
-PORTREVISION=	3
+PORTVERSION=	1.1.0
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}-emulator/${PORTNAME}/${PORTVERSION}
 
@@ -12,7 +11,7 @@ COMMENT=	Free Unix (Sinclair ZX-)Spectrum Emulator
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	spectrum.8:${PORTSDIR}/emulators/libspectrum \
+LIB_DEPENDS=	spectrum:${PORTSDIR}/emulators/libspectrum \
 		png15:${PORTSDIR}/graphics/png \
 		gcrypt:${PORTSDIR}/security/libgcrypt
 
@@ -34,13 +33,13 @@ SAMPLERATE_DESC=	Better beeper sound quality
 
 .if ${PORT_OPTIONS:MAO}
 CONFIGURE_ARGS+=--with-libao
-LIB_DEPENDS+=	ao.4:${PORTSDIR}/audio/libao
+LIB_DEPENDS+=	ao:${PORTSDIR}/audio/libao
 .else
 CONFIGURE_ARGS+=--without-libao
 .endif
 
 .if ${PORT_OPTIONS:MSAMPLERATE}
-LIB_DEPENDS+=	samplerate.1:${PORTSDIR}/audio/libsamplerate
+LIB_DEPENDS+=	samplerate:${PORTSDIR}/audio/libsamplerate
 .else
 CONFIGURE_ARGS+=--without-libsamplerate
 .endif
diff --git a/emulators/fuse/distinfo b/emulators/fuse/distinfo
index 5807d7253c39..c5419e83d0d1 100644
--- a/emulators/fuse/distinfo
+++ b/emulators/fuse/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fuse-1.0.0.1.tar.gz) = 4bc7be3dca87aaf244b0769387a4d9b40f74d50b5077a4cf499d88c3362b511b
-SIZE (fuse-1.0.0.1.tar.gz) = 1629111
+SHA256 (fuse-1.1.0.tar.gz) = c0960b72f76e3b9fb49ad6970d2f80e0db8e8bfd257449f37c30bd76ea071617
+SIZE (fuse-1.1.0.tar.gz) = 1870034
diff --git a/emulators/fuse/files/patch-screenshot.c b/emulators/fuse/files/patch-screenshot.c
deleted file mode 100644
index 25205faf3088..000000000000
--- a/emulators/fuse/files/patch-screenshot.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- screenshot.c.orig	2011-01-12 22:36:28.000000000 +0100
-+++ screenshot.c	2012-05-09 12:59:50.000000000 +0200
-@@ -49,6 +49,7 @@
- #ifdef USE_LIBPNG
- 
- #include <png.h>
-+#include <zlib.h>
- 
- static int get_rgb32_data( libspectrum_byte *rgb32_data, size_t stride,
- 			   size_t height, size_t width );
diff --git a/emulators/fuse/files/patch-sound__aosound.c b/emulators/fuse/files/patch-sound__aosound.c
new file mode 100644
index 000000000000..f7346fe64d17
--- /dev/null
+++ b/emulators/fuse/files/patch-sound__aosound.c
@@ -0,0 +1,27 @@
+--- ./sound/aosound.c.orig	2013-05-16 22:26:12.000000000 +0200
++++ ./sound/aosound.c	2013-05-20 14:06:11.000000000 +0200
+@@ -78,14 +78,14 @@
+   }
+ }
+ 
+-static void
++static int
+ parse_driver_options( const char *device, int *driver_id, ao_option **options )
+ {
+   char *mutable, *option, *key, *value;
+ 
+   /* Get a copy of the device string we can modify */
+   if( !device || *device == '\0' )
+-    return;
++    return 1;
+ 
+   mutable = utils_safe_strdup( device );
+ 
+@@ -119,6 +119,7 @@
+   }
+ 
+   free( mutable );
++  return 0;
+ }
+ 
+ int
diff --git a/emulators/fuse/pkg-plist b/emulators/fuse/pkg-plist
index 194fd24e1ff7..51799b4c8196 100644
--- a/emulators/fuse/pkg-plist
+++ b/emulators/fuse/pkg-plist
@@ -2,21 +2,13 @@
 bin/fuse
 %%DATADIR%%/128-0.rom
 %%DATADIR%%/128-1.rom
-%%DATADIR%%/128p-0.rom
-%%DATADIR%%/128p-1.rom
-%%DATADIR%%/256s-0.rom
-%%DATADIR%%/256s-1.rom
-%%DATADIR%%/256s-2.rom
-%%DATADIR%%/256s-3.rom
 %%DATADIR%%/48.rom
 %%DATADIR%%/cassette.bmp
+%%DATADIR%%/disciple.rom
 %%DATADIR%%/disk_plus3.szx
-%%DATADIR%%/gluck.rom
-%%DATADIR%%/if1-1.rom
-%%DATADIR%%/if1-2.rom
 %%DATADIR%%/keyboard.scr
+%%DATADIR%%/menu_data.ui
 %%DATADIR%%/microdrive.bmp
-%%DATADIR%%/opus.rom
 %%DATADIR%%/plus2-0.rom
 %%DATADIR%%/plus2-1.rom
 %%DATADIR%%/plus3-0.rom
@@ -31,6 +23,7 @@ bin/fuse
 %%DATADIR%%/plusd.rom
 %%DATADIR%%/se-0.rom
 %%DATADIR%%/se-1.rom
+%%DATADIR%%/speccyboot-1.4.rom
 %%DATADIR%%/tape_128.szx
 %%DATADIR%%/tape_16.szx
 %%DATADIR%%/tape_2048.szx
@@ -48,7 +41,6 @@ bin/fuse
 %%DATADIR%%/tc2048.rom
 %%DATADIR%%/tc2068-0.rom
 %%DATADIR%%/tc2068-1.rom
-%%DATADIR%%/trdos.rom
 @dirrm %%DATADIR%%
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
diff --git a/emulators/libspectrum/Makefile b/emulators/libspectrum/Makefile
index e1b761aa1e6e..0997c6742a7a 100644
--- a/emulators/libspectrum/Makefile
+++ b/emulators/libspectrum/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libspectrum
-PORTVERSION=	1.0.0
-PORTREVISION=	3
+PORTVERSION=	1.1.0
 CATEGORIES=	emulators devel
 MASTER_SITES=	SF/fuse-emulator/${PORTNAME}/${PORTVERSION}
 
@@ -28,7 +27,7 @@ AUDIOFILE_DESC=	Support loading from .wav files
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MAUDIOFILE}
-LIB_DEPENDS+=	audiofile.0:${PORTSDIR}/audio/libaudiofile
+LIB_DEPENDS+=	audiofile:${PORTSDIR}/audio/libaudiofile
 .else
 CONFIGURE_ARGS+=--without-libaudiofile
 .endif
diff --git a/emulators/libspectrum/distinfo b/emulators/libspectrum/distinfo
index 7518cf659e1f..178dac069f92 100644
--- a/emulators/libspectrum/distinfo
+++ b/emulators/libspectrum/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libspectrum-1.0.0.tar.gz) = cdf8f5006676c0f68939e331eeadeda5d608d777f1234b080b97f677f1dd287c
-SIZE (libspectrum-1.0.0.tar.gz) = 462552
+SHA256 (libspectrum-1.1.0.tar.gz) = 17938b9f62b2c80ed3e0a58f52ef5ad4e9dfab24ed9a1ca828a56145e109ab2e
+SIZE (libspectrum-1.1.0.tar.gz) = 500889
diff --git a/emulators/libspectrum/pkg-plist b/emulators/libspectrum/pkg-plist
index fca5bdb196c1..b079a2b936d1 100644
--- a/emulators/libspectrum/pkg-plist
+++ b/emulators/libspectrum/pkg-plist
@@ -3,7 +3,7 @@ include/libspectrum.h
 lib/libspectrum.a
 lib/libspectrum.la
 lib/libspectrum.so
-lib/libspectrum.so.8
+lib/libspectrum.so.9
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README