Mercurial > hg > sonic-visualiser

changeset 551:e8e4552fbf70 with-dependencies

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from the default branch
author Chris Cannam <chris.cannam@eecs.qmul.ac.uk>
date Fri, 10 May 2013 12:09:08 +0100
parents 1345e72335da (current diff) 209c442fdb34 (diff)
children a0192b0397fb
files .hgsubstate
diffstat 5 files changed, 45 insertions(+), 49 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Thu May 09 11:01:52 2013 +0100
+++ b/.hgsubstate	Fri May 10 12:09:08 2013 +0100
@@ -1,5 +1,5 @@
 345a563df58bc7f7069727e95a267843b29c41b8 dataquay
 619f715526df43e23b2b9b50715e825941572352 sv-dependency-builds
-3ee1bd4b0995d4ddd3532e9a817303ed71333919 svapp
-711a4652d616dfe0ec1845d5fac6f53ef9c4efa1 svcore
-e11a9d91b86b9695203de0da52f2563d35dcb929 svgui
+6c66fb64db64b6e156adc331480f056f3f998464 svapp
+98cf98a217d2516fd739dee08c4dc7f02ab82709 svcore
+2146130d12366b1733151bac3a81e2a9076bfb5b svgui
--- a/README	Thu May 09 11:01:52 2013 +0100
+++ b/README	Fri May 10 12:09:08 2013 +0100
@@ -46,7 +46,7 @@
 design work by Christian Landone.  Thanks also to Craig Sapp for his
 suggestions and useful feedback.
 
-Code copyright 2005-2007 Chris Cannam and copyright 2006-2011 Queen
+Code copyright 2005-2007 Chris Cannam and copyright 2006-2013 Queen
 Mary, University of London, except where indicated in the individual
 source files.
 
@@ -72,8 +72,8 @@
 
 Sonic Visualiser may also make use of the following libraries:
 
- * Qt4 -- Copyright Nokia Corporation, distributed under the Lesser GPL
- * JACK -- Copyright Paul Davis, Jack O'Quin et al, under the Lesser GPL
+ * Qt5 -- Copyright Digia Oyj, distributed under the LGPL
+ * JACK -- Copyright Paul Davis, Jack O'Quin et al, under the LGPL
  * PortAudio -- Copyright Ross Bencina, Phil Burk et al, BSD license
  * Ogg decoder -- Copyright CSIRO Australia, BSD license
  * MAD mp3 decoder -- Copyright Underbit Technologies Inc, GPL
@@ -81,21 +81,17 @@
  * libsndfile -- Copyright Erik de Castro Lopo, LGPL
  * FFTW3 -- Copyright Matteo Frigo and MIT, GPL
  * Rubber Band -- Copyright Chris Cannam, GPL
- * Vamp plugin SDK -- Copyright Chris Cannam, BSD license
+ * Vamp plugin SDK -- Copyright Chris Cannam and QMUL, BSD license
  * LADSPA plugin SDK -- Copyright Richard Furse et al, LGPL
- * Redland RDF libraries -- Copyright Dave Beckett and the University of Bristol, LGPL/Apache license
  * RtMIDI -- Copyright Gary P. Scavone, BSD license
+ * Dataquay -- Copyright Breakfast Quay, BSD license
+ * Sord and Serd -- Copyright David Robillard, BSD license
+ * Redland -- Copyright Dave Beckett and the University of Bristol, LGPL/Apache license
  * liblo OSC library -- Copyright Steve Harris, GPL
 
 (Some distributions of Sonic Visualiser may have one or more of these
 libraries statically linked.)  Many thanks to their authors.
 
-Sonic Visualiser can also use QuickTime for audio file import on OS/X.
-For licensing reasons, you may not distribute binaries of Sonic
-Visualiser 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 Visualiser
 --------------------------
--- a/acinclude.m4	Thu May 09 11:01:52 2013 +0100
+++ b/acinclude.m4	Fri May 10 12:09:08 2013 +0100
@@ -66,7 +66,7 @@
 AC_REQUIRE([AC_PROG_CXX])
 
 if test x$QMAKE = x ; then
