13
0
Commit Graph

229 Commits

Author SHA1 Message Date
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
Carl Hetherington
366b7ac36b Try to make cppunit mandatory if --test is passed to
configure.


git-svn-id: svn://localhost/ardour2/branches/3.0@12653 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-11 13:07:10 +00:00
27a1cf2cf7 Compile cleanly with clang.
To compile Ardour with LLVM/clang, do the usual thing but set the CXX and CC
environment variables, e.g.:

CC=/usr/bin/clang CXX=/usr/bin/clang++ ./waf configure build


git-svn-id: svn://localhost/ardour2/branches/3.0@12418 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-24 02:54:10 +00:00
f86f363243 bump version because of paste deadlock
git-svn-id: svn://localhost/ardour2/branches/3.0@12404 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-23 21:12:34 +00:00
528abdeaa4 bump to beta4
git-svn-id: svn://localhost/ardour2/branches/3.0@12381 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-22 13:08:05 +00:00