Mercurial > hg > vamp-plugin-pack

changeset 110:721eca4cf59b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update to avoid FFTW dependency from UA Vamp Plugins
author Chris Cannam
date Thu, 05 Mar 2020 11:55:26 +0000
parents 78de58bfc3df
children fe176cd5280c
files repoint-lock.json repoint-project.json ua-vamp-plugins.pro vamp-fanchirp.pro
diffstat 4 files changed, 6 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/repoint-lock.json	Tue Mar 03 11:52:54 2020 +0000
+++ b/repoint-lock.json	Thu Mar 05 11:55:26 2020 +0000
@@ -61,7 +61,7 @@
       "pin": "90bd27a23123fcc524c31787c9c8fc0ae4c79378"
     },
     "ua-vamp-plugins": {
-      "pin": "d2a57e002f5a3a0cf5311e1f77a8b21bf932f7bb"
+      "pin": "5867554d82feb486eef67efde9ea540450097b5f"
     },
     "vamp-libxtract-plugins": {
       "pin": "81146373f024"
--- a/repoint-project.json	Tue Mar 03 11:52:54 2020 +0000
+++ b/repoint-project.json	Thu Mar 05 11:55:26 2020 +0000
@@ -122,9 +122,9 @@
         "ua-vamp-plugins": {
             "vcs": "git",
             "service": "github",
-            "owner": "pertusa",
+            "owner": "cannam",
             "repository": "UAVampPlugins",
-            "pin": "d2a57e002f5a3a0cf5311e1f77a8b21bf932f7bb"
+            "pin": "5867554d82feb486eef67efde9ea540450097b5f"
         },
         "vamp-libxtract-plugins": {
             "vcs": "hg",
--- a/ua-vamp-plugins.pro	Tue Mar 03 11:52:54 2020 +0000
+++ b/ua-vamp-plugins.pro	Thu Mar 05 11:55:26 2020 +0000
@@ -21,17 +21,16 @@
 QMAKE_CXXFLAGS -= -Werror
 
 win32-msvc* {
-    LIBS += -L$$PWD/sv-dependency-builds/win64-msvc/lib -lfftw3
     LIBS += -EXPORT:vampGetPluginDescriptor
 }
 win32-g++* {
     LIBS += -Wl,--version-script=$$PWD/ua-vamp-plugins/vamp-plugin.map
 }
 linux* {
-    LIBS += -Wl,-Bstatic -Lsv-dependency-builds/linux/lib/fftw-3.3.8-x86_64 -lfftw3 -Wl,-Bdynamic -Wl,--version-script=$$PWD/ua-vamp-plugins/vamp-plugin.map -Wl,-no-undefined
+    LIBS += -Wl,--version-script=$$PWD/ua-vamp-plugins/vamp-plugin.map -Wl,-no-undefined
 }
 macx* {
-    LIBS += -exported_symbols_list $$PWD/ua-vamp-plugins/vamp-plugin.list -lfftw3
+    LIBS += -exported_symbols_list $$PWD/ua-vamp-plugins/vamp-plugin.list
 }
 
 QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out
--- a/vamp-fanchirp.pro	Tue Mar 03 11:52:54 2020 +0000
+++ b/vamp-fanchirp.pro	Thu Mar 05 11:55:26 2020 +0000
@@ -21,14 +21,13 @@
 QMAKE_CXXFLAGS -= -Werror
 
 win32-msvc* {
-    LIBS += -L$$PWD/sv-dependency-builds/win64-msvc/lib -lfftw3
     LIBS += -EXPORT:vampGetPluginDescriptor
 }
 win32-g++* {
     LIBS += -Wl,--version-script=$$PWD/vamp-fanchirp/vamp-plugin.map
 }
 linux* {
-    LIBS += -Wl,-Bstatic -Lsv-dependency-builds/linux/lib/fftw-3.3.8-x86_64 -lfftw3 -Wl,-Bdynamic -Wl,--version-script=$$PWD/vamp-fanchirp/vamp-plugin.map
+    LIBS += -Wl,--version-script=$$PWD/vamp-fanchirp/vamp-plugin.map
 }
 macx* {
     LIBS += -exported_symbols_list $$PWD/vamp-fanchirp/vamp-plugin.list