From 8dbc16a929a0c547088b39b7820f6e2c52ace165 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 15 Sep 2020 17:03:54 +0200 Subject: [PATCH] Remove unused LV2 configuration checks 3/3 LV2 has been mandatory since 6.0 (04ccd328dc9ea) --- libs/plugins/a-comp.lv2/wscript | 41 ++++++++++--------- libs/plugins/a-delay.lv2/wscript | 43 ++++++++++---------- libs/plugins/a-eq.lv2/wscript | 43 ++++++++++---------- libs/plugins/a-exp.lv2/wscript | 41 ++++++++++--------- libs/plugins/a-fluidsynth.lv2/wscript | 51 ++++++++++++------------ libs/plugins/a-reverb.lv2/wscript | 43 ++++++++++---------- libs/plugins/reasonablesynth.lv2/wscript | 37 +++++++++-------- 7 files changed, 146 insertions(+), 153 deletions(-) diff --git a/libs/plugins/a-comp.lv2/wscript b/libs/plugins/a-comp.lv2/wscript index c739e4bea7..f2948a12c1 100644 --- a/libs/plugins/a-comp.lv2/wscript +++ b/libs/plugins/a-comp.lv2/wscript @@ -24,27 +24,26 @@ def build(bld): module_pat = re.sub('^lib', '', bld.env.cshlib_PATTERN) module_ext = module_pat[module_pat.rfind('.'):] - if bld.is_defined('HAVE_LV2'): - # Build RDF files - for i in ['manifest.ttl', 'a-comp.ttl', 'a-comp#stereo.ttl', 'presets.ttl']: - obj = bld(features='subst') - obj.source = i + '.in' - obj.target = '../../LV2/%s/%s' % (bundle, i) - obj.install_path = '${LV2DIR}/%s' % bundle - obj.chmod = Utils.O644 - obj.LIB_EXT = module_ext + # Build RDF files + for i in ['manifest.ttl', 'a-comp.ttl', 'a-comp#stereo.ttl', 'presets.ttl']: + obj = bld(features='subst') + obj.source = i + '.in' + obj.target = '../../LV2/%s/%s' % (bundle, i) + obj.install_path = '${LV2DIR}/%s' % bundle + obj.chmod = Utils.O644 + obj.LIB_EXT = module_ext - # Build plugin library - obj = bld(features = 'c cshlib', - source = 'a-comp.c', - name = 'a-comp', - cflags = [ bld.env['compiler_flags_dict']['pic'], bld.env['compiler_flags_dict']['c99'] ], - includes = [ '../../ardour', '../shared' ], - target = '../../LV2/%s/a-comp' % bundle, - install_path = '${LV2DIR}/%s' % bundle, - uselib = 'CAIRO', - use = 'LV2_1_0_0' - ) - obj.env.cshlib_PATTERN = module_pat + # Build plugin library + obj = bld(features = 'c cshlib', + source = 'a-comp.c', + name = 'a-comp', + cflags = [ bld.env['compiler_flags_dict']['pic'], bld.env['compiler_flags_dict']['c99'] ], + includes = [ '../../ardour', '../shared' ], + target = '../../LV2/%s/a-comp' % bundle, + install_path = '${LV2DIR}/%s' % bundle, + uselib = 'CAIRO', + use = 'LV2_1_0_0' + ) + obj.env.cshlib_PATTERN = module_pat # vi:set ts=4 sw=4 et: diff --git a/libs/plugins/a-delay.lv2/wscript b/libs/plugins/a-delay.lv2/wscript index 3458dc7ea1..1699ca72d7 100644 --- a/libs/plugins/a-delay.lv2/wscript +++ b/libs/plugins/a-delay.lv2/wscript @@ -24,28 +24,27 @@ def build(bld): module_pat = re.sub('^lib', '', bld.env.cshlib_PATTERN) module_ext = module_pat[module_pat.rfind('.'):] - if bld.is_defined('HAVE_LV2'): - # Build RDF files - for i in ['manifest.ttl', 'a-delay.ttl', 'presets.ttl']: - obj = bld(features='subst') - obj.source = i + '.in' - obj.target = '../../LV2/%s/%s' % (bundle, i) - obj.install_path = '${LV2DIR}/%s' % bundle - obj.chmod = Utils.O644 - obj.LIB_EXT = module_ext + # Build RDF files + for i in ['manifest.ttl', 'a-delay.ttl', 'presets.ttl']: + obj = bld(features='subst') + obj.source = i + '.in' + obj.target = '../../LV2/%s/%s' % (bundle, i) + obj.install_path = '${LV2DIR}/%s' % bundle + obj.chmod = Utils.O644 + obj.LIB_EXT = module_ext - # Build plugin library - obj = bld(features = 'c cshlib', - source = 'a-delay.c', - name = 'a-delay', - cflags = [ bld.env['compiler_flags_dict']['pic'], bld.env['compiler_flags_dict']['c99'] ], - includes = [ '../../ardour' ], - target = '../../LV2/%s/a-delay' % bundle, - install_path = '${LV2DIR}/%s' % bundle, - uselib = 'CAIRO', - use = 'LV2_1_0_0' - ) - obj.env.cshlib_PATTERN = module_pat - obj.env.cxxshlib_PATTERN = module_pat + # Build plugin library + obj = bld(features = 'c cshlib', + source = 'a-delay.c', + name = 'a-delay', + cflags = [ bld.env['compiler_flags_dict']['pic'], bld.env['compiler_flags_dict']['c99'] ], + includes = [ '../../ardour' ], + target = '../../LV2/%s/a-delay' % bundle, + install_path = '${LV2DIR}/%s' % bundle, + uselib = 'CAIRO', + use = 'LV2_1_0_0' + ) + obj.env.cshlib_PATTERN = module_pat + obj.env.cxxshlib_PATTERN = module_pat # vi:set ts=4 sw=4 et: diff --git a/libs/plugins/a-eq.lv2/wscript b/libs/plugins/a-eq.lv2/wscript index fd6853a79d..cfb82d5ee2 100644 --- a/libs/plugins/a-eq.lv2/wscript +++ b/libs/plugins/a-eq.lv2/wscript @@ -24,28 +24,27 @@ def build(bld): module_pat = re.sub('^lib', '', bld.env.cshlib_PATTERN) module_ext = module_pat[module_pat.rfind('.'):] - if bld.is_defined('HAVE_LV2'): - # Build RDF files - for i in ['manifest.ttl', 'a-eq.ttl']: - obj = bld(features='subst') - obj.source = i + '.in' - obj.target = '../../LV2/%s/%s' % (bundle, i) - obj.install_path = '${LV2DIR}/%s' % bundle - obj.chmod = Utils.O644 - obj.LIB_EXT = module_ext + # Build RDF files + for i in ['manifest.ttl', 'a-eq.ttl']: + obj = bld(features='subst') + obj.source = i + '.in' + obj.target = '../../LV2/%s/%s' % (bundle, i) + obj.install_path = '${LV2DIR}/%s' % bundle + obj.chmod = Utils.O644 + obj.LIB_EXT = module_ext - # Build plugin library - obj = bld(features = 'c cshlib', - source = 'a-eq.c', - name = 'a-eq', - cflags = [ bld.env['compiler_flags_dict']['pic'], bld.env['compiler_flags_dict']['c99'] ], - includes = [ '../../ardour' ], - target = '../../LV2/%s/a-eq' % bundle, - install_path = '${LV2DIR}/%s' % bundle, - uselib = 'CAIRO', - use = 'LV2_1_0_0' - ) - obj.env.cshlib_PATTERN = module_pat - obj.env.cxxshlib_PATTERN = module_pat + # Build plugin library + obj = bld(features = 'c cshlib', + source = 'a-eq.c', + name = 'a-eq', + cflags = [ bld.env['compiler_flags_dict']['pic'], bld.env['compiler_flags_dict']['c99'] ], + includes = [ '../../ardour' ], + target = '../../LV2/%s/a-eq' % bundle, + install_path = '${LV2DIR}/%s' % bundle, + uselib = 'CAIRO', + use = 'LV2_1_0_0' + ) + obj.env.cshlib_PATTERN = module_pat + obj.env.cxxshlib_PATTERN = module_pat # vi:set ts=4 sw=4 et: diff --git a/libs/plugins/a-exp.lv2/wscript b/libs/plugins/a-exp.lv2/wscript index fb526376a4..fd42c9bd57 100644 --- a/libs/plugins/a-exp.lv2/wscript +++ b/libs/plugins/a-exp.lv2/wscript @@ -24,27 +24,26 @@ def build(bld): module_pat = re.sub('^lib', '', bld.env.cshlib_PATTERN) module_ext = module_pat[module_pat.rfind('.'):] - if bld.is_defined('HAVE_LV2'): - # Build RDF files - for i in ['manifest.ttl', 'a-exp.ttl', 'a-exp#stereo.ttl']: - obj = bld(features='subst') - obj.source = i + '.in' - obj.target = '../../LV2/%s/%s' % (bundle, i) - obj.install_path = '${LV2DIR}/%s' % bundle - obj.chmod = Utils.O644 - obj.LIB_EXT = module_ext + # Build RDF files + for i in ['manifest.ttl', 'a-exp.ttl', 'a-exp#stereo.ttl']: + obj = bld(features='subst') + obj.source = i + '.in' + obj.target = '../../LV2/%s/%s' % (bundle, i) + obj.install_path = '${LV2DIR}/%s' % bundle + obj.chmod = Utils.O644 + obj.LIB_EXT = module_ext - # Build plugin library - obj = bld(features = 'c cshlib', - source = 'a-exp.c', - name = 'a-exp', - cflags = [ bld.env['compiler_flags_dict']['pic'], bld.env['compiler_flags_dict']['c99'] ], - includes = [ '../../ardour', '../shared' ], - target = '../../LV2/%s/a-exp' % bundle, - install_path = '${LV2DIR}/%s' % bundle, - uselib = 'CAIRO', - use = 'LV2_1_0_0' - ) - obj.env.cshlib_PATTERN = module_pat + # Build plugin library + obj = bld(features = 'c cshlib', + source = 'a-exp.c', + name = 'a-exp', + cflags = [ bld.env['compiler_flags_dict']['pic'], bld.env['compiler_flags_dict']['c99'] ], + includes = [ '../../ardour', '../shared' ], + target = '../../LV2/%s/a-exp' % bundle, + install_path = '${LV2DIR}/%s' % bundle, + uselib = 'CAIRO', + use = 'LV2_1_0_0' + ) + obj.env.cshlib_PATTERN = module_pat # vi:set ts=4 sw=4 et: diff --git a/libs/plugins/a-fluidsynth.lv2/wscript b/libs/plugins/a-fluidsynth.lv2/wscript index a2c5cdc0ed..eb8eeaa39c 100644 --- a/libs/plugins/a-fluidsynth.lv2/wscript +++ b/libs/plugins/a-fluidsynth.lv2/wscript @@ -23,34 +23,33 @@ def build(bld): module_pat = re.sub('^lib', '', bld.env.cshlib_PATTERN) module_ext = module_pat[module_pat.rfind('.'):] - if bld.is_defined('HAVE_LV2'): - # Build RDF files - for i in ['manifest.ttl', 'a-fluidsynth.ttl']: - obj = bld(features='subst') - obj.source = i + '.in' - obj.target = '../../LV2/%s/%s' % (bundle, i) - obj.install_path = '${LV2DIR}/%s' % bundle - obj.chmod = Utils.O644 - obj.LIB_EXT = module_ext + # Build RDF files + for i in ['manifest.ttl', 'a-fluidsynth.ttl']: + obj = bld(features='subst') + obj.source = i + '.in' + obj.target = '../../LV2/%s/%s' % (bundle, i) + obj.install_path = '${LV2DIR}/%s' % bundle + obj.chmod = Utils.O644 + obj.LIB_EXT = module_ext - # Build plugin library - obj = bld(features = 'cxx cshlib', - source = 'a-fluidsynth.cc', - name = 'a-fluidsynth', - cxxflags = [ bld.env['compiler_flags_dict']['pic'] ], - includes = [ '../../ardour' ], - target = '../../LV2/%s/a-fluidsynth' % bundle, - install_path = '${LV2DIR}/%s' % bundle, - uselib = ['LIBFLUIDSYNTH', 'GLIB'], - use = ['LV2_1_0_0'] - ) + # Build plugin library + obj = bld(features = 'cxx cshlib', + source = 'a-fluidsynth.cc', + name = 'a-fluidsynth', + cxxflags = [ bld.env['compiler_flags_dict']['pic'] ], + includes = [ '../../ardour' ], + target = '../../LV2/%s/a-fluidsynth' % bundle, + install_path = '${LV2DIR}/%s' % bundle, + uselib = ['LIBFLUIDSYNTH', 'GLIB'], + use = ['LV2_1_0_0'] + ) - if bld.is_defined('USE_EXTERNAL_LIBS'): - obj.uselib.extend(['LIBFLUIDSYNTH']) - else: - obj.use.extend(['libfluidsynth_includes', 'libfluidsynth']) + if bld.is_defined('USE_EXTERNAL_LIBS'): + obj.uselib.extend(['LIBFLUIDSYNTH']) + else: + obj.use.extend(['libfluidsynth_includes', 'libfluidsynth']) - obj.env.cshlib_PATTERN = module_pat - obj.env.cxxshlib_PATTERN = module_pat + obj.env.cshlib_PATTERN = module_pat + obj.env.cxxshlib_PATTERN = module_pat # vi:set ts=4 sw=4 et: diff --git a/libs/plugins/a-reverb.lv2/wscript b/libs/plugins/a-reverb.lv2/wscript index 6196af70b1..60ca671c08 100644 --- a/libs/plugins/a-reverb.lv2/wscript +++ b/libs/plugins/a-reverb.lv2/wscript @@ -23,28 +23,27 @@ def build(bld): module_pat = re.sub('^lib', '', bld.env.cshlib_PATTERN) module_ext = module_pat[module_pat.rfind('.'):] - if bld.is_defined('HAVE_LV2'): - # Build RDF files - for i in ['manifest.ttl', 'a-reverb.ttl']: - obj = bld(features='subst') - obj.source = i + '.in' - obj.target = '../../LV2/%s/%s' % (bundle, i) - obj.install_path = '${LV2DIR}/%s' % bundle - obj.chmod = Utils.O644 - obj.LIB_EXT = module_ext + # Build RDF files + for i in ['manifest.ttl', 'a-reverb.ttl']: + obj = bld(features='subst') + obj.source = i + '.in' + obj.target = '../../LV2/%s/%s' % (bundle, i) + obj.install_path = '${LV2DIR}/%s' % bundle + obj.chmod = Utils.O644 + obj.LIB_EXT = module_ext - # Build plugin library - obj = bld(features = 'c cshlib', - source = 'a-reverb.c', - name = 'a-reverb', - cflags = [ bld.env['compiler_flags_dict']['pic'], bld.env['compiler_flags_dict']['c99'] ], - includes = [ '../../ardour' ], - target = '../../LV2/%s/a-reverb' % bundle, - install_path = '${LV2DIR}/%s' % bundle, - uselib = 'CAIRO', - use = 'LV2_1_0_0' - ) - obj.env.cshlib_PATTERN = module_pat - obj.env.cxxshlib_PATTERN = module_pat + # Build plugin library + obj = bld(features = 'c cshlib', + source = 'a-reverb.c', + name = 'a-reverb', + cflags = [ bld.env['compiler_flags_dict']['pic'], bld.env['compiler_flags_dict']['c99'] ], + includes = [ '../../ardour' ], + target = '../../LV2/%s/a-reverb' % bundle, + install_path = '${LV2DIR}/%s' % bundle, + uselib = 'CAIRO', + use = 'LV2_1_0_0' + ) + obj.env.cshlib_PATTERN = module_pat + obj.env.cxxshlib_PATTERN = module_pat # vi:set ts=4 sw=4 et: diff --git a/libs/plugins/reasonablesynth.lv2/wscript b/libs/plugins/reasonablesynth.lv2/wscript index 2ee6b399f3..7c382ae533 100644 --- a/libs/plugins/reasonablesynth.lv2/wscript +++ b/libs/plugins/reasonablesynth.lv2/wscript @@ -23,25 +23,24 @@ def build(bld): module_pat = re.sub('^lib', '', bld.env.cshlib_PATTERN) module_ext = module_pat[module_pat.rfind('.'):] - if bld.is_defined('HAVE_LV2'): - # Build RDF files - for i in ['manifest.ttl', 'reasonablesynth.ttl']: - obj = bld(features='subst') - obj.source = i + '.in' - obj.target = '../../LV2/%s/%s' % (bundle, i) - obj.install_path = '${LV2DIR}/%s' % bundle - obj.chmod = Utils.O644 - obj.LIB_EXT = module_ext + # Build RDF files + for i in ['manifest.ttl', 'reasonablesynth.ttl']: + obj = bld(features='subst') + obj.source = i + '.in' + obj.target = '../../LV2/%s/%s' % (bundle, i) + obj.install_path = '${LV2DIR}/%s' % bundle + obj.chmod = Utils.O644 + obj.LIB_EXT = module_ext - # Build plugin library - obj = bld(features = 'c cshlib', - source = 'lv2.c', - dep_files = 'rsynth.c', - name = 'reasonablesynth', - target = '../../LV2/%s/reasonablesynth' % bundle, - install_path = '${LV2DIR}/%s' % bundle, - use = 'LV2_1_0_0' - ) - obj.env.cshlib_PATTERN = module_pat + # Build plugin library + obj = bld(features = 'c cshlib', + source = 'lv2.c', + dep_files = 'rsynth.c', + name = 'reasonablesynth', + target = '../../LV2/%s/reasonablesynth' % bundle, + install_path = '${LV2DIR}/%s' % bundle, + use = 'LV2_1_0_0' + ) + obj.env.cshlib_PATTERN = module_pat # vi:set ts=4 sw=4 et: