Index: Makefile =================================================================== --- Makefile (revision 493770) +++ Makefile (working copy) @@ -1,10 +1,9 @@ # $FreeBSD$ PORTNAME= sonic-visualiser -PORTVERSION= 2.5 -PORTREVISION= 4 +PORTVERSION= 3.2.1 CATEGORIES= audio -MASTER_SITES= https://code.soundsoftware.ac.uk/attachments/download/1675/ +MASTER_SITES= https://code.soundsoftware.ac.uk/attachments/download/2434/ MAINTAINER= uddka@student.kit.edu COMMENT= Program for viewing and analysing the contents of music audio files @@ -14,6 +13,7 @@ LIB_DEPENDS= libfftw3.so:math/fftw3 \ libfftw3f.so:math/fftw3-float \ + libcapnp.so:devel/capnproto \ libsamplerate.so:audio/libsamplerate \ libsndfile.so:audio/libsndfile \ librubberband.so:audio/rubberband \ @@ -21,10 +21,10 @@ libsord-0.so:devel/sord \ libvamp-hostsdk.so:audio/vamp-plugin-sdk -USES= autoreconf desktop-file-utils gmake pkgconfig qt:5 +USES= autoreconf desktop-file-utils gl gmake pkgconfig qt:5 GNU_CONFIGURE= yes -USE_QT= buildtools_build core gui network qmake_build testlib widgets xml +USE_QT= buildtools_build core gui network qmake_build svg testlib widgets xml USE_XORG= x11 USE_GL= gl Index: distinfo =================================================================== --- distinfo (revision 493770) +++ distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1487954437 -SHA256 (sonic-visualiser-2.5.tar.gz) = 5a66f20bae002876c64bc26d79dcba4f4c96c3c71ae160b5aafb40cfeacecdbe -SIZE (sonic-visualiser-2.5.tar.gz) = 4112133 +TIMESTAMP = 1551027440 +SHA256 (sonic-visualiser-3.2.1.tar.gz) = e79955e4e50c6149dff527655061c8e2fb95929e9d8baed12cf7a920d1cc3a42 +SIZE (sonic-visualiser-3.2.1.tar.gz) = 5597276 Index: files/patch-base.pri =================================================================== --- files/patch-base.pri (nonexistent) +++ files/patch-base.pri (working copy) @@ -0,0 +1,22 @@ +--- base.pri.orig 2019-01-08 14:32:16.000000000 +0100 ++++ base.pri 2019-02-24 20:22:20.573083000 +0100 +@@ -16,10 +16,7 @@ + svcore/data \ + svcore/plugin/api/alsa \ + svgui \ +- svapp \ +- vamp-plugin-sdk \ +- rubberband \ +- rubberband/src ++ svapp + + DEPENDPATH += $$SV_INCLUDEPATH + INCLUDEPATH += $$SV_INCLUDEPATH +@@ -34,6 +31,7 @@ + DEFINES += USE_SORD + + # Defines for Rubber Band ++freebsd*: DEFINES += USE_PTHREADS + linux*: DEFINES += USE_PTHREADS + macx*: DEFINES += USE_PTHREADS + Property changes on: files/patch-base.pri ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-base.pro =================================================================== --- files/patch-base.pro (nonexistent) +++ files/patch-base.pro (working copy) @@ -0,0 +1,12 @@ +--- base.pro.orig 2019-02-24 20:51:22.585365000 +0100 ++++ base.pro 2019-02-24 20:52:25.795850000 +0100 +@@ -25,9 +25,7 @@ + } + + include(bq-files.pri) +-include(vamp-plugin-sdk-files.pri) + include(svcore/files.pri) +-include(capnp-regen.pri) + + DATAQUAY_SOURCES=$$fromfile(dataquay/lib.pro, SOURCES) + DATAQUAY_HEADERS=$$fromfile(dataquay/lib.pro, HEADERS) Property changes on: files/patch-base.pro ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-bqvec_src_VectorOpsComplex.cpp =================================================================== --- files/patch-bqvec_src_VectorOpsComplex.cpp (nonexistent) +++ files/patch-bqvec_src_VectorOpsComplex.cpp (working copy) @@ -0,0 +1,18 @@ +--- bqvec/src/VectorOpsComplex.cpp.orig 2019-02-24 19:47:00.932155000 +0100 ++++ bqvec/src/VectorOpsComplex.cpp 2019-02-24 19:47:27.692142000 +0100 +@@ -45,15 +45,6 @@ + #endif + #endif + +-#if defined(_MSC_VER) || defined(WIN32) +-#include +-#ifndef alloca +-#define alloca _alloca +-#endif +-#else +-#include +-#endif +- + #include + + using namespace std; Property changes on: files/patch-bqvec_src_VectorOpsComplex.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-rubberband_src_StretcherImpl.cpp =================================================================== --- files/patch-rubberband_src_StretcherImpl.cpp (nonexistent) +++ files/patch-rubberband_src_StretcherImpl.cpp (working copy) @@ -0,0 +1,13 @@ +--- rubberband/src/StretcherImpl.cpp.orig 2019-02-24 20:03:17.214195000 +0100 ++++ rubberband/src/StretcherImpl.cpp 2019-02-24 20:03:23.369920000 +0100 +@@ -37,10 +37,6 @@ + + #include "base/Profiler.h" + +-#ifndef _WIN32 +-#include +-#endif +- + #include + #include + #include Property changes on: files/patch-rubberband_src_StretcherImpl.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-rubberband_src_StretcherProcess.cpp =================================================================== --- files/patch-rubberband_src_StretcherProcess.cpp (nonexistent) +++ files/patch-rubberband_src_StretcherProcess.cpp (working copy) @@ -0,0 +1,13 @@ +--- rubberband/src/StretcherProcess.cpp.orig 2019-02-24 20:01:56.974984000 +0100 ++++ rubberband/src/StretcherProcess.cpp 2019-02-24 20:02:05.506472000 +0100 +@@ -34,10 +34,6 @@ + #include "base/Profiler.h" + #include "system/VectorOps.h" + +-#ifndef _WIN32 +-#include +-#endif +- + #include + #include + #include Property changes on: files/patch-rubberband_src_StretcherProcess.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-rubberband_src_kissfft_kiss__fft.h =================================================================== --- files/patch-rubberband_src_kissfft_kiss__fft.h (nonexistent) +++ files/patch-rubberband_src_kissfft_kiss__fft.h (working copy) @@ -0,0 +1,12 @@ +--- rubberband/src/kissfft/kiss_fft.h.orig 2019-02-24 20:09:18.566723000 +0100 ++++ rubberband/src/kissfft/kiss_fft.h 2019-02-24 20:09:30.503363000 +0100 +@@ -5,9 +5,6 @@ + #include + #include + #include +-#ifndef __APPLE__ +-#include +-#endif + + #ifdef __cplusplus + extern "C" { Property changes on: files/patch-rubberband_src_kissfft_kiss__fft.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-rubberband_src_system_sysutils.h =================================================================== --- files/patch-rubberband_src_system_sysutils.h (nonexistent) +++ files/patch-rubberband_src_system_sysutils.h (working copy) @@ -0,0 +1,11 @@ +--- rubberband/src/system/sysutils.h.orig 2019-02-24 19:42:14.471255000 +0100 ++++ rubberband/src/system/sysutils.h 2019-02-24 19:42:27.408497000 +0100 +@@ -47,7 +47,7 @@ + #include + #else + #ifndef __MSVC__ +-#include ++/* #include */ + #endif + #endif + Property changes on: files/patch-rubberband_src_system_sysutils.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-sonic-visualiser.pro =================================================================== --- files/patch-sonic-visualiser.pro (revision 493770) +++ files/patch-sonic-visualiser.pro (nonexistent) @@ -1,11 +0,0 @@ -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 -@@ -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 - } - - sub_sv.file = sv.pro Property changes on: files/patch-sonic-visualiser.pro ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-svapp_audioio_AudioJACKTarget.cpp =================================================================== --- files/patch-svapp_audioio_AudioJACKTarget.cpp (revision 493770) +++ files/patch-svapp_audioio_AudioJACKTarget.cpp (nonexistent) @@ -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 - #include - --#include -- - //#define DEBUG_AUDIO_JACK_TARGET 1 - - #ifdef BUILD_STATIC Property changes on: files/patch-svapp_audioio_AudioJACKTarget.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-svcore_base_RealTime.cpp =================================================================== --- files/patch-svcore_base_RealTime.cpp (revision 493770) +++ files/patch-svcore_base_RealTime.cpp (nonexistent) @@ -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); - } - Property changes on: files/patch-svcore_base_RealTime.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: pkg-descr =================================================================== --- pkg-descr (revision 493770) +++ pkg-descr (working copy) @@ -6,4 +6,4 @@ 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/