LADI
/
ardour
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

do proper install on x86_64 system, remove stupid debuggig code from panner, handle port registration error with its own error message 

git-svn-id: svn://localhost/ardour2/trunk@1264 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2007-01-03 20:00:57 +00:00
parent fd42bffae7
commit ebbc8b3b6a
30 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
SConstruct
View File

@ -631,6 +631,13 @@ if env['FPU_OPTIMIZATION']:
print "\nWarning: you are building Ardour with SSE support even though your system does not support these instructions. (This may not be an error, especially if you are a package maintainer)"
# end optimization section
# handle x86/x86_64 libdir properly
if env['DIST_TARGET'] == 'x86_64':
env['LIBDIR']='lib64'
else:
env['LIBDIR']='lib'
#
# save off guessed arch element in an env
#

11
gtk2_ardour/SConscript
View File

@ -272,6 +272,7 @@ tt = gtkmmtests.Program(target = 'tt', source = tt_files)
my_subst_dict = { }
my_subst_dict['%INSTALL_PREFIX%'] = final_prefix
my_subst_dict['%LIBDIR%'] = env['LIBDIR']
ardoursh = env.SubstInFile ('ardour.sh','ardour.sh.in', SUBST_DICT = my_subst_dict);
env.AddPostAction (ardoursh, Chmod ('$TARGET', 0755))
@ -279,7 +280,7 @@ env.AddPostAction (ardoursh, Chmod ('$TARGET', 0755))
if env['VST']:
Default(ardourlib)
# the library - into the library dir
env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), ardourlib))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), ardourlib))
else:
if env['VERSIONED']:
@ -290,7 +291,7 @@ else:
#install
# the executable - into the library dir
env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), ardour))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), ardour))
# the script - into the bin dir
env.Alias('install', env.InstallAs(os.path.join(install_prefix, 'bin')+'/ardour2', ardoursh))
@ -303,9 +304,9 @@ env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour
env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour.bindings'))
env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour.colors'))
# data files
env.Alias('install', env.Install(os.path.join(install_prefix, 'share/ardour2'), 'splash.png'))
env.Alias('install', env.Install(os.path.join(install_prefix, 'share/ardour2/pixmaps'), pixmap_files))
env.Alias('install', env.Install(os.path.join(install_prefix, 'share/ardour2/icons'), icon_files))
env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour2'), 'splash.png'))
env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour2', 'pixmaps'), pixmap_files))
env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour2', 'icons'), icon_files))
env.Alias ('version', gtkardour.VersionBuild(['version.cc','version.h'], []))

2
gtk2_ardour/ardour.bindings
View File

@ -218,8 +218,8 @@
; (gtk_accel_path "<Actions>/Editor/PullupPlus1" "")
; (gtk_accel_path "<Actions>/Editor/Smpte24976" "")
; (gtk_accel_path "<Actions>/options/FileDataFormat24bit" "")
(gtk_accel_path "<Actions>/Common/ToggleOptionsEditor" "<Control>o")
; (gtk_accel_path "<Actions>/Editor/SnapMode" "")
(gtk_accel_path "<Actions>/Common/ToggleOptionsEditor" "<Control>o")
; (gtk_accel_path "<Actions>/Editor/PullupMinus4" "")
(gtk_accel_path "<Actions>/Common/goto-mixer" "<Alt>m")
; (gtk_accel_path "<Actions>/Editor/addExternalAudioToTrack" "")

6
gtk2_ardour/ardour.sh.in
View File

@ -1,11 +1,11 @@
#!/bin/sh
export GTK_PATH=%INSTALL_PREFIX%/lib/ardour2:$GTK_PATH
export GTK_PATH=%INSTALL_PREFIX%/%LIBDIR%/ardour2:$GTK_PATH
export LD_LIBRARY_PATH=%INSTALL_PREFIX%/lib/ardour2:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH=%INSTALL_PREFIX%/%LIBDIR%/ardour2:$LD_LIBRARY_PATH
# DYLD_LIBRARY_PATH is for Darwin
export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH
exec %INSTALL_PREFIX%/lib/ardour2/ardour.bin $*
exec %INSTALL_PREFIX%/%LIBDIR%/ardour2/ardour.bin $*

8
gtk2_ardour/ardour_ui.cc
View File

@ -1813,14 +1813,6 @@ This prevents the session from being loaded."));
new_session = new Session (*engine, path, snap_name, mix_template);
}
/* handle this one in a different way than all others, so that its clear what happened */
catch (AudioEngine::PortRegistrationFailure& err) {
error << _("Unable to create all required ports")
<< endmsg;
return -1;
}
catch (...) {
error << string_compose(_("Session \"%1 (snapshot %2)\" did not load successfully"), path, snap_name) << endmsg;

2
gtk2_ardour/pixmaps/SConscript
View File

@ -5,6 +5,6 @@ import glob
pixmap_files = glob.glob('*.xpm')
Import('env install_prefix')
env.Alias('install', env.Install(os.path.join(install_prefix, 'share/ardour/pixmaps'), pixmap_files))
env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour', 'pixmaps'), pixmap_files))
env.Alias('tarball', env.Distribute(env['DISTTREE'], [ 'SConscript' ] + pixmap_files))

2
libs/appleutility/SConscript
View File

@ -17,6 +17,6 @@ appleutility.Append(LINKFLAGS='-framework CoreServices')
libappleutility = appleutility.SharedLibrary('appleutility', appleutility_files)
if appleutility['COREAUDIO']:
Default(libappleutility)
env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libappleutility))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libappleutility))
env.Alias('tarball', env.Distribute (env['DISTTREE'], ['SConscript'] + appleutility_files + glob.glob('*.h') ))

10
libs/ardour/SConscript
View File

@ -113,10 +113,10 @@ if ardour['LIBLO']:
extra_sources += osc_files
ardour.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
ardour.Append(CXXFLAGS="-DDATA_DIR=\\\""+final_prefix+"/share\\\"")
ardour.Append(CXXFLAGS="-DMODULE_DIR=\\\""+final_prefix+"/lib\\\"")
ardour.Append(CXXFLAGS="-DCONFIG_DIR=\\\""+final_config_prefix+"\\\"")
ardour.Append(CXXFLAGS="-DLOCALEDIR=\\\""+final_prefix+"/share/locale\\\"")
ardour.Append(CXXFLAGS="-DDATA_DIR=\\\"" + os.path.join (final_prefix, 'share') + "\\\"")
ardour.Append(CXXFLAGS="-DMODULE_DIR=\\\"" + os.path.join (final_prefix, env['LIBDIR']) + "\\\"")
ardour.Append(CXXFLAGS="-DCONFIG_DIR=\\\"" + final_config_prefix + "\\\"")
ardour.Append(CXXFLAGS="-DLOCALEDIR=\\\"" + os.path.join (final_prefix, 'share', 'locale') + "\\\"")
ardour.Merge ([ libraries['jack'] ])
@ -299,7 +299,7 @@ if env['NLS']:
i18n (ardour, ardour_files + vst_files + coreaudio_files + audiounit_files, env)
env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libardour))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libardour))
env.Alias('version', ardour.VersionBuild(['version.cc', 'ardour/version.h'], []))

20
libs/ardour/io.cc
View File

@ -514,21 +514,13 @@ IO::deliver_output_no_pan (vector<Sample *>& bufs, uint32_t nbufs, nframes_t nfr
dst = (*o)->get_buffer (nframes) + offset;
src = bufs[min(nbufs,i)];
if (_name == "Audio 2") {
for (nframes_t x = 0; x < nframes; ++x) {
dst[x] = 0.7;
}
if (dg != _gain || actual_gain == 1.0f) {
memcpy (dst, src, sizeof (Sample) * nframes);
} else if (actual_gain == 0.0f) {
memset (dst, 0, sizeof (Sample) * nframes);
} else {
if (dg != _gain || actual_gain == 1.0f) {
memcpy (dst, src, sizeof (Sample) * nframes);
} else if (actual_gain == 0.0f) {
memset (dst, 0, sizeof (Sample) * nframes);
} else {
for (nframes_t x = 0; x < nframes; ++x) {
dst[x] = src[x] * actual_gain;
}
for (nframes_t x = 0; x < nframes; ++x) {
dst[x] = src[x] * actual_gain;
}
}

8
libs/ardour/session_state.cc
View File

@ -313,6 +313,14 @@ Session::second_stage_init (bool new_session)
when_engine_running();
}
/* handle this one in a different way than all others, so that its clear what happened */
catch (AudioEngine::PortRegistrationFailure& err) {
error << _("Unable to create all required ports")
<< endmsg;
return -1;
}
catch (...) {
return -1;
}

2
libs/clearlooks/SConscript
View File

@ -23,7 +23,7 @@ usable_libclearlooks = clearlooks.Install ('engines', libclearlooks)
Default (usable_libclearlooks)
env.Alias('install',
env.Install(os.path.join(install_prefix,'lib/ardour2/engines'),
env.Install(os.path.join(install_prefix,env['LIBDIR'], 'ardour2', 'engines'),
libclearlooks))
env.Alias('tarball', env.Distribute (env['DISTTREE'],

2
libs/flowcanvas/SConscript
View File

@ -39,7 +39,7 @@ libflowcanvas = flowcanvas.SharedLibrary('flowcanvas', flowcanvas_files)
Default(libflowcanvas)
env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libflowcanvas))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libflowcanvas))
env.Alias('tarball', env.Distribute (env['DISTTREE'],
['SConscript'] +

2
libs/glibmm2/SConscript
View File

@ -28,7 +28,7 @@ else :
Default([glibmm2_config_h, libglibmm2])
env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libglibmm2))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libglibmm2))
env.Alias('tarball', env.Distribute (env['DISTTREE'],
[ 'SConscript',

2
libs/gtkmm2/atk/SConscript
View File

@ -13,7 +13,7 @@ atkmm.Merge([libraries['glibmm2'], libraries['gtk2'], libraries['sigc2'] ])
libatkmm = atkmm.SharedLibrary('atkmm', atkmm_files)
Default(libatkmm)
env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libatkmm))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libatkmm))
env.Alias('tarball', env.Distribute (env['DISTTREE'],
[ 'SConscript', 'atkmm.h'] +

2
libs/gtkmm2/gdk/SConscript
View File

@ -14,7 +14,7 @@ gdkmm2.Append(CXXFLAGS="-Ilibs/gtkmm2/gtk")
libgdkmm2 = gdkmm2.SharedLibrary('gdkmm2', gdkmm2_files)
Default(libgdkmm2)
env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libgdkmm2))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libgdkmm2))
env.Alias('tarball', env.Distribute (env['DISTTREE'],
[ 'SConscript', 'gdkmmconfig.h', 'gdkmm.h'] +

2
libs/gtkmm2/gtk/SConscript
View File

@ -13,7 +13,7 @@ gtkmm2.Merge([libraries['glibmm2'], libraries['gtk2'], libraries['sigc2'], libra
libgtkmm2 = gtkmm2.SharedLibrary('gtkmm2', gtkmm2_files)
Default(libgtkmm2)
env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libgtkmm2))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libgtkmm2))
env.Alias('tarball', env.Distribute (env['DISTTREE'],
[ 'SConscript', 'gtkmmconfig.h', 'gtkmm.h'] +

2
libs/gtkmm2/pango/SConscript
View File

@ -13,7 +13,7 @@ pangomm.Merge([libraries['glibmm2'], libraries['pango'], libraries['sigc2']])
libpangomm = pangomm.SharedLibrary('pangomm', pangomm_files)
Default(libpangomm)
env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libpangomm))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libpangomm))
env.Alias('tarball', env.Distribute (env['DISTTREE'],
[ 'SConscript', 'pangomm.h'] +

2
libs/gtkmm2ext/SConscript
View File

@ -69,7 +69,7 @@ Default(libgtkmm2ext)
if env['NLS']:
i18n (gtkmm2ext, gtkmm2ext_files, env)
env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libgtkmm2ext))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libgtkmm2ext))
env.Alias('tarball', env.Distribute (env['DISTTREE'],
[ 'SConscript', 'i18n.h', 'gettext.h'] +

2
libs/libglademm/SConscript
View File

@ -15,7 +15,7 @@ libglade = libglademm.SharedLibrary('libglademm', libglademm_files)
Default(libglade)
env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libglade))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libglade))
env.Alias('tarball', env.Distribute (env['DISTTREE'],
[ 'SConscript', 'libglademmconfig.h', 'libglademm.h'] +

2
libs/libgnomecanvasmm/SConscript
View File

@ -20,7 +20,7 @@ gnomecanvasmm.Merge([libraries['glibmm2'],
libgnomecanvasmm = gnomecanvasmm.SharedLibrary('libgnomecanvasmm', gnomecanvasmm_files)
Default(libgnomecanvasmm)
env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libgnomecanvasmm))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libgnomecanvasmm))
env.Alias('tarball', env.Distribute (env['DISTTREE'],
[ 'SConscript', 'libgnomecanvasmmconfig.h', 'libgnomecanvasmm.h'] +

2
libs/libsndfile/SConscript
View File

@ -32,7 +32,7 @@ sndfile_h = sndfile.Command('src/sndfile.h', ['src/sndfile.h.in'], 'cd libs/libs
Default([sndfile_h,libsndfile])
env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libsndfile))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libsndfile))
env.Alias('tarball', env.Distribute (env['DISTTREE'],
[ 'NEWS', 'README', 'AUTHORS', 'ChangeLog',

2
libs/midi++2/SConscript
View File

@ -51,7 +51,7 @@ libmidi2 = midi2.SharedLibrary('midi++', [ sources, sysdep_src ])
Default(libmidi2)
env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libmidi2))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libmidi2))
env.Alias('tarball', env.Distribute (env['DISTTREE'],
[ 'SConscript' ] + sources + sysdep_sources +

2
libs/pbd/SConscript
View File

@ -67,7 +67,7 @@ mount_env.Program('mountpoint', 'mountpoint.cc')
if env['NLS']:
i18n (pbd, pbd_files, env)
env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libpbd))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libpbd))
env.Alias('tarball', env.Distribute (env['DISTTREE'],
[ 'SConscript', 'i18n.h', 'gettext.h', 'pbd/abstract_ui.cc' ] +

2
libs/sigc++2/SConscript
View File

@ -20,7 +20,7 @@ else :
Default([sigc2_config_h,libsigc2])
env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libsigc2))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libsigc2))
env.Alias('tarball', env.Distribute (env['DISTTREE'],
[ 'NEWS', 'README', 'AUTHORS', 'ChangeLog',

2
libs/soundtouch/SConscript
View File

@ -23,7 +23,7 @@ libst = st.SharedLibrary('soundtouch', soundtouch_files)
Default(libst)
env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libst))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libst))
env.Alias('tarball', env.Distribute (env['DISTTREE'],
[ 'SConscript'] + soundtouch_files + glob.glob('*.h')))

2
libs/surfaces/control_protocol/SConscript
View File

@ -50,7 +50,7 @@ Default(libardour_cp)
if env['NLS']:
i18n (cp, cp_files, env)
env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libardour_cp))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libardour_cp))
env.Alias('tarball', env.Distribute (env['DISTTREE'],
[ 'SConscript' ] +

2
libs/surfaces/generic_midi/SConscript
View File

@ -51,7 +51,7 @@ Default(libardour_genericmidi)
if env['NLS']:
i18n (genericmidi, genericmidi_files, env)
env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2/surfaces'), libardour_genericmidi))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2', 'surfaces'), libardour_genericmidi))
env.Alias('tarball', env.Distribute (env['DISTTREE'],
[ 'SConscript' ] +

2
libs/surfaces/tranzport/SConscript
View File

@ -48,7 +48,7 @@ if tranzport['TRANZPORT']:
Default(libardour_tranzport)
if env['NLS']:
i18n (tranzport, tranzport_files, env)
env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2/surfaces'), libardour_tranzport))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2', 'surfaces'), libardour_tranzport))
env.Alias('tarball', env.Distribute (env['DISTTREE'],
[ 'SConscript' ] +

2
templates/SConscript
View File

@ -14,5 +14,5 @@ for template in template_files:
Default(template_build)
env.Alias('install', env.Install(os.path.join(install_prefix, 'share/ardour2/templates'), files))
env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour2', 'templates'), files))
env.Alias('tarball', env.Distribute (env['DISTTREE'], [ 'SConscript' ] + template_build))

2
vst/SConscript
View File

@ -74,7 +74,7 @@ if ardour_vst['VST']:
# the wine script - into the bin dir
env.Alias('install', env.Install(os.path.join(install_prefix, 'bin'), wine_executable))
# the win32 executable - into the lib dir since the wine script will look for it there
env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), 'ardour_vst.exe.so'))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), 'ardour_vst.exe.so'))
env.Alias ('tarball', env.Distribute (env['DISTTREE'],
[ 'SConscript',