# HG changeset patch # User Chris Cannam # Date 1575555537 0 # Node ID 3bff037dcae3cf3be2b30d731baf72c9fceb5531 # Parent 1d86ed252be7324ef2d2853efc1bf4552f5049e8 Add a couple more plugin builds diff -r 1d86ed252be7 -r 3bff037dcae3 .hgignore --- a/.hgignore Sat Nov 23 11:04:39 2019 +0000 +++ b/.hgignore Thu Dec 05 14:18:57 2019 +0000 @@ -31,6 +31,7 @@ out/*.cat out/*.n3 out/*_README.txt +out/*_README.md out/*_CITATION.txt out/*_COPYING.txt build_win64 diff -r 1d86ed252be7 -r 3bff037dcae3 bbc-vamp-plugins.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/bbc-vamp-plugins.pro Thu Dec 05 14:18:57 2019 +0000 @@ -0,0 +1,53 @@ + +TEMPLATE = lib + +exists(config.pri) { + include(config.pri) +} + +!exists(config.pri) { + include(noconfig.pri) +} + +CONFIG -= qt +CONFIG += plugin no_plugin_name_prefix release warn_on + +TARGET = out/bbc-vamp-plugins + +OBJECTS_DIR = bbc-vamp-plugins/o + +INCLUDEPATH += $$PWD/vamp-plugin-sdk + +QMAKE_CXXFLAGS -= -Werror + +win32-msvc* { + LIBS += -EXPORT:vampGetPluginDescriptor +} +win32-g++* { + LIBS += -Wl,--version-script=$$PWD/bbc-vamp-plugins/src/vamp-plugin.map +} +linux* { + LIBS += -Wl,--version-script=$$PWD/bbc-vamp-plugins/src/vamp-plugin.map +} +macx* { + LIBS += -exported_symbols_list $$PWD/bbc-vamp-plugins/src/vamp-plugin.list +} +!win* { + QMAKE_POST_LINK += \ + cp bbc-vamp-plugins/bbc-vamp-plugins.cat bbc-vamp-plugins/bbc-vamp-plugins.n3 out/ && \ + cp bbc-vamp-plugins/COPYING out/bbc-vamp-plugins_COPYING.txt && \ + cp bbc-vamp-plugins/README.md out/bbc-vamp-plugins_README.md +} + +SOURCES += \ + bbc-vamp-plugins/src/Energy.cpp \ + bbc-vamp-plugins/src/Intensity.cpp \ + bbc-vamp-plugins/src/SpectralFlux.cpp \ + bbc-vamp-plugins/src/Rhythm.cpp \ + bbc-vamp-plugins/src/SpectralContrast.cpp \ + bbc-vamp-plugins/src/SpeechMusicSegmenter.cpp \ + bbc-vamp-plugins/src/Peaks.cpp \ + bbc-vamp-plugins/src/plugins.cpp \ + vamp-plugin-sdk/src/vamp-sdk/PluginAdapter.cpp \ + vamp-plugin-sdk/src/vamp-sdk/RealTime.cpp + diff -r 1d86ed252be7 -r 3bff037dcae3 cepstral-pitchtracker.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cepstral-pitchtracker.pro Thu Dec 05 14:18:57 2019 +0000 @@ -0,0 +1,52 @@ + +TEMPLATE = lib + +exists(config.pri) { + include(config.pri) +} + +!exists(config.pri) { + include(noconfig.pri) +} + +CONFIG -= qt +CONFIG += plugin no_plugin_name_prefix release warn_on + +TARGET = out/cepstral-pitchtracker + +OBJECTS_DIR = cepstral-pitchtracker/o + +INCLUDEPATH += $$PWD/vamp-plugin-sdk + +QMAKE_CXXFLAGS -= -Werror + +win32-msvc* { + LIBS += -EXPORT:vampGetPluginDescriptor +} +win32-g++* { + LIBS += -Wl,--version-script=$$PWD/cepstral-pitchtracker/vamp-plugin.map +} +linux* { + LIBS += -Wl,--version-script=$$PWD/cepstral-pitchtracker/vamp-plugin.map +} +macx* { + LIBS += -exported_symbols_list $$PWD/cepstral-pitchtracker/vamp-plugin.list +} +!win* { + QMAKE_POST_LINK += \ + cp cepstral-pitchtracker/cepstral-pitchtracker.cat out/ && \ + cp cepstral-pitchtracker/cepstral-pitchtracker.n3 out/ && \ + cp cepstral-pitchtracker/README out/cepstral-pitchtracker_README.txt +} + +SOURCES += \ + cepstral-pitchtracker/CepstralPitchTracker.cpp \ + cepstral-pitchtracker/AgentFeeder.cpp \ + cepstral-pitchtracker/NoteHypothesis.cpp \ + cepstral-pitchtracker/PeakInterpolator.cpp \ + cepstral-pitchtracker/libmain.cpp \ + vamp-plugin-sdk/src/vamp-sdk/FFT.cpp \ + vamp-plugin-sdk/src/vamp-sdk/PluginAdapter.cpp \ + vamp-plugin-sdk/src/vamp-sdk/RealTime.cpp + + diff -r 1d86ed252be7 -r 3bff037dcae3 constant-q-cpp.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/constant-q-cpp.pro Thu Dec 05 14:18:57 2019 +0000 @@ -0,0 +1,62 @@ + +TEMPLATE = lib + +exists(config.pri) { + include(config.pri) +} + +!exists(config.pri) { + include(noconfig.pri) +} + +CONFIG -= qt +CONFIG += plugin no_plugin_name_prefix release warn_on + +TARGET = out/cqvamp + +OBJECTS_DIR = constant-q-cpp/o + +INCLUDEPATH += $$PWD/vamp-plugin-sdk $$PWD/constant-q-cpp $$PWD/constant-q-cpp/cq $$PWD/constant-q-cpp/src $$PWD/constant-q-cpp/src/ext/kissfft $$PWD/constant-q-cpp/src/ext/kissfft/tools + +DEFINES += kiss_fft_scalar=double + +win32-msvc* { + LIBS += -EXPORT:vampGetPluginDescriptor +} +win32-g++* { + LIBS += -Wl,--version-script=$$PWD/constant-q-cpp/vamp/vamp-plugin.map +} +linux* { + LIBS += -Wl,--version-script=$$PWD/constant-q-cpp/vamp/vamp-plugin.map +} +macx* { + LIBS += -exported_symbols_list $$PWD/constant-q-cpp/vamp/vamp-plugin.list +} +!win* { + QMAKE_POST_LINK += \ + cp constant-q-cpp/cqvamp.cat out/ && \ + cp constant-q-cpp/cqvamp.n3 out/ && \ + cp constant-q-cpp/COPYING out/cqvamp_COPYING.txt && \ + cp constant-q-cpp/README out/cqvamp_README.txt && \ + cp constant-q-cpp/CITATION out/cqvamp_CITATION.txt +} + +SOURCES += \ + constant-q-cpp/src/CQKernel.cpp \ + constant-q-cpp/src/ConstantQ.cpp \ + constant-q-cpp/src/CQSpectrogram.cpp \ + constant-q-cpp/src/CQInverse.cpp \ + constant-q-cpp/src/Chromagram.cpp \ + constant-q-cpp/src/Pitch.cpp \ + constant-q-cpp/src/dsp/FFT.cpp \ + constant-q-cpp/src/dsp/KaiserWindow.cpp \ + constant-q-cpp/src/dsp/MathUtilities.cpp \ + constant-q-cpp/src/dsp/Resampler.cpp \ + constant-q-cpp/src/dsp/SincWindow.cpp \ + constant-q-cpp/src/ext/kissfft/kiss_fft.c \ + constant-q-cpp/src/ext/kissfft/tools/kiss_fftr.c \ + constant-q-cpp/vamp/CQVamp.cpp \ + constant-q-cpp/vamp/CQChromaVamp.cpp \ + constant-q-cpp/vamp/libmain.cpp \ + vamp-plugin-sdk/src/vamp-sdk/PluginAdapter.cpp \ + vamp-plugin-sdk/src/vamp-sdk/RealTime.cpp diff -r 1d86ed252be7 -r 3bff037dcae3 noconfig.pri --- a/noconfig.pri Sat Nov 23 11:04:39 2019 +0000 +++ b/noconfig.pri Thu Dec 05 14:18:57 2019 +0000 @@ -35,6 +35,6 @@ linux* { QMAKE_CXXFLAGS_RELEASE += -O3 -flto - QMAKE_LFLAGS_RELEASE += -O3 -flto + QMAKE_LFLAGS_RELEASE += -O3 -flto -Wl,--no-undefined } diff -r 1d86ed252be7 -r 3bff037dcae3 qm-vamp-plugins.pro --- a/qm-vamp-plugins.pro Sat Nov 23 11:04:39 2019 +0000 +++ b/qm-vamp-plugins.pro Thu Dec 05 14:18:57 2019 +0000 @@ -45,7 +45,7 @@ !win* { QMAKE_POST_LINK += \ cp qm-vamp-plugins/qm-vamp-plugins.cat qm-vamp-plugins/qm-vamp-plugins.n3 out/ && \ - cp qm-vamp-plugins/README.md out/qm-vamp-plugins_README.txt && \ + cp qm-vamp-plugins/README.md out/qm-vamp-plugins_README.md && \ cp qm-vamp-plugins/COPYING out/qm-vamp-plugins_COPYING.txt } diff -r 1d86ed252be7 -r 3bff037dcae3 repoint-lock.json --- a/repoint-lock.json Sat Nov 23 11:04:39 2019 +0000 +++ b/repoint-lock.json Thu Dec 05 14:18:57 2019 +0000 @@ -34,7 +34,7 @@ "pin": "3faac48d491d" }, "azi": { - "pin": "230562aa012d" + "pin": "39a06bc19a36" }, "vamp-simple-cepstrum": { "pin": "f021dc97da29" diff -r 1d86ed252be7 -r 3bff037dcae3 tuning-difference.pro --- a/tuning-difference.pro Sat Nov 23 11:04:39 2019 +0000 +++ b/tuning-difference.pro Thu Dec 05 14:18:57 2019 +0000 @@ -37,7 +37,7 @@ QMAKE_POST_LINK += \ cp tuning-difference/tuning-difference.cat tuning-difference/tuning-difference.n3 out/ && \ cp tuning-difference/COPYING out/tuning-difference_COPYING.txt && \ - cp tuning-difference/README.md out/tuning-difference_README.txt + cp tuning-difference/README.md out/tuning-difference_README.md } SOURCES += \ diff -r 1d86ed252be7 -r 3bff037dcae3 ua-vamp-plugins.pro --- a/ua-vamp-plugins.pro Sat Nov 23 11:04:39 2019 +0000 +++ b/ua-vamp-plugins.pro Thu Dec 05 14:18:57 2019 +0000 @@ -36,7 +36,7 @@ QMAKE_POST_LINK += \ cp ua-vamp-plugins/ua-vamp-plugins.cat out/ && \ cp ua-vamp-plugins/LICENSE out/ua-vamp-plugins_COPYING.txt && \ - cp ua-vamp-plugins/readme.md out/ua-vamp-plugins_README.txt + cp ua-vamp-plugins/readme.md out/ua-vamp-plugins_README.md } SOURCES += \ diff -r 1d86ed252be7 -r 3bff037dcae3 vamp-aubio-plugins.pro --- a/vamp-aubio-plugins.pro Sat Nov 23 11:04:39 2019 +0000 +++ b/vamp-aubio-plugins.pro Thu Dec 05 14:18:57 2019 +0000 @@ -37,7 +37,7 @@ QMAKE_POST_LINK += \ cp vamp-aubio-plugins/vamp-aubio.cat vamp-aubio-plugins/vamp-aubio.n3 out/ && \ cp vamp-aubio-plugins/COPYING out/vamp-aubio-plugins_COPYING.txt && \ - cp vamp-aubio-plugins/README.md out/vamp-aubio-plugins_README.txt + cp vamp-aubio-plugins/README.md out/vamp-aubio-plugins_README.md } SOURCES += \ diff -r 1d86ed252be7 -r 3bff037dcae3 vamp-plugin-pack.pro --- a/vamp-plugin-pack.pro Sat Nov 23 11:04:39 2019 +0000 +++ b/vamp-plugin-pack.pro Thu Dec 05 14:18:57 2019 +0000 @@ -14,7 +14,10 @@ sub_tipic \ sub_segmentino \ sub_examples \ - sub_ua + sub_ua \ + sub_bbc \ + sub_cq \ + sub_cepstral_pitchtracker sub_sdk.file = vamp-plugin-sdk.pro sub_match.file = match-vamp.pro @@ -29,6 +32,9 @@ sub_segmentino.file = segmentino.pro sub_examples.file = vamp-example-plugins.pro sub_ua.file = ua-vamp-plugins.pro +sub_bbc.file = bbc-vamp-plugins.pro +sub_cq.file = constant-q-cpp.pro +sub_cepstral_pitchtracker.file = cepstral-pitchtracker.pro repoint.target = $$PWD/.repoint.point repoint.depends = $$PWD/repoint-project.json $$PWD/repoint-lock.json