Mercurial > hg > vamp-plugin-pack

changeset 1:f7134276bfb8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Build Aubio + plugins
author Chris Cannam
date Wed, 13 Nov 2019 11:51:17 +0000
parents eaa4410df4cd
children b77ce402e5e5
files .hgignore repoint-lock.json repoint-project.json vamp-aubio-plugins.pro vamp-plugin-pack.pro
diffstat 5 files changed, 120 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Tue Oct 22 14:45:45 2019 +0100
+++ b/.hgignore	Wed Nov 13 11:51:17 2019 +0000
@@ -26,3 +26,4 @@
 .qmake.stash
 *.o
 *.a
+aubio
--- a/repoint-lock.json	Tue Oct 22 14:45:45 2019 +0100
+++ b/repoint-lock.json	Wed Nov 13 11:51:17 2019 +0000
@@ -1,14 +1,11 @@
 {
   "libraries": {
     "vamp-plugin-sdk": {
-      "pin": "569fc23fa37a"
+      "pin": "c42e50a5c297"
     },
     "icons/scalable": {
       "pin": "be45984f7915"
     },
-    "vamp-aubio-plugins": {
-      "pin": "be4c729d6549"
-    },
     "qm-vamp-plugins": {
       "pin": "7aa2536321769ece0873c072200b8183c899c924"
     },
@@ -53,6 +50,12 @@
     },
     "vamp-tempogram": {
       "pin": "02721bb9c4f0"
+    },
+    "vamp-aubio-plugins": {
+      "pin": "7a8e644aa81f0a3672b4e140396f9afe17eb2627"
+    },
+    "aubio": {
+      "pin": "63fc1dfb73714cac40869e4469cb6eac1b37beab"
     }
   }
 }
--- a/repoint-project.json	Tue Oct 22 14:45:45 2019 +0100
+++ b/repoint-project.json	Wed Nov 13 11:51:17 2019 +0000
@@ -7,6 +7,10 @@
 	    "vcs": ["hg", "git"],
 	    "anonymous": "https://code.soundsoftware.ac.uk/{vcs}/{repository}",
 	    "authenticated": "https://{account}@code.soundsoftware.ac.uk/{vcs}/{repository}"
+	},
+	"aubio": {
+	    "vcs": ["git"],
+	    "anonymous": "https://git.aubio.org/aubio/{repository}"
 	}
     },
     "libraries": {
@@ -19,10 +23,6 @@
 	    "service": "soundsoftware",
 	    "repository": "sv-iconset"
         },
-        "vamp-aubio-plugins": {
-            "vcs": "hg",
-            "service": "soundsoftware"
-        },
         "qm-vamp-plugins": {
             "vcs": "git",
             "service": "github",
@@ -87,6 +87,14 @@
         "vamp-tempogram": {
             "vcs": "hg",
             "service": "soundsoftware"
+        },
+        "vamp-aubio-plugins": {
+            "vcs": "git",
+            "service": "aubio"
+        },
+        "aubio": {
+            "vcs": "git",
+            "service": "aubio"
         }
     }
 }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vamp-aubio-plugins.pro	Wed Nov 13 11:51:17 2019 +0000
