14 files changed, 186 insertions, 71 deletions

diff --git a/audio/sonic-visualiser/Makefile b/audio/sonic-visualiser/Makefile
index abdbaa834fe0..c92c69cd5e05 100644
--- a/audio/sonic-visualiser/Makefile
+++ b/audio/sonic-visualiser/Makefile
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	sonic-visualiser
-PORTVERSION=	2.5
-PORTREVISION=	5
+DISTVERSION=	4.0.1
 CATEGORIES=	audio
-MASTER_SITES=	https://code.soundsoftware.ac.uk/attachments/download/1675/
+MASTER_SITES=	https://code.soundsoftware.ac.uk/attachments/download/2607/
 
 MAINTAINER=	uddka@student.kit.edu
 COMMENT=	Program for viewing and analysing the contents of music audio files
@@ -12,33 +11,37 @@ COMMENT=	Program for viewing and analysing the contents of music audio files
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libfftw3.so:math/fftw3 \
+LIB_DEPENDS=	libcapnp.so:devel/capnproto \
+		libfftw3.so:math/fftw3 \
 		libfftw3f.so:math/fftw3-float \
+		liblrdf.so:textproc/liblrdf \
+		libogg.so:audio/libogg \
+		liboggz.so:audio/liboggz \
+		libopusfile.so:audio/opusfile \
+		librubberband.so:audio/rubberband \
 		libsamplerate.so:audio/libsamplerate \
 		libsndfile.so:audio/libsndfile \
-		librubberband.so:audio/rubberband \
 		libserd-0.so:devel/serd \
 		libsord-0.so:devel/sord \
 		libvamp-hostsdk.so:audio/vamp-plugin-sdk
 
-USES=		autoreconf compiler:c++11-lang desktop-file-utils gmake gl \
-		pkgconfig qt:5 xorg
-
-GNU_CONFIGURE=	yes
-USE_QT=		buildtools_build core gui network qmake_build testlib widgets xml
+USES=		autoreconf compiler:c++11-lang desktop-file-utils dos2unix gmake gl pkgconfig qt:5 xorg
+DOS2UNIX_FILES=	convert.pro
+USE_QT=		buildtools_build core gui network qmake_build svg testlib widgets xml
 USE_XORG=	x11
 USE_GL=		gl
 
-OPTIONS_DEFINE=	DEBUG FISHSOUND ID3TAG JACK LRDF MAD OGGZ OSC PORTAUDIO PULSEAUDIO
-OPTIONS_DEFAULT=	FISHSOUND ID3TAG MAD OGGZ PORTAUDIO
-OPTIONS_SUB=	yes
+GNU_CONFIGURE=	yes
+
+OPTIONS_DEFINE=		DEBUG FISHSOUND ID3TAG JACK MAD OSC PORTAUDIO PULSEAUDIO
+OPTIONS_DEFAULT=	FISHSOUND ID3TAG JACK MAD PORTAUDIO PULSEAUDIO
+OPTIONS_SUB=		yes
 
 DEBUG_CONFIGURE_ENABLE=	debug
 
+FISHSOUND_DESC=		FLAC, Speex and Vorbis codecs support
 FISHSOUND_CONFIGURE_WITH=	fishsound
-FISHSOUND_DESC=	FLAC, Speex and Vorbis codecs support
 FISHSOUND_LIB_DEPENDS=	libfishsound.so:audio/libfishsound \
-			libogg.so:audio/libogg \
 			libvorbis.so:audio/libvorbis \
 			libspeex.so:audio/speex \
 			libFLAC.so:audio/flac
@@ -49,20 +52,11 @@ ID3TAG_LIB_DEPENDS=	libid3tag.so:audio/libid3tag
 JACK_CONFIGURE_WITH=	jack
 JACK_LIB_DEPENDS=	libjack.so:audio/jack
 
-LRDF_CONFIGURE_WITH=	lrdf
-LRDF_DESC=	Resource Description Framework support
-LRDF_LIB_DEPENDS=	liblrdf.so:textproc/liblrdf
-
 MAD_CONFIGURE_WITH=	mad
 MAD_LIB_DEPENDS=	libmad.so:audio/libmad
 
-OGGZ_CONFIGURE_WITH=	oggz
-OGGZ_DESC=	Ogg container format support
-OGGZ_LIB_DEPENDS=	liboggz.so:audio/liboggz \
-			libogg.so:audio/libogg
-
+OSC_DESC=		OpenSound Control support
 OSC_CONFIGURE_WITH=	lo
