smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-29 16:33:14 +01:00
Code Issues Projects Releases Wiki Activity
10325 commits 104 branches 148 tags 333 MiB
Commit graph

254 commits

Author SHA1 Message Date
Robin Gareus
700f7c37f5 enable videotimeline by default 2013-05-01 00:05:22 -04:00
Paul Davis
78fc9af908 resolve merge conflict with master 2013-04-10 12:39:06 -04:00
Paul Davis
d79e3a21c6 bump to 3.1 2013-04-08 12:00:29 -04:00
Paul Davis
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
Paul Davis
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
Paul Davis
daf097ede9 merge w/master; resolve merge conflicts from master, fix small change in local lib name used by libs/soundgrid 2013-04-05 17:01:58 -04:00
Paul Davis
cfafa7bf83 merged from master, another royal mess that git really didn't do a very good job of handling 2013-04-02 11:28:18 -04:00
Paul Davis
55c59504ca 3.0-SG catchup merge after git changeover and merge with master (more to do) 2013-04-01 14:59:17 -04:00
Paul Davis
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
Robin Gareus
0c3e840700 videotimline 
squashed 694 commits from http://gareus.org/gitweb/?p=ardour3.git
 2013-03-13 20:28:15 +01:00
Robin Gareus
d957bf7a28 print the git version on build 2013-03-13 19:13:00 +01:00
Paul Davis
2acc37e38d merged with 3.0, probably finished 2013-03-12 17:36:51 -04:00
Robin Gareus
59c74e675c git revision extraction 2013-03-12 17:44:48 +01:00
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Robin Gareus
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Robin Gareus
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
Robin Gareus
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
Paul Davis
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
Paul Davis
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
Paul Davis
26741db3c4 merge -r 13414:13599 svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0 ; plus a few tweaks that will be cleaned up soon 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@13600 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-12-05 14:33:11 +00:00
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
c76a8fbe78 provide new --depstack-root argument for configure step, to allow moving the location of the dependency stacks and the soundgrid treee to a specific location 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@13593 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-12-03 15:21:01 +00:00
Paul Davis
98a70a905b merge -r 13398:13409 svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@13410 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-11-09 13:34:58 +00:00
Paul Davis
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
Paul Davis
7b995e773e code cleanup, fix process group bug, move to more advanced topology, avoid bug with multi-assignment, tweaks for new SG SDK 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@13383 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-11-05 16:03:56 +00:00
Paul Davis
6c52612009 merge 12954:1363 svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@13364 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-10-29 16:50:05 +00:00