Update fuse-utils to 1.3.1.

Dropped dependency on ffmpeg (and the now useless patch) as it's not
used anymore.

OK bentley@

emulators/fuse-utils/Makefile

@@ -1,27 +1,22 @@
-# $OpenBSD: Makefile,v 1.21 2015/08/17 19:10:12 sthen Exp $
+# $OpenBSD: Makefile,v 1.22 2017/01/03 13:20:42 fcambus Exp $
 
 COMMENT=		Free Unix Spectrum Emulator utilities
 
-DISTNAME =		fuse-utils-1.1.1
-REVISION=		1
+DISTNAME =		fuse-utils-1.3.1
 CATEGORIES=		emulators
 HOMEPAGE=		http://fuse-emulator.sourceforge.net/
 
 # GPLv2+
 PERMIT_PACKAGE_CDROM=	Yes
 
-MODULES=		devel/gettext
-
-WANTLIB += FLAC audiofile avcodec avformat avutil bz2 c crypto
-WANTLIB += gcrypt glib-2.0 gpg-error gsm m mp3lame ogg opus
-WANTLIB += pcre pthread speex ssl stdc++ swscale vorbis vorbisenc
-WANTLIB += vpx x264 xvidcore z swresample x265
+WANTLIB += FLAC audiofile bz2 c gcrypt glib-2.0 gpg-error iconv
+WANTLIB += intl jpeg m ogg pcre png pthread spectrum stdc++ z
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=fuse-emulator/}
 
 LIB_DEPENDS=		devel/libspectrum \
-			graphics/ffmpeg
-WANTLIB +=		spectrum>=5
+			graphics/jpeg \
+			graphics/png
 
 CONFIGURE_STYLE=	gnu
 

emulators/fuse-utils/distinfo

@@ -1,2 +1,2 @@
-SHA256 (fuse-utils-1.1.1.tar.gz) = fDbAtCgFZhoGwhrt40Yf/IzNtc5W/iModb+G5593yTw=
-SIZE (fuse-utils-1.1.1.tar.gz) = 505766
+SHA256 (fuse-utils-1.3.1.tar.gz) = H5+VhRoXntm+R0YFoVgHORaOaNBRlFcpJCJ0vqLw6Hw=
+SIZE (fuse-utils-1.3.1.tar.gz) = 488461

emulators/fuse-utils/patches/patch-fmfconv_ff_c

@@ -1,66 +0,0 @@
-$OpenBSD: patch-fmfconv_ff_c,v 1.1 2014/06/09 08:55:16 bentley Exp $
-
-Fix build with recent ffmpeg. From upstream r5072.
-
---- fmfconv_ff.c.orig	Tue Apr 29 04:21:51 2014
-+++ fmfconv_ff.c	Tue Apr 29 04:24:00 2014
-@@ -113,6 +113,14 @@ static int res_rte = -1;
- static void setup_x264_dict( AVDictionary **  pm );
- #endif
- 
-+#if LIBAVCODEC_BUILD >= AV_VERSION_INT(54,25,0)
-+#define FMF_CODEC_ID AVCodecID
-+#define FMF_CODEC(name) AV_##name
-+#else
-+#define FMF_CODEC_ID CodecID
-+#define FMF_CODEC(name) name
-+#endif
-+
- /* check that a given sample format is supported by the encoder */
- static int
- check_sample_fmt( AVCodec *codec, enum AVSampleFormat sample_fmt )
-@@ -224,7 +232,7 @@ ffmpeg_rescale_video( void )
-  */
- 
- static int
--add_audio_stream( enum CodecID codec_id, int freq, int stereo )
-+add_audio_stream( enum FMF_CODEC_ID codec_id, int freq, int stereo )
- {
-   AVCodecContext *c;
- 
-@@ -440,7 +448,7 @@ check_framerate( const AVRational *frates, int timing 
- 
- /* add a video output stream */
- static int
--add_video_stream( enum CodecID codec_id, int w, int h, int timing )
-+add_video_stream( enum FMF_CODEC_ID codec_id, int w, int h, int timing )
- {
-   AVCodecContext *c;
- 
-@@ -674,7 +682,7 @@ out_write_ffmpegheader( void )
- {
- 
-   AVCodec *ac, *vc;
--  enum CodecID acodec, vcodec;
-+  enum FMF_CODEC_ID acodec, vcodec;
- 
-   ff_picture = NULL;
-   ff_tmp_picture = NULL;
-@@ -725,7 +733,7 @@ out_write_ffmpegheader( void )
-   vcodec = fmt->video_codec;
-   acodec = fmt->audio_codec;
- 
--  if( out_t == TYPE_FFMPEG && vcodec != CODEC_ID_NONE ) {
-+  if( out_t == TYPE_FFMPEG && vcodec != FMF_CODEC( CODEC_ID_NONE ) ) {
- 
-     /* Find the video encoder requested by user selection */
-     if( ffmpeg_vcodec != NULL && *ffmpeg_vcodec != 0 ) {
-@@ -758,7 +766,7 @@ out_write_ffmpegheader( void )
-       return 1;
-   }
- 
--  if( snd_t == TYPE_FFMPEG && acodec != CODEC_ID_NONE ) {
-+  if( snd_t == TYPE_FFMPEG && acodec != FMF_CODEC( CODEC_ID_NONE ) ) {
- 
-     /* Find the audio encoder requested by user selection */
-     if( ffmpeg_acodec != NULL && *ffmpeg_acodec != 0 ) {

emulators/fuse-utils/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.7 2014/06/09 08:55:16 bentley Exp $
+@comment $OpenBSD: PLIST,v 1.8 2017/01/03 13:20:43 fcambus Exp $
 @bin bin/audio2tape
 @bin bin/createhdf
 @bin bin/fmfconv
@@ -11,6 +11,7 @@
 @bin bin/scl2trd
 @bin bin/snap2tzx
 @bin bin/snapconv
+@bin bin/tape2pulses
 @bin bin/tape2wav
 @bin bin/tapeconv
 @bin bin/tzxlist
@@ -27,6 +28,7 @@
 @man man/man1/scl2trd.1
 @man man/man1/snap2tzx.1
 @man man/man1/snapconv.1
+@man man/man1/tape2pulses.1
 @man man/man1/tape2wav.1
 @man man/man1/tapeconv.1
 @man man/man1/tzxlist.1