-OSC_DESC=	OpenSound Control support
 OSC_LIB_DEPENDS=	liblo.so:audio/liblo
 
 PORTAUDIO_CONFIGURE_WITH=	portaudio
@@ -71,11 +65,16 @@ PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
 PULSEAUDIO_CONFIGURE_WITH=	pulse
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 
+post-patch: # remove the bundled vamp-plugin-sdk to avoid possible confusion
+	@${RM} -r ${WRKSRC}/vamp-plugin-sdk
+
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/sonic-visualiser ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/sonic-visualiser.desktop ${STAGEDIR}${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKSRC}/x-sonicvisualiser.desktop ${STAGEDIR}${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKSRC}/x-sonicvisualiser-layer.desktop  ${STAGEDIR}${PREFIX}/share/applications
+.for f in sonic-visualiser piper-vamp-simple-server piper-convert checker/vamp-plugin-load-checker
+	${INSTALL_PROGRAM} ${WRKSRC}/$f ${STAGEDIR}${PREFIX}/bin
+.endfor
+.for f in sonic-visualiser.desktop x-sonicvisualiser.desktop x-sonicvisualiser-layer.desktop
+	${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${PREFIX}/share/applications
+.endfor
 	${INSTALL_DATA} ${WRKSRC}/icons/sv-icon.svg ${STAGEDIR}${PREFIX}/share/pixmaps
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${STAGEDIR}${DOCSDIR}
diff --git a/audio/sonic-visualiser/distinfo b/audio/sonic-visualiser/distinfo
index d88c11bcf24d..be93aa29c6e0 100644
--- a/audio/sonic-visualiser/distinfo
+++ b/audio/sonic-visualiser/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1487954437
-SHA256 (sonic-visualiser-2.5.tar.gz) = 5a66f20bae002876c64bc26d79dcba4f4c96c3c71ae160b5aafb40cfeacecdbe
-SIZE (sonic-visualiser-2.5.tar.gz) = 4112133
+TIMESTAMP = 1587060340
+SHA256 (sonic-visualiser-4.0.1.tar.gz) = e6e9dbec686c9dc94d32dff311eb0f6b44b63d3643285b3d8d908dfb9b22c790
+SIZE (sonic-visualiser-4.0.1.tar.gz) = 6649178
diff --git a/audio/sonic-visualiser/files/patch-base.pro b/audio/sonic-visualiser/files/patch-base.pro
new file mode 100644
index 000000000000..d5bf066498d8
--- /dev/null
+++ b/audio/sonic-visualiser/files/patch-base.pro
@@ -0,0 +1,22 @@
+--- base.pro.orig	2020-04-16 18:47:44 UTC
++++ base.pro
+@@ -25,7 +25,7 @@ exists(repoint.pri) {
+ }
+ 
+ include(bq-files.pri)
+-include(vamp-plugin-sdk-files.pri)
++#include(vamp-plugin-sdk-files.pri)
+ include(svcore/files.pri)
+ include(capnp-regen.pri)
+ 
+@@ -40,8 +40,8 @@ CLIENT_HEADERS=$$fromfile(piper-vamp-cpp/vamp-client/q
+ for (file, BQ_SOURCES)       { SOURCES += $$file }
+ for (file, BQ_HEADERS)       { HEADERS += $$file }
+ 
+-for (file, VAMP_SOURCES)     { SOURCES += $$file }
+-for (file, VAMP_HEADERS)     { HEADERS += $$file }
++#for (file, VAMP_SOURCES)     { SOURCES += $$file }
++#for (file, VAMP_HEADERS)     { HEADERS += $$file }
+ 
+ for (file, DATAQUAY_SOURCES) { SOURCES += $$sprintf("dataquay/%1", $$file) }
+ for (file, DATAQUAY_HEADERS) { HEADERS += $$sprintf("dataquay/%1", $$file) }
diff --git a/audio/sonic-visualiser/files/patch-bqvec_src_VectorOpsComplex.cpp b/audio/sonic-visualiser/files/patch-bqvec_src_VectorOpsComplex.cpp
new file mode 100644
index 000000000000..3e3549f4a258
--- /dev/null
+++ b/audio/sonic-visualiser/files/patch-bqvec_src_VectorOpsComplex.cpp
@@ -0,0 +1,11 @@
+--- bqvec/src/VectorOpsComplex.cpp.orig	2020-04-16 18:11:58 UTC
++++ bqvec/src/VectorOpsComplex.cpp
+@@ -50,6 +50,8 @@
+ #ifndef alloca
+ #define alloca _alloca
+ #endif
++#elif defined(__FreeBSD__)
++#include <stdlib.h>
+ #else
+ #include <alloca.h>
+ #endif
diff --git a/audio/sonic-visualiser/files/patch-config.pri.in b/audio/sonic-visualiser/files/patch-config.pri.in
new file mode 100644
index 000000000000..839e2fc45dc1
--- /dev/null
+++ b/audio/sonic-visualiser/files/patch-config.pri.in
@@ -0,0 +1,11 @@
+--- config.pri.in.orig	2020-04-16 19:38:03 UTC
++++ config.pri.in
+@@ -17,6 +17,8 @@ CONFIG += @CXXSTANDARD@
+ 
+ linux*:LIBS += -L$$PWD -lbase -lasound -ldl 
+ 
++LIBS += -L$$PWD -lbase -lvamp-hostsdk
++
+ macx*:DEFINES += HAVE_COREAUDIO
+ macx*:LIBS += -framework CoreAudio -framework CoreMidi -framework AudioUnit -framework AudioToolbox -framework CoreFoundation -framework CoreServices
+ 
diff --git a/audio/sonic-visualiser/files/patch-configure.ac b/audio/sonic-visualiser/files/patch-configure.ac
index eb0500818fdb..ff972828244a 100644
--- a/audio/sonic-visualiser/files/patch-configure.ac
+++ b/audio/sonic-visualiser/files/patch-configure.ac
@@ -1,8 +1,8 @@
---- configure.ac.orig	2015-10-22 11:26:02 UTC
+--- configure.ac.orig	2019-12-10 09:29:11 UTC
 +++ configure.ac
-@@ -99,8 +99,8 @@ SV_MODULE_OPTIONAL([fishsound],[fishsoun
- SV_MODULE_OPTIONAL([mad],[mad >= 0.15.0],[mad.h],[mad],[mad_decoder_init])
- SV_MODULE_OPTIONAL([id3tag],[id3tag >= 0.15.0],[id3tag.h],[id3tag],[id3_tag_new])
+@@ -127,8 +127,8 @@ SV_MODULE_REQUIRED([mad],[mad >= 0.15.0],[mad.h],[mad]
+ SV_MODULE_REQUIRED([id3tag],[id3tag >= 0.15.0],[id3tag.h],[id3tag],[id3_tag_new])
+ SV_MODULE_REQUIRED([opus],[opusfile],[opus/opusfile.h],[opusfile],[op_read_float])
  
 -# Link in -lX11 if it exists -- this is for the X error handler
 -SV_MODULE_OPTIONAL([X11],[x11 >= 1.0.0],[X11/X.h],[x11],[XGetErrorText])
@@ -11,3 +11,19 @@
  
  AC_SUBST(PERL)
  AC_SUBST(XARGS)
+@@ -154,6 +154,7 @@ AC_CONFIG_FILES([config.pri])
+ 
+ AC_OUTPUT
+ 
++if false; then
+ if test -x repoint ; then
+    if test -d .hg -o -d .git ; then 
+       if ! ./repoint install; then
+@@ -170,6 +171,7 @@ else
+    if ! test -d vamp-plugin-sdk ; then
+       AC_MSG_WARN([No vamp-plugin-sdk directory present, so external components might not have been updated])
+    fi
++fi
+ fi
+ 
+ if ! $QMAKE -r sonic-visualiser.pro; then
diff --git a/audio/sonic-visualiser/files/patch-convert.pro b/audio/sonic-visualiser/files/patch-convert.pro
new file mode 100644
index 000000000000..8da6ec4bdc29
--- /dev/null
+++ b/audio/sonic-visualiser/files/patch-convert.pro
@@ -0,0 +1,26 @@
+--- convert.pro.orig	2019-12-10 09:29:11 UTC
++++ convert.pro
+@@ -26,17 +26,19 @@ macx*: CONFIG -= app_bundle
+ 
+ linux*: LIBS += -ldl
+ 
++LIBS += -lvamp-hostsdk
++
+ TARGET = piper-convert
+ 
+ OBJECTS_DIR = o
+ MOC_DIR = o
+ 
+-INCLUDEPATH += piper-vamp-cpp piper-vamp-cpp/ext vamp-plugin-sdk
++INCLUDEPATH += piper-vamp-cpp piper-vamp-cpp/ext
+ 
+-include(vamp-plugin-sdk-files.pri)
++#include(vamp-plugin-sdk-files.pri)
+ 
+-for (file, VAMP_SOURCES) { SOURCES += $$file }
+-for (file, VAMP_HEADERS) { HEADERS += $$file }
++#for (file, VAMP_SOURCES) { SOURCES += $$file }
++#for (file, VAMP_HEADERS) { HEADERS += $$file }
+ 
+ HEADERS += \
+         piper-vamp-cpp/vamp-capnp/piper.capnp.h \
diff --git a/audio/sonic-visualiser/files/patch-server.pro b/audio/sonic-visualiser/files/patch-server.pro
new file mode 100644
index 000000000000..e5da5e186026
--- /dev/null
+++ b/audio/sonic-visualiser/files/patch-server.pro
@@ -0,0 +1,26 @@
+--- server.pro.orig	2019-12-10 09:29:11 UTC
++++ server.pro
+@@ -25,17 +25,19 @@ macx*: CONFIG -= app_bundle
+ 
+ linux*: LIBS += -ldl
+ 
++LIBS += -lvamp-hostsdk
++
+ TARGET = piper-vamp-simple-server
+ 
+ OBJECTS_DIR = o
+ MOC_DIR = o
+ 
+-INCLUDEPATH += piper-vamp-cpp piper-vamp-cpp/ext vamp-plugin-sdk
++INCLUDEPATH += piper-vamp-cpp piper-vamp-cpp/ext
+ 
+-include(vamp-plugin-sdk-files.pri)
++#include(vamp-plugin-sdk-files.pri)
+ 
+-for (file, VAMP_SOURCES) { SOURCES += $$file }
+-for (file, VAMP_HEADERS) { HEADERS += $$file }
++#for (file, VAMP_SOURCES) { SOURCES += $$file }
++#for (file, VAMP_HEADERS) { HEADERS += $$file }
+ 
+ HEADERS += \
+         piper-vamp-cpp/vamp-capnp/piper.capnp.h \
diff --git a/audio/sonic-visualiser/files/patch-sonic-visualiser.pro b/audio/sonic-visualiser/files/patch-sonic-visualiser.pro
index 9533354751f0..d9e1a5234238 100644
--- a/audio/sonic-visualiser/files/patch-sonic-visualiser.pro
+++ b/audio/sonic-visualiser/files/patch-sonic-visualiser.pro
@@ -1,11 +1,34 @@
-Disable building the tests.  They prevent building sonic-visualiser in parallel.
---- sonic-visualiser.pro.orig	2017-02-24 17:52:22 UTC
+--- sonic-visualiser.pro.orig	2020-04-16 19:10:53 UTC
 +++ sonic-visualiser.pro
-@@ -5,7 +5,6 @@ SUBDIRS = sub_dataquay svcore svgui svap
-     # We should build and run the tests on any platform,
-     # but doing it automatically doesn't work so well from
-     # within an IDE on Windows, so remove that from here
--    SUBDIRS += svcore/base/test svcore/data/fileio/test svcore/data/model/test
- }
+@@ -8,11 +8,11 @@ SUBDIRS += \
+ # writing they are only automatically run on non-Windows platforms
+ # (because of the difficulty of getting them running nicely in the
+ # IDE without causing great confusion if a test fails).
+-SUBDIRS += \
+-        sub_test_svcore_base \
+-        sub_test_svcore_system \
+-        sub_test_svcore_data_fileio \
+-        sub_test_svcore_data_model
++#SUBDIRS += \
++#        sub_test_svcore_base \
++#        sub_test_svcore_system \
++#        sub_test_svcore_data_fileio \
++#        sub_test_svcore_data_model
  
- sub_sv.file = sv.pro
+ SUBDIRS += \
+ 	checker \
+@@ -22,10 +22,10 @@ SUBDIRS += \
+ 
+ sub_base.file = base.pro
+         
+-sub_test_svcore_base.file = test-svcore-base.pro
+-sub_test_svcore_system.file = test-svcore-system.pro
+-sub_test_svcore_data_fileio.file = test-svcore-data-fileio.pro
+-sub_test_svcore_data_model.file = test-svcore-data-model.pro
++#sub_test_svcore_base.file = test-svcore-base.pro
++#sub_test_svcore_system.file = test-svcore-system.pro
++#sub_test_svcore_data_fileio.file = test-svcore-data-fileio.pro
++#sub_test_svcore_data_model.file = test-svcore-data-model.pro
+ 
+ sub_server.file = server.pro
+ sub_convert.file = convert.pro
diff --git a/audio/sonic-visualiser/files/patch-sv.pro b/audio/sonic-visualiser/files/patch-sv.pro
index 13270d2ab8ee..2312a3b60dc5 100644
--- a/audio/sonic-visualiser/files/patch-sv.pro
+++ b/audio/sonic-visualiser/files/patch-sv.pro
@@ -1,10 +1,10 @@
---- sv.pro.orig	2015-10-22 11:26:02 UTC
+--- sv.pro.orig	2019-12-10 09:29:11 UTC
 +++ sv.pro
-@@ -41,6 +41,7 @@ QT += network xml gui widgets
+@@ -15,6 +15,7 @@ QT += network xml gui widgets svg
  
  TARGET = "Sonic Visualiser"
  linux*:TARGET = sonic-visualiser
 +freebsd*:TARGET = sonic-visualiser
  solaris*:TARGET = sonic-visualiser
  
- DEPENDPATH += . svcore svgui svapp
+ !win32 {
diff --git a/audio/sonic-visualiser/files/patch-svapp_audioio_AudioJACKTarget.cpp b/audio/sonic-visualiser/files/patch-svapp_audioio_AudioJACKTarget.cpp
deleted file mode 100644
index aa502caa4084..000000000000
--- a/audio/sonic-visualiser/files/patch-svapp_audioio_AudioJACKTarget.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- svapp/audioio/AudioJACKTarget.cpp.orig	2015-10-22 11:26:02 UTC
-+++ svapp/audioio/AudioJACKTarget.cpp
-@@ -21,8 +21,6 @@
- #include <iostream>
- #include <cmath>
- 
--#include <alloca.h>
--
- //#define DEBUG_AUDIO_JACK_TARGET 1
- 
- #ifdef BUILD_STATIC
diff --git a/audio/sonic-visualiser/files/patch-svcore_base_RealTime.cpp b/audio/sonic-visualiser/files/patch-svcore_base_RealTime.cpp
deleted file mode 100644
index 186b2552e234..000000000000
--- a/audio/sonic-visualiser/files/patch-svcore_base_RealTime.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- svcore/base/RealTime.cpp.orig	2015-10-22 11:26:02 UTC
-+++ svcore/base/RealTime.cpp
-@@ -105,7 +105,7 @@ RealTime::fromXsdDuration(std::string xs
-         char *eptr = 0;
- 
-         if (isdigit(s[i]) || s[i] == '.') {
--            value = strtod(&s[i], &eptr);
-+            value = strtod_l(&s[i], &eptr, NULL);
-             i = int(eptr - s);
-         }
- 
diff --git a/audio/sonic-visualiser/pkg-descr b/audio/sonic-visualiser/pkg-descr
index 8dc4f47045cd..2a6ea2640c00 100644
--- a/audio/sonic-visualiser/pkg-descr
+++ b/audio/sonic-visualiser/pkg-descr
@@ -6,4 +6,4 @@ and spectograms in a straightforward way. The audio data can be
 annotated and played back featuring time streching. Furthermore it
 can be extended by third-party vamp plugins for feature extraction.
 
-WWW: http://www.sonicvisualiser.org/
+WWW: https://www.sonicvisualiser.org/
diff --git a/audio/sonic-visualiser/pkg-plist b/audio/sonic-visualiser/pkg-plist
index d1ff2606da7a..1557b65a6ba8 100644
--- a/audio/sonic-visualiser/pkg-plist
+++ b/audio/sonic-visualiser/pkg-plist
@@ -1,4 +1,7 @@
+bin/piper-convert
+bin/piper-vamp-simple-server
 bin/sonic-visualiser
+bin/vamp-plugin-load-checker
 share/applications/sonic-visualiser.desktop
 share/applications/x-sonicvisualiser.desktop
 share/applications/x-sonicvisualiser-layer.desktop