Merge commit '231132e108804db7f832faf0d9d0dce238118e2a' into lib-rede…

…sign-conflicts
daschuer · Feb 25, 2018 · 8de673f · 8de673f
2 parents 2812b5f + 231132e
commit 8de673f
Show file tree

Hide file tree

Showing 70 changed files with 2,802 additions and 900 deletions.
diff --git a/build/features.py b/build/features.py
@@ -372,7 +372,7 @@ def sources(self, build):
 
 class Vamp(Feature):
     INTERNAL_LINK = False
-    INTERNAL_VAMP_PATH = '#lib/vamp-2.6'
+    INTERNAL_VAMP_PATH = '#lib/vamp'
 
     def description(self):
         return "Vamp Analyzer support"
@@ -393,9 +393,10 @@ def configure(self, build, conf):
         build.env.Append(CPPDEFINES='__VAMP__')
         build.env.Append(CPPDEFINES='kiss_fft_scalar=double')
 
-        # If there is no system vamp-hostdk installed, then we'll directly link
-        # the vamp-hostsdk.
-        if not conf.CheckLib(['vamp-hostsdk']):
+        # If there is no system vamp-hostsdk is installed or if the version
+        # of the installed vamp-hostsdk is less than the bundled version,
+        # then we'll directly link the bundled vamp-hostsdk
+        if not conf.CheckLib('vamp-hostsdk') or not conf.CheckForPKG('vamp-plugin-sdk', '2.7.1'):
             # For header includes
             build.env.Append(CPPPATH=[self.INTERNAL_VAMP_PATH])
             self.INTERNAL_LINK = True

diff --git a/lib/vamp-2.6/src/vamp-sdk/FFT.cpp b/lib/vamp-2.6/src/vamp-sdk/FFT.cpp
diff --git a/lib/vamp-2.6/src/vamp-sdk/FFTimpl.cpp b/lib/vamp-2.6/src/vamp-sdk/FFTimpl.cpp
diff --git a/lib/vamp-2.6/vamp-sdk/FFT.h b/lib/vamp-2.6/vamp-sdk/FFT.h