@@ -0,0 +1,97 @@
+
+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 = vamp-aubio
+
+OBJECTS_DIR = vamp-aubio-plugins/o
+
+INCLUDEPATH += $$PWD/vamp-plugin-sdk $$PWD/aubio $$PWD/aubio/src
+
+QMAKE_CXXFLAGS -= -Werror
+
+DEFINES += HAVE_STDLIB_H HAVE_STDIO_H HAVE_MATH_H HAVE_STRING_H HAVE_ERRNO_H HAVE_LIMITS_H HAVE_STDARG_H
+
+win32-msvc* {
+    LIBS += -EXPORT:vampGetPluginDescriptor
+}
+win32-g++* {
+    LIBS += -Wl,--version-script=$$PWD/vamp-aubio-plugins/vamp-plugin.map
+}
+linux* {
+    LIBS += -Wl,--version-script=$$PWD/vamp-aubio-plugins/vamp-plugin.map
+}
+macx* {
+    LIBS += -exported_symbols_list $$PWD/vamp-aubio-plugins/vamp-plugin.list
+}
+
+SOURCES += \
+    aubio/src/cvec.c \
+    aubio/src/fmat.c \
+    aubio/src/fvec.c \
+    aubio/src/lvec.c \
+    aubio/src/mathutils.c \
+    aubio/src/musicutils.c \
+    aubio/src/vecutils.c \
+    aubio/src/notes/notes.c \
+    aubio/src/onset/onset.c \
+    aubio/src/onset/peakpicker.c \
+    aubio/src/pitch/pitch.c \
+    aubio/src/pitch/pitchfcomb.c \
+    aubio/src/pitch/pitchmcomb.c \
+    aubio/src/pitch/pitchschmitt.c \
+    aubio/src/pitch/pitchspecacf.c \
+    aubio/src/pitch/pitchyin.c \
+    aubio/src/pitch/pitchyinfast.c \
+    aubio/src/pitch/pitchyinfft.c \
+    aubio/src/spectral/awhitening.c \
+    aubio/src/spectral/dct.c \
+    aubio/src/spectral/dct_ooura.c \
+    aubio/src/spectral/dct_plain.c \
+    aubio/src/spectral/fft.c \
+    aubio/src/spectral/filterbank.c \
+    aubio/src/spectral/filterbank_mel.c \
+    aubio/src/spectral/mfcc.c \
+    aubio/src/spectral/ooura_fft8g.c \
+    aubio/src/spectral/phasevoc.c \
+    aubio/src/spectral/specdesc.c \
+    aubio/src/spectral/statistics.c \
+    aubio/src/spectral/tss.c \
+    aubio/src/tempo/beattracking.c \
+    aubio/src/temporal/a_weighting.c \
+    aubio/src/temporal/biquad.c \
+    aubio/src/temporal/c_weighting.c \
+    aubio/src/temporal/filter.c \
+    aubio/src/temporal/resampler.c \
+    aubio/src/tempo/tempo.c \
+    aubio/src/utils/hist.c \
+    aubio/src/utils/log.c \
+    aubio/src/utils/parameter.c \
+    aubio/src/utils/scale.c \
+    vamp-aubio-plugins/plugins/MelEnergy.cpp \
+    vamp-aubio-plugins/plugins/Mfcc.cpp \
+    vamp-aubio-plugins/plugins/Notes.cpp \
+    vamp-aubio-plugins/plugins/Onset.cpp \
+    vamp-aubio-plugins/plugins/Pitch.cpp \
+    vamp-aubio-plugins/plugins/Silence.cpp \
+    vamp-aubio-plugins/plugins/SpecDesc.cpp \
+    vamp-aubio-plugins/plugins/Tempo.cpp \
+    vamp-aubio-plugins/plugins/Types.cpp \
+    vamp-aubio-plugins/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
+
+HEADERS += \
+    azi/Azi.h
+
--- a/vamp-plugin-pack.pro	Tue Oct 22 14:45:45 2019 +0100
+++ b/vamp-plugin-pack.pro	Wed Nov 13 11:51:17 2019 +0000
@@ -8,7 +8,8 @@
         sub_pyin \
         sub_nnls_chroma \
         sub_qm_vamp_plugins \
-        sub_azi
+        sub_azi \
+        sub_aubio
 
 sub_sdk.file = vamp-plugin-sdk.pro
 sub_match.file = match-vamp.pro
@@ -17,6 +18,7 @@
 sub_nnls_chroma.file = nnls-chroma.pro
 sub_qm_vamp_plugins.file = qm-vamp-plugins.pro
 sub_azi.file = azi.pro
+sub_aubio.file = vamp-aubio-plugins.pro
 
 repoint.target = $$PWD/.repoint.point
 repoint.depends = $$PWD/repoint-project.json $$PWD/repoint-lock.json