new files from sakari, missed last time
[ardour.git] / SConstruct
index a1a3dbbf80a055316090a95885210f864e69b8db..d8bb19e1fbb39ad7b7868d965855b17e4fc7d9a3 100644 (file)
@@ -1,6 +1,11 @@
 # -*- python -*-
 
+#
+# and there we have it, or do we?
+#
+
 import os
+import os.path
 import sys
 import re
 import shutil
@@ -16,7 +21,7 @@ import SCons.Node.FS
 SConsignFile()
 EnsureSConsVersion(0, 96)
 
-ardour_version = '2.1'
+ardour_version = '3.0'
 
 subst_dict = { }
 
@@ -27,16 +32,19 @@ subst_dict = { }
 opts = Options('scache.conf')
 opts.AddOptions(
     ('ARCH', 'Set architecture-specific compilation flags by hand (all flags as 1 argument)',''),
+    ('WINDOWS_KEY', 'Set X Modifier (Mod1,Mod2,Mod3,Mod4,Mod5) for "Windows" key', 'Mod4'),
     BoolOption('AUDIOUNITS', 'Compile with Apple\'s AudioUnit library. (experimental)', 0),
     BoolOption('COREAUDIO', 'Compile with Apple\'s CoreAudio library', 0),
     BoolOption('GTKOSX', 'Compile for use with GTK-OSX, not GTK-X11', 0),
-    BoolOption('NATIVE_OSX_KEYS', 'Build key bindings file that matches OS X conventions', 0),
+    BoolOption('OLDFONTS', 'Old school font sizes', 0),
     BoolOption('DEBUG', 'Set to build with debugging information and no optimizations', 0),
+    BoolOption('STL_DEBUG', 'Set to build with Standard Template Library Debugging', 0),
     PathOption('DESTDIR', 'Set the intermediate install "prefix"', '/'),
-    EnumOption('DIST_TARGET', 'Build target for cross compiling packagers', 'auto', allowed_values=('auto', 'i386', 'i686', 'x86_64', 'powerpc', 'tiger', 'panther', 'none' ), ignorecase=2),
+    EnumOption('DIST_TARGET', 'Build target for cross compiling packagers', 'auto', allowed_values=('auto', 'i386', 'i686', 'x86_64', 'powerpc', 'tiger', 'panther', 'leopard', 'none' ), ignorecase=2),
     BoolOption('DMALLOC', 'Compile and link using the dmalloc library', 0),
     BoolOption('EXTRA_WARN', 'Compile with -Wextra, -ansi, and -pedantic.  Might break compilation.  For pedants', 0),
-    BoolOption('FFT_ANALYSIS', 'Include FFT analysis window', 0),
+    BoolOption('FFT_ANALYSIS', 'Include FFT analysis window', 1),
+    BoolOption('FREESOUND', 'Include Freesound database lookup', 0),
     BoolOption('FPU_OPTIMIZATION', 'Build runtime checked assembler code', 1),
     BoolOption('LIBLO', 'Compile with support for liblo library', 1),
     BoolOption('NLS', 'Set to turn on i18n support', 1),
@@ -46,8 +54,11 @@ opts.AddOptions(
     BoolOption('UNIVERSAL', 'Compile as universal binary.  Requires that external libraries are already universal.', 0),
     BoolOption('VERSIONED', 'Add revision information to ardour/gtk executable name inside the build directory', 0),
     BoolOption('VST', 'Compile with support for VST', 0),
+    BoolOption('LV2', 'Compile with support for LV2 (if slv2 is available)', 1),
     BoolOption('GPROFILE', 'Compile with support for gprofile (Developers only)', 0),
-    BoolOption('TRANZPORT', 'Compile with support for Frontier Designs (if libusb is available)', 1)
+    BoolOption('FREEDESKTOP', 'Install MIME type, icons and .desktop file as per the freedesktop.org spec (requires xdg-utils and shared-mime-info). "scons uninstall" removes associations in desktop database', 0),
+    BoolOption('TRANZPORT', 'Compile with support for Frontier Designs (if libusb is available)', 1),
+    BoolOption('AUBIO', "Use Paul Brossier's aubio library for feature detection (if available)", 1)
 )
 
 #----------------------------------------------------------------------
@@ -231,6 +242,7 @@ def i18n (buildenv, sources, installenv):
         buildenv.PoBuild(po_file, ['po/'+po_file, potfile])
         mo_file = po_file.replace (".po", ".mo")
         installenv.Alias ('install', buildenv.MoBuild (mo_file, po_file))
+        installenv.Alias ('msgupdate', buildenv.MoBuild (mo_file, po_file))
     
     for lang in languages:
         modir = (os.path.join (install_prefix, 'share/locale/' + lang + '/LC_MESSAGES/'))
@@ -249,16 +261,16 @@ def create_stored_revision (target = None, source = None, env = None):
     if os.path.exists('.svn'):    
         rev = fetch_svn_revision ('.');
         try:
-            text  = "#ifndef __ardour_svn_revision_h__\n"
-            text += "#define __ardour_svn_revision_h__\n"
-            text += "static const char* ardour_svn_revision = \"" + rev + "\";\n";
-            text += "#endif\n"
-            print '============> writing svn revision info to svn_revision.h\n'
-            o = file ('svn_revision.h', 'w')
+            text  = "#include <ardour/svn_revision.h>\n"
+            text += "namespace ARDOUR {\n";
+            text += "extern const char* svn_revision = \"" + rev + "\";\n";
+            text += "}\n";
+            print '============> writing svn revision info to libs/ardour/svn_revision.cc\n'
+            o = file ('libs/ardour/svn_revision.cc', 'w')
             o.write (text)
             o.close ()
         except IOError:
-            print "Could not open svn_revision.h for writing\n"
+            print "Could not open libs/ardour/svn_revision.cc for writing\n"
             sys.exit (-1)
     else:
         print "You cannot use \"scons revision\" on without using a checked out"
@@ -363,7 +375,7 @@ def distcopy (target, source, env):
     return p.close ()
 
 def tarballer (target, source, env):
-    cmd = 'tar -jcf ' + str (target[0]) +  ' ' + str(source[0]) + "  --exclude '*~'"
+    cmd = 'tar -jcf ' + str (target[0]) +  ' ' + str(source[0]) + "  --exclude '*~'" + " --exclude .svn --exclude '.svn/*'"
     print 'running ', cmd, ' ... '
     p = os.popen (cmd)
     return p.close ()
@@ -402,7 +414,6 @@ else:
     if os.path.isfile('.personal_use_only'):
         os.remove('.personal_use_only')
 
-
 ####################
 # push environment
 ####################
@@ -439,8 +450,12 @@ deps = \
        'samplerate'           : '0.1.0',
        'raptor'               : '1.4.2',
        'lrdf'                 : '0.4.0',
-       'jack'                 : '0.101.1',
-       'libgnomecanvas-2.0'   : '2.0'
+       'jack'                 : '0.109.0',
+       'libgnomecanvas-2.0'   : '2.0',
+        'aubio'                : '0.3.2',
+        'ogg'                  : '1.1.2',
+        'flac'                 : '1.2.1',
+        'sndfile'              : '1.0.18'
 }
 
 def DependenciesRequiredMessage():
