From f3d858f9dfa8e708cefb445c3825bca8304e897b Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sat, 4 Jan 2014 19:28:15 +0100 Subject: [PATCH] fix detection of aubio library - aubio-0.4 breaks API and ABI. ideally we'll want atleast_version='0.3.2', max_version='0.3.9' (or anything before 0.4.0) for the time being. but waf/autowaf don't seem to allow that. aubio-0.3.2 was the previous minimum requirement and is also the last release of audio-0.3.X, so we're good with exact_version for now. --- libs/ardour/wscript | 2 +- libs/vamp-plugins/wscript | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/ardour/wscript b/libs/ardour/wscript index 2a3c998ca1..dbc0335ecd 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -244,7 +244,7 @@ def configure(conf): 'libardour3', conf.env['MAJOR'], conf.env['MINOR'], 0) autowaf.configure(conf) autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO', - atleast_version='0.3.2') + exact_version='0.3.2') autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML') autowaf.check_pkg(conf, 'lrdf', uselib_store='LRDF', atleast_version='0.4.0') diff --git a/libs/vamp-plugins/wscript b/libs/vamp-plugins/wscript index 46198cc18e..9568e96367 100644 --- a/libs/vamp-plugins/wscript +++ b/libs/vamp-plugins/wscript @@ -26,7 +26,8 @@ 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) + autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO', mandatory=False, + exact_version='0.3.2') conf.write_config_header('libvampplugins-config.h', remove=False) def build(bld):