X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fwscript;h=b4a50a888b0eca3e2e57296c255e0fbff901466d;hb=79db9422ac70605cb3b706c3a19cf1c4e00af2f1;hp=d6b72dbf2de9df9370816c15756f24897870d005;hpb=7c87036ee3ba9dc4cc8b6f60c5a9e6dd399b1285;p=ardour.git diff --git a/libs/ardour/wscript b/libs/ardour/wscript index d6b72dbf2d..b4a50a888b 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -18,12 +18,12 @@ LIBARDOUR_VERSION = "%s.%s.%s" % (MAJOR, MINOR, MICRO) LIBARDOUR_LIB_VERSION = '3.0.0' # default state file version for this build -CURRENT_SESSION_FILE_VERSION = 3000 +CURRENT_SESSION_FILE_VERSION = 3001 # Variables for 'waf dist' APPNAME = 'libardour3' VERSION = LIBARDOUR_VERSION -I18N_PACKAGE = 'libardour3' +I18N_PACKAGE = 'ardour3' # Mandatory variables top = '.' @@ -55,6 +55,7 @@ libardour_sources = [ 'automation.cc', 'automation_control.cc', 'automation_list.cc', + 'automation_watch.cc', 'beats_frames_converter.cc', 'broadcast_info.cc', 'buffer.cc', @@ -62,7 +63,6 @@ libardour_sources = [ 'buffer_set.cc', 'bundle.cc', 'butler.cc', - 'callback.cc', 'capturing_processor.cc', 'chan_count.cc', 'chan_mapping.cc', @@ -70,8 +70,6 @@ libardour_sources = [ 'config_text.cc', 'control_protocol_manager.cc', 'control_protocol_search_path.cc', - 'crossfade.cc', - 'crossfade_binder.cc', 'cycle_timer.cc', 'data_type.cc', 'default_click.cc', @@ -103,11 +101,11 @@ libardour_sources = [ 'filesystem_paths.cc', 'filter.cc', 'find_session.cc', - 'gain.cc', 'globals.cc', 'graph.cc', 'graphnode.cc', 'import.cc', + 'instrument_info.cc', 'internal_return.cc', 'internal_send.cc', 'interpolation.cc', @@ -117,6 +115,7 @@ libardour_sources = [ 'ladspa_plugin.cc', 'location.cc', 'location_importer.cc', + 'ltc_slave.cc', 'meter.cc', 'midi_automation_list_binder.cc', 'midi_buffer.cc', @@ -124,6 +123,7 @@ libardour_sources = [ 'midi_diskstream.cc', 'midi_model.cc', 'midi_patch_manager.cc', + 'midi_patch_search_path.cc', 'midi_playlist.cc', 'midi_playlist_source.cc', 'midi_port.cc', @@ -139,7 +139,6 @@ libardour_sources = [ 'mtc_slave.cc', 'mtdm.cc', 'mute_master.cc', - 'named_selection.cc', 'onset_detector.cc', 'operations.cc', 'pan_controllable.cc', @@ -185,6 +184,7 @@ libardour_sources = [ 'session_events.cc', 'session_export.cc', 'session_handle.cc', + 'session_ltc.cc', 'session_metadata.cc', 'session_midi.cc', 'session_object.cc', @@ -195,7 +195,6 @@ libardour_sources = [ 'session_state_utils.cc', 'session_time.cc', 'session_transport.cc', - 'session_utils.cc', 'slave.cc', 'smf_source.cc', 'sndfile_helpers.cc', @@ -218,7 +217,7 @@ libardour_sources = [ 'user_bundle.cc', 'utils.cc', 'version.cc', - 'vst_plugin.cc' + 'worker.cc' ] def flac_supported(): @@ -258,11 +257,24 @@ def configure(conf): autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', atleast_version='2.0') if Options.options.lv2: + autowaf.check_pkg(conf, 'lv2', uselib_store='LV2', + atleast_version='1.0.0', mandatory=True) + autowaf.check_pkg(conf, 'lv2', uselib_store='NEW_LV2', + atleast_version='1.0.15', mandatory=False) + autowaf.check_pkg(conf, 'serd-0', uselib_store='SERD', + atleast_version='0.14.0', mandatory=True) + autowaf.check_pkg(conf, 'sord-0', uselib_store='SORD', + atleast_version='0.8.0', mandatory=True) + autowaf.check_pkg(conf, 'sratom-0', uselib_store='SRATOM', + atleast_version='0.2.0', mandatory=True) autowaf.check_pkg(conf, 'lilv-0', uselib_store='LILV', - atleast_version='0.0.0', mandatory=False) - if conf.is_defined('HAVE_LILV'): - autowaf.check_pkg(conf, 'suil-0', uselib_store='SUIL', - atleast_version='0.2.0', mandatory=False) + atleast_version='0.14.0', mandatory=True) + autowaf.check_pkg(conf, 'lilv-0', uselib_store='NEW_LILV', + atleast_version='0.15.0', mandatory=False) + autowaf.check_pkg(conf, 'suil-0', uselib_store='SUIL', + atleast_version='0.6.0', mandatory=False) + conf.define ('LV2_SUPPORT', 1) + # autowaf.check_pkg(conf, 'soundtouch-1.0', uselib_store='SOUNDTOUCH', # mandatory=False) autowaf.check_pkg(conf, 'cppunit', uselib_store='CPPUNIT', @@ -281,6 +293,7 @@ def configure(conf): conf.define('CURRENT_SESSION_FILE_VERSION', CURRENT_SESSION_FILE_VERSION) conf.check(header_name='sys/vfs.h', define_name='HAVE_SYS_VFS_H',mandatory=False) + conf.check(header_name='sys/statvfs.h', define_name='HAVE_SYS_STATVFS_H',mandatory=False) conf.check(header_name='jack/session.h', uselib = [ 'JACK' ], define_name='HAVE_JACK_SESSION') @@ -328,15 +341,24 @@ int main(int argc, char **argv) { mandatory = True, errmsg = missing_jack_message) + conf.check_cc(fragment = ''' +#include +int main(int argc, char** argv) { + jack_position_t pos; + pos.valid & JackVideoFrameOffset; + return 0; +}''', + uselib= [ 'JACK' ], + msg = 'Checking for JackVideoFrameOffset', + define_name = 'HAVE_JACK_VIDEO_SUPPORT', + mandatory = False, + okmsg = 'present') + if flac_supported(): conf.define ('HAVE_FLAC', 1) if ogg_supported(): conf.define ('HAVE_OGG', 1) - if Options.options.lv2 and conf.is_defined('HAVE_LILV'): - print "LV2 option was ", Options.options.lv2 - conf.define ('LV2_SUPPORT', 1) - conf.write_config_header('libardour-config.h', remove=False) # Boost headers @@ -359,19 +381,16 @@ def build(bld): 'OSX','BOOST','CURL','DL'] obj.use = ['libpbd','libmidipp','libevoral','libvamphost', 'libvampplugin','libtaglib','librubberband', - 'libaudiographer'] + 'libaudiographer','libltc'] obj.vnum = LIBARDOUR_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') obj.defines = [ 'PACKAGE="' + I18N_PACKAGE + '"', 'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"', 'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"', - 'MODULE_DIR="' + os.path.normpath(bld.env['LIBDIR']) + '"', - 'LOCALEDIR="' + os.path.join( - os.path.normpath(bld.env['DATADIR']), 'locale') + '"', - 'VAMP_DIR="' + os.path.join( - os.path.normpath(bld.env['LIBDIR']), 'ardour3', 'vamp') + '"', - 'PROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"' + 'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"', + 'PROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"', + 'EVORAL_MIDI_XML=1' ] #obj.source += ' st_stretch.cc st_pitch.cc ' @@ -379,8 +398,7 @@ def build(bld): #obj.add_objects = 'default/libs/surfaces/control_protocol/smpte_1.o' if bld.is_defined('HAVE_LILV') : - obj.source += [ 'lv2_plugin_lilv.cc', 'lv2_event_buffer.cc', - 'uri_map.cc', 'rdff.c' ] + obj.source += ['lv2_plugin.cc', 'lv2_evbuf.c', 'uri_map.cc'] obj.uselib += ['LILV'] if bld.is_defined('HAVE_SUIL'): obj.uselib += ['SUIL'] @@ -395,16 +413,17 @@ def build(bld): obj.defines += [ 'LXVST_SUPPORT' ] if bld.is_defined('WINDOWS_VST_SUPPORT') or bld.is_defined('LXVST_SUPPORT'): - obj.source += [ 'session_vst.cc' ] + obj.source += [ 'session_vst.cc', 'vst_plugin.cc' ] if bld.is_defined('HAVE_COREAUDIO'): obj.source += [ 'coreaudiosource.cc', 'caimportable.cc' ] obj.use += ['libappleutility'] + + if bld.is_defined('AUDIOUNIT_SUPPORT'): obj.source += [ 'audio_unit.cc' ] if Options.options.fpu_optimization: - if (bld.env['build_target'] == 'i386' - or bld.env['build_target'] == 'i686'): + if (bld.env['build_target'] == 'i386' or bld.env['build_target'] == 'i686'): obj.source += [ 'sse_functions_xmm.cc', 'sse_functions.s' ] elif bld.env['build_target'] == 'x86_64': obj.source += [ 'sse_functions_xmm.cc', 'sse_functions_64bit.s' ] @@ -423,13 +442,34 @@ def build(bld): testobj = bld(features = 'cxx cxxprogram') testobj.source = ''' test/dummy_lxvst.cc - test/bbt_test.cpp - test/interpolation_test.cpp - test/midi_clock_slave_test.cpp - test/resampled_source.cc - test/mantis_3356.cc - test/testrunner.cpp + test/test_util.cc + test/test_needing_session.cc + test/audio_region_test.cc + test/test_globals.cc + test/audio_region_read_test.cc + test/automation_list_property_test.cc + test/bbt_test.cc + test/tempo_test.cc + test/interpolation_test.cc + test/midi_clock_slave_test.cc + test/resampled_source_test.cc + test/framewalk_to_beats_test.cc + test/framepos_plus_beats_test.cc + test/framepos_minus_beats_test.cc + test/playlist_layering_test.cc + test/playlist_read_test.cc + test/playlist_equivalent_regions_test.cc + test/control_surfaces_test.cc + test/combine_regions_test.cc + test/region_naming_test.cc + test/load_sessions_test.cc + test/mtdm_test.cc + test/testrunner.cc '''.split() + +# Tests that don't work +# test/mantis_3356_test.cc + testobj.includes = obj.includes + ['test', '../pbd'] testobj.uselib = ['CPPUNIT','SIGCPP','JACK','GLIBMM','GTHREAD', 'SAMPLERATE','XML','LRDF','COREAUDIO'] @@ -441,7 +481,6 @@ def build(bld): 'PACKAGE="libardour3test"', 'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"', 'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"', - 'MODULE_DIR="' + os.path.normpath(bld.env['LIBDIR']) + '"', 'LOCALEDIR="' + os.path.join( os.path.normpath(bld.env['DATADIR']), 'locale') + '"', 'VAMP_DIR="' + os.path.join( @@ -455,6 +494,74 @@ def build(bld): elif bld.env['build_target'] == 'x86_64': testobj.source += [ 'sse_functions_64bit.s' ] + # Tester to just load a session + session_load_tester = bld(features = 'cxx cxxprogram') + session_load_tester.source = ''' + test/test_util.cc + test/load_session.cc + test/dummy_lxvst.cc + '''.split() + + session_load_tester.includes = obj.includes + session_load_tester.includes.append ('test') + session_load_tester.uselib = ['CPPUNIT','SIGCPP','JACK','GLIBMM','GTHREAD', + 'SAMPLERATE','XML','LRDF','COREAUDIO'] + session_load_tester.use = ['libpbd','libmidipp','libardour'] + session_load_tester.name = 'libardour-session-load-tester' + session_load_tester.target = 'load-session' + session_load_tester.install_path = '' + session_load_tester.defines = [ + 'PACKAGE="libardour3profile"', + 'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"', + 'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"', + 'LOCALEDIR="' + os.path.join( + os.path.normpath(bld.env['DATADIR']), 'locale') + '"', + 'VAMP_DIR="' + os.path.join( + os.path.normpath(bld.env['LIBDIR']), 'ardour3', 'vamp') + '"' + ] + if bld.env['FPU_OPTIMIZATION']: + session_load_tester.source += [ 'sse_functions_xmm.cc' ] + if (bld.env['build_target'] == 'i386' + or bld.env['build_target'] == 'i686'): + session_load_tester.source += [ 'sse_functions.s' ] + elif bld.env['build_target'] == 'x86_64': + session_load_tester.source += [ 'sse_functions_64bit.s' ] + + # Profiling + for p in ['runpc', 'lots_of_regions', 'load_session']: + profilingobj = bld(features = 'cxx cxxprogram') + profilingobj.source = ''' + test/dummy_lxvst.cc + test/test_util.cc + '''.split() + + profilingobj.source.append('test/profiling/%s.cc' % p) + + profilingobj.includes = obj.includes + profilingobj.includes.append ('test') + profilingobj.uselib = ['CPPUNIT','SIGCPP','JACK','GLIBMM','GTHREAD', + 'SAMPLERATE','XML','LRDF','COREAUDIO'] + profilingobj.use = ['libpbd','libmidipp','libardour'] + profilingobj.name = 'libardour-profiling' + profilingobj.target = p + profilingobj.install_path = '' + profilingobj.defines = [ + 'PACKAGE="libardour3profile"', + 'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"', + 'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"', + 'LOCALEDIR="' + os.path.join( + os.path.normpath(bld.env['DATADIR']), 'locale') + '"', + 'VAMP_DIR="' + os.path.join( + os.path.normpath(bld.env['LIBDIR']), 'ardour3', 'vamp') + '"' + ] + if bld.env['FPU_OPTIMIZATION']: + profilingobj.source += [ 'sse_functions_xmm.cc' ] + if (bld.env['build_target'] == 'i386' + or bld.env['build_target'] == 'i686'): + profilingobj.source += [ 'sse_functions.s' ] + elif bld.env['build_target'] == 'x86_64': + profilingobj.source += [ 'sse_functions_64bit.s' ] + def shutdown(): autowaf.shutdown()