[Ardour-Dev] git branch mechanics : massive merge from cairocanvas->master

[Paul Davis]

As of this moment, the cairocanvas branch has been merged into the master
branch of Ardour.

The cairocanvas branch was about 3000 commits ahead of master, and
represents major code changes to Ardour, including the new canvas for the
editor, new backends for direct audio/MIDI I/O with ALSA and CoreAudio,
Windows compilability, and many other fixes.

Anyone who has been building Ardour from git needs to get their local
repository up to date:

                  git checkout master
                  git pull --rebase
                  rm -rf build
                  ./waf configure [ ... options ... ]
                  ./waf

If you're not an active developer, you may prefer to just do a fresh clone
of Ardour and start from there.

The cairocanvas branch will continue to exist for a while, but there should
be NO MORE COMMITS to this branch. Development work will now continue with
master as the reference branch.

Finally, for Ardour packagers, especially on platforms that provide
anything like apt-get's "build-dep" feature, note that the code now has two
new build dependencies: the VAMP SDK and Rubberband. These were part of the
Ardour source tree before this merge, but they have now been removed and we
rely on the platform to provide them during a build. The build scripts in
the ardour-build-tools repository have been updated to reflect this change
(for quite some time).
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ardour.org/pipermail/ardour-dev-ardour.org/attachments/20141016/6c372520/attachment.htm>