ardour/livetrax
13
0
Fork 0
Code

add a no-jack-metadata option for poor 12.04 souls

Browse Source 
(jack does have metadata support but ubuntu packaged
a version with a wrong header)
This commit is contained in:
Robin Gareus 2015-03-08 21:31:08 +01:00
parent 90110c4308
commit 9107a4b7fe
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/backends/jack/wscript
View File

@ -37,6 +37,9 @@ def configure(conf):
else: else:
conf.env['libjack_link'] = "link" conf.env['libjack_link'] = "link"
if not Options.options.libjack_meta:
conf.define ('NO_JACK_METADATA', 1)
def build(bld): def build(bld):
obj = bld(features = 'c cxx cxxshlib') obj = bld(features = 'c cxx cxxshlib')
@ -62,7 +65,6 @@ def build(bld):
if (bld.env['build_target'] == 'mingw'): if (bld.env['build_target'] == 'mingw'):
obj.uselib = [ 'PORTAUDIO' ] obj.uselib = [ 'PORTAUDIO' ]
obj.defines += [ 'NO_JACK_METADATA' ] # TODO bug stephane to at least update the headers
else: else:
obj.uselib = [ ] obj.uselib = [ ]

3
wscript
View File

@ -597,6 +597,8 @@ def options(opt):
help='Compile for use with gprofile') help='Compile for use with gprofile')
opt.add_option('--libjack', type='string', default="auto", dest='libjack_link', opt.add_option('--libjack', type='string', default="auto", dest='libjack_link',
help='libjack link mode [auto|link|weak]') help='libjack link mode [auto|link|weak]')
opt.add_option('--no-jack-metadata', action='store_false', default=True, dest='libjack_meta',
help='disable support for jack metadata')
opt.add_option('--internal-shared-libs', action='store_true', default=True, dest='internal_shared_libs', opt.add_option('--internal-shared-libs', action='store_true', default=True, dest='internal_shared_libs',
help='Build internal libs as shared libraries') help='Build internal libs as shared libraries')
opt.add_option('--internal-static-libs', action='store_false', dest='internal_shared_libs', opt.add_option('--internal-static-libs', action='store_false', dest='internal_shared_libs',
@ -1037,6 +1039,7 @@ const char* const ardour_config_info = "\\n\\
write_config_text('Freedesktop files', opts.freedesktop) write_config_text('Freedesktop files', opts.freedesktop)
write_config_text('JACK Backend', conf.env['BUILD_JACKBACKEND']) write_config_text('JACK Backend', conf.env['BUILD_JACKBACKEND'])
write_config_text('Libjack linking', conf.env['libjack_link']) write_config_text('Libjack linking', conf.env['libjack_link'])
write_config_text('Libjack metadata', not conf.is_defined('NO_JACK_METADATA'))
write_config_text('LV2 UI embedding', conf.is_defined('HAVE_SUIL')) write_config_text('LV2 UI embedding', conf.is_defined('HAVE_SUIL'))
write_config_text('LV2 support', conf.is_defined('LV2_SUPPORT')) write_config_text('LV2 support', conf.is_defined('LV2_SUPPORT'))
write_config_text('LXVST support', conf.is_defined('LXVST_SUPPORT')) write_config_text('LXVST support', conf.is_defined('LXVST_SUPPORT'))