Date: Mon, 03 Aug 2026 03:59:45 +0000 From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: e4ee3b21a95a - main - audio/sonic-visualiser: update 4.0.=?utf-8?Q?1 =E2=86=92 5.?=2.1 and take maintainership Message-ID: <6a701231.3a141.5776ef67@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=e4ee3b21a95ae5f6da7fc9ea9f800a58fe24be1f commit e4ee3b21a95ae5f6da7fc9ea9f800a58fe24be1f Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2026-08-03 03:57:54 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2026-08-03 03:59:41 +0000 audio/sonic-visualiser: update 4.0.1 → 5.2.1 and take maintainership PR: 289533 --- audio/sonic-visualiser/Makefile | 62 +++--- audio/sonic-visualiser/distinfo | 6 +- audio/sonic-visualiser/files/patch-acinclude.m4 | 42 ---- audio/sonic-visualiser/files/patch-base.pro | 22 -- .../files/patch-bqvec_src_VectorOpsComplex.cpp | 11 - audio/sonic-visualiser/files/patch-config.pri.in | 11 - audio/sonic-visualiser/files/patch-configure.ac | 29 --- audio/sonic-visualiser/files/patch-convert.pro | 26 --- audio/sonic-visualiser/files/patch-freebsd-fixes | 97 +++++++++ audio/sonic-visualiser/files/patch-meson.build | 225 +++++++++++++++++++++ .../sonic-visualiser/files/patch-meson_options.txt | 45 +++++ audio/sonic-visualiser/files/patch-server.pro | 26 --- .../files/patch-sonic-visualiser.pro | 34 ---- audio/sonic-visualiser/files/patch-sv.pro | 10 - .../files/patch-svapp_acinclude.m4 | 42 ---- .../files/patch-svcore_acinclude.m4 | 42 ---- .../files/patch-svcore_config.pri.in | 10 - .../patch-svcore_plugin_DSSIPluginInstance.cpp | 15 -- .../files/patch-svgui_acinclude.m4 | 42 ---- .../files/patch-svgui_layer_WaveformLayer.cpp | 10 - .../files/patch-svgui_view_Overview.cpp | 10 - audio/sonic-visualiser/pkg-plist | 2 +- 22 files changed, 394 insertions(+), 425 deletions(-) diff --git a/audio/sonic-visualiser/Makefile b/audio/sonic-visualiser/Makefile index ea27dcbf0283..58ccf01db4e9 100644 --- a/audio/sonic-visualiser/Makefile +++ b/audio/sonic-visualiser/Makefile @@ -1,21 +1,19 @@ PORTNAME= sonic-visualiser -DISTVERSION= 4.0.1 -PORTREVISION= 14 +DISTVERSION= 5.2.1 CATEGORIES= audio -MASTER_SITES= https://code.soundsoftware.ac.uk/attachments/download/2607/ +MASTER_SITES= https://github.com/sonic-visualiser/sonic-visualiser/releases/download/sv_v${DISTVERSION}/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= yuri@FreeBSD.org COMMENT= Program for viewing and analysing the contents of music audio files -WWW= https://www.sonicvisualiser.org/ +WWW= https://www.sonicvisualiser.org/ \ + https://github.com/sonic-visualiser/sonic-visualiser LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING 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 \ @@ -25,64 +23,50 @@ LIB_DEPENDS= libcapnp.so:devel/capnproto \ libsord-0.so:devel/sord \ libvamp-hostsdk.so:audio/vamp-plugin-sdk -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 +USES= compiler:c++11-lang desktop-file-utils dos2unix gl meson pkgconfig qt:6 xorg +USE_QT= base svg tools:build USE_XORG= x11 USE_GL= gl -GNU_CONFIGURE= yes - -OPTIONS_DEFINE= DEBUG FISHSOUND ID3TAG JACK MAD OSC PORTAUDIO PULSEAUDIO +OPTIONS_DEFINE= FISHSOUND ID3TAG JACK MAD OSC PORTAUDIO PULSEAUDIO OPTIONS_DEFAULT= FISHSOUND ID3TAG JACK MAD PORTAUDIO OPTIONS_SUB= yes -DEBUG_CONFIGURE_ENABLE= debug - FISHSOUND_DESC= FLAC, Speex and Vorbis codecs support -FISHSOUND_CONFIGURE_WITH= fishsound -FISHSOUND_LIB_DEPENDS= libfishsound.so:audio/libfishsound \ - libvorbis.so:audio/libvorbis \ - libspeex.so:audio/speex \ - libFLAC.so:audio/flac +FISHSOUND_MESON_TRUE= fishsound +FISHSOUND_LIB_DEPENDS= libfishsound.so:audio/libfishsound -ID3TAG_CONFIGURE_WITH= id3tag +ID3TAG_MESON_TRUE= id3tag ID3TAG_LIB_DEPENDS= libid3tag.so:audio/libid3tag -JACK_CONFIGURE_WITH= jack +JACK_MESON_TRUE= jack JACK_LIB_DEPENDS= libjack.so:audio/jack -MAD_CONFIGURE_WITH= mad +MAD_MESON_TRUE= mad MAD_LIB_DEPENDS= libmad.so:audio/libmad OSC_DESC= OpenSound Control support -OSC_CONFIGURE_WITH= lo +OSC_MESON_TRUE= osc OSC_LIB_DEPENDS= liblo.so:audio/liblo -PORTAUDIO_CONFIGURE_WITH= portaudio +PORTAUDIO_MESON_TRUE= portaudio PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio -PULSEAUDIO_CONFIGURE_WITH= pulse +PULSEAUDIO_MESON_TRUE= 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 - # workaround for https://sourceforge.net/p/sv1/bugs/280/, also see Bug#236000 - @${FIND} ${WRKSRC} -name "*.pro" -o -name "*.pri" | ${XARGS} ${REINPLACE_CMD} -e 's|-Werror| |' -do-install: -.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 +post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}/README +.for f in x-sonicvisualiser.desktop x-sonicvisualiser-layer.desktop + ${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${PREFIX}/share/applications +.endfor -do-install-OSC-on: - ${INSTALL_DATA} ${WRKSRC}/README.OSC ${STAGEDIR}${DOCSDIR} +post-install-OSC-on: + ${INSTALL_DATA} ${WRKSRC}/README_OSC.md ${STAGEDIR}${DOCSDIR}/README.OSC .include <bsd.port.mk> diff --git a/audio/sonic-visualiser/distinfo b/audio/sonic-visualiser/distinfo index be93aa29c6e0..b59b79d20690 100644 --- a/audio/sonic-visualiser/distinfo +++ b/audio/sonic-visualiser/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1587060340 -SHA256 (sonic-visualiser-4.0.1.tar.gz) = e6e9dbec686c9dc94d32dff311eb0f6b44b63d3643285b3d8d908dfb9b22c790 -SIZE (sonic-visualiser-4.0.1.tar.gz) = 6649178 +TIMESTAMP = 1785644885 +SHA256 (sonic-visualiser-5.2.1.tar.gz) = 2f338af0231e930539c5e5e04dac7c3384257866cc29fda112215f8c410898c9 +SIZE (sonic-visualiser-5.2.1.tar.gz) = 6597676 diff --git a/audio/sonic-visualiser/files/patch-acinclude.m4 b/audio/sonic-visualiser/files/patch-acinclude.m4 deleted file mode 100644 index 5756b8eeed59..000000000000 --- a/audio/sonic-visualiser/files/patch-acinclude.m4 +++ /dev/null @@ -1,42 +0,0 @@ ---- acinclude.m4.orig 2015-10-22 11:26:02 UTC -+++ acinclude.m4 -@@ -30,33 +30,12 @@ fi - - AC_DEFUN([SV_MODULE_OPTIONAL], - [ --SV_MODULE_MODULE=$1 --SV_MODULE_VERSION_TEST="$2" --SV_MODULE_HEADER=$3 --SV_MODULE_LIB=$4 --SV_MODULE_FUNC=$5 --SV_MODULE_HAVE=HAVE_$(echo $1 | tr '[a-z]' '[A-Z]') --SV_MODULE_FAILED=1 --if test -n "$$1_LIBS" ; then -- AC_MSG_NOTICE([User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE]) -- CXXFLAGS="$CXXFLAGS $$1_CFLAGS" -- LIBS="$LIBS $$1_LIBS" -- SV_MODULE_FAILED="" --fi --if test -z "$SV_MODULE_VERSION_TEST" ; then -- SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE --fi --if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then -- PKG_CHECK_MODULES($1,[$SV_MODULE_VERSION_TEST],[HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $$1_CFLAGS";LIBS="$LIBS $$1_LIBS";SV_MODULE_FAILED=""],[AC_MSG_NOTICE([Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means])]) --fi --if test -n "$SV_MODULE_FAILED"; then -- AC_CHECK_HEADER([$SV_MODULE_HEADER],[HAVES="$HAVES $SV_MODULE_HAVE";SV_MODULE_FAILED=""],[AC_MSG_NOTICE([Failed to find header $SV_MODULE_HEADER for optional module $SV_MODULE_MODULE])]) -- if test -z "$SV_MODULE_FAILED"; then -- if test -n "$SV_MODULE_LIB"; then -- AC_CHECK_LIB([$SV_MODULE_LIB],[$SV_MODULE_FUNC],[LIBS="$LIBS -l$SV_MODULE_LIB"],[AC_MSG_NOTICE([Failed to find library $SV_MODULE_LIB for optional module $SV_MODULE_MODULE])]) -- fi -- fi --fi -+AC_ARG_WITH([$4], -+ [AS_HELP_STRING([--with-$4], -+ [Enable support for $1 [default=no]])], -+ [], -+ [with_$4=no]) -+AS_IF([test "x$with_$4" = xyes], [SV_MODULE_REQUIRED($1,$2,$3,$4,$5)]) - ]) - - # Check for Qt. The only part of Qt we use directly is qmake. diff --git a/audio/sonic-visualiser/files/patch-base.pro b/audio/sonic-visualiser/files/patch-base.pro deleted file mode 100644 index d5bf066498d8..000000000000 --- a/audio/sonic-visualiser/files/patch-base.pro +++ /dev/null @@ -1,22 +0,0 @@ ---- 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 deleted file mode 100644 index 3e3549f4a258..000000000000 --- a/audio/sonic-visualiser/files/patch-bqvec_src_VectorOpsComplex.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 839e2fc45dc1..000000000000 --- a/audio/sonic-visualiser/files/patch-config.pri.in +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 657ce488d309..000000000000 --- a/audio/sonic-visualiser/files/patch-configure.ac +++ /dev/null @@ -1,29 +0,0 @@ ---- configure.ac.orig 2019-12-10 09:29:11 UTC -+++ configure.ac -@@ -127,8 +127,8 @@ SV_MODULE_REQUIRED([opus],[opusfile],[opus/opusfile.h] - 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]) -+# Link in -lX11 -- this is for the X error handler -+SV_MODULE_REQUIRED([X11],[x11 >= 1.0.0],[X11/X.h],[x11],[XGetErrorText]) - - AC_SUBST(PERL) - AC_SUBST(XARGS) -@@ -154,6 +154,7 @@ AC_OUTPUT - - 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 deleted file mode 100644 index 8da6ec4bdc29..000000000000 --- a/audio/sonic-visualiser/files/patch-convert.pro +++ /dev/null @@ -1,26 +0,0 @@ ---- 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-freebsd-fixes b/audio/sonic-visualiser/files/patch-freebsd-fixes new file mode 100644 index 000000000000..d5e2674b4992 --- /dev/null +++ b/audio/sonic-visualiser/files/patch-freebsd-fixes @@ -0,0 +1,97 @@ +-- Fix Qt6 compatibility issues and FreeBSD-specific compilation errors. +-- +-- * Use .load() on std::atomic<float/int> values passed to QString::arg, +-- because Qt6's arg() templates no longer accept std::atomic types. +-- * On FreeBSD include <cstdlib> instead of <alloca.h> for alloca(). +-- * Cast Qt::KeyboardModifiers to int before passing to QString::arg(). + +--- svcore/data/model/SparseTimeValueModel.h 2025-03-21 07:36:49.000000000 -0700 ++++ svcore/data/model/SparseTimeValueModel.h 2026-08-02 20:29:09.285282000 -0700 +@@ -342,8 +342,8 @@ + .arg("true") // always true after model reaches 100% - + // subsequent events are always notified + .arg(m_events.getExportId()) +- .arg(m_valueMinimum) +- .arg(m_valueMaximum) ++ .arg(m_valueMinimum.load()) ++ .arg(m_valueMaximum.load()) + .arg(encodeEntities(m_units)) + .arg(extraAttributes)); + +--- svcore/data/model/RegionModel.h 2025-03-21 07:36:49.000000000 -0700 ++++ svcore/data/model/RegionModel.h 2026-08-02 20:29:15.109250000 -0700 +@@ -335,8 +335,8 @@ + .arg(m_events.getExportId()) + .arg("region") + .arg(m_valueQuantization) +- .arg(m_valueMinimum) +- .arg(m_valueMaximum) ++ .arg(m_valueMinimum.load()) ++ .arg(m_valueMaximum.load()) + .arg(encodeEntities(m_units)) + .arg(extraAttributes)); + +--- svcore/data/model/NoteModel.h 2025-03-21 07:36:49.000000000 -0700 ++++ svcore/data/model/NoteModel.h 2026-08-02 20:29:20.648718000 -0700 +@@ -403,8 +403,8 @@ + .arg(m_events.getExportId()) + .arg(m_subtype == FLEXI_NOTE ? "flexinote" : "note") + .arg(m_valueQuantization) +- .arg(m_valueMinimum) +- .arg(m_valueMaximum) ++ .arg(m_valueMinimum.load()) ++ .arg(m_valueMaximum.load()) + .arg(encodeEntities(m_units)) + .arg(extraAttributes)); + +--- svcore/data/model/EditableDenseThreeDimensionalModel.cpp 2025-03-21 07:36:49.000000000 -0700 ++++ svcore/data/model/EditableDenseThreeDimensionalModel.cpp 2026-08-02 20:30:50.093315000 -0700 +@@ -458,10 +458,10 @@ + Model::toXml + (out, indent, + QString("type=\"dense\" dimensions=\"3\" windowSize=\"%1\" yBinCount=\"%2\" minimum=\"%3\" maximum=\"%4\" dataset=\"%5\" startFrame=\"%6\" %7") +- .arg(m_resolution) +- .arg(m_yBinCount) +- .arg(m_minimum) +- .arg(m_maximum) ++ .arg(m_resolution.load()) ++ .arg(m_yBinCount.load()) ++ .arg(m_minimum.load()) ++ .arg(m_maximum.load()) + .arg(getExportId()) + .arg(m_startFrame) + .arg(extraAttributes)); +--- bqvec/src/VectorOpsComplex.cpp 2025-03-21 07:37:34.000000000 -0700 ++++ bqvec/src/VectorOpsComplex.cpp 2026-08-02 20:29:54.751287000 -0700 +@@ -50,6 +50,8 @@ + #ifndef alloca + #define alloca _alloca + #endif ++#elif defined(__FreeBSD__) ++#include <cstdlib> + #else + #include <alloca.h> + #endif +--- svcore/plugin/DSSIPluginInstance.cpp 2025-03-21 07:36:49.000000000 -0700 ++++ svcore/plugin/DSSIPluginInstance.cpp 2026-08-02 20:29:57.272823000 -0700 +@@ -28,7 +28,9 @@ + #include <cstdlib> + + #ifndef Q_OS_WIN32 ++#ifndef __FreeBSD__ + #include <alloca.h> ++#endif + #else + #include <memory.h> + #endif +--- svgui/view/Pane.cpp 2025-03-21 07:36:58.000000000 -0700 ++++ svgui/view/Pane.cpp 2026-08-02 20:31:39.504290000 -0700 +@@ -1423,7 +1423,7 @@ + if (m & Qt::GroupSwitchModifier) s << "GroupSwitch"; + m &= (~ (Qt::ShiftModifier | Qt::ControlModifier | Qt::AltModifier | + Qt::MetaModifier | Qt::KeypadModifier | Qt::GroupSwitchModifier)); +- if (m) s << QString(" (residue %1)").arg(m); ++ if (m) s << QString(" (residue %1)").arg(int(m)); + if (s.empty()) return "(none)"; + else return s.join(" | "); + } diff --git a/audio/sonic-visualiser/files/patch-meson.build b/audio/sonic-visualiser/files/patch-meson.build new file mode 100644 index 000000000000..e6f3640f7b8a --- /dev/null +++ b/audio/sonic-visualiser/files/patch-meson.build @@ -0,0 +1,225 @@ +-- Add FreeBSD support and make optional dependencies controllable via the +-- port option framework. The upstream meson build hardcodes these as +-- Linux-only and always enables them; this patch maps them to the same +-- options that the previous GNU configure port provided. +-- Also force the use of the system vamp-hostsdk instead of the bundled +-- copy, and remove bundled include directories that are deleted by the +-- port's post-patch step. Finally, install the main binary with the +-- lowercase name on FreeBSD. + +--- meson.build.orig 2026-08-03 03:46:29 UTC ++++ meson.build +@@ -94,19 +94,19 @@ dl_dep = meson.get_compiler('c').find_library('dl', re + server_dependencies = [] + + dl_dep = meson.get_compiler('c').find_library('dl', required: false) +-vamphostsdk_dep = dependency('vamp-hostsdk', version: '>= 2.10', required: false) ++vamphostsdk_dep = dependency('vamp-hostsdk', version: '>= 2.10', required: true) + + unwind_dep = [] + with_unwind = false + +-if system == 'linux' ++if system == 'linux' or system == 'freebsd' + + capnp = find_program('capnp') + capnp_additional_args = [] + capnp_cpp_plugin = 'c++' + + rc = [] +- ++ + bzip2_dep = dependency('bzip2', required: false) + + if not bzip2_dep.found() +@@ -123,21 +123,60 @@ if system == 'linux' + capnp_dep = dependency('capnp', version: '>= 0.6') + lrdf_dep = dependency('lrdf', version: '>= 0.2') + oggz_dep = dependency('oggz', version: '>= 1.0.0') +- fishsound_dep = dependency('fishsound', version: '>= 1.0.0') +- mad_dep = dependency('mad', version: '>= 0.15.0') +- id3tag_dep = dependency('id3tag', version: '>= 0.15.0') + opus_dep = dependency('opusfile') + opusenc_dep = dependency('opusenc', required: false) + if not opusenc_dep.found() + opusenc_dep = dependency('libopusenc', required: false) + endif +- lo_dep = dependency('liblo') +- jack_dep = dependency('jack', version: '>= 0.100') +- libpulse_dep = dependency('libpulse', version: '>= 0.9') +- alsa_dep = dependency('alsa') +- +- portaudio_dep = dependency('portaudio-2.0', version: '>= 19', required: false) +- ++ ++ with_fishsound = get_option('fishsound') ++ with_id3tag = get_option('id3tag') ++ with_mad = get_option('mad') ++ with_jack = get_option('jack') ++ with_osc = get_option('osc') ++ with_portaudio = get_option('portaudio') ++ with_pulse = get_option('pulse') ++ ++ fishsound_dep = [] ++ if with_fishsound ++ fishsound_dep = dependency('fishsound', version: '>= 1.0.0') ++ endif ++ ++ id3tag_dep = [] ++ if with_id3tag ++ id3tag_dep = dependency('id3tag', version: '>= 0.15.0') ++ endif ++ ++ mad_dep = [] ++ if with_mad ++ mad_dep = dependency('mad', version: '>= 0.15.0') ++ endif ++ ++ lo_dep = [] ++ if with_osc ++ lo_dep = dependency('liblo') ++ endif ++ ++ jack_dep = [] ++ if with_jack ++ jack_dep = dependency('jack', version: '>= 0.100') ++ endif ++ ++ libpulse_dep = [] ++ if with_pulse ++ libpulse_dep = dependency('libpulse', version: '>= 0.9') ++ endif ++ ++ portaudio_dep = [] ++ if with_portaudio ++ portaudio_dep = dependency('portaudio-2.0', version: '>= 19', required: false) ++ endif ++ ++ alsa_dep = [] ++ if system == 'linux' ++ alsa_dep = dependency('alsa') ++ endif ++ + unwind_dep = dependency('libunwind', required: false) + + feature_dependencies = [ +@@ -152,11 +191,11 @@ if system == 'linux' + capnp_dep, + lrdf_dep, + oggz_dep, ++ opus_dep, ++ opusenc_dep, + fishsound_dep, + mad_dep, + id3tag_dep, +- opus_dep, +- opusenc_dep, + lo_dep, + portaudio_dep, + jack_dep, +@@ -171,7 +210,7 @@ if system == 'linux' + serd_dep, + dl_dep, + ] +- ++ + feature_defines = [ + '-DHAVE_BZ2', + '-DHAVE_FFTW3', +@@ -184,17 +223,35 @@ if system == 'linux' + '-DHAVE_CAPNP', + '-DHAVE_LRDF', + '-DHAVE_OGGZ', +- '-DHAVE_FISHSOUND', +- '-DHAVE_MAD', +- '-DHAVE_ID3TAG', + '-DHAVE_OPUS', +- '-DHAVE_LIBLO', +- '-DHAVE_JACK', '-DDYNAMIC_JACK', +- '-DHAVE_LIBPULSE', +- '-D__LINUX_ALSASEQ__', +- '-D__LINUX_ALSA__' # for RtMidi + ] + ++ if with_fishsound ++ feature_defines += [ '-DHAVE_FISHSOUND' ] ++ endif ++ if with_mad ++ feature_defines += [ '-DHAVE_MAD' ] ++ svcore_moc_args += [ '-DHAVE_MAD' ] ++ endif ++ if with_id3tag ++ feature_defines += [ '-DHAVE_ID3TAG' ] ++ endif ++ if with_osc ++ feature_defines += [ '-DHAVE_LIBLO' ] ++ endif ++ if with_jack ++ feature_defines += [ '-DHAVE_JACK', '-DDYNAMIC_JACK' ] ++ endif ++ if with_pulse ++ feature_defines += [ '-DHAVE_LIBPULSE' ] ++ endif ++ if system == 'linux' ++ feature_defines += [ ++ '-D__LINUX_ALSASEQ__', ++ '-D__LINUX_ALSA__' # for RtMidi ++ ] ++ endif ++ + if unwind_dep.found() and buildtype.startswith('debug') + with_unwind = true + feature_defines += [ +@@ -204,7 +261,7 @@ if system == 'linux' + unwind_dep = [] + endif + +- if portaudio_dep.found() ++ if with_portaudio and portaudio_dep.found() + feature_defines += [ + '-DHAVE_PORTAUDIO', + ] +@@ -215,10 +272,6 @@ if system == 'linux' + '-DHAVE_OPUS_READ_ONLY' + ] + endif +- +- svcore_moc_args = [ +- '-DHAVE_MAD' +- ] + + elif system == 'darwin' + +@@ -539,7 +592,6 @@ all_include_dirs = include_directories( + 'svcore', + 'svgui', + 'svapp', +- 'vamp-plugin-sdk', + ] + ) + +@@ -1193,7 +1245,7 @@ if with_qt + if system == 'linux' + sv_main_name = 'sonic-visualiser' + else +- sv_main_name = 'Sonic Visualiser' ++ sv_main_name = 'sonic-visualiser' + endif # system + + install_data( +@@ -1360,7 +1412,6 @@ executable( + capnp_gen_cpp_target, + vamphostsdk_files, + include_directories: [ +- 'vamp-plugin-sdk', + 'piper-vamp-cpp', + 'piper-vamp-cpp/ext', + feature_include_dirs, +@@ -1389,7 +1440,6 @@ executable( + capnp_gen_cpp_target, + vamphostsdk_files, + include_directories: [ +- 'vamp-plugin-sdk', + 'piper-vamp-cpp', + 'piper-vamp-cpp/ext', + feature_include_dirs, diff --git a/audio/sonic-visualiser/files/patch-meson_options.txt b/audio/sonic-visualiser/files/patch-meson_options.txt new file mode 100644 index 000000000000..260456c99b20 --- /dev/null +++ b/audio/sonic-visualiser/files/patch-meson_options.txt @@ -0,0 +1,45 @@ +-- Add meson options that mirror the options from the previous GNU configure +-- based port (fishsound, id3tag, jack, mad, osc, portaudio, pulse). The +-- defaults match the previous OPTIONS_DEFAULT. + +--- meson_options.txt 2025-03-21 07:36:40.000000000 -0700 ++++ meson_options.txt 2026-08-02 20:24:59.300404000 -0700 +@@ -3,3 +3,38 @@ + value: 'false', + description: 'Build only the small utilities that do not use Qt.') + ++option('fishsound', ++ type: 'boolean', ++ value: 'true', ++ description: 'Enable FLAC, Speex and Vorbis codecs support through libfishsound.') ++ ++option('id3tag', ++ type: 'boolean', ++ value: 'true', ++ description: 'Enable ID3 tag support through libid3tag.') ++ ++option('jack', ++ type: 'boolean', ++ value: 'true', ++ description: 'Enable JACK audio support.') ++ ++option('mad', ++ type: 'boolean', ++ value: 'true', ++ description: 'Enable MP3 decoding support through libmad.') ++ ++option('osc', ++ type: 'boolean', ++ value: 'false', ++ description: 'Enable OpenSound Control support through liblo.') ++ ++option('portaudio', ++ type: 'boolean', ++ value: 'true', ++ description: 'Enable PortAudio playback support.') ++ ++option('pulse', ++ type: 'boolean', ++ value: 'false', ++ description: 'Enable PulseAudio playback support.') ++ diff --git a/audio/sonic-visualiser/files/patch-server.pro b/audio/sonic-visualiser/files/patch-server.pro deleted file mode 100644 index e5da5e186026..000000000000 --- a/audio/sonic-visualiser/files/patch-server.pro +++ /dev/null @@ -1,26 +0,0 @@ ---- 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 deleted file mode 100644 index d9e1a5234238..000000000000 --- a/audio/sonic-visualiser/files/patch-sonic-visualiser.pro +++ /dev/null @@ -1,34 +0,0 @@ ---- sonic-visualiser.pro.orig 2020-04-16 19:10:53 UTC -+++ sonic-visualiser.pro -@@ -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 - - 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 deleted file mode 100644 index 2312a3b60dc5..000000000000 --- a/audio/sonic-visualiser/files/patch-sv.pro +++ /dev/null @@ -1,10 +0,0 @@ ---- sv.pro.orig 2019-12-10 09:29:11 UTC -+++ sv.pro -@@ -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 - - !win32 { diff --git a/audio/sonic-visualiser/files/patch-svapp_acinclude.m4 b/audio/sonic-visualiser/files/patch-svapp_acinclude.m4 deleted file mode 100644 index ba17072fdeee..000000000000 --- a/audio/sonic-visualiser/files/patch-svapp_acinclude.m4 +++ /dev/null @@ -1,42 +0,0 @@ ---- svapp/acinclude.m4.orig 2015-10-22 11:26:02 UTC -+++ svapp/acinclude.m4 -@@ -30,33 +30,12 @@ fi - - AC_DEFUN([SV_MODULE_OPTIONAL], - [ --SV_MODULE_MODULE=$1 --SV_MODULE_VERSION_TEST="$2" --SV_MODULE_HEADER=$3 --SV_MODULE_LIB=$4 --SV_MODULE_FUNC=$5 --SV_MODULE_HAVE=HAVE_$(echo $1 | tr '[a-z]' '[A-Z]') --SV_MODULE_FAILED=1 --if test -n "$$1_LIBS" ; then -- AC_MSG_NOTICE([User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE]) -- CXXFLAGS="$CXXFLAGS $$1_CFLAGS" -- LIBS="$LIBS $$1_LIBS" -- SV_MODULE_FAILED="" --fi --if test -z "$SV_MODULE_VERSION_TEST" ; then -- SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE --fi --if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then -- PKG_CHECK_MODULES($1,[$SV_MODULE_VERSION_TEST],[HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $$1_CFLAGS";LIBS="$LIBS $$1_LIBS";SV_MODULE_FAILED=""],[AC_MSG_NOTICE([Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means])]) --fi --if test -n "$SV_MODULE_FAILED"; then -- AC_CHECK_HEADER([$SV_MODULE_HEADER],[HAVES="$HAVES $SV_MODULE_HAVE";SV_MODULE_FAILED=""],[AC_MSG_NOTICE([Failed to find header $SV_MODULE_HEADER for optional module $SV_MODULE_MODULE])]) -- if test -z "$SV_MODULE_FAILED"; then -- if test -n "$SV_MODULE_LIB"; then -- AC_CHECK_LIB([$SV_MODULE_LIB],[$SV_MODULE_FUNC],[LIBS="$LIBS -l$SV_MODULE_LIB"],[AC_MSG_NOTICE([Failed to find library $SV_MODULE_LIB for optional module $SV_MODULE_MODULE])]) -- fi -- fi --fi -+AC_ARG_WITH([$4], -+ [AS_HELP_STRING([--with-$4], -+ [Enable support for $1 [default=no]])], -+ [], -+ [with_$4=no]) -+AS_IF([test "x$with_$4" = xyes], [SV_MODULE_REQUIRED($1,$2,$3,$4,$5)]) - ]) - - # Check for Qt. The only part of Qt we use directly is qmake. diff --git a/audio/sonic-visualiser/files/patch-svcore_acinclude.m4 b/audio/sonic-visualiser/files/patch-svcore_acinclude.m4 deleted file mode 100644 index c74e466bf137..000000000000 --- a/audio/sonic-visualiser/files/patch-svcore_acinclude.m4 +++ /dev/null @@ -1,42 +0,0 @@ ---- svcore/acinclude.m4.orig 2015-10-22 11:26:02 UTC -+++ svcore/acinclude.m4 -@@ -30,33 +30,12 @@ fi - - AC_DEFUN([SV_MODULE_OPTIONAL], - [ --SV_MODULE_MODULE=$1 --SV_MODULE_VERSION_TEST="$2" --SV_MODULE_HEADER=$3 --SV_MODULE_LIB=$4 --SV_MODULE_FUNC=$5 --SV_MODULE_HAVE=HAVE_$(echo $1 | tr '[a-z]' '[A-Z]') --SV_MODULE_FAILED=1 --if test -n "$$1_LIBS" ; then -- AC_MSG_NOTICE([User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE]) -- CXXFLAGS="$CXXFLAGS $$1_CFLAGS" -- LIBS="$LIBS $$1_LIBS" -- SV_MODULE_FAILED="" --fi --if test -z "$SV_MODULE_VERSION_TEST" ; then -- SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE --fi --if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then -- PKG_CHECK_MODULES($1,[$SV_MODULE_VERSION_TEST],[HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $$1_CFLAGS";LIBS="$LIBS $$1_LIBS";SV_MODULE_FAILED=""],[AC_MSG_NOTICE([Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means])]) --fi --if test -n "$SV_MODULE_FAILED"; then -- AC_CHECK_HEADER([$SV_MODULE_HEADER],[HAVES="$HAVES $SV_MODULE_HAVE";SV_MODULE_FAILED=""],[AC_MSG_NOTICE([Failed to find header $SV_MODULE_HEADER for optional module $SV_MODULE_MODULE])]) -- if test -z "$SV_MODULE_FAILED"; then -- if test -n "$SV_MODULE_LIB"; then -- AC_CHECK_LIB([$SV_MODULE_LIB],[$SV_MODULE_FUNC],[LIBS="$LIBS -l$SV_MODULE_LIB"],[AC_MSG_NOTICE([Failed to find library $SV_MODULE_LIB for optional module $SV_MODULE_MODULE])]) -- fi -- fi --fi -+AC_ARG_WITH([$4], -+ [AS_HELP_STRING([--with-$4], -+ [Enable support for $1 [default=no]])], -+ [], -+ [with_$4=no]) -+AS_IF([test "x$with_$4" = xyes], [SV_MODULE_REQUIRED($1,$2,$3,$4,$5)]) - ]) - - # Check for Qt. The only part of Qt we use directly is qmake. diff --git a/audio/sonic-visualiser/files/patch-svcore_config.pri.in b/audio/sonic-visualiser/files/patch-svcore_config.pri.in deleted file mode 100644 index 911f4fa0f543..000000000000 --- a/audio/sonic-visualiser/files/patch-svcore_config.pri.in +++ /dev/null @@ -1,10 +0,0 @@ ---- svcore/config.pri.in.orig 2015-10-22 11:26:02 UTC -+++ svcore/config.pri.in -@@ -1,6 +1,6 @@ - CONFIG += @QMAKE_CONFIG@ - --DEFINES += @HAVES@ HAVE_DATAQUAY -+DEFINES += @HAVES@ HAVE_DATAQUAY __RTMIDI_DUMMY_ONLY__ - - QMAKE_CC = @CC@ - QMAKE_CXX = @CXX@ diff --git a/audio/sonic-visualiser/files/patch-svcore_plugin_DSSIPluginInstance.cpp b/audio/sonic-visualiser/files/patch-svcore_plugin_DSSIPluginInstance.cpp deleted file mode 100644 index 6462a50a655c..000000000000 --- a/audio/sonic-visualiser/files/patch-svcore_plugin_DSSIPluginInstance.cpp +++ /dev/null @@ -1,15 +0,0 @@ ---- svcore/plugin/DSSIPluginInstance.cpp.orig 2015-10-22 11:26:02 UTC -+++ svcore/plugin/DSSIPluginInstance.cpp -@@ -27,12 +27,6 @@ - - #include <cstdlib> - --#ifndef Q_OS_WIN32 --#include <alloca.h> --#else --#include <memory.h> --#endif -- - //#define DEBUG_DSSI 1 - #define DEBUG_DSSI_PROCESS 1 - diff --git a/audio/sonic-visualiser/files/patch-svgui_acinclude.m4 b/audio/sonic-visualiser/files/patch-svgui_acinclude.m4 deleted file mode 100644 index 821d474f6945..000000000000 --- a/audio/sonic-visualiser/files/patch-svgui_acinclude.m4 +++ /dev/null @@ -1,42 +0,0 @@ ---- svgui/acinclude.m4.orig 2015-10-22 11:26:02 UTC -+++ svgui/acinclude.m4 -@@ -30,33 +30,12 @@ fi - - AC_DEFUN([SV_MODULE_OPTIONAL], - [ --SV_MODULE_MODULE=$1 --SV_MODULE_VERSION_TEST="$2" --SV_MODULE_HEADER=$3 --SV_MODULE_LIB=$4 --SV_MODULE_FUNC=$5 --SV_MODULE_HAVE=HAVE_$(echo $1 | tr '[a-z]' '[A-Z]') --SV_MODULE_FAILED=1 --if test -n "$$1_LIBS" ; then -- AC_MSG_NOTICE([User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE]) -- CXXFLAGS="$CXXFLAGS $$1_CFLAGS" -- LIBS="$LIBS $$1_LIBS" -- SV_MODULE_FAILED="" --fi --if test -z "$SV_MODULE_VERSION_TEST" ; then -- SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE --fi --if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then -- PKG_CHECK_MODULES($1,[$SV_MODULE_VERSION_TEST],[HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $$1_CFLAGS";LIBS="$LIBS $$1_LIBS";SV_MODULE_FAILED=""],[AC_MSG_NOTICE([Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means])]) --fi --if test -n "$SV_MODULE_FAILED"; then -- AC_CHECK_HEADER([$SV_MODULE_HEADER],[HAVES="$HAVES $SV_MODULE_HAVE";SV_MODULE_FAILED=""],[AC_MSG_NOTICE([Failed to find header $SV_MODULE_HEADER for optional module $SV_MODULE_MODULE])]) -- if test -z "$SV_MODULE_FAILED"; then -- if test -n "$SV_MODULE_LIB"; then -- AC_CHECK_LIB([$SV_MODULE_LIB],[$SV_MODULE_FUNC],[LIBS="$LIBS -l$SV_MODULE_LIB"],[AC_MSG_NOTICE([Failed to find library $SV_MODULE_LIB for optional module $SV_MODULE_MODULE])]) -- fi -- fi --fi -+AC_ARG_WITH([$4], -+ [AS_HELP_STRING([--with-$4], *** 52 LINES SKIPPED ***home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a701231.3a141.5776ef67>