Update Fuse (the Spectrum emulator) ports to their latest versions.

emulators/fuse -> 1.6.0
- add ALSA, OSS (was implicit default), PulseAudio options for sound
- prefer GTK 3 over GTK 2, push down cairo dependency
- prefer SDL 2 over SDL 1

emulators/libspectrum -> 1.5.0 (needed for fuse)
emulators/fuse-utils: no update, but force rebuild against new libspectrum

Reported by:	upstream mail

7 files changed, 29 insertions, 22 deletions

diff --git a/emulators/fuse-utils/Makefile b/emulators/fuse-utils/Makefile
index 908ede99b96b..9586f961247f 100644
--- a/emulators/fuse-utils/Makefile
+++ b/emulators/fuse-utils/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	fuse-utils
 DISTVERSION=	1.4.3
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/fuse-emulator/${PORTNAME}/${PORTVERSION}
 
diff --git a/emulators/fuse/Makefile b/emulators/fuse/Makefile
index 968ea35f9197..ed8958edef67 100644
--- a/emulators/fuse/Makefile
+++ b/emulators/fuse/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	fuse
-PORTVERSION=	1.5.7
-PORTREVISION=	1
+PORTVERSION=	1.6.0
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}-emulator/${PORTNAME}/${PORTVERSION}
 
@@ -21,31 +20,37 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 USES=		compiler:c++11-lang gettext gmake gnome localbase perl5 \
 		pkgconfig xorg
 USE_PERL5=	build
-USE_GNOME=	cairo libxml2 glib20
+USE_GNOME=	libxml2 glib20
 USE_XORG=	x11
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--without-alsa --without-joystick
+CONFIGURE_ARGS+=--without-joystick # TODO needs libjsw for GTK
 
-OPTIONS_DEFINE=		AO ICONS ROMS DOCS
-OPTIONS_DEFAULT=	ICONS GTK2
-OPTIONS_SINGLE=		UI
+OPTIONS_DEFINE=		ICONS ROMS DOCS
+OPTIONS_DEFAULT=	ICONS OSS GTK3
+OPTIONS_SINGLE=		AUDIO UI
+AUDIO_DESC=		Audio output interface
 UI_DESC=		User Interface
 ROMS_DESC=		Extra ROM images (128p, 256s, Gluck, IF1, Opus, TrDOS)
+OPTIONS_SINGLE_AUDIO=	ALSA AO OSS PULSEAUDIO
 OPTIONS_SINGLE_UI=	GTK2 GTK3 SDL SVGALIB
 
 OPTIONS_SUB=		yes
-AO_CONFIGURE_WITH=	libao
+ALSA_CONFIGURE_ON=	--with-audio-driver=alsa
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
+AO_CONFIGURE_ON=	--with-audio-driver=libao
 AO_LIB_DEPENDS=		libao.so:audio/libao
+OSS_CONFIGURE_ON=	--with-audio-driver=oss
+PULSEAUDIO_CONFIGURE_ON=--with-audio-driver=pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 ICONS_USES=		desktop-file-utils shared-mime-info
 ICONS_CONFIGURE_ENABLE=	desktop-integration
-GTK2_USE=		GNOME=gtk20
-GTK2_CONFIGURE_ON=	--with-gtk
-GTK3_USE=		GNOME=gtk30
-GTK3_CONFIGURE_ON=	--with-gtk
+GTK2_USE=		GNOME=cairo,gtk20
+GTK2_CONFIGURE_ON=	--disable-gtk3
+GTK3_USE=		GNOME=cairo,gtk30
 GTK3_CONFIGURE_ENABLE=	gtk3
 SDL_USES=		sdl
-SDL_USE=		SDL=sdl
+SDL_USE=		SDL=sdl2
 SDL_CONFIGURE_WITH=	sdl
 SDL_CONFIGURE_ON=	--without-gtk
 SVGALIB_LIB_DEPENDS=	libvga.so:graphics/svgalib
diff --git a/emulators/fuse/distinfo b/emulators/fuse/distinfo
index a66c436f7fe3..72da9cdf8837 100644
--- a/emulators/fuse/distinfo
+++ b/emulators/fuse/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1544525073
-SHA256 (fuse-1.5.7.tar.gz) = f0e2583f2642cdc3b2a737910d24e289d46e4f7e151805e3b0827024b2b45e4d
-SIZE (fuse-1.5.7.tar.gz) = 1634568
+TIMESTAMP = 1614605732
+SHA256 (fuse-1.6.0.tar.gz) = 3a8fedf2ffe947c571561bac55a59adad4c59338f74e449b7e7a67d9ca047096
+SIZE (fuse-1.6.0.tar.gz) = 1686171
diff --git a/emulators/fuse/pkg-plist b/emulators/fuse/pkg-plist
index df02a139a65e..c560e533232d 100644
--- a/emulators/fuse/pkg-plist
+++ b/emulators/fuse/pkg-plist
@@ -11,6 +11,7 @@ man/man1/fuse.1.gz
 %%DATADIR%%/keyboard.scr
 %%GTK2%%%%DATADIR%%/menu_data.ui
 %%GTK3%%%%DATADIR%%/menu_data.ui
+%%DATADIR%%/keyboard.png
 %%DATADIR%%/microdrive.bmp
 %%DATADIR%%/plus2-0.rom
 %%DATADIR%%/plus2-1.rom
diff --git a/emulators/libspectrum/Makefile b/emulators/libspectrum/Makefile
index 59f2fe72d9fe..6e77a260281f 100644
--- a/emulators/libspectrum/Makefile
+++ b/emulators/libspectrum/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libspectrum
-PORTVERSION=	1.4.4
+PORTVERSION=	1.5.0
 CATEGORIES=	emulators devel
 MASTER_SITES=	SF/fuse-emulator/${PORTNAME}/${PORTVERSION}
 
diff --git a/emulators/libspectrum/distinfo b/emulators/libspectrum/distinfo
index 189d3c541ddd..f37fc7a1775e 100644
--- a/emulators/libspectrum/distinfo
+++ b/emulators/libspectrum/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1530714358
-SHA256 (libspectrum-1.4.4.tar.gz) = fdfb2b2bad17bcfc98c098deaebf2a9811824b08d525172436d5eb134c9780b1
-SIZE (libspectrum-1.4.4.tar.gz) = 568684
+TIMESTAMP = 1614630187
+SHA256 (libspectrum-1.5.0.tar.gz) = a353cb46e9b1a281061d816353ea010d0a6fe78e6a17aa0b7b74271ca5e4acfc
+SIZE (libspectrum-1.5.0.tar.gz) = 602354
diff --git a/emulators/libspectrum/pkg-plist b/emulators/libspectrum/pkg-plist
index 56e688854b83..50175f737ec8 100644
--- a/emulators/libspectrum/pkg-plist
+++ b/emulators/libspectrum/pkg-plist
@@ -1,8 +1,8 @@
 include/libspectrum.h
 lib/libspectrum.a
 lib/libspectrum.so
-lib/libspectrum.so.8
-lib/libspectrum.so.8.8.14
+lib/libspectrum.so.9
+lib/libspectrum.so.9.8.15
 libdata/pkgconfig/libspectrum.pc
 man/man3/libspectrum.3.gz
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS