X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fwscript;h=b657e5fcd5306c77cce442f8c8d8c38d130bc363;hb=ae6b0b9f1ab02ab949eaf741b98e69bdab487e92;hp=2fb8f0ddd9df18f9a3940a8a996266deb6670eed;hpb=46e448252f74ce35f37a1a41bb3ebe0f0312cd5d;p=ardour.git diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index 2fb8f0ddd9..b657e5fcd5 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -8,15 +8,6 @@ import re import time from waflib.Task import Task -# Version of this package (even if built as a child) -MAJOR = '3' -MINOR = '0' -MICRO = '0' -GTK2_ARDOUR_VERSION = "%s.%s.%s" % (MAJOR, MINOR, MICRO) - -# Variables for 'waf dist' -APPNAME = 'gtk2_ardour3' -VERSION = GTK2_ARDOUR_VERSION I18N_PACKAGE = 'gtk2_ardour3' # Mandatory variables @@ -52,6 +43,7 @@ gtk2_ardour_sources = [ 'automation_streamview.cc', 'automation_time_axis.cc', 'axis_view.cc', + 'big_clock_window.cc', 'bundle_manager.cc', 'button_joiner.cc', 'canvas-flag.cc', @@ -93,7 +85,6 @@ gtk2_ardour_sources = [ 'editor_regions.cc', 'editor_routes.cc', 'editor_rulers.cc', - 'editor_scrub.cc', 'editor_selection.cc', 'editor_snapshots.cc', 'editor_summary.cc', @@ -112,6 +103,7 @@ gtk2_ardour_sources = [ 'fft.cc', 'fft_graph.cc', 'fft_result.cc', + 'sfdb_freesound_mootcher.cc', 'gain_meter.cc', 'generic_pluginui.cc', 'ghostregion.cc', @@ -147,12 +139,16 @@ gtk2_ardour_sources = [ 'midi_streamview.cc', 'midi_time_axis.cc', 'midi_tracer.cc', + 'midi_velocity_dialog.cc', 'missing_file_dialog.cc', 'missing_plugin_dialog.cc', 'mixer_actor.cc', 'mixer_group_tabs.cc', 'mixer_strip.cc', 'mixer_ui.cc', + 'meterbridge.cc', + 'meter_strip.cc', + 'meter_patterns.cc', 'monitor_section.cc', 'mono_panner.cc', 'mono_panner_editor.cc', @@ -161,6 +157,8 @@ gtk2_ardour_sources = [ 'new_plugin_preset_dialog.cc', 'normalize_dialog.cc', 'note_player.cc', + 'nsm.cc', + 'nsmclient.cc', 'option_editor.cc', 'opts.cc', 'panner2d.cc', @@ -168,6 +166,7 @@ gtk2_ardour_sources = [ 'panner_interface.cc', 'panner_ui.cc', 'piano_roll_header.cc', + 'pingback.cc', 'playlist_selector.cc', 'plugin_eq_gui.cc', 'plugin_selector.cc', @@ -204,6 +203,7 @@ gtk2_ardour_sources = [ 'search_path_option.cc', 'selection.cc', 'send_ui.cc', + 'session_dialog.cc', 'session_import_dialog.cc', 'session_metadata_dialog.cc', 'session_option_editor.cc', @@ -239,7 +239,20 @@ gtk2_ardour_sources = [ 'visibility_group.cc', 'volume_controller.cc', 'waveview.cc', - 'window_proxy.cc' + 'window_manager.cc', +# video-timeline related sources: + 'video_image_frame.cc', + 'add_video_dialog.cc', + 'editor_videotimeline.cc', + 'video_timeline.cc', + 'system_exec.cc', + 'video_monitor.cc', + 'transcode_ffmpeg.cc', + 'transcode_video_dialog.cc', + 'video_server_dialog.cc', + 'utils_videotl.cc', + 'export_video_dialog.cc', + 'export_video_infobox.cc' ] def options(opt): @@ -248,10 +261,11 @@ def options(opt): def configure(conf): conf.load('misc') conf.load('compiler_cxx') + # we don't use hard-coded micro versions with ardour, so hard code it to zero autowaf.build_version_files( path_prefix + 'version.h', path_prefix + 'version.cc', - 'gtk2_ardour', MAJOR, MINOR, MICRO) + 'gtk2_ardour', conf.env['MAJOR'], conf.env['MINOR'], 0) autowaf.configure(conf) if re.search ("linux", sys.platform) != None: @@ -259,6 +273,8 @@ def configure(conf): # TODO: Insert a sanity check for on OS X to ensure CoreAudio is present + autowaf.check_pkg(conf, 'fftw3f', uselib_store='FFTW3F', + mandatory=True) autowaf.check_pkg(conf, 'flac', uselib_store='FLAC', atleast_version='1.2.1') autowaf.check_pkg(conf, 'gthread-2.0', uselib_store='GTHREAD', @@ -272,7 +288,8 @@ def configure(conf): autowaf.check_pkg(conf, 'libgnomecanvasmm-2.6', uselib_store='GNOMECANVASMM', atleast_version='2.16') autowaf.check_pkg(conf, 'ogg', uselib_store='OGG', atleast_version='1.1.2') - autowaf.check_pkg(conf, 'x11', uselib_store='X11', atleast_version='1.3', mandatory=False) + autowaf.check_pkg(conf, 'x11', uselib_store='X11', atleast_version='1.1', mandatory=False) + autowaf.check_pkg(conf, 'fontconfig', uselib_store='FONTCONFIG') conf.write_config_header('gtk2ardour-config.h', remove=False) @@ -348,6 +365,8 @@ def build_color_scheme(path, prefix): def build(bld): + VERSION = "%s.%s" % (bld.env['MAJOR'], bld.env['MINOR']) + if bld.is_defined('WINDOWS_VST_SUPPORT'): # If we require VST support we build a stub main() and the FST library # here using winegcc, and link it to the GTK front-end library @@ -359,18 +378,19 @@ def build(bld): ../libs/fst/vstwin.c ../vst/winmain.c ''' - obj.uselib = 'ALSA' obj.use = [ 'libpbd', 'libmidipp', 'libtaglib', 'libardour', 'libardour_cp', + 'libtimecode', + 'libmidipp', 'libgtk2_ardour', 'libgtkmm2ext', - 'libtaglib' ] - obj.target = 'ardour-3.0-vst.exe.so' + 'libtaglib'] + obj.target = 'ardour-' + bld.env['VERSION'] + '-vst.exe.so' obj.includes = [ '../libs/fst', '.' ] - obj.linkflags = ['-mwindows', '-Wl,--export-dynamic', '-lpthread'] + obj.linkflags = ['-mwindows', '-Wl,--export-dynamic'] obj.defines = ['_POSIX_SOURCE', 'USE_WS_PREFIX'] obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') # end of the wine executable @@ -385,24 +405,28 @@ def build(bld): # just the normal executable version of the GTK GUI obj = bld(features = 'cxx c cxxprogram') obj.source = gtk2_ardour_sources - obj.target = 'ardour-3.0' + obj.target = 'ardour-' + bld.env['VERSION'] obj.includes = ['.'] + obj.use = [ 'libpbd', + 'libardour', + 'libardour_cp', + 'libtimecode', + 'libmidipp', + 'libgtk2_ardour', + 'libgtkmm2ext', + ] # continue with setup of obj, which could be a shared library # or an executable. obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') - - obj.uselib = 'UUID FLAC GLIBMM GTHREAD GTK OGG ALSA CURL DL' - obj.uselib += ' GTKMM GNOMECANVASMM GNOMECANVAS ' - obj.uselib += ' AUDIOUNITS OSX GTKOSX ' - obj.use = [ 'libpbd', - 'libmidipp', - 'libtaglib', - 'libardour', - 'libardour_cp', - 'libgtkmm2ext', - 'libtaglib' ] + obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG CURL DL' + obj.uselib += ' GTKMM GNOMECANVASMM GNOMECANVAS FFTW3F' + obj.uselib += ' AUDIOUNITS OSX GTKOSX LO ' + if bld.is_defined('USE_EXTERNAL_LIBS'): + obj.uselib += ' TAGLIB' + else: + obj.use.append('libtaglib') if sys.platform == 'darwin': obj.use += ' libappleutility' obj.defines = [ @@ -417,21 +441,20 @@ def build(bld): if bld.is_defined('HAVE_SUIL'): obj.source += [ 'lv2_plugin_ui.cc' ] - obj.uselib += ' SUIL ' + obj.use += [ 'SUIL' ] - if bld.is_defined('FREESOUND'): - obj.source += [ 'sfdb_freesound_mootcher.cc' ] - obj.defines += [ 'FREESOUND' ] + if bld.is_defined('NEED_INTL'): + obj.linkflags = ' -lintl' if bld.is_defined('WINDOWS_VST_SUPPORT'): obj.source += [ 'windows_vst_plugin_ui.cc' ] obj.defines += [ 'WINDOWS_VST_SUPPORT' ] - obj.uselib += ' X11 ' - + obj.use += [ 'X11' ] + if bld.is_defined('LXVST_SUPPORT'): obj.source += [ 'linux_vst_gui_support.cc', 'lxvst_plugin_ui.cc' ] obj.defines += [ 'LXVST_SUPPORT' ] - obj.uselib += ' X11 ' + obj.use += [ 'X11' ] if bld.is_defined('WINDOWS_VST_SUPPORT') or bld.is_defined('LXVST_SUPPORT'): obj.source += [ 'vst_plugin_ui.cc' ] @@ -455,8 +478,8 @@ def build(bld): 'DATADIR' : os.path.normpath(bld.env['DATADIR']), 'SYSCONFDIR' : os.path.normpath(bld.env['SYSCONFDIR']), 'LIBS' : 'build/libs', - 'VERSION' : '3.0', - 'EXECUTABLE' : 'build/gtk2_ardour/ardour-3.0' + 'VERSION' : bld.env['VERSION'], + 'EXECUTABLE' : 'build/gtk2_ardour/ardour-' + bld.env['VERSION'] } def set_subst_dict(obj, dict): @@ -498,30 +521,44 @@ def build(bld): if bld.is_defined('GTKOSX'): # OS X fonts basefont = "" font_sizes = { - 'TINY' : '7', 'SMALLER' : '9', 'SMALL' : '10', 'NORMAL' : '11', - 'BIG' : '12', - 'BIGGER' : '14', + 'BIG' : '13', + 'BIGGER' : '17', 'LARGE' : '18', 'LARGER' : '28', 'HUGER' : '36', - 'MASSIVE' : '60' + 'MASSIVE' : '60', + } + + # There is no acceptable monospace font available on older versions of OS X + # and no API on those versions to load TTF files that will work with + # GTK/fontconfig/pango. + # + # In addition, the ArdourMono font gets clipped for some reason on OS X + # + # Moreover, Lucida Grande just seems to work even though it is not monospace + # so just use it. + # + font_names = { + 'MONOSPACE' : 'Lucida Grande', } else: # Linux/X11 fonts basefont = '' # unspecified - use system defaults font_sizes = { - 'TINY' : '6', 'SMALLER' : '8', 'SMALL' : '9', 'NORMAL' : '10', 'BIG' : '14', - 'BIGGER' : '16', + 'BIGGER' : '17', 'LARGE' : '18', 'LARGER' : '24', 'HUGER' : '34', - 'MASSIVE' : '60' + 'MASSIVE' : '60', + } + font_names = { + 'MONOSPACE' : 'ArdourMono', } # Set up font substitution dictionary @@ -544,6 +581,12 @@ def build(bld): dark_rc_subst_dict[key] = points light_rc_subst_dict[key] = points + # various font names, eg @BOLD_MONOSPACE@ + for font_sym,text in iter(font_names.items()): + key = font_sym + dark_rc_subst_dict[key] = text + light_rc_subst_dict[key] = text + # RC files dark_rc_subst_dict['COLOR_SCHEME'] = build_color_scheme( 'gtk2_ardour/ardour3_ui_dark.rc.in', 'ARDOUR_DARK') @@ -613,6 +656,7 @@ def build(bld): menus_argv = [ '-E', '-P', '-DGTKOSX' ] else: menus_argv = [ '-E', '-P' ] + obj = bld(features = 'command-output') obj.command = 'cpp' obj.command_is_external = True @@ -620,6 +664,7 @@ def build(bld): obj.argv = menus_argv obj.stdin = 'ardour.menus.in' obj.stdout = 'ardour.menus' + obj.dep_vars = ['GTKOSX'] bld.install_files(os.path.join(bld.env['SYSCONFDIR'], 'ardour3'), 'ardour.menus') @@ -646,6 +691,7 @@ def build(bld): bld.install_files('${DATADIR}/ardour3/icons', bld.path.ant_glob('icons/*.png')) bld.install_files('${DATADIR}/ardour3/pixmaps', bld.path.ant_glob('pixmaps/*.xpm')) bld.install_files('${DATADIR}/ardour3', 'splash.png') + bld.install_files('${DATADIR}/ardour3', 'ArdourMono.ttf') # Default UI configuration bld.install_files('${SYSCONFDIR}/ardour3', 'ardour3_ui_default.conf')