@@ -491,8 +506,14 @@ libraries = { }
 
 libraries['core'] = LibraryInfo (CCFLAGS = '-Ilibs')
 
-#libraries['sndfile'] = LibraryInfo()
-#libraries['sndfile'].ParseConfig('pkg-config --cflags --libs sndfile')
+libraries['flac'] = LibraryInfo ()
+libraries['flac'].ParseConfig ('pkg-config --cflags --libs flac')
+
+libraries['ogg'] = LibraryInfo ()
+libraries['ogg'].ParseConfig ('pkg-config --cflags --libs ogg')
+
+libraries['sndfile'] = LibraryInfo()
+libraries['sndfile'].ParseConfig('pkg-config --cflags --libs sndfile')
 
 libraries['lrdf'] = LibraryInfo()
 libraries['lrdf'].ParseConfig('pkg-config --cflags --libs lrdf')
@@ -513,6 +534,13 @@ if conf.CheckPKGExists ('fftw3'):
     libraries['fftw3'] = LibraryInfo()
     libraries['fftw3'].ParseConfig('pkg-config --cflags --libs fftw3')
 
+if conf.CheckPKGExists ('aubio'):
+    libraries['aubio'] = LibraryInfo()
+    libraries['aubio'].ParseConfig('pkg-config --cflags --libs aubio')
+    env['AUBIO'] = 1
+else:
+    env['AUBIO'] = 0
+
 env = conf.Finish ()
 
 if env['FFT_ANALYSIS']:
