# HG changeset patch
# User Chris Cannam
# Date 1495617087 -3600
# Node ID 67f1a896bd87f1f097e8b0960a7ef098b672a517
# Parent  ed456dd05d40afe2ad3a807ffa6c711ac600dab8
Update install instructions, add Dockerfile for v3.1 (when released)

diff -r ed456dd05d40 -r 67f1a896bd87 INSTALL.txt
--- a/INSTALL.txt	Wed May 24 09:22:55 2017 +0100
+++ b/INSTALL.txt	Wed May 24 10:11:27 2017 +0100
@@ -51,14 +51,14 @@
 
 On Linux, you will need the ALSA libraries (used for MIDI).
 
-Cap'n Proto is a tricky dependency at the time of writing, as the
-version needed is more recent than the last official release (which is
-0.5.3 as I write -- hopefully this instruction will rapidly become
-obsolete). You can install a git checkout of Cap'n Proto like this:
+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
 
-$ git clone https://github.com/sandstorm-io/capnproto
-$ cd capnproto/c++
-$ ./setup-autotools.sh && autoreconf -i 
+$ 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
 
diff -r ed456dd05d40 -r 67f1a896bd87 deploy/linux/docker/Dockerfile_v3.1_ubuntu1604
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deploy/linux/docker/Dockerfile_v3.1_ubuntu1604	Wed May 24 10:11:27 2017 +0100
@@ -0,0 +1,44 @@
+FROM ubuntu:16.04
+MAINTAINER Chris Cannam <cannam@all-day-breakfast.com>
+RUN apt-get update && \
+    apt-get install -y \
+    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 \
+    curl wget \
+    autoconf automake libtool lintian
+RUN apt-get clean && rm -rf /var/lib/apt/lists/*
+RUN locale-gen en_US.UTF-8
+ENV LANG en_US.UTF-8  
+ENV LANGUAGE en_US:en  
+ENV LC_ALL en_US.UTF-8
+RUN curl -L -o capnproto-v0.6.0.tar.gz https://github.com/sandstorm-io/capnproto/archive/v0.6.0.tar.gz
+RUN tar xf capnproto-v0.6.0.tar.gz
+WORKDIR capnproto-0.6.0/c++
+RUN autoreconf -i 
+RUN ./configure --enable-static --disable-shared
+RUN make && make install
+WORKDIR ../..
+RUN hg clone -rsv_v3.1 https://code.soundsoftware.ac.uk/hg/sonic-visualiser
+WORKDIR sonic-visualiser
+RUN ./configure
+RUN make -j3
+RUN deploy/linux/deploy-deb.sh 3.1 amd64
+RUN tar cvf output.tar *.deb && cp output.tar ..