From ee5cfcfaf9b7dd66c6eed72c538c8fbe599711c4 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 17 Oct 2019 13:27:39 +0200 Subject: Update autowaf --- plugins/eg-amp.lv2/wscript | 2 +- plugins/eg-fifths.lv2/wscript | 2 +- plugins/eg-metro.lv2/wscript | 2 +- plugins/eg-midigate.lv2/wscript | 2 +- plugins/eg-params.lv2/wscript | 2 +- plugins/eg-sampler.lv2/wscript | 8 +++----- plugins/eg-scope.lv2/wscript | 8 +++----- waflib | 2 +- 8 files changed, 12 insertions(+), 16 deletions(-) diff --git a/plugins/eg-amp.lv2/wscript b/plugins/eg-amp.lv2/wscript index 6e44f08..2949937 100644 --- a/plugins/eg-amp.lv2/wscript +++ b/plugins/eg-amp.lv2/wscript @@ -20,7 +20,7 @@ def configure(conf): conf.load('lv2', cache=True) conf.load('autowaf', cache=True) - autowaf.check_pkg(conf, 'lv2', uselib_store='LV2') + conf.check_pkg('lv2', uselib_store='LV2') conf.check(features='c cshlib', lib='m', uselib_store='M', mandatory=False) diff --git a/plugins/eg-fifths.lv2/wscript b/plugins/eg-fifths.lv2/wscript index 95ab670..5bf0aff 100644 --- a/plugins/eg-fifths.lv2/wscript +++ b/plugins/eg-fifths.lv2/wscript @@ -20,7 +20,7 @@ def configure(conf): conf.load('lv2', cache=True) conf.load('autowaf', cache=True) - autowaf.check_pkg(conf, 'lv2', atleast_version='1.2.1', uselib_store='LV2') + conf.check_pkg('lv2 >= 1.2.1', uselib_store='LV2') def build(bld): bundle = 'eg-fifths.lv2' diff --git a/plugins/eg-metro.lv2/wscript b/plugins/eg-metro.lv2/wscript index 13b09aa..58f6743 100644 --- a/plugins/eg-metro.lv2/wscript +++ b/plugins/eg-metro.lv2/wscript @@ -20,7 +20,7 @@ def configure(conf): conf.load('lv2', cache=True) conf.load('autowaf', cache=True) - autowaf.check_pkg(conf, 'lv2', atleast_version='0.2.0', uselib_store='LV2') + conf.check_pkg('lv2 >= 0.2.0', uselib_store='LV2') conf.check(features='c cshlib', lib='m', uselib_store='M', mandatory=False) diff --git a/plugins/eg-midigate.lv2/wscript b/plugins/eg-midigate.lv2/wscript index 5dbc774..e95bf87 100644 --- a/plugins/eg-midigate.lv2/wscript +++ b/plugins/eg-midigate.lv2/wscript @@ -20,7 +20,7 @@ def configure(conf): conf.load('lv2', cache=True) conf.load('autowaf', cache=True) - autowaf.check_pkg(conf, 'lv2', uselib_store='LV2') + conf.check_pkg('lv2', uselib_store='LV2') def build(bld): bundle = 'eg-midigate.lv2' diff --git a/plugins/eg-params.lv2/wscript b/plugins/eg-params.lv2/wscript index 4a7d7a5..8e5095e 100644 --- a/plugins/eg-params.lv2/wscript +++ b/plugins/eg-params.lv2/wscript @@ -20,7 +20,7 @@ def configure(conf): conf.load('lv2', cache=True) conf.load('autowaf', cache=True) - autowaf.check_pkg(conf, 'lv2', atleast_version='1.12.1', uselib_store='LV2') + conf.check_pkg('lv2 >= 1.12.1', uselib_store='LV2') def build(bld): bundle = 'eg-params.lv2' diff --git a/plugins/eg-sampler.lv2/wscript b/plugins/eg-sampler.lv2/wscript index 7e33d68..1ff4bbd 100644 --- a/plugins/eg-sampler.lv2/wscript +++ b/plugins/eg-sampler.lv2/wscript @@ -20,11 +20,9 @@ def configure(conf): conf.load('lv2', cache=True) conf.load('autowaf', cache=True) - autowaf.check_pkg(conf, 'lv2', atleast_version='1.2.1', uselib_store='LV2') - autowaf.check_pkg(conf, 'sndfile', uselib_store='SNDFILE', - atleast_version='1.0.0', mandatory=True) - autowaf.check_pkg(conf, 'gtk+-2.0', uselib_store='GTK2', - atleast_version='2.18.0', mandatory=False) + conf.check_pkg('lv2 >= 1.2.1', uselib_store='LV2') + conf.check_pkg('sndfile >= 1.0.0', uselib_store='SNDFILE') + conf.check_pkg('gtk+-2.0 >= 2.18.0', uselib_store='GTK2', mandatory=False) conf.check(features='c cshlib', lib='m', uselib_store='M', mandatory=False) def build(bld): diff --git a/plugins/eg-scope.lv2/wscript b/plugins/eg-scope.lv2/wscript index ca3413d..5c91da6 100644 --- a/plugins/eg-scope.lv2/wscript +++ b/plugins/eg-scope.lv2/wscript @@ -20,11 +20,9 @@ def configure(conf): conf.load('lv2', cache=True) conf.load('autowaf', cache=True) - autowaf.check_pkg(conf, 'lv2', atleast_version='1.2.1', uselib_store='LV2') - autowaf.check_pkg(conf, 'cairo', uselib_store='CAIRO', - atleast_version='1.8.10', mandatory=True) - autowaf.check_pkg(conf, 'gtk+-2.0', uselib_store='GTK2', - atleast_version='2.18.0', mandatory=False) + conf.check_pkg('lv2 >= 1.2.1', uselib_store='LV2') + conf.check_pkg('cairo >= 1.8.10', uselib_store='CAIRO') + conf.check_pkg('gtk+-2.0 >= 2.18.0', uselib_store='GTK2', mandatory=False) def build(bld): bundle = 'eg-scope.lv2' diff --git a/waflib b/waflib index 2314e23..de76b89 160000 --- a/waflib +++ b/waflib @@ -1 +1 @@ -Subproject commit 2314e236ca6e7d94a26c3c17091da0f25f5867f3 +Subproject commit de76b89dc1039e2f7d6c6b229a8950156b0e5c94 -- cgit v1.2.1