fix merge conflicts from master

diff --cc gtk2_ardour/gtk_pianokeyboard.c
Simple merge

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

diff --cc libs/backends/jack/jack_audiobackend.cc
index 1ceb794dc569558bf41224b9f9f33fc26dc21321,5e447a6ee1dc54d0e114ed4b7e38f573b185b44f..f34cd746f0b8fb0c809f5f43186d299ec0f9471d
--- 1/libs/backends/jack/jack_audiobackend.cc
--- 2/libs/backends/jack/jack_audiobackend.cc
+++ b/libs/backends/jack/jack_audiobackend.cc
@@@ -765,8 -765,12 +765,9 @@@ in
  JACKAudioBackend::jack_sync_callback (jack_transport_state_t state, jack_position_t* pos)
  {
        TransportState tstate;
+       bool tstate_valid = true;
  
        switch (state) {
 -      case JackTransportStopped:
 -              tstate = TransportStopped;
 -              break;
        case JackTransportRolling:
                tstate = TransportRolling;
                break;
@@@ -776,13 -780,15 +777,18 @@@
        case JackTransportStarting:
                tstate = TransportStarting;
                break;
-       default:
 +      case JackTransportStopped:
 +              tstate = TransportStopped;
 +              break;
+       default:
+               // ignore "unofficial" states like JackTransportNetStarting (jackd2)
+               tstate_valid = false;
+               break;
        }
  
-       return engine.sync_callback (tstate, pos->frame);
+       if (tstate_valid) {
+               return engine.sync_callback (tstate, pos->frame);
+       }
  
        return true;
  }

diff --cc wscript
index dbe768823b8171c452ed5cefab586ac0729ec308,e68780f1e0a09c54739056dd331235521c836f2a..411c3ed4c07a896d32caf77bcae989f4751025ab
--- 1/wscript
--- 2/wscript
+++ b/wscript
@@@ -415,25 -393,27 +394,29 @@@ def set_compiler_flags (conf,opt)
      # more boilerplate
      #
  
-     conf.env.append_value('CFLAGS', '-DBOOST_SYSTEM_NO_DEPRECATED')
-     conf.env.append_value('CXXFLAGS', '-DBOOST_SYSTEM_NO_DEPRECATED')
-     # need ISOC9X for llabs()
-     conf.env.append_value('CFLAGS', '-D_ISOC9X_SOURCE')
-     conf.env.append_value('CFLAGS', '-D_LARGEFILE64_SOURCE')
-     conf.env.append_value('CFLAGS', '-D_FILE_OFFSET_BITS=64')
      # need ISOC9X for llabs()
-     conf.env.append_value('CXXFLAGS', '-D_ISOC9X_SOURCE')
-     conf.env.append_value('CXXFLAGS', '-D_LARGEFILE64_SOURCE')
-     conf.env.append_value('CXXFLAGS', '-D_FILE_OFFSET_BITS=64')
+     compiler_flags.extend(
 -            ('-DBOOST_SYSTEM_NO_DEPRECATED', '-D_ISOC9X_SOURCE',
 -             '-D_LARGEFILE64_SOURCE', '-D_FILE_OFFSET_BITS=64'))
 -    cxx_flags.extend(('-D__STDC_LIMIT_MACROS', '-D__STDC_FORMAT_MACROS'))
 -
++        ('-DBOOST_SYSTEM_NO_DEPRECATED', '-D_ISOC9X_SOURCE',
++         '-D_LARGEFILE64_SOURCE', '-D_FILE_OFFSET_BITS=64'))
++    cxx_flags.extend(
++        ('-D__STDC_LIMIT_MACROS', '-D__STDC_FORMAT_MACROS', 
++         '-DCANVAS_COMPATIBILITY', '-DCANVAS_DEBUG'))
++    
+     if opt.nls:
+         compiler_flags.append('-DENABLE_NLS')
  
-     conf.env.append_value('CXXFLAGS', '-D__STDC_LIMIT_MACROS')
-     conf.env.append_value('CXXFLAGS', '-D__STDC_FORMAT_MACROS')
-     conf.env.append_value('CXXFLAGS', '-DCANVAS_COMPATIBILITY')
-     conf.env.append_value('CXXFLAGS', '-DCANVAS_DEBUG')
+     if opt.debug:
+         conf.env.append_value('CFLAGS', debug_flags)
+         conf.env.append_value('CXXFLAGS', debug_flags)
+     else:
+         conf.env.append_value('CFLAGS', optimization_flags)
+         conf.env.append_value('CXXFLAGS', optimization_flags)
  
-     if opt.nls:
-         conf.env.append_value('CXXFLAGS', '-DENABLE_NLS')
-         conf.env.append_value('CFLAGS', '-DENABLE_NLS')
+     conf.env.append_value('CFLAGS', compiler_flags)
+     conf.env.append_value('CFLAGS', c_flags)
+     conf.env.append_value('CXXFLAGS', compiler_flags)
+     conf.env.append_value('CXXFLAGS', cxx_flags)
+     conf.env.append_value('LINKFLAGS', linker_flags)
  
  #----------------------------------------------------------------