Fix off-by-one in body_range().

[ardour.git] / libs / ardour / wscript

diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index aec91cb2fdaf3e1923d217a1ed7645eb1af67985..ee86a203193608f30077480a245f4a30ad68605c 100644 (file)
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -18,7 +18,7 @@ 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'
@@ -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',
@@ -258,15 +256,19 @@ 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, '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)
-        autowaf.check_pkg(conf, 'lilv-0', uselib_store='NEW_LILV',
-                          atleast_version='0.14.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)
-            autowaf.check_pkg(conf, 'suil-0', uselib_store='NEW_SUIL',
-                              atleast_version='0.5.0', mandatory=False)
+                          atleast_version='0.14.0', mandatory=True)
+        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)
@@ -338,9 +340,6 @@ int main(int argc, char **argv) {
     if ogg_supported():
         conf.define ('HAVE_OGG', 1)
 
-    if Options.options.lv2 and conf.is_defined('HAVE_LILV'):
-        conf.define ('LV2_SUPPORT', 1)
-
     conf.write_config_header('libardour-config.h', remove=False)
 
     # Boost headers
@@ -370,11 +369,7 @@ def build(bld):
         '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') + '"',
+        'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"',
         'PROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"'
         ]
 
@@ -408,8 +403,7 @@ def build(bld):
         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' ]
@@ -430,6 +424,8 @@ def build(bld):
                 test/dummy_lxvst.cc
                 test/test_needing_session.cc
                 test/test_needing_playlist_and_regions.cc
+                test/test_globals.cc
+                test/audio_region_test.cc
                 test/bbt_test.cc
                 test/tempo_test.cc
                 test/interpolation_test.cc
@@ -439,6 +435,9 @@ def build(bld):
                 test/framepos_plus_beats_test.cc
                 test/framepos_minus_beats_test.cc
                 test/playlist_layering_test.cc
+                test/playlist_read_test.cc
+                test/control_surfaces_test.cc
+                test/mtdm_test.cc
                 test/testrunner.cc
         '''.split()
 
@@ -456,7 +455,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(
@@ -488,7 +486,6 @@ def build(bld):
             'PACKAGE="libardour3profile"',
             '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(