Update ZynAddSubFX to version 3.0.6-rc3:

- Several changes and improvements.
- Moved sources location to GitHUB.
- Switched GUI from FLTK to NTK.
- Added support for SNDIO.

Approved by: pi (implicit)

3 files changed, 34 insertions, 22 deletions

diff --git a/audio/zynaddsubfx/Makefile b/audio/zynaddsubfx/Makefile
index f9d6d0e6ed54..dd3786256143 100644
--- a/audio/zynaddsubfx/Makefile
+++ b/audio/zynaddsubfx/Makefile
@@ -2,20 +2,15 @@
 # $FreeBSD$
 
 PORTNAME=	zynaddsubfx
-PORTVERSION=	3.0.5
-PORTREVISION=	2
+PORTVERSION=	3.0.6
+DISTVERSIONSUFFIX=	-rc3
 CATEGORIES=	audio
-MASTER_SITES=	SF
 
 MAINTAINER=	hselasky@FreeBSD.org
 COMMENT=	Realtime software synthesizer
 
 LICENSE=	GPLv2
 
-BROKEN_aarch64=		fails to compile: argument unused during compilation: '-msse'
-BROKEN_armv6=		fails to compile: unknown argument: '-mvectorize-with-neon-quad'
-BROKEN_armv7=		fails to compile: unknown argument: '-mvectorize-with-neon-quad'
-
 LIB_DEPENDS=	libfftw3.so:math/fftw3 \
 		libmxml.so:textproc/mxml \
 		liblo.so:audio/liblo
@@ -23,7 +18,13 @@ LIB_DEPENDS=	libfftw3.so:math/fftw3 \
 USES=		cmake:insource compiler:c++11-lang pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=		OSS JACK GUI PORTAUDIO LASH DOCS EXAMPLES
+USE_GITHUB=	yes
+GH_ACCOUNT=	zynaddsubfx
+GH_TUPLE=	DISTRHO:DPF:e0d8e14a14d407648768da7e34bcf31812245387:d/DPF \
+		fundamental:rtosc:7de244bae04deb5964516ba544e551d95e7f15ce:e/rtosc \
+		zynaddsubfx:instruments:22ea12d55e985eee6b57fcac1cafb7df6ae392f2:f/instruments
+
+OPTIONS_DEFINE=		OSS JACK GUI PORTAUDIO SNDIO LASH DOCS EXAMPLES
 OPTIONS_DEFAULT=	OSS JACK GUI PORTAUDIO
 OPTIONS_RADIO=		AUDIO
 OPTIONS_RADIO_AUDIO=	ALSAMIDI DSSI
@@ -41,10 +42,10 @@ DSSI_RUN_DEPENDS=		dssi>0:audio/dssi
 DSSI_CFLAGS=			-I${LOCALBASE}/include/dssi
 DSSI_CMAKE_OFF=			-DDssiEnable:BOOL=OFF
 
-GUI_LIB_DEPENDS=		libfltk.so:x11-toolkits/fltk \
+GUI_LIB_DEPENDS=		libntk.so:x11-toolkits/ntk \
 				libpng.so:graphics/png \
 				libfontconfig.so:x11-fonts/fontconfig
-GUI_CMAKE_ON=			-DGuiModule:STRING=fltk
+GUI_CMAKE_ON=			-DGuiModule:STRING=ntk
 GUI_CMAKE_OFF=			-DGuiModule:STRING=OFF
 GUI_USE+=			XORG=x11,xext,xfixes,xcursor,xrender,ice,sm,xpm,xinerama,xft
 GUI_USE+=			GL=gl,glu
@@ -61,12 +62,14 @@ JACK_CMAKE_OFF=			-DJackEnable:BOOL=OFF
 
 PORTAUDIO_LIB_DEPENDS=		libportaudio.so:audio/portaudio
 PORTAUDIO_CMAKE_OFF=		-DPaEnable:BOOL=OFF
-PORTAUDIO_LDFLAGS=		-L${LOCALBASE}/lib -lportaudio
+
+SNDIO_LIB_DEPENDS=		libsndio.so:audio/sndio
+SNDIO_CMAKE_OFF=		-DSndioEnable:BOOL=OFF
 
 PORTDOCS=	*
 
 DOCSRCDIR1=	${WRKSRC}
-DOC_FILES1=	AUTHORS.txt ChangeLog HISTORY.txt
+DOC_FILES1=	AUTHORS.txt NEWS.txt
 
 DOCSRCDIR2=	${WRKSRC}/doc
 DOCSDIR2=	${DOCSDIR}/doc
@@ -86,8 +89,6 @@ CMAKE_ARGS+=	-DZYN_EXAMPLESDIR:STRING=${EXAMPLESDIR}
 
 .if ${ARCH} == "i386" || ${ARCH} == "amd64"
 CFLAGS+=	-DASM_F2I_YES
-.else
-CMAKE_ARGS+=	-DSUPPORT_SSE:BOOL=OFF
 .endif
 
 post-patch:
@@ -96,10 +97,6 @@ post-patch:
 		 /-DASM_F2I_YES/d ; \
 		 /-g #/d' ${WRKSRC}/src/CMakeLists.txt
 
-post-configure-GUI-off:
-# kill a stray -lX11, fixed upstream
-	@${REINPLACE_CMD} -e 's| -lX11||' ${WRKSRC}/build.ninja
-
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/banks \
 		${STAGEDIR}${DOCSDIR} \
@@ -107,7 +104,7 @@ post-install:
 		${STAGEDIR}${DOCSDIR3} \
 		${STAGEDIR}${EXAMPLESDIR}
 
-	(cd ${WRKDIR}/${DISTNAME}/instruments/banks && \
+	(cd ${WRKSRC}/instruments/banks && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/banks)
 	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2}
diff --git a/audio/zynaddsubfx/distinfo b/audio/zynaddsubfx/distinfo
index ab7bdbe8088a..5c8cbcb95d16 100644
--- a/audio/zynaddsubfx/distinfo
+++ b/audio/zynaddsubfx/distinfo
@@ -1,3 +1,9 @@
-TIMESTAMP = 1555856637
-SHA256 (zynaddsubfx-3.0.5.tar.bz2) = 7447322268114a1e0ac5f281ac37a09a78e761a7be61999caf79100049789f63
-SIZE (zynaddsubfx-3.0.5.tar.bz2) = 8141703
+TIMESTAMP = 1616790785
+SHA256 (zynaddsubfx-zynaddsubfx-3.0.6-rc3_GH0.tar.gz) = 7be1ee7ae4ebb98fb88e9615fedb807a1b3752261afc0ba10f3a5ca963673eed
+SIZE (zynaddsubfx-zynaddsubfx-3.0.6-rc3_GH0.tar.gz) = 3020508
+SHA256 (DISTRHO-DPF-e0d8e14a14d407648768da7e34bcf31812245387_GH0.tar.gz) = 8ca3a33825d08066867e661b562e6548844c21967ef97805cde77d03171614c0
+SIZE (DISTRHO-DPF-e0d8e14a14d407648768da7e34bcf31812245387_GH0.tar.gz) = 1596130
+SHA256 (fundamental-rtosc-7de244bae04deb5964516ba544e551d95e7f15ce_GH0.tar.gz) = eb48173874c1e59e3a67c49d239487706e07d24b9cf7eadbabd921c720e709d2
+SIZE (fundamental-rtosc-7de244bae04deb5964516ba544e551d95e7f15ce_GH0.tar.gz) = 181942
+SHA256 (zynaddsubfx-instruments-22ea12d55e985eee6b57fcac1cafb7df6ae392f2_GH0.tar.gz) = ef52fe4e3cebb198e33e6312fb112905a877cfd3750850f535f3d8efaf9c7cd2
+SIZE (zynaddsubfx-instruments-22ea12d55e985eee6b57fcac1cafb7df6ae392f2_GH0.tar.gz) = 4815814
diff --git a/audio/zynaddsubfx/pkg-plist b/audio/zynaddsubfx/pkg-plist
index dee416be6273..bb8e681f81db 100644
--- a/audio/zynaddsubfx/pkg-plist
+++ b/audio/zynaddsubfx/pkg-plist
@@ -79,7 +79,9 @@ lib/vst/ZynReverb.so
 %%GUI%%share/applications/zynaddsubfx-jack-multi.desktop
 %%GUI%%share/applications/zynaddsubfx-alsa.desktop
 %%GUI%%share/applications/zynaddsubfx-oss.desktop
+share/bash-completion/completions/zynaddsubfx
 share/pixmaps/zynaddsubfx.svg
+share/pixmaps/zynaddsubfx.png
 %%DATADIR%%/banks/Arpeggios/0001-Arpeggio1.xiz
 %%DATADIR%%/banks/Arpeggios/0002-Arpeggio2.xiz
 %%DATADIR%%/banks/Arpeggios/0003-Arpeggio3.xiz
@@ -1245,3 +1247,10 @@ share/pixmaps/zynaddsubfx.svg
 %%DATADIR%%/banks/the_mysterious_bank_4/0036-organ_not_distorted.xiz
 %%DATADIR%%/banks/the_mysterious_bank_4/0037-old_organ.xiz
 %%DATADIR%%/banks/the_mysterious_bank_4/0039-jazz_guitar.xiz
+%%GUI%%%%DATADIR%%/pixmaps/black_key.png
+%%GUI%%%%DATADIR%%/pixmaps/black_key_pressed.png
+%%GUI%%%%DATADIR%%/pixmaps/knob.png
+%%GUI%%%%DATADIR%%/pixmaps/module_backdrop.png
+%%GUI%%%%DATADIR%%/pixmaps/white_key.png
+%%GUI%%%%DATADIR%%/pixmaps/white_key_pressed.png
+%%GUI%%%%DATADIR%%/pixmaps/window_backdrop.png