Mercurial > hg > sonic-visualiser

changeset 2434:43ac4c02efe9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam
date Thu, 12 Dec 2019 17:25:51 +0000
parents 83f0f01eab1b (current diff) a46ca166c29c (diff)
children f40cd7a512d4 d7b724db4bd0
files repoint-lock.json
diffstat 5 files changed, 47 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Dec 12 17:25:37 2019 +0000
+++ b/.hgtags	Thu Dec 12 17:25:51 2019 +0000
@@ -103,3 +103,4 @@
 1a0defadb9119e4dac4a6bfc00062477338695b5 sv_v4.0
 1a0defadb9119e4dac4a6bfc00062477338695b5 sv_v4.0
 90da8fead9495edf5aae369cfed7c2d0916a125f sv_v4.0
+7cb68e49b64ccbdd005a516c3cfb8a0f5ce092e1 sv_v4.0.1
--- a/CHANGELOG	Thu Dec 12 17:25:37 2019 +0000
+++ b/CHANGELOG	Thu Dec 12 17:25:51 2019 +0000
@@ -1,5 +1,5 @@
 
-Changes in Sonic Visualiser v4.0.1 (Nov 2019) since the previous release 4.0:
+Changes in Sonic Visualiser v4.0.1 (10 Dec 2019) since the previous release 4.0:
 
  - Fix nonsense vertical scale in NoteLayer when displaying a model
    with non-Hz scale (e.g. from an analysis plugin that outputs MIDI
@@ -9,7 +9,7 @@
    certain audio devices
 
  - Fix failure to make installed executables executable when
-   installing from the source package
+   compiling and installing the source package
 
 
 Changes in Sonic Visualiser v4.0 (25 Oct 2019) since the previous release 3.3:
--- a/INSTALL.txt	Thu Dec 12 17:25:37 2019 +0000
+++ b/INSTALL.txt	Thu Dec 12 17:25:51 2019 +0000
@@ -5,6 +5,13 @@
 (NOTE: Refer also to .travis.yml and .appveyor.yml to see what the
 continuous-integration processes do to run a build)
 
+On Windows and Mac is it actually easier to build from a checkout of
+the Mercurial repository (be sure to update to the appropriate tag if
+you need a specific release) than it is to build from an official
+Sonic Visualiser source release package. This is because the
+repository checkout pulls in some required library builds, while the
+source package contains only Sonic Visualiser code.
+
 
 Windows
 -------
@@ -24,14 +31,27 @@
 
 Install Qt5, either via Homebrew or from the official installer.
 
-If you are building Sonic Visualiser from a repository checkout,
-install Poly/ML via Homebrew (`brew install polyml`) and run
-`./repoint install` before proceeding. This isn't necessary when
-building from an official source release.
+ * If you are building from a repository checkout, install Poly/ML via
+Homebrew (`brew install polyml`) and run `./repoint install` before
+proceeding. This isn't necessary when building from an official source
+release.
 
-Then run `qmake -r` and `make`. (You may need to provide the full path
-to the correct `qmake` executable for the version of Qt you want to
-build with.)
+ * If you are building from an official source release, make sure the
+following required dependencies are available, whether installed using
+Homebrew or some other method: (This isn't necessary when building
+from a repository checkout)
+
+REQUIRED        Rubber Band Library     http://www.breakfastquay.com/rubberband/
+REQUIRED        libsndfile              http://www.mega-nerd.com/libsndfile/
+REQUIRED        libsamplerate           http://www.mega-nerd.com/SRC/
+REQUIRED        FFTW3                   http://www.fftw.org/
+REQUIRED        bzip2 library           http://www.bzip.org/
+REQUIRED        Sord and Serd libraries http://drobilla.net/software/
+REQUIRED        Cap'n Proto             http://capnproto.org/
+
+Then run `qmake -r sonic-visualiser.pro` and `make`. (You may need to
+provide the full path to the correct `qmake` executable for the
+version of Qt you want to build with.)
 
 
 Linux
@@ -41,8 +61,7 @@
 
 The following additional libraries are required or optional:
 
-REQUIRED        Qt v5                   http://qt-project.org/
-REQUIRED        Vamp Plugin SDK v2.x    http://www.vamp-plugins.org/
+REQUIRED        Qt v5                   http://www.qt.io/
 REQUIRED        Rubber Band Library     http://www.breakfastquay.com/rubberband/
 REQUIRED        libsndfile              http://www.mega-nerd.com/libsndfile/
 REQUIRED        libsamplerate           http://www.mega-nerd.com/SRC/
@@ -50,9 +69,10 @@
 REQUIRED        bzip2 library           http://www.bzip.org/
 REQUIRED        Sord and Serd libraries http://drobilla.net/software/
 REQUIRED        Cap'n Proto             http://capnproto.org/
+REQUIRED        MAD mp3 decoder         http://www.underbit.com/products/mad/
+REQUIRED        Oggz and fishsound      http://xiph.org/oggz/
+REQUIRED        Opus                    http://www.opus-codec.org/
 
-Optional        MAD mp3 decoder         http://www.underbit.com/products/mad/
-Optional        Oggz and fishsound      http://xiph.org/oggz/
 Optional        liblo OSC library       http://www.plugin.org.uk/liblo/
 Optional        JACK                    http://www.jackaudio.org/
 Optional        PortAudio v19           http://www.portaudio.com/
@@ -65,25 +85,17 @@
 
 On Linux, you will need the ALSA libraries (used for MIDI).
 
-For Cap'n Proto, currently you will need the v0.6 release which (if
-not available as a package) can be obtained from the releases page on
-Github. To build it, you might do something like
-
-$ curl -L -o capnproto-v0.6.0.tar.gz https://github.com/sandstorm-io/capnproto/archive/v0.6.0.tar.gz
-$ tar xf capnproto-v0.6.0.tar.gz
-$ cd capnproto-0.6.0/c++
-$ autoreconf -i 
-$ ./configure --enable-static --disable-shared
-$ make && make install
+For Cap'n Proto you will need v0.6 or newer.
 
 For the rest, if you happen to be using a Debian-based Linux, you
 probably want to apt install something like the following packages:
 
 build-essential libbz2-dev libfftw3-dev libfishsound1-dev
 libid3tag0-dev liblo-dev liblrdf0-dev libmad0-dev liboggz2-dev
-libpulse-dev libsamplerate-dev libsndfile-dev libsord-dev
-libxml2-utils portaudio19-dev qt5-default libqt5svg5-dev raptor-utils
-librubberband-dev git mercurial autoconf automake libtool mlton
+libopus-dev libopusfile-dev libpulse-dev libsamplerate-dev
+libsndfile-dev libsord-dev libxml2-utils portaudio19-dev qt5-default
+libqt5svg5-dev raptor-utils librubberband-dev git mercurial autoconf
+automake libtool mlton
 
 If you are building Sonic Visualiser from a repository checkout, then
 the configure script will use Repoint to obtain further checkouts of
--- a/deploy/src/archive.sh	Thu Dec 12 17:25:37 2019 +0000
+++ b/deploy/src/archive.sh	Thu Dec 12 17:25:51 2019 +0000
@@ -6,6 +6,11 @@
 
 v=`echo "$tag" | sed 's/sv_v//' | sed 's/_.*$//'`
 
+echo -n "Package up source code for version $v from tag $tag [Yn] ? "
+read yn
+case "$yn" in "") ;; [Yy]) ;; *) exit 3;; esac
+echo "Proceeding"
+
 current=$(hg id | awk '{ print $1; }')
 
 case "$current" in
--- a/repoint-lock.json	Thu Dec 12 17:25:37 2019 +0000
+++ b/repoint-lock.json	Thu Dec 12 17:25:51 2019 +0000
@@ -4,13 +4,13 @@
       "pin": "c42e50a5c297"
     },
     "svcore": {
-      "pin": "73447d746db3"
+      "pin": "ee3b248bda25"
     },
     "svgui": {
-      "pin": "045063dcd2bc"
+      "pin": "76e4302a3fc2"
     },
     "svapp": {
-      "pin": "464fed3096f5"
+      "pin": "55f317633b93"
     },
     "checker": {
       "pin": "87908a5d6c88"