X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fwscript;h=799349c22542a25170bff0b339231f1a54c2f507;hb=2e27e21d3a09889311e18a8efe11abcaa6d9c8b3;hp=57b68a0fdee9e507c4ae1fc9a91f192ae1a1a0b0;hpb=d074bc586e494d7dd83d415a487195a477095a4f;p=ardour.git diff --git a/libs/ardour/wscript b/libs/ardour/wscript index 57b68a0fde..799349c225 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -1,7 +1,8 @@ -1#!/usr/bin/env python +#!/usr/bin/env python from waflib.extras import autowaf as autowaf from waflib import Options import os +import sys import re import subprocess import sys @@ -69,6 +70,7 @@ libardour_sources = [ 'diskstream.cc', 'element_import_handler.cc', 'element_importer.cc', + 'engine_slave.cc', 'enums.cc', 'event_type_map.cc', 'export_channel.cc', @@ -103,9 +105,9 @@ libardour_sources = [ 'interpolation.cc', 'io.cc', 'io_processor.cc', - 'jack_slave.cc', 'kmeterdsp.cc', 'ladspa_plugin.cc', + 'ladspa_search_path.cc', 'location.cc', 'location_importer.cc', 'ltc_slave.cc', @@ -180,7 +182,6 @@ libardour_sources = [ 'session_events.cc', 'session_export.cc', 'session_handle.cc', - 'session_jack.cc', 'session_ltc.cc', 'session_metadata.cc', 'session_midi.cc', @@ -242,23 +243,24 @@ def configure(conf): autowaf.build_version_files( path_prefix + 'ardour/version.h', path_prefix + 'version.cc', - 'libardour3', conf.env['MAJOR'], conf.env['MINOR'], 0) + 'libardour3', conf.env['MAJOR'], conf.env['MINOR'], 0, + 'LIBARDOUR_API', 'ardour/libardour_visibility.h') autowaf.configure(conf) autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO', atleast_version='0.3.2') - autowaf.check_pkg(conf, 'jack', uselib_store='JACK', - atleast_version='0.118.2') + autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO4', + atleast_version='0.4.0', mandatory=False) autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML') - autowaf.check_pkg(conf, 'lrdf', uselib_store='LRDF', - atleast_version='0.4.0') + if Options.options.dist_target != 'mingw': + autowaf.check_pkg(conf, 'lrdf', uselib_store='LRDF', + atleast_version='0.4.0') + autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO', + atleast_version='0.3.2') autowaf.check_pkg(conf, 'samplerate', uselib_store='SAMPLERATE', atleast_version='0.1.0') autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', atleast_version='2.0') - if re.search ("linux", sys.platform) != None: - autowaf.check_pkg(conf, 'alsa', uselib_store='ALSA') - if Options.options.lv2: autowaf.check_pkg(conf, 'lv2', uselib_store='LV2', atleast_version='1.0.0', mandatory=True) @@ -288,75 +290,17 @@ def configure(conf): autowaf.check_pkg(conf, 'libcurl', uselib_store='CURL', atleast_version='7.0.0') - # we don't try to detect this, since its part of our source tree - - conf.define('HAVE_RUBBERBAND', 1) # controls whether we think we have it - conf.define('USE_RUBBERBAND', 1) # controls whether we actually use it + # controls whether we actually use it in preference to soundtouch + # Note: as of 2104, soundtouch (WSOLA) has been out-of-use for years. + conf.define('USE_RUBBERBAND', 1) 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') - conf.check(header_name='unistd.h', define_name='HAVE_UNISTD',mandatory=False) - conf.check_cc(fragment = ''' -#include -void callback(jack_status_t code, const char* reason, void* arg) { return; } -int main(int argc, char **argv) { - jack_client_t* c; - jack_on_info_shutdown(c, callback, (void*) 0); - return 0; -}''', - uselib= [ 'JACK' ], - msg = 'Checking for jack_on_info_shutdown', - define_name = 'HAVE_JACK_ON_INFO_SHUTDOWN', - okmsg = 'present') - - missing_jack_message = 'missing - a version of JACK that supports jack_port_set_latency_range() is required to compile Ardour3.' - - conf.check_cc(fragment = ''' -#include -int main(int argc, char **argv) { - jack_port_t* p; - jack_latency_range_t r; - jack_port_set_latency_range(p, JackCaptureLatency, &r); - return 0; -}''', - uselib = [ 'JACK' ], - msg = 'Checking for new JACK latency API', - okmsg = 'present', - mandatory = True, - errmsg = missing_jack_message) - - conf.check_cc(fragment = ''' -#include -int main(int argc, char **argv) { - jack_port_type_get_buffer_size((jack_client_t*)0, ""); - return 0; -}''', - uselib = [ 'JACK' ], - msg = 'Checking for new jack_port_type_get_buffer_size', - okmsg = 'present', - 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(): @@ -376,35 +320,44 @@ def build(bld): # major increment <=> incompatible changes # minor increment <=> compatible changes (additions) # micro increment <=> no interface changes - LIBARDOUR_LIB_VERSION = "3.0.0." + LIBARDOUR_LIB_VERSION = "3.0.0" # Library if bld.is_defined ('INTERNAL_SHARED_LIBS'): obj = bld.shlib(features = 'c cxx cshlib cxxshlib', source=libardour_sources) + # macros for this shared library + obj.defines = [ 'LIBARDOUR_DLL_EXPORTS=1' ] else: obj = bld.stlib(features = 'c cxx cstlib cxxstlib', source=libardour_sources) obj.cxxflags = [ '-fPIC' ] obj.cflags = [ '-fPIC' ] + obj.defines = [] obj.export_includes = ['.'] obj.includes = ['.', '../surfaces/control_protocol', '..'] - obj.name = 'ardour' + obj.name = 'libardour' obj.target = 'ardour' obj.uselib = ['GLIBMM','GTHREAD','AUBIO','SIGCPP','XML','UUID', - 'JACK','SNDFILE','SAMPLERATE','LRDF','AUDIOUNITS', - 'OSX','BOOST','CURL','DL'] - obj.use = ['libpbd','libmidipp','libevoral','libvamphost', - 'libvampplugin','libtaglib','librubberband', - 'libaudiographer','libltc'] + 'SNDFILE','SAMPLERATE','LRDF','AUDIOUNITS', + 'OSX','BOOST','CURL','DL','TAGLIB','VAMPSDK','VAMPHOSTSDK','RUBBERBAND'] + obj.use = ['libpbd','libmidipp','libevoral', + 'libaudiographer', + 'libtimecode', + ] + if bld.is_defined('USE_EXTERNAL_LIBS'): + obj.uselib.extend(['VAMPSDK', 'LIBLTC']) + else: + obj.use.extend(['librubberband', 'libltc_includes', 'libltc']) + obj.vnum = LIBARDOUR_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') - obj.defines = [ + obj.defines += [ 'PACKAGE="' + I18N_PACKAGE + '"', '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') + '"', 'PROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"', - 'EVORAL_MIDI_XML=1' + 'EVORAL_MIDI_XML=1', ] #obj.source += ' st_stretch.cc st_pitch.cc ' @@ -442,41 +395,6 @@ def build(bld): elif bld.env['build_target'] == 'x86_64': obj.source += [ 'sse_functions_xmm.cc', 'sse_functions_64bit.s' ] - # the JACK audio backend - - obj = bld.shlib (features = 'c cxx cshlib cxxshlib', - source = [ - 'jack_api.cc', - 'jack_connection.cc', - 'jack_audiobackend.cc', - 'jack_portengine.cc', - 'jack_utils.cc' - ]) - obj.cxxflags = [ '-fPIC' ] - obj.name = 'jack_audiobackend' - obj.target = 'jack_audiobackend' - obj.uselib = [ 'JACK' ] - - # - # device discovery code in the jack backend needs ALSA - # on Linux. - # - - if re.search ("linux", sys.platform) != None: - obj.uselib += [ 'ALSA' ] - - obj.use = [ 'ardour' ] - obj.vnum = '1.0.0' - obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') - obj.includes = [ '.' ] - obj.defines = [ - 'PACKAGE="' + I18N_PACKAGE + '"', - 'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"', - 'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"', - 'PROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"', - ] - - # i18n if bld.is_defined('ENABLE_NLS'): mo_files = bld.path.ant_glob('po/*.mo') @@ -491,20 +409,21 @@ def build(bld): # only build these common sources once testcommon = bld(features = 'cxx') testcommon.includes = obj.includes + ['test', '../pbd', '..'] - testcommon.source = ['test/test_globals.cc', 'test/testrunner.cc', 'test/test_needing_session.cc', + testcommon.source = ['test/testrunner.cc', 'test/test_needing_session.cc', 'test/test_common.cc', 'test/dummy_lxvst.cc', 'test/audio_region_test.cc', 'test/test_util.cc'] - testcommon.uselib = ['CPPUNIT','SIGCPP','JACK','GLIBMM','GTHREAD', - 'SAMPLERATE','XML','LRDF','COREAUDIO'] - testcommon.use = ['libpbd','libmidipp','libevoral','libvamphost', - 'libvampplugin','libtaglib','librubberband', - 'libaudiographer','libltc','ardour'] + testcommon.uselib = ['CPPUNIT','SIGCPP','GLIBMM','GTHREAD', + 'SAMPLERATE','XML','LRDF','COREAUDIO','TAGLIB','VAMPSDK','VAMPHOSTSDK','RUBBERBAND'] + testcommon.use = ['libpbd','libmidipp','libevoral', + 'libaudiographer','ardour'] + if bld.is_defined('USE_EXTERNAL_LIBS'): + testcommon.uselib.extend(['LIBLTC',]) + else: + testcommon.use.extend(['libltc', 'librubberband']) testcommon.defines = [ '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') + '"' ] testcommon.name = 'testcommon' @@ -517,6 +436,7 @@ def build(bld): testcommon.source += [ 'sse_functions_64bit.s' ] if bld.env['SINGLE_TESTS']: + create_ardour_test_program(bld, obj.includes, 'audio_engine_test', 'test_audio_engine', ['test/audio_engine_test.cc']) create_ardour_test_program(bld, obj.includes, 'automation_list_property_test', 'test_automation_list_property', ['test/automation_list_property_test.cc']) create_ardour_test_program(bld, obj.includes, 'bbt', 'test_bbt', ['test/bbt_test.cc']) create_ardour_test_program(bld, obj.includes, 'tempo', 'test_tempo', ['test/tempo_test.cc']) @@ -528,12 +448,14 @@ def build(bld): create_ardour_test_program(bld, obj.includes, 'framepos_minus_beats', 'test_framepos_minus_beats', ['test/framepos_minus_beats_test.cc']) create_ardour_test_program(bld, obj.includes, 'playlist_equivalent_regions', 'test_playlist_equivalent_regions', ['test/playlist_equivalent_regions_test.cc']) create_ardour_test_program(bld, obj.includes, 'playlist_layering', 'test_playlist_layering', ['test/playlist_layering_test.cc']) + create_ardour_test_program(bld, obj.includes, 'plugins_test', 'test_plugins', ['test/plugins_test.cc']) create_ardour_test_program(bld, obj.includes, 'region_naming', 'test_region_naming', ['test/region_naming_test.cc']) create_ardour_test_program(bld, obj.includes, 'control_surface', 'test_control_surfaces', ['test/control_surfaces_test.cc']) create_ardour_test_program(bld, obj.includes, 'mtdm_test', 'test_mtdm', ['test/mtdm_test.cc']) create_ardour_test_program(bld, obj.includes, 'session_test', 'test_session', ['test/session_test.cc']) test_sources = ''' + test/audio_engine_test.cc test/automation_list_property_test.cc test/bbt_test.cc test/tempo_test.cc @@ -545,6 +467,7 @@ def build(bld): test/framepos_minus_beats_test.cc test/playlist_equivalent_regions_test.cc test/playlist_layering_test.cc + test/plugins_test.cc test/region_naming_test.cc test/control_surfaces_test.cc test/mtdm_test.cc @@ -569,7 +492,7 @@ def build(bld): session_load_tester.includes = obj.includes session_load_tester.includes.append ('test') - session_load_tester.uselib = ['CPPUNIT','SIGCPP','JACK','GLIBMM','GTHREAD', + session_load_tester.uselib = ['CPPUNIT','SIGCPP','GLIBMM','GTHREAD', 'SAMPLERATE','XML','LRDF','COREAUDIO'] session_load_tester.use = ['libpbd','libmidipp','ardour'] session_load_tester.name = 'libardour-session-load-tester' @@ -581,8 +504,6 @@ def build(bld): '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' ] @@ -604,7 +525,7 @@ def build(bld): profilingobj.includes = obj.includes profilingobj.includes.append ('test') - profilingobj.uselib = ['CPPUNIT','SIGCPP','JACK','GLIBMM','GTHREAD', + profilingobj.uselib = ['CPPUNIT','SIGCPP','GLIBMM','GTHREAD', 'SAMPLERATE','XML','LRDF','COREAUDIO'] profilingobj.use = ['libpbd','libmidipp','ardour'] profilingobj.name = 'libardour-profiling' @@ -616,8 +537,6 @@ def build(bld): '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' ] @@ -631,11 +550,15 @@ def create_ardour_test_program(bld, includes, name, target, sources): testobj = bld(features = 'cxx cxxprogram') testobj.includes = includes + ['test', '../pbd', '..'] testobj.source = sources - testobj.uselib = ['CPPUNIT','SIGCPP','JACK','GLIBMM','GTHREAD', - 'SAMPLERATE','XML','LRDF','COREAUDIO'] - testobj.use = ['libpbd','libmidipp','libevoral','libvamphost', - 'libvampplugin','libtaglib','librubberband', - 'libaudiographer','libltc','ardour','testcommon'] + testobj.uselib = ['CPPUNIT','SIGCPP','GLIBMM','GTHREAD', + 'SAMPLERATE','XML','LRDF','COREAUDIO','TAGLIB','VAMPSDK','VAMPHOSTSDK','RUBBERBAND'] + testobj.use = ['libpbd','libmidipp','libevoral', + 'libaudiographer','ardour','testcommon'] + if bld.is_defined('USE_EXTERNAL_LIBS'): + testobj.uselib.extend(['LIBLTC']) + else: + testobj.use.extend(['libltc']) + testobj.name = name testobj.target = target # not sure about install path @@ -646,8 +569,6 @@ def create_ardour_test_program(bld, includes, name, target, sources): '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') + '"' ] def shutdown():