X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fvamp-plugins%2Fwscript;h=f3e0024ee949d7e3c67f1d1c165c491e91431b64;hb=ed4909bd59a2bc62b589e51c4faef66118071141;hp=9568e963670e9e231c06a753921cbb73e5e1d58a;hpb=3020b224fa2d6e1b6b8a576e8e8e211e0585f2a2;p=ardour.git

diff --git a/libs/vamp-plugins/wscript b/libs/vamp-plugins/wscript
index 9568e96367..f3e0024ee9 100644
--- a/libs/vamp-plugins/wscript
+++ b/libs/vamp-plugins/wscript
@@ -26,8 +26,10 @@ def configure(conf):
     conf.load('compiler_cxx')
     autowaf.configure(conf)
     autowaf.check_pkg(conf, 'fftw3f', uselib_store='FFTW3F', mandatory=True)
-    autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO', mandatory=False,
-                      exact_version='0.3.2')
+    autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO',
+                      atleast_version='0.3.2')
+    autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO4',
+                      atleast_version='0.4.0', mandatory=False)
     conf.write_config_header('libvampplugins-config.h', remove=False)
 
 def build(bld):
@@ -36,22 +38,36 @@ def build(bld):
     obj.source = '''
             plugins.cpp
             AmplitudeFollower.cpp
+            BarBeatTrack.cpp
+            BeatTrack.cpp
+            ChromagramPlugin.cpp
+            EBUr128.cpp
+            ebu_r128_proc.cc
+            KeyDetect.cpp
             OnsetDetect.cpp
             PercussionOnsetDetector.cpp
+            SimilarityPlugin.cpp
             SpectralCentroid.cpp
+            TonalChangeDetect.cpp
+            Transcription.cpp
+            TruePeak.cpp
             ZeroCrossing.cpp
     '''
     obj.export_includes = ['.']
     obj.includes     = ['.']
     obj.name         = 'libardourvampplugins'
     obj.target       = 'ardourvampplugins'
-    obj.uselib       = 'FFTW3F'
-    obj.use          = 'libvampplugin libqmdsp'
-    if bld.is_defined('HAVE_AUBIO'):
+    obj.uselib       = 'FFTW3F VAMPSDK QMDSP'
+    obj.use          = 'libvampplugin libqm-dsp'
+    autowaf.ensure_visible_symbols (obj, True)
+    if bld.is_defined('HAVE_AUBIO4'):
+        obj.source += ' Onset.cpp '
+        obj.uselib += ' AUBIO4 '
+    elif bld.is_defined('HAVE_AUBIO'):
         obj.source += ' Onset.cpp '
         obj.uselib += ' AUBIO '
     obj.vnum         = LIBARDOURVAMPPLUGINS_LIB_VERSION
-    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'vamp')
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'vamp')
 
 def shutdown():
     autowaf.shutdown()