changeset 87:52e5e2c03792

Update changelog and readme; remove out-of-date install file
author Chris Cannam
date Thu, 09 May 2013 13:51:02 +0100
parents 318e2f177ed5
children c82736e79739 6de99d209e32
files CHANGELOG INSTALL README configure
diffstat 4 files changed, 17 insertions(+), 94 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGELOG	Thu May 09 13:41:03 2013 +0100
+++ b/CHANGELOG	Thu May 09 13:51:02 2013 +0100
@@ -1,6 +1,8 @@
 
 Changes in Sonic Annotator 1.0 since the previous release 0.7:
 
+Bug fixes:
+
  - Fix incorrect samplerate in reading m4a files on OS/X
  - Fix incorrect handling of FixedSampleRate outputs (Vamp SDK fix)
  - Add tests that use the Vamp test plugin
--- a/INSTALL	Thu May 09 13:41:03 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-
-To compile from source
-----------------------
-
-First, please consider getting one of the ready-to-run binary
-distributions available from
-
-  http://code.soundsoftware.ac.uk/projects/sonic-annotator/files
-
-The following additional libraries are required or optional when
-building Sonic Annotator:
-
-REQUIRED	Sonic Visualiser Core Library, svcore
-		http://code.soundsoftware.ac.uk/projects/svcore
-
-REQUIRED	Vamp Plugin SDK         http://www.vamp-plugins.org/
-REQUIRED	Qt4 Free Edition        http://qt.nokia.com/
-REQUIRED	libsndfile		http://www.mega-nerd.com/libsndfile/
-REQUIRED	libsamplerate		http://www.mega-nerd.com/SRC/
-REQUIRED	FFTW3			http://www.fftw.org/
-REQUIRED	Redland RDF libraries   http://librdf.org/
-
-Optional	MAD mp3 decoder		http://www.underbit.com/products/mad/
-Optional	Oggz and fishsound	http://www.annodex.net/software/libraries.html
-
-The Redland RDF libraries include the Raptor RDF parser library,
-Rasqal RDF query library, and librdf, the Redland RDF datastore (which
-depends on both of those).  Sonic Annotator uses Rasqal and Redland
-directly, and so indirectly also requires Raptor.  For best
-performance it's strongly recommended that you build with Redland
-1.0.8 or newer.
-
-If you happen to be using a Debian-based Linux, you probably want to
-apt-get install the following packages: libqt4-dev libsndfile1-dev \
-libsamplerate0-dev fftw3-dev libmad0-dev liboggz1-dev \
-libfishsound1-dev liblrdf0-dev librdf0-dev libbz2-dev libasound2-dev .
-
-If you are building on a Unix-like system that supports pkg-config and
-uses it for all appropriate libraries (such as a modern Linux
-distribution) then you should be able to just run "qmake" (being
-careful to ensure it is the Qt 4 version of qmake you are running, and
-not a Qt 3 version).
-
-If you do not have pkg-config, you should first edit the file sv.prf
-and comment out any of the optional HAVE_* lines (in the section
-starting "If you don't have pkg-config...") for library dependencies
-that you aren't using.  Then run the Qt 4 "qmake" command.  This will
-create the proper Makefile.
-
-(If you're on the Mac and you have Qt3 installed as well, you must
-export QMAKESPEC=macx-g++ before you do this, or Qt will get confused.)
-
-Then type "make".  The program will then either build, or not build.
-If it builds, the result will be a binary file in sonic-annotator (on
-Linux) or release/Sonic Annotator.exe (on Win32), or a bundle in
-sonic-annotator.app.  There should be nothing to install apart from
-the executable itself and any of the above listed third-party shared
-libraries that are not already installed.
-
-
-Qt Library Version Requirements
--------------------------------
-
-Sonic Annotator requires Qt version 4.3 or newer.  It can not be
-built with Qt3 or with Qt 4.0.x, 4.1.x, or 4.2.x.
-
-
--- a/README	Thu May 09 13:41:03 2013 +0100
+++ b/README	Thu May 09 13:51:02 2013 +0100
@@ -20,12 +20,12 @@
 Sonic Annotator was developed at the Centre for Digital Music,
 Queen Mary, University of London.
 
-  http://www.elec.qmul.ac.uk/digitalmusic/
+  http://c4dm.eecs.qmul.ac.uk/
 
 The main program is by Mark Levy, Chris Cannam, and Chris Sutton.
 Sonic Annotator incorporates library code from the Sonic Visualiser
 application by Chris Cannam.  Code copyright 2005-2007 Chris Cannam,
-copyright 2006-2011 Queen Mary, University of London, except where
+copyright 2006-2013 Queen Mary, University of London, except where
 indicated in the individual source files.
 
 This work was funded by the Engineering and Physical Sciences Research
@@ -39,31 +39,19 @@
 
 Sonic Annotator may also make use of the following libraries:
 
- * Qt4 -- Copyright Nokia Corporation, distributed under the GPL
+ * Qt5 -- Copyright Digia Oyj, distributed under the LGPL
  * Ogg decoder -- Copyright CSIRO Australia, BSD license
  * MAD mp3 decoder -- Copyright Underbit Technologies Inc, GPL
  * libsamplerate -- Copyright Erik de Castro Lopo, GPL
  * libsndfile -- Copyright Erik de Castro Lopo, LGPL
  * FFTW3 -- Copyright Matteo Frigo and MIT, GPL
- * Vamp plugin SDK -- Copyright Chris Cannam, BSD license
- * Redland RDF libraries -- Copyright Dave Beckett and the University of Bristol, LGPL/Apache license
+ * Vamp plugin SDK -- Copyright Chris Cannam and QMUL, BSD license
+ * Dataquay -- Copyright Breakfast Quay, BSD license
+ * Sord and Serd -- Copyright David Robillard, BSD license
 
 (Some distributions of Sonic Annotator may have one or more of these
 libraries statically linked.)  Many thanks to their authors.
 
-Sonic Annotator can also use QuickTime for audio file import on OS/X.
-For licensing reasons, you may not distribute binaries of Sonic
-Annotator with QuickTime support included for any platform that does
-not include QuickTime as part of the platform itself (see section 3 of
-version 2 of the GNU General Public License).
-
-
-Compiling Sonic Annotator
---------------------------
-
-If you are planning to compile Sonic Annotator from source code,
-please read the file INSTALL.
-
 
 A Quick Tutorial
 ================
--- a/configure	Thu May 09 13:41:03 2013 +0100
+++ b/configure	Thu May 09 13:51:02 2013 +0100
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Sonic Annotator 0.8.
+# Generated by GNU Autoconf 2.69 for Sonic Annotator 1.0.
 #
 # Report bugs to <cannam@all-day-breakfast.com>.
 #
@@ -580,8 +580,8 @@
 # Identity of this package.
 PACKAGE_NAME='Sonic Annotator'
 PACKAGE_TARNAME='sonic-annotator'
-PACKAGE_VERSION='0.8'
-PACKAGE_STRING='Sonic Annotator 0.8'
+PACKAGE_VERSION='1.0'
+PACKAGE_STRING='Sonic Annotator 1.0'
 PACKAGE_BUGREPORT='cannam@all-day-breakfast.com'
 PACKAGE_URL=''
 
@@ -1309,7 +1309,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Sonic Annotator 0.8 to adapt to many kinds of systems.
+\`configure' configures Sonic Annotator 1.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1370,7 +1370,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Sonic Annotator 0.8:";;
+     short | recursive ) echo "Configuration of Sonic Annotator 1.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1502,7 +1502,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Sonic Annotator configure 0.8
+Sonic Annotator configure 1.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1842,7 +1842,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Sonic Annotator $as_me 0.8, which was
+It was created by Sonic Annotator $as_me 1.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -6930,7 +6930,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Sonic Annotator $as_me 0.8, which was
+This file was extended by Sonic Annotator $as_me 1.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6983,7 +6983,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Sonic Annotator config.status 0.8
+Sonic Annotator config.status 1.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"