@@ -523,10 +551,42 @@ if env['FFT_ANALYSIS']:
         conf = Configure(libraries['fftw3'])
 
         if conf.CheckHeader ('fftw3.h') == False:
-            print ('FFT Analysis cannot be compiled without the FFTW3 headers, which do not seem to be installed')
+            print ('Ardour cannot be compiled without the FFTW3 headers, which do not seem to be installed')
             sys.exit (1)            
         conf.Finish()
-        
+
+if env['FREESOUND']:
+        #
+        # Check for curl header as well as the library
+        #
+
+       libraries['curl'] = LibraryInfo()
+
+       conf = Configure(libraries['curl'])
+
+       if conf.CheckHeader ('curl/curl.h') == False:
+               print ('Ardour cannot be compiled without the curl headers, which do not seem to be installed')
+               sys.exit (1)            
+       else:
+               libraries['curl'].ParseConfig('pkg-config --cflags --libs libcurl')
+       conf.Finish()
+else:
+       print 'FREESOUND support is not enabled.  Build with \'scons FREESOUND=1\' to enable.'
+
+if env['LV2']:
+       conf = env.Configure(custom_tests = { 'CheckPKGVersion' : CheckPKGVersion})
+       
+       if conf.CheckPKGVersion('slv2', '0.6.0'):
+               libraries['slv2'] = LibraryInfo()
+               libraries['slv2'].ParseConfig('pkg-config --cflags --libs slv2')
+                env.Append (CCFLAGS="-DHAVE_LV2")
+       else:
+               print 'LV2 support is not enabled (SLV2 not found or older than 0.6.0)'
+               env['LV2'] = 0
+       conf.Finish()
+else:
+       print 'LV2 support is not enabled.  Build with \'scons LV2=1\' to enable.'
+
 libraries['jack'] = LibraryInfo()
 libraries['jack'].ParseConfig('pkg-config --cflags --libs jack')
 
@@ -542,12 +602,18 @@ libraries['glib2'].ParseConfig ('pkg-config --cflags --libs gobject-2.0')
 libraries['glib2'].ParseConfig ('pkg-config --cflags --libs gmodule-2.0')
 libraries['glib2'].ParseConfig ('pkg-config --cflags --libs gthread-2.0')
 
+libraries['freetype2'] = LibraryInfo()
+libraries['freetype2'].ParseConfig ('pkg-config --cflags --libs freetype2')
+
 libraries['gtk2'] = LibraryInfo()
 libraries['gtk2'].ParseConfig ('pkg-config --cflags --libs gtk+-2.0')
 
 libraries['pango'] = LibraryInfo()
 libraries['pango'].ParseConfig ('pkg-config --cflags --libs pango')
 
+libraries['pangocairo'] = LibraryInfo()
+libraries['pangocairo'].ParseConfig ('pkg-config --cflags --libs pangocairo')
+
 libraries['libgnomecanvas2'] = LibraryInfo()
 libraries['libgnomecanvas2'].ParseConfig ('pkg-config --cflags --libs libgnomecanvas-2.0')
 
@@ -608,8 +674,10 @@ if env['DIST_TARGET'] == 'auto':
         # The [.] matches to the dot after the major version, "." would match any character
         if re.search ("darwin[0-7][.]", config[config_kernel]) != None:
             env['DIST_TARGET'] = 'panther'
-        else:
+        if re.search ("darwin8[.]", config[config_kernel]) != None:
             env['DIST_TARGET'] = 'tiger'
+        else:
+            env['DIST_TARGET'] = 'leopard'
     else:
         if re.search ("x86_64", config[config_cpu]) != None:
             env['DIST_TARGET'] = 'x86_64'
@@ -675,9 +743,9 @@ elif ((re.search ("i[0-9]86", config[config_cpu]) != None) or (re.search ("x86_6
 
 # optimization section
 if env['FPU_OPTIMIZATION']:
-    if env['DIST_TARGET'] == 'tiger':
-        opt_flags.append ("-DBUILD_VECLIB_OPTIMIZATIONS")
-        debug_flags.append ("-DBUILD_VECLIB_OPTIMIZATIONS")
+    if env['DIST_TARGET'] == 'tiger' or env['DIST_TARGET'] == 'leopard':
+        opt_flags.append ("-DBUILD_VECLIB_OPTIMIZATIONS");
+        debug_flags.append ("-DBUILD_VECLIB_OPTIMIZATIONS");
         libraries['core'].Append(LINKFLAGS= '-framework Accelerate')
     elif env['DIST_TARGET'] == 'i686' or env['DIST_TARGET'] == 'x86_64':
         opt_flags.append ("-DBUILD_SSE_OPTIMIZATIONS")
@@ -696,6 +764,25 @@ if env['DIST_TARGET'] == 'x86_64':
 else:
     env['LIBDIR']='lib'
 
+#
+# a single way to test if we're on OS X
+#
+
+if env['DIST_TARGET'] in ['panther', 'tiger', 'leopard' ]:
+    env['IS_OSX'] = 1
+    # force tiger or later, to avoid issues on PPC which defaults
+    # back to 10.1 if we don't tell it otherwise.
+    env.Append (CCFLAGS="-DMAC_OS_X_VERSION_MIN_REQUIRED=1040")
+
+    if env['DIST_TARGET'] == 'leopard':
+        # need this to really build against the 10.4 SDK when building on leopard
+        # ideally this would be configurable, but lets just do that later when we need it
+        env.Append(CCFLAGS="-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk")
+        env.Append(LINKFLAGS="-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk")
+
+else:
+    env['IS_OSX'] = 0
+
 #
 # save off guessed arch element in an env
 #
@@ -728,10 +815,14 @@ else:
     env.Append(CCFLAGS=" ".join (opt_flags))
     env.Append(LINKFLAGS=" ".join (opt_flags))
 
+if env['STL_DEBUG'] == 1:
+    env.Append(CXXFLAGS="-D_GLIBCXX_DEBUG")
+
 if env['UNIVERSAL'] == 1:
     env.Append(CCFLAGS="-arch i386 -arch ppc")
     env.Append(LINKFLAGS="-arch i386 -arch ppc")
 
+
 #
 # warnings flags
 #
@@ -754,46 +845,52 @@ if env['LIBLO']:
 
 
 def prep_libcheck(topenv, libinfo):
-    if topenv['DIST_TARGET'] == 'panther' or topenv['DIST_TARGET'] == 'tiger':
+    if topenv['IS_OSX']:
        #
-       # rationale: GTK-Quartz uses jhbuild and installs to /opt/gtk by default.
+       # rationale: GTK-Quartz uses jhbuild and installs to $HOME/gtk/inst by default.
        #            All libraries needed should be built against this location
+
        if topenv['GTKOSX']:
-               libinfo.Append(CPPPATH="/opt/gtk/include", LIBPATH="/opt/gtk/lib")
-               libinfo.Append(CXXFLAGS="-I/opt/gtk/include", LINKFLAGS="-L/opt/gtk/lib")
-       libinfo.Append(CPPPATH="/opt/local/include", LIBPATH="/opt/local/lib")
-       libinfo.Append(CXXFLAGS="-I/opt/local/include", LINKFLAGS="-L/opt/local/lib")
+               GTKROOT = os.path.expanduser ('~/gtk/inst')
+               libinfo.Append(CPPPATH= GTKROOT + "/include", LIBPATH= GTKROOT + "/lib")
+               libinfo.Append(CXXFLAGS="-I" + GTKROOT + "/include", LINKFLAGS="-L" + GTKROOT + "/lib")
+               #libinfo.Append(CPPPATH="/opt/local/include", LIBPATH="/opt/local/lib")
+               #libinfo.Append(CXXFLAGS="-I/opt/local/include", LINKFLAGS="-L/opt/local/lib")
 
 prep_libcheck(env, env)
 
 #
-# check for VAMP and rubberband (currently optional)
-#
+# these are part of the Ardour source tree because they are C++
+# 
 
-libraries['vamp'] = LibraryInfo()
+libraries['vamp'] = LibraryInfo (LIBS='vampsdk',
+                                 LIBPATH='#libs/vamp-sdk',
+                                 CPPPATH='#libs/vamp-sdk')
+libraries['vamphost'] = LibraryInfo (LIBS='vamphostsdk',
+                                 LIBPATH='#libs/vamp-sdk',
+                                 CPPPATH='#libs/vamp-sdk')
 
 env['RUBBERBAND'] = False
 
-#conf = env.Configure (custom_tests = { 'CheckPKGExists' : CheckPKGExists } )
-#
-#if conf.CheckPKGExists('vamp-sdk'):
-#    have_vamp = True
-#    libraries['vamp'].ParseConfig('pkg-config --cflags --libs vamp-sdk')
-#else:
-#    have_vamp = False
-#
-#libraries['vamp'] = conf.Finish ()
-#
-#if have_vamp:
-#    if os.path.exists ('libs/rubberband/src'):
-#        conf = Configure (libraries['vamp'])
-#        if conf.CheckHeader ('fftw3.h'):
-#            env['RUBBERBAND'] = True
-#            libraries['rubberband'] = LibraryInfo (LIBS='rubberband',
-#                                                   LIBPATH='#libs/rubberband',
-#                                                   CPPPATH='#libs/rubberband',
-#                                                   CCFLAGS='-DUSE_RUBBERBAND')
-#        libraries['vamp'] = conf.Finish ()
+conf = Configure (env)
+
+if conf.CheckHeader ('fftw3.h'):
+    env['RUBBERBAND'] = True
+    libraries['rubberband'] = LibraryInfo (LIBS='rubberband',
+                                           LIBPATH='#libs/rubberband',
+                                           CPPPATH='#libs/rubberband',
+                                           CCFLAGS='-DUSE_RUBBERBAND')
+else:
+    print ""
+    print "-------------------------------------------------------------------------"
+    print "You do not have the FFTW single-precision development package installed."
+    print "This prevents Ardour from using the Rubberband library for timestretching"
+    print "and pitchshifting. It will fall back on SoundTouch for timestretch, and "
+    print "pitchshifting will not be available."
+    print "-------------------------------------------------------------------------"
+    print ""
+
+conf.Finish()
 
 #
 # Check for libusb
@@ -815,31 +912,6 @@ else:
 
 libraries['usb'] = conf.Finish ()
 
-#
-# Check for FLAC
-
-libraries['flac'] = LibraryInfo ()
-prep_libcheck(env, libraries['flac'])
-libraries['flac'].Append(CPPPATH="/usr/local/include", LIBPATH="/usr/local/lib")
-
-#
-# june 1st 2007: look for a function that is in FLAC 1.1.2 and not in later versions
-#                since the version of libsndfile we have internally does not support
-#                the new API that libFLAC has adopted
-#
-
-conf = Configure (libraries['flac'])
-if conf.CheckLib ('FLAC', 'FLAC__seekable_stream_decoder_init', language='CXX'):
-    conf.env.Append(CCFLAGS='-DHAVE_FLAC')
-    use_flac = True
-else:
-    use_flac = False
-    
-libraries['flac'] = conf.Finish ()
-
-# or if that fails...
-#libraries['flac']    = LibraryInfo (LIBS='FLAC')
-
 # boost (we don't link against boost, just use some header files)
 
 libraries['boost'] = LibraryInfo ()
@@ -847,7 +919,7 @@ prep_libcheck(env, libraries['boost'])
 libraries['boost'].Append(CPPPATH="/usr/local/include", LIBPATH="/usr/local/lib")
 conf = Configure (libraries['boost'])
 if conf.CheckHeader ('boost/shared_ptr.hpp', language='CXX') == False:
-        print "Boost header files do not appear to be installed."
+        print "Boost header files do not appear to be installed. You also might be running a buggy version of scons. Try scons 0.97 if you can."
         sys.exit (1)
     
 libraries['boost'] = conf.Finish ()
@@ -884,6 +956,26 @@ else:
 
 libraries['dmalloc'] = conf.Finish ()
 
+#
+# ensure FREEDESKTOP target is doable..
+#
+
+conf = env.Configure ()
+if env['FREEDESKTOP']:
+       have_update_mime_database = conf.TryAction (Action ('update-mime-database -v'))
+       if have_update_mime_database[0] != 1:
+               print "Warning. You have no update-mime-database command in your PATH. FREEDESKTOP is now disabled."
+               env['FREEDESKTOP'] = 0
+       have_gtk_update_icon_cache = conf.TryAction (Action ('gtk-update-icon-cache -?'))
+       if have_gtk_update_icon_cache[0] != 1:
+               print "Warning. You have no gtk-update-icon-cache command in your PATH. FREEDESKTOP is now disabled."
+               env['FREEDESKTOP'] = 0
+       have_update_desktop_database = conf.TryAction (Action ('update-desktop-database -?'))
+       if have_update_desktop_database[0] != 1:
+               print "Warning. You have no update-desktop-database command in your PATH. FREEDESKTOP is now disabled."
+               env['FREEDESKTOP'] = 0
+env = conf.Finish()
+
 #
 # Audio/MIDI library (needed for MIDI, since audio is all handled via JACK)
 #
@@ -943,13 +1035,15 @@ if env['SYSLIBS']:
             print '%s >= %s not found.' %(pkg, version)
             DependenciesRequiredMessage()
             Exit(1)
-       
+    
     env = conf.Finish()
     
     libraries['sigc2'] = LibraryInfo()
     libraries['sigc2'].ParseConfig('pkg-config --cflags --libs sigc++-2.0')
     libraries['glibmm2'] = LibraryInfo()
     libraries['glibmm2'].ParseConfig('pkg-config --cflags --libs glibmm-2.4')
+    libraries['cairo'] = LibraryInfo()
+    libraries['cairo'].ParseConfig('pkg-config --cflags --libs cairo')
     libraries['cairomm'] = LibraryInfo()
     libraries['cairomm'].ParseConfig('pkg-config --cflags --libs cairomm-1.0')
     libraries['gdkmm2'] = LibraryInfo()
@@ -963,36 +1057,33 @@ if env['SYSLIBS']:
     libraries['libgnomecanvasmm'] = LibraryInfo()
     libraries['libgnomecanvasmm'].ParseConfig ('pkg-config --cflags --libs libgnomecanvasmm-2.6')
 
-#
-# cannot use system one for the time being
-#
-    
-    libraries['sndfile-ardour'] = LibraryInfo(LIBS='libsndfile-ardour',
-                                    LIBPATH='#libs/libsndfile',
-                                    CPPPATH=['#libs/libsndfile/src'])
-
 #    libraries['libglademm'] = LibraryInfo()
 #    libraries['libglademm'].ParseConfig ('pkg-config --cflags --libs libglademm-2.4')
 
 #    libraries['flowcanvas'] = LibraryInfo(LIBS='flowcanvas', LIBPATH='#/libs/flowcanvas', CPPPATH='#libs/flowcanvas')
     libraries['soundtouch'] = LibraryInfo()
-    #libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs soundtouch-1.0')
-    # Comment the previous line and uncomment this for Debian:
-    libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch')
+    libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs soundtouch-1.0')
+    # Comment the previous line and uncomment this for some versions of Debian:
+    #libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch')
 
     libraries['appleutility'] = LibraryInfo(LIBS='libappleutility',
                                             LIBPATH='#libs/appleutility',
                                             CPPPATH='#libs/appleutility')
     
+    libraries['sndfile'] = LibraryInfo()
+    libraries['sndfile'].ParseConfig ('pkg-config --cflags --libs libsndfile')
+
     coredirs = [
-        'templates'
+        'templates',
+        'manual'
     ]
     
     subdirs = [
-        'libs/libsndfile',
         'libs/pbd',
         'libs/midi++2',
         'libs/ardour',
+        'libs/vamp-sdk',
+        'libs/vamp-plugins/',
     # these are unconditionally included but have
     # tests internally to avoid compilation etc
     # if VST is not set
@@ -1012,18 +1103,27 @@ if env['SYSLIBS']:
         ]
 
 else:
+    libraries['cairo'] = LibraryInfo()
+    libraries['cairo'].ParseConfig('pkg-config --cflags --libs cairo')
+    
+    libraries['gtk2-unix-print'] = LibraryInfo()
+    libraries['gtk2-unix-print'].ParseConfig('pkg-config --cflags --libs gtk+-unix-print-2.0')
+    
     libraries['sigc2'] = LibraryInfo(LIBS='sigc++2',
                                     LIBPATH='#libs/sigc++2',
                                     CPPPATH='#libs/sigc++2')
     libraries['glibmm2'] = LibraryInfo(LIBS='glibmm2',
                                     LIBPATH='#libs/glibmm2',
-                                    CPPPATH='#libs/glibmm2')
+                                    CPPPATH='#libs/glibmm2/glib')
     libraries['pangomm'] = LibraryInfo(LIBS='pangomm',
                                     LIBPATH='#libs/gtkmm2/pango',
                                     CPPPATH='#libs/gtkmm2/pango')
     libraries['atkmm'] = LibraryInfo(LIBS='atkmm',
                                      LIBPATH='#libs/gtkmm2/atk',
                                      CPPPATH='#libs/gtkmm2/atk')
+    libraries['cairomm'] = LibraryInfo(LIBS='cairomm',
+                                      LIBPATH='#libs/cairomm',
+                                      CPPPATH='#libs/cairomm')
     libraries['gdkmm2'] = LibraryInfo(LIBS='gdkmm2',
                                       LIBPATH='#libs/gtkmm2/gdk',
                                       CPPPATH='#libs/gtkmm2/gdk')
@@ -1037,9 +1137,9 @@ else:
     libraries['soundtouch'] = LibraryInfo(LIBS='soundtouch',
                                           LIBPATH='#libs/soundtouch',
                                           CPPPATH=['#libs', '#libs/soundtouch'])
-    libraries['sndfile-ardour'] = LibraryInfo(LIBS='libsndfile-ardour',
-                                    LIBPATH='#libs/libsndfile',
-                                    CPPPATH=['#libs/libsndfile', '#libs/libsndfile/src'])
+    libraries['taglib'] = LibraryInfo(LIBS='libtaglib',
+                                      LIBPATH='#libs/taglib',
+                                      CPPPATH=['#libs/taglib/headers','#libs/taglib/headers/taglib'])
 #    libraries['libglademm'] = LibraryInfo(LIBS='libglademm',
 #                                          LIBPATH='#libs/libglademm',
 #                                          CPPPATH='#libs/libglademm')
@@ -1048,15 +1148,18 @@ else:
                                             CPPPATH='#libs/appleutility')
 
     coredirs = [
-        'templates'
+        'templates',
+       'manual'
     ]
     
     subdirs = [
         'libs/sigc++2',
-        'libs/libsndfile',
+        'libs/taglib',
         'libs/pbd',
         'libs/midi++2',
         'libs/ardour',
+        'libs/vamp-sdk',
+        'libs/vamp-plugins/',
     # these are unconditionally included but have
     # tests internally to avoid compilation etc
     # if VST is not set
@@ -1069,16 +1172,16 @@ else:
         ]
     
     gtk_subdirs = [
-       'libs/glibmm2',
-       'libs/gtkmm2/pango',
-       'libs/gtkmm2/atk',
-       'libs/gtkmm2/gdk',
-       'libs/gtkmm2/gtk',
-       'libs/libgnomecanvasmm',
-#      'libs/flowcanvas',
+        'libs/glibmm2',
+        'libs/gtkmm2/pango',
+        'libs/gtkmm2/atk',
+        'libs/gtkmm2/gdk',
+        'libs/gtkmm2/gtk',
+        'libs/libgnomecanvasmm',
         'libs/gtkmm2ext',
         'gtk2_ardour',
-        'libs/clearlooks'
+        'libs/clearlooks',
+        'libs/cairomm'
         ]
 
 #
@@ -1119,9 +1222,9 @@ else:
 #
 
 timefx_subdirs = ['libs/soundtouch']
-#if env['RUBBERBAND']:
-#    timefx_subdirs += ['libs/rubberband']
-    
+if env['RUBBERBAND']:
+    timefx_subdirs += ['libs/rubberband']
+
 opts.Save('scache.conf', env)
 Help(opts.GenerateHelpText(env))
 
@@ -1185,7 +1288,7 @@ env = conf.Finish()
 if env['NLS'] == 1:
     env.Append(CCFLAGS="-DENABLE_NLS")
 
-Export('env install_prefix final_prefix config_prefix final_config_prefix libraries i18n ardour_version subst_dict use_flac')
+Export('env install_prefix final_prefix config_prefix final_config_prefix libraries i18n ardour_version subst_dict')
 
 #
 # the configuration file may be system dependent
@@ -1224,12 +1327,13 @@ if os.path.exists('.svn'):
 
 the_revision = env.Command ('frobnicatory_decoy', [], create_stored_revision)
 remove_ardour = env.Command ('frobnicatory_decoy2', [],
-                             [ Delete ('$PREFIX/etc/ardour2'),
-                               Delete ('$PREFIX/lib/ardour2'),
-                               Delete ('$PREFIX/bin/ardour2')])
+                             [ Delete ('$PREFIX/etc/ardour3'),
+                               Delete ('$PREFIX/lib/ardour3'),
+                               Delete ('$PREFIX/bin/ardour3'),
+                               Delete ('$PREFIX/share/ardour3')])
 
 env.Alias('revision', the_revision)
-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour_system.rc'))
+env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'ardour_system.rc'))
 env.Alias('uninstall', remove_ardour)
 
 Default (sysrcbuild)
@@ -1272,6 +1376,12 @@ env.Alias ('srctar', srcdist)
 env.AddPreAction (env['DISTTREE'], Action ('rm -rf ' + str (File (env['DISTTREE']))))
 env.AddPostAction (srcdist, Action ('rm -rf ' + str (File (env['DISTTREE']))))
 
+#
+# Update revision info before going into subdirs
+#
+
+create_stored_revision()
+
 #
 # the subdirs
 #