remove configure-time --no-lv2 option. LV2 is integral to what we do

This commit is contained in:
Paul Davis 2018-12-28 09:47:55 -05:00
parent f385133a75
commit 04ccd328dc
9 changed files with 35 additions and 45 deletions

View File

@ -299,24 +299,23 @@ def configure(conf):
autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP',
atleast_version='2.0') atleast_version='2.0')
if Options.options.lv2: autowaf.check_pkg(conf, 'lv2', uselib_store='LV2',
autowaf.check_pkg(conf, 'lv2', uselib_store='LV2', atleast_version='1.0.0', mandatory=True)
atleast_version='1.0.0', mandatory=True) autowaf.check_pkg(conf, 'lv2', uselib_store='LV2_1_2_0',
autowaf.check_pkg(conf, 'lv2', uselib_store='LV2_1_2_0', atleast_version='1.2.0', mandatory=False)
atleast_version='1.2.0', mandatory=False) autowaf.check_pkg(conf, 'lv2', uselib_store='LV2_1_10_0',
autowaf.check_pkg(conf, 'lv2', uselib_store='LV2_1_10_0', atleast_version='1.10.0', mandatory=False)
atleast_version='1.10.0', mandatory=False) autowaf.check_pkg(conf, 'serd-0', uselib_store='SERD',
autowaf.check_pkg(conf, 'serd-0', uselib_store='SERD', atleast_version='0.14.0', mandatory=True)
atleast_version='0.14.0', mandatory=True) autowaf.check_pkg(conf, 'sord-0', uselib_store='SORD',
autowaf.check_pkg(conf, 'sord-0', uselib_store='SORD', atleast_version='0.8.0', mandatory=True)
atleast_version='0.8.0', mandatory=True) autowaf.check_pkg(conf, 'sratom-0', uselib_store='SRATOM',
autowaf.check_pkg(conf, 'sratom-0', uselib_store='SRATOM', atleast_version='0.2.0', mandatory=True)
atleast_version='0.2.0', mandatory=True) autowaf.check_pkg(conf, 'lilv-0', uselib_store='LILV',
autowaf.check_pkg(conf, 'lilv-0', uselib_store='LILV', atleast_version='0.24.2', mandatory=False)
atleast_version='0.24.2', mandatory=False) autowaf.check_pkg(conf, 'suil-0', uselib_store='SUIL',
autowaf.check_pkg(conf, 'suil-0', uselib_store='SUIL', atleast_version='0.6.0', mandatory=False)
atleast_version='0.6.0', mandatory=False) conf.define ('LV2_SUPPORT', 1)
conf.define ('LV2_SUPPORT', 1)
# non-standard LV2 extention -- TODO: add option to disable?? # non-standard LV2 extention -- TODO: add option to disable??
if conf.is_defined ('HAVE_LV2_1_10_0'): if conf.is_defined ('HAVE_LV2_1_10_0'):

View File

@ -15,10 +15,9 @@ def options(opt):
def configure(conf): def configure(conf):
conf.load('compiler_c') conf.load('compiler_c')
autowaf.configure(conf) autowaf.configure(conf)
if Options.options.lv2: autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0',
autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0', uselib_store='LV2_1_0_0')
uselib_store='LV2_1_0_0') autowaf.check_pkg(conf, 'cairo', uselib_store='CAIRO', atleast_version='1.12.0')
autowaf.check_pkg(conf, 'cairo', uselib_store='CAIRO', atleast_version='1.12.0')
def build(bld): def build(bld):
bundle = 'a-comp.lv2' bundle = 'a-comp.lv2'

View File

@ -15,10 +15,9 @@ def options(opt):
def configure(conf): def configure(conf):
conf.load('compiler_c') conf.load('compiler_c')
autowaf.configure(conf) autowaf.configure(conf)
if Options.options.lv2: autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0',
autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0', uselib_store='LV2_1_0_0')
uselib_store='LV2_1_0_0') autowaf.check_pkg(conf, 'cairo', uselib_store='CAIRO', atleast_version='1.12.0')
autowaf.check_pkg(conf, 'cairo', uselib_store='CAIRO', atleast_version='1.12.0')
def build(bld): def build(bld):
bundle = 'a-delay.lv2' bundle = 'a-delay.lv2'

View File

@ -15,10 +15,9 @@ def options(opt):
def configure(conf): def configure(conf):
conf.load('compiler_c') conf.load('compiler_c')
autowaf.configure(conf) autowaf.configure(conf)
if Options.options.lv2: autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0',
autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0', uselib_store='LV2_1_0_0')
uselib_store='LV2_1_0_0') autowaf.check_pkg(conf, 'cairo', uselib_store='CAIRO', atleast_version='1.12.0')
autowaf.check_pkg(conf, 'cairo', uselib_store='CAIRO', atleast_version='1.12.0')
def build(bld): def build(bld):
bundle = 'a-eq.lv2' bundle = 'a-eq.lv2'

View File

@ -15,10 +15,9 @@ def options(opt):
def configure(conf): def configure(conf):
conf.load('compiler_c') conf.load('compiler_c')
autowaf.configure(conf) autowaf.configure(conf)
if Options.options.lv2: autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0',
autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0', uselib_store='LV2_1_0_0')
uselib_store='LV2_1_0_0') autowaf.check_pkg(conf, 'cairo', uselib_store='CAIRO', atleast_version='1.12.0')
autowaf.check_pkg(conf, 'cairo', uselib_store='CAIRO', atleast_version='1.12.0')
def build(bld): def build(bld):
bundle = 'a-exp.lv2' bundle = 'a-exp.lv2'

View File

@ -15,9 +15,8 @@ def options(opt):
def configure(conf): def configure(conf):
conf.load('compiler_c') conf.load('compiler_c')
autowaf.configure(conf) autowaf.configure(conf)
if Options.options.lv2: autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0',
autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0', uselib_store='LV2_1_0_0')
uselib_store='LV2_1_0_0')
def build(bld): def build(bld):
bundle = 'a-fluidsynth.lv2' bundle = 'a-fluidsynth.lv2'

View File

@ -15,9 +15,8 @@ def options(opt):
def configure(conf): def configure(conf):
conf.load('compiler_c') conf.load('compiler_c')
autowaf.configure(conf) autowaf.configure(conf)
if Options.options.lv2: autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0',
autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0', uselib_store='LV2_1_0_0')
uselib_store='LV2_1_0_0')
def build(bld): def build(bld):
bundle = 'a-reverb.lv2' bundle = 'a-reverb.lv2'

View File

@ -15,9 +15,8 @@ def options(opt):
def configure(conf): def configure(conf):
conf.load('compiler_c') conf.load('compiler_c')
autowaf.configure(conf) autowaf.configure(conf)
if Options.options.lv2: autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0',
autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0', uselib_store='LV2_1_0_0')
uselib_store='LV2_1_0_0')
def build(bld): def build(bld):
bundle = 'reasonablesynth.lv2' bundle = 'reasonablesynth.lv2'

View File

@ -769,8 +769,6 @@ def options(opt):
help='Compile beatbox test app') help='Compile beatbox test app')
opt.add_option('--lv2', action='store_true', default=True, dest='lv2', opt.add_option('--lv2', action='store_true', default=True, dest='lv2',
help='Compile with support for LV2 (if Lilv+Suil is available)') help='Compile with support for LV2 (if Lilv+Suil is available)')
opt.add_option('--no-lv2', action='store_false', dest='lv2',
help='Do not compile with support for LV2')
opt.add_option('--lv2dir', type='string', help="install destination for builtin LV2 bundles [Default: LIBDIR/lv2]") opt.add_option('--lv2dir', type='string', help="install destination for builtin LV2 bundles [Default: LIBDIR/lv2]")
opt.add_option('--lxvst', action='store_true', default=True, dest='lxvst', opt.add_option('--lxvst', action='store_true', default=True, dest='lxvst',
help='Compile with support for linuxVST plugins') help='Compile with support for linuxVST plugins')