19bb2b33a8
Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows
...
Conflicts (hopefully resolved):
gtk2_ardour/marker.cc
gtk2_ardour/midi_region_view.h
gtk2_ardour/region_gain_line.h
gtk2_ardour/utils.cc
gtk2_ardour/video_image_frame.cc
gtk2_ardour/wscript
libs/backends/jack/wscript
2013-09-21 09:17:25 +01:00
7a30e63eaa
fix merge conflicts with master
2013-09-14 16:42:40 -04:00
60da662aff
Merge branch 'master' into windows
2013-09-14 16:21:32 -04:00
Nils Philippsen
e3b954e16f
don't confuse arm with i686
2013-09-13 16:28:04 +02:00
bb826f4bee
incomplete merge of master into windows (requires upcoming changes to master to be complete)
2013-09-12 11:28:50 -04:00
f4cf283f26
move JACK audio backend to its own folder and adjust build system to reflect that (installed version may now work)
2013-09-07 11:03:57 -04:00
8c5cff6091
Merge branch 'master' into windows
2013-09-06 10:56:36 -04:00
808ee5d139
Only define certain debug flags when dist_target is auto
...
Fixes issue when cross compiling using MinGW
2013-09-06 14:31:49 +10:00
91b027a4a0
bump to 3.4
2013-09-03 09:08:18 -04:00
0013feddbf
Merge branch 'master' into windows
2013-09-03 08:34:27 -04:00
dee91c2c39
Revert "bump to 3.4"
...
This reverts commit ad7ab8f09a
2013-09-03 07:59:59 -04:00
f5a60e247e
revert to --backtrace enabled by default, since the original goal of this change was addressed in other ways
2013-09-02 22:10:51 -04:00
ad7ab8f09a
bump to 3.4
2013-09-02 21:57:40 -04:00
ee1b49f87e
fix merge conflicts from master
2013-08-24 12:18:06 -04:00
cc92c879bf
Merge branch 'master' into ccmerge
...
Conflicts:
gtk2_ardour/ardour_ui_options.cc
gtk2_ardour/generic_pluginui.cc
gtk2_ardour/level_meter.cc
gtk2_ardour/utils.cc
gtk2_ardour/utils.h
gtk2_ardour/video_image_frame.cc
2013-08-10 15:41:40 +02:00
3f423339bc
add _ISOC9X_SOURCE define to compiler command line to provide uniform access to llabs()
2013-08-08 15:26:18 -04:00
56020b8f8c
bump actual publically visible version (oops)
2013-08-08 15:23:10 -04:00
Michael R. Fisher
d872a0a31b
Add c++11 enablement options in wscript
...
- adds "--cxx11" toggle for ./waf configure
- The switch adds appropriate compiler flags and tests the compiler
for usability of c++11
- This 'should' be compatible for linux, osx, and windows systems
that have gcc and/or clang with support c++11
2013-08-08 15:23:10 -04:00
d9862364be
Add --single-tests option to also build each libardour test as a separate program
2013-08-08 15:23:08 -04:00
897074730a
remove --no-freesound option. fixes #5640
2013-08-08 20:08:20 +02:00
bb8cb93789
Merge branch 'master' into windows
2013-08-01 10:44:58 -04:00
0bd09a0e23
add _ISOC9X_SOURCE define to compiler command line to provide uniform access to llabs()
2013-08-01 10:10:21 -04:00
ed9dd5ca62
Enable lxvst support by default and then disable for build targets that don't support it
2013-07-22 13:41:14 +10:00
56a6f52856
Remove lxvst variable from wscript that was no longer in use
2013-07-22 13:41:14 +10:00
d0deae357b
Remove tools/sanity_check dir from build in mingw cross compile
...
This is already added to build further down. I believe this is result of
a partially applied patch.
2013-07-22 13:41:14 +10:00
1e9301a713
Define PLATFORM_WINDOWS and COMPILER_MINGW when dist target is set to mingw
2013-07-22 13:41:14 +10:00
650964f320
Merge branch 'master' into windows
2013-07-17 08:05:59 -04:00
fc0053a721
bump actual publically visible version (oops)
2013-07-16 18:54:45 -04:00
Michael R. Fisher
cdef4aa50f
Add c++11 enablement options in wscript
...
- adds "--cxx11" toggle for ./waf configure
- The switch adds appropriate compiler flags and tests the compiler
for usability of c++11
- This 'should' be compatible for linux, osx, and windows systems
that have gcc and/or clang with support c++11
2013-07-15 22:57:35 -05:00
590e1fb458
Disable check for boost with mingw build
2013-07-15 13:43:47 -04:00
00ae5492f4
(reapply with fixes) Build system changes to support mingw build target
2013-07-15 13:43:17 -04:00
96ea407d1a
Revert "Build system changes to support mingw build target"
...
This reverts commit 94145732f3
2013-07-15 13:21:22 -04:00
555174d510
Revert "tweaks to mingw build environment"
...
This reverts commit fa09121a7f
2013-07-15 13:20:48 -04:00
fa09121a7f
tweaks to mingw build environment
2013-07-15 13:17:32 -04:00
94145732f3
Build system changes to support mingw build target
2013-07-15 13:16:09 -04:00
7a5118f403
Add --single-tests option to also build each libardour test as a separate program
2013-07-11 10:57:21 -04:00
3031a99364
Merge branch 'master' into cairocanvas
2013-06-25 22:24:47 -04:00
4a7c615714
fix issue with wscript on OS X caused by earlier removal of AU_STATE_SUPPORT; in config summary use NO_PLUGIN_STATE not removed AU_STATE_SUPPORT
2013-06-25 11:09:47 -04:00
f00b3b7f11
merge with master
2013-06-13 23:00:24 -04:00
80a13145f3
Generalize no-plugin-state from AudioUnits to all plugins
...
Replace AU_STATE_SUPPORT compile-time define with NO_PLUGIN_STATE and make it prevent plugin state setting, preset loading, preset saving and plugin state saving. Blocks on these actions exist partially in the backend and partially in the GUI (this latter class are not absolute, and should OSC or MIDI be able to drive Plugin::save_preset() the block could be circumvented). Set NO_PLUGIN_STATE if --freebie is used at waf-configure time
2013-06-13 22:50:54 -04:00
a1e3cee926
bump to v3.2
2013-06-13 10:53:51 -04:00
2e1e5da78e
more changes to consolidate version definition into the top level wscript file
2013-06-11 11:37:52 -04:00
31d234b48c
Merge branch 'master' into cairocanvas
2013-06-07 13:18:48 -04:00
53c6c714cd
disable symbol export -- fix LinuxVST issue
...
-rdynamic: Pass the flag -export-dynamic to the ELF linker,
on targets that support it. This instructs the linker to add
all symbols, not only used ones, to the dynamic symbol table.
This option is needed for some uses of dlopen or to allow
obtaining backtraces from within a program.
Some LinuxVST pluging cause ardour3 to crash -- if ardour is linked with
-rdynamic (see #ardour log from 2013-jun-6). This is likely compiler
specific and not a problem on las' build-machine (gcc 4.5.5) which is
why the linux-packaging script enables it by default.
The issue can be reproduced reliably with gcc 4.7.2 and 4.6.3. Although
it is yet unclear if it is caused by g++/ld or related to other factors
of the build-system...
2013-06-06 21:27:07 +02:00
bebe2af95a
merge with master
2013-05-08 14:48:28 -04:00
cadfc2aee1
various miscellany related to versions, gtk2 build and packaging
2013-05-08 13:16:50 -04:00
e8301185c0
a few minor changes required to get a DMG to build (on Tiger, at least)
2013-05-07 12:21:42 -04:00
6ae4f10437
Merge branch 'master' into cairocanvas
...
Conflicts:
gtk2_ardour/editor.h
gtk2_ardour/editor_canvas.cc
gtk2_ardour/wscript
2013-04-11 22:24:05 +02:00
66ee2c8e59
enable videotimeline by default
2013-04-11 19:49:48 +02:00
bca507a808
Merge branch 'master' into cairocanvas
2013-04-09 14:23:41 -04:00
d79e3a21c6
bump to 3.1
2013-04-08 12:00:29 -04:00
30968b8542
merge with master, including manual merge conflict resolution
2013-04-06 16:12:15 -04:00
2a1b4bff48
do not include templates in a distributed version of ardour, they are useless. see the comments in templates/wscript on why this is so, and why this change was made
2013-04-06 11:37:16 -04:00
b023273d01
add pkg-config check on liblo, now that NSM support requires 0.26 rather than just "any" version ( fixes #5435 )
2013-04-06 09:29:54 -04:00
aaea166135
initial commit of hand merging, plus getting "ancient" waf script to work correctly
2013-04-04 00:32:52 -04:00
9eaefe3d12
remaining part of static library commit, should have been a part of 16ce39c230
2013-03-20 17:22:32 -04:00
Julien de Kozak
eb7a85b8f9
Set the revision mechanism independent from the VCS name
2013-03-18 20:13:05 +01:00
0c3e840700
videotimline
...
squashed 694 commits from http://gareus.org/gitweb/?p=ardour3.git
2013-03-13 20:28:15 +01:00
d957bf7a28
print the git version on build
2013-03-13 19:13:00 +01:00
59c74e675c
git revision extraction
2013-03-12 17:44:48 +01:00
224edbeb15
remove debug output from wscript
...
git-svn-id: svn://localhost/ardour2/branches/3.0@14213 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-11 09:06:07 +00:00
25b934406a
removal manual tree from source code, since this has its own website and git repo now
...
git-svn-id: svn://localhost/ardour2/branches/3.0@14212 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-11 09:05:39 +00:00
903c29d07d
add pseudo-target "tarball" needed in order to build source tarballs correctly
...
git-svn-id: svn://localhost/ardour2/branches/3.0@14209 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-10 20:22:26 +00:00
a9bb9f0401
welcome to version 3.0
...
git-svn-id: svn://localhost/ardour2/branches/3.0@14206 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-10 15:33:21 +00:00
ba73a77c63
switch to Lucida Sans Typewriter as OS X monospace font; new pingback code to get announcements from ardour.org (can be disabled on the command line with -a)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@14189 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-08 16:41:45 +00:00
7dab0f7e04
get 1040 vs 1070 OS X min requirement working (for lion, at least)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@14185 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-08 04:28:18 +00:00
e301c7ca61
include min OS X spec in CXXFLAGS as well as CFLAGS
...
git-svn-id: svn://localhost/ardour2/branches/3.0@14184 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-08 04:11:54 +00:00
2d1cb16c4c
correct python syntax
...
git-svn-id: svn://localhost/ardour2/branches/3.0@14180 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-08 03:41:02 +00:00
5907f3eb03
potential fix, part two, for Tiger-based font issues. this also switches things so that building on Lion or Mountain Lion sets MAC_OS_VERSION_MIN_REQUIRED to 1070, to avoid legacy stuff
...
git-svn-id: svn://localhost/ardour2/branches/3.0@14179 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-08 03:39:58 +00:00
95c86bec2d
two fixes from TheCranston to help out on OS X with disk space measurement, modified by me
...
git-svn-id: svn://localhost/ardour2/branches/3.0@14157 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-06 01:05:15 +00:00
f9d908e3a9
allow build/packaging scripts to find the right version ID for as long as we have separate designations on different platforms
...
git-svn-id: svn://localhost/ardour2/branches/3.0@14132 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-04 15:49:36 +00:00
968c53aba1
bump version to rc3, but keep OS X releases as "beta"
...
git-svn-id: svn://localhost/ardour2/branches/3.0@14128 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-04 14:58:20 +00:00
126802ffc5
add --depstack-root option to waf to allow building with gtk/ardour dependency stacks in various locations; clean up libintl logic in wscript
...
git-svn-id: svn://localhost/ardour2/branches/3.0@14099 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-02-26 14:29:58 +00:00
a4fb605804
reinstate decode() call on Popen.communicate() output, needed for python 3
...
git-svn-id: svn://localhost/ardour2/branches/3.0@14069 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-02-20 21:48:17 +00:00
ff0662ef85
revert 14046 which attempted to "fix" something with python3 but broke various common uses
...
git-svn-id: svn://localhost/ardour2/branches/3.0@14068 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-02-20 20:13:35 +00:00
9bbed5925d
add MIDNAM (patchfiles) to child list so that they get installed
...
git-svn-id: svn://localhost/ardour2/branches/3.0@14057 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-02-13 19:38:47 +00:00
Sakari Bergen
6dbfeaf164
Make fetch_svn_revision work properly with python 3
...
git-svn-id: svn://localhost/ardour2/branches/3.0@14046 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-02-03 13:21:52 +00:00
9d29fb8e0a
reverse logic used to decide whether or not to explicitly link against libintl, which should not happen on a linux system where glibc includes the libintl API
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13973 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-23 01:47:18 +00:00
daf22cd327
fix git-svn version extraction for local git branches
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13962 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-21 22:41:31 +00:00
ee71553180
new take on getting SVN revision number
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13881 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-19 01:11:48 +00:00
a52deb13e7
fix i18n-caused error in determining svn revision (shoudl fix #5256 )
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13798 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-07 19:14:46 +00:00
33d071468f
fix error in wscript re: wiimote
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13797 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-07 18:55:33 +00:00
0209267980
reinstate wiimote support, thanks to work by jannis pohlmann
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13796 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-07 18:28:09 +00:00
982f9beaab
sys.platform == 'linux2' VA linux2.x and 3.x
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13792 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-06 09:49:49 +00:00
1ba50c59d1
!darwin != linux
...
needed for BSD support.
tools/sanity_check is Linux specific.
git-svn-id: svn://localhost/ardour2/branches/3.0@13780 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-05 10:08:04 +00:00
1f6684237c
fix builds on newer gcc/ld
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13778 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-04 21:46:29 +00:00
c9c94ca1c2
merge robin gareus' libltc into ardour source tree for convenience
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13665 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-14 16:18:47 +00:00
932615d7a6
bump version
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13599 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-04 22:31:15 +00:00
5446fc3339
(re)fix for OS X 10.6 math.h breakage
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13598 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-04 20:19:23 +00:00
27fdf5f6e3
fix for OS X 10.6 math.h breakage
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13597 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-04 20:18:50 +00:00
aad35ec182
clean up stupid confusion over ardour_system.rc and its contents. this file does not require substitution anymore, and besides, it was being subst'ed incorrectly because of changes to waf that were addressed in gtk2_ardour/wscript but not the top level wscript
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13408 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-09 13:27:14 +00:00
Carl Hetherington
1a9d9b058c
Fix wscript when PKG_CONFIG_PATH is empty.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13210 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-10-05 08:53:18 +00:00
5ee968d66b
fix up various aspects of building against a private/personal dependency stack
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13209 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-10-04 22:21:59 +00:00
760ccbabfb
add -Wpointer-arith -Wcast-qual -Wcast-align and others to compile flags, and fix const cast warnings generated by new flags
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13124 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-08-10 15:57:09 +00:00
3b566446b2
fix for fetching git revision, from robin gareus
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13085 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-26 12:31:42 +00:00
eb6e352dd0
we're not really a beta anymore
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13083 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-25 17:45:09 +00:00
ce17c5727c
add a new -DBOOST_SYSTEM_NO_DEPRECATED to try to remove the need to link against boost::system on boost 1.50 and above
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13081 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-25 11:16:19 +00:00
02fad6c375
bump glibmm required version to 2.32
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13080 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-25 10:56:33 +00:00
1cdf02ae2f
remove use of boost::thread/boost::mutex; bump glibmm requirement to 2.30 in order to pick up Glib::Threads::Mutex which can be used statically, use that to replace boost::mutex; add required inclusion of <cerrno> in a couple of places
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13076 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-24 21:43:05 +00:00
23aa71c759
bump version
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13067 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-23 13:32:01 +00:00