-   	AC_CHECK_PROG(QMAKE, qmake-qt4, $QTDIR/bin/qmake-qt4,,$QTDIR/bin/)
+   	AC_CHECK_PROG(QMAKE, qmake-qt5, $QTDIR/bin/qmake-qt5,,$QTDIR/bin/)
 fi
 if test x$QMAKE = x ; then
    	AC_CHECK_PROG(QMAKE, qmake, $QTDIR/bin/qmake,,$QTDIR/bin/)
@@ -75,16 +75,16 @@
 	AC_CHECK_PROG(QMAKE, qmake.exe, $QTDIR/bin/qmake.exe,,$QTDIR/bin/)
 fi
 if test x$QMAKE = x ; then
-   	AC_CHECK_PROG(QMAKE, qmake-qt4, qmake-qt4,,$PATH)
+   	AC_CHECK_PROG(QMAKE, qmake-qt5, qmake-qt5,,$PATH)
 fi
 if test x$QMAKE = x ; then
    	AC_CHECK_PROG(QMAKE, qmake, qmake,,$PATH)
 fi
 if test x$QMAKE = x ; then
    	AC_MSG_ERROR([
-Failed to find the required qmake-qt4 or qmake program.  Please
-ensure you have the necessary Qt4 development files installed, and
-if necessary set QTDIR to the location of your Qt4 installation.
+Failed to find the required qmake-qt5 or qmake program.  Please
+ensure you have the necessary Qt5 development files installed, and
+if necessary set QTDIR to the location of your Qt5 installation.
 ])
 fi
 
@@ -98,11 +98,11 @@
 #
 QMAKE_VERSION_OUTPUT=`$QMAKE -v`
 case "$QMAKE_VERSION_OUTPUT" in
-     *2.*4.*) ;;
+     *5.*) ;;
      *) AC_MSG_WARN([
  *** The version of qmake found in "$QMAKE" looks like it might be
-     from the wrong version of Qt (Qt4 is required).  Please check
-     that this is the correct version of qmake for Qt4 builds.
+     from the wrong version of Qt (Qt5 is required).  Please check
+     that this is the correct version of qmake for Qt5 builds.
 ])
 esac
 
--- a/configure	Thu May 09 11:01:52 2013 +0100
+++ b/configure	Fri May 10 12:09:08 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 Visualiser 2.0.
+# Generated by GNU Autoconf 2.69 for Sonic Visualiser 2.1.
 #
 # Report bugs to <cannam@all-day-breakfast.com>.
 #
@@ -580,8 +580,8 @@
 # Identity of this package.
 PACKAGE_NAME='Sonic Visualiser'
 PACKAGE_TARNAME='sonic-visualiser'
-PACKAGE_VERSION='2.0'
-PACKAGE_STRING='Sonic Visualiser 2.0'
+PACKAGE_VERSION='2.1'
+PACKAGE_STRING='Sonic Visualiser 2.1'
 PACKAGE_BUGREPORT='cannam@all-day-breakfast.com'
 PACKAGE_URL=''
 
@@ -1329,7 +1329,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 Visualiser 2.0 to adapt to many kinds of systems.
+\`configure' configures Sonic Visualiser 2.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1391,7 +1391,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Sonic Visualiser 2.0:";;
+     short | recursive ) echo "Configuration of Sonic Visualiser 2.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1542,7 +1542,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Sonic Visualiser configure 2.0
+Sonic Visualiser configure 2.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1882,7 +1882,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 Visualiser $as_me 2.0, which was
+It was created by Sonic Visualiser $as_me 2.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3974,8 +3974,8 @@
 
 
 if test x$QMAKE = x ; then
-   	# Extract the first word of "qmake-qt4", so it can be a program name with args.
-set dummy qmake-qt4; ac_word=$2
+   	# Extract the first word of "qmake-qt5", so it can be a program name with args.
+set dummy qmake-qt5; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_QMAKE+:} false; then :
@@ -3991,7 +3991,7 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_QMAKE="$QTDIR/bin/qmake-qt4"
+    ac_cv_prog_QMAKE="$QTDIR/bin/qmake-qt5"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -4091,8 +4091,8 @@
 
 fi
 if test x$QMAKE = x ; then
-   	# Extract the first word of "qmake-qt4", so it can be a program name with args.
-set dummy qmake-qt4; ac_word=$2
+   	# Extract the first word of "qmake-qt5", so it can be a program name with args.
+set dummy qmake-qt5; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_QMAKE+:} false; then :
@@ -4108,7 +4108,7 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_QMAKE="qmake-qt4"
+    ac_cv_prog_QMAKE="qmake-qt5"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -4170,9 +4170,9 @@
 fi
 if test x$QMAKE = x ; then
    	as_fn_error $? "
-Failed to find the required qmake-qt4 or qmake program.  Please
-ensure you have the necessary Qt4 development files installed, and
-if necessary set QTDIR to the location of your Qt4 installation.
+Failed to find the required qmake-qt5 or qmake program.  Please
+ensure you have the necessary Qt5 development files installed, and
+if necessary set QTDIR to the location of your Qt5 installation.
 " "$LINENO" 5
 fi
 
@@ -4186,16 +4186,16 @@
 #
 QMAKE_VERSION_OUTPUT=`$QMAKE -v`
 case "$QMAKE_VERSION_OUTPUT" in
-     *2.*4.*) ;;
+     *5.*) ;;
      *) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
  *** The version of qmake found in \"$QMAKE\" looks like it might be
-     from the wrong version of Qt (Qt4 is required).  Please check
-     that this is the correct version of qmake for Qt4 builds.
+     from the wrong version of Qt (Qt5 is required).  Please check
+     that this is the correct version of qmake for Qt5 builds.
 " >&5
 $as_echo "$as_me: WARNING:
  *** The version of qmake found in \"$QMAKE\" looks like it might be
-     from the wrong version of Qt (Qt4 is required).  Please check
-     that this is the correct version of qmake for Qt4 builds.
+     from the wrong version of Qt (Qt5 is required).  Please check
+     that this is the correct version of qmake for Qt5 builds.
 " >&2;}
 esac
 
@@ -7746,7 +7746,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Sonic Visualiser $as_me 2.0, which was
+This file was extended by Sonic Visualiser $as_me 2.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7799,7 +7799,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 Visualiser config.status 2.0
+Sonic Visualiser config.status 2.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -8531,7 +8531,7 @@
 
 The file config.pri contains the configuration settings for
 qmake.  If you want to adjust these by hand, edit config.pri
-and run \"qmake -r\" again to regenerate the Makefile.
+and run \"$QMAKE -r\" again to regenerate the Makefile.
 " >&5
 $as_echo "$as_me:
 
@@ -8541,5 +8541,5 @@
 
 The file config.pri contains the configuration settings for
 qmake.  If you want to adjust these by hand, edit config.pri
-and run \"qmake -r\" again to regenerate the Makefile.
+and run \"$QMAKE -r\" again to regenerate the Makefile.
 " >&6;}
--- a/configure.ac	Thu May 09 11:01:52 2013 +0100
+++ b/configure.ac	Fri May 10 12:09:08 2013 +0100
@@ -1,5 +1,5 @@
 
-AC_INIT([Sonic Visualiser], 2.0.1, cannam@all-day-breakfast.com)
+AC_INIT([Sonic Visualiser], 2.1, cannam@all-day-breakfast.com)
 
 AC_CONFIG_SRCDIR(main/main.cpp)
 
@@ -131,5 +131,5 @@
 
 The file config.pri contains the configuration settings for
 qmake.  If you want to adjust these by hand, edit config.pri
-and run "qmake -r" again to regenerate the Makefile.
+and run "$QMAKE -r" again to regenerate the Makefile.
 ])