merge with master, fixing conflicts in 3 wscript files

diff --cc gtk2_ardour/ardour_ui.cc
Simple merge

diff --cc gtk2_ardour/ardour_ui.h
Simple merge

diff --cc gtk2_ardour/export_video_dialog.cc
index 7f6fcc2a8ad80088010e60f392479b48d1f322a4,dd08b586611aa2854b5419f11bf306255581aad5..b3a97f20b93d436f62b1be01f80331d95e909bf0
--- 1/gtk2_ardour/export_video_dialog.cc
--- 2/gtk2_ardour/export_video_dialog.cc
+++ b/gtk2_ardour/export_video_dialog.cc
@@@ -28,10 -28,7 +28,9 @@@
  #include <fcntl.h>
  
  #include <sigc++/bind.h>
- #include <libgen.h>
  
 +#include <glib/gstdio.h>
 +
  #include "pbd/error.h"
  #include "pbd/convert.h"
  #include "gtkmm2ext/utils.h"

diff --cc gtk2_ardour/main.cc
Simple merge

diff --cc gtk2_ardour/mixer_strip.cc
Simple merge

diff --cc gtk2_ardour/plugin_selector.cc
Simple merge

diff --cc gtk2_ardour/processor_box.cc
Simple merge

diff --cc gtk2_ardour/sfdb_ui.cc
Simple merge

diff --cc gtk2_ardour/transcode_video_dialog.cc
index 9f18e85b64880e1002d43ae5cb7edf8cb6479a50,6e4a1a3298ad6c90560110913e82fa28e36ffde7..3963bb6cd3f2c59b613cb7de45b38de4f38dcdbf
--- 1/gtk2_ardour/transcode_video_dialog.cc
--- 2/gtk2_ardour/transcode_video_dialog.cc
+++ b/gtk2_ardour/transcode_video_dialog.cc
@@@ -28,10 -28,7 +28,9 @@@
  #include <fcntl.h>
  
  #include <sigc++/bind.h>
- #include <libgen.h>
  
 +#include <glib/gstdio.h>
 +
  #include "pbd/error.h"
  #include "pbd/convert.h"
  #include "gtkmm2ext/utils.h"

diff --cc gtk2_ardour/utils.cc
Simple merge

diff --cc gtk2_ardour/video_monitor.cc
Simple merge

diff --cc gtk2_ardour/wscript
Simple merge

diff --cc libs/ardour/ardour/session.h
Simple merge

diff --cc libs/ardour/audioengine.cc
Simple merge

diff --cc libs/ardour/globals.cc
index 0cda9ebdf404fe81773763aad7e8f8610cbeaf87,9850d82d314b96b92d10fdab178db6d099410cd6..84693af5417f7f066a64412ff2b90be6b26ea6ff
--- 1/libs/ardour/globals.cc
--- 2/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@@ -366,13 -354,17 +366,19 @@@ ARDOUR::init_post_engine (
        ARDOUR::PluginManager::instance().refresh ();
  }
  
- int
- ARDOUR::cleanup ()
+ void
+ ARDOUR::cleanup () 
  {
+       if (!libardour_initialized) {
+               return;
+       }
+ 
+       ARDOUR::AudioEngine::destroy ();
+ 
        delete Library;
 +#ifdef HAVE_LRDF
        lrdf_cleanup ();
 +#endif
        delete &ControlProtocolManager::instance();
  #ifdef WINDOWS_VST_SUPPORT
        fst_exit ();

diff --cc libs/ardour/graph.cc
Simple merge

diff --cc libs/ardour/session.cc
Simple merge

diff --cc libs/ardour/session_state.cc
Simple merge

diff --cc libs/ardour/utils.cc
Simple merge

diff --cc libs/ardour/wscript
index b99e70e6bb7e95b4ad375ef034f5838c6c73829f,96932495f4073c9403b57716dcfc1748e84da3f4..ea065530f7a6e42079f4e1b8a63595adf1313074
--- 1/libs/ardour/wscript
--- 2/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@@ -104,10 -104,8 +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',
@@@ -246,17 -243,11 +245,15 @@@ def configure(conf)
          path_prefix + 'version.cc',
          'libardour3', conf.env['MAJOR'], conf.env['MINOR'], 0)
      autowaf.configure(conf)
-     autowaf.check_pkg(conf, 'jack', uselib_store='JACK',
-                       atleast_version='0.118.2')
 -    autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO',
 -                      atleast_version='0.3.2')
 +    if Options.options.dist_target == 'auto':
 +        if re.search ("linux", sys.platform) != None:
 +            autowaf.check_pkg(conf, 'alsa', uselib_store='ALSA')
      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',

diff --cc libs/backends/jack/wscript
index 0bfb016e313c2bac4774ef1410e0866786931b5b,d76ec095cab6fd7f304772dd0dd7c739c6c0fc97..c5c506525a2290af4fbc58067c44a1f222bb14c2
--- 1/libs/backends/jack/wscript
--- 2/libs/backends/jack/wscript
+++ b/libs/backends/jack/wscript
@@@ -37,16 -29,13 +37,16 @@@ def build(bld)
              'jack_connection.cc',
              'jack_audiobackend.cc',
              'jack_portengine.cc',
-             'jack_utils.cc'
+             'jack_utils.cc',
+             'jack_session.cc',
              ]
      obj.includes = ['.']
-     obj.cxxflags = [ '-fPIC' ]
      obj.name     = 'jack_audiobackend'
      obj.target   = 'jack_audiobackend'
 -    obj.uselib   = [ 'JACK' ]
 +    if Options.options.dist_target == 'mingw':
 +        obj.uselib   = [ 'JACK', 'PORTAUDIO' ]
 +    else:
 +        obj.uselib   = [ 'JACK' ]
      obj.use      = 'ardour libpbd'
      obj.vnum     = JACKBACKEND_VERSION
      obj.install_path  = os.path.join(bld.env['LIBDIR'], 'ardour3', 'backends')

diff --cc libs/gtkmm2ext/gtk_ui.cc
Simple merge

diff --cc libs/gtkmm2ext/gtkmm2ext/gtk_ui.h
Simple merge

diff --cc wscript
index 82a5ac8b776722d2402967c2519ef849bb3802e4,da7b39d8835ba67353a9a8dc4141055fea4ab356..4046caf47a0558763197a946a2892283bfff98a0
--- 1/wscript
--- 2/wscript
+++ b/wscript
@@@ -668,15 -657,8 +673,13 @@@ def configure(conf)
          conf.env.append_value('CXXFLAGS', '-I' + Options.options.wine_include)
          autowaf.check_header(conf, 'cxx', 'windows.h', mandatory = True)
      if opts.lxvst:
 -        conf.define('LXVST_SUPPORT', 1)
 -        conf.env['LXVST_SUPPORT'] = True
 +        if sys.platform == 'darwin':
 +            conf.env['LXVST_SUPPORT'] = False
 +        elif Options.options.dist_target == 'mingw':
 +            conf.env['LXVST_SUPPORT'] = False
 +      else:
 +          conf.define('LXVST_SUPPORT', 1)
 +          conf.env['LXVST_SUPPORT'] = True
-     if bool(conf.env['JACK_SESSION']):
-         conf.define('HAVE_JACK_SESSION', 1)
      conf.define('WINDOWS_KEY', opts.windows_key)
      conf.env['PROGRAM_NAME'] = opts.program_name
      if opts.rt_alloc_debug: