changeset 2:475f4623feba

* build update for runner with "incorporated" SV libraries
author Chris Cannam
date Thu, 11 Dec 2008 11:01:37 +0000
parents 92911f967a16
children 03a02c1f0a9f
files COPYING INSTALL README runner/main.cpp runner/runner.pro sv.prf version.h
diffstat 7 files changed, 591 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/COPYING	Thu Dec 11 11:01:37 2008 +0000
@@ -0,0 +1,280 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                          675 Mass Ave, Cambridge, MA 02139, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/INSTALL	Thu Dec 11 11:01:37 2008 +0000
@@ -0,0 +1,64 @@
+
+To compile from source
+----------------------
+
+First, please consider getting one of the ready-to-run binary
+distributions available from http://www.omras2.org/SonicAnnotator .
+
+The following additional libraries are required or optional when
+building Sonic Annotator:
+
+REQUIRED	Vamp Plugin SDK		http://www.vamp-plugins.org/
+
+REQUIRED	Qt4 Free Edition	http://www.trolltech.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 .
+
+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
+runner/sonic-annotator (on Linux) or runner/release/Sonic
+Annotator.exe (on Win32), or a bundle in runner/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 Dec 11 10:26:12 2008 +0000
+++ b/README	Thu Dec 11 11:01:37 2008 +0000
@@ -6,9 +6,67 @@
 audio files.  It runs Vamp audio analysis plugins on audio files, and
 can write the result features in a selection of formats.
 
+For more information, see
+
+  http://www.omras2.org/SonicAnnotator
+
+More documentation follows further down this README file, after the
+credits.
+
+
+Credits
+-------
+
+Sonic Annotator was developed at the Centre for Digital Music,
+Queen Mary, University of London.
+
+  http://www.elec.qmul.ac.uk/digitalmusic/
+
+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-2008 Queen Mary, University of London, except where
+indicated in the individual source files.
+
+This work was funded by the Engineering and Physical Sciences Research
+Council through the OMRAS2 project EP/E017614/1.
+
+Sonic Annotator is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.  See the file COPYING
+included with this distribution for more information.
+
+Sonic Annotator may also make use of the following libraries:
+
+ * Qt4 -- Copyright Nokia Corporation, distributed under the GPL
+ * 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
+
+(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
-----------------
+================
 
 To use Sonic Annotator, you need to tell it three things: what audio
 files to extract features from; what features to extract; and how and
--- a/runner/main.cpp	Thu Dec 11 10:26:12 2008 +0000
+++ b/runner/main.cpp	Thu Dec 11 11:01:37 2008 +0000
@@ -30,6 +30,8 @@
 using std::vector;
 using std::string;
 
+#include "../version.h"
+
 #include "base/Exceptions.h"
 #include "base/TempDirectory.h"
 
@@ -138,7 +140,7 @@
     set<string> writers = FeatureWriterFactory::getWriterTags();
         
     cerr << endl;
-    cerr << "Sonic Annotator" << endl;
+    cerr << "Sonic Annotator v" << RUNNER_VERSION << endl;
     cerr << "A utility for batch feature extraction from audio files." << endl;
     cerr << "Mark Levy, Chris Sutton and Chris Cannam, Queen Mary, University of London." << endl;
     cerr << "Copyright 2007-2008 Queen Mary, University of London." << endl;
--- a/runner/runner.pro	Thu Dec 11 10:26:12 2008 +0000
+++ b/runner/runner.pro	Thu Dec 11 11:01:37 2008 +0000
@@ -6,7 +6,7 @@
 #linux-g++:LIBS += -Wl,-Bstatic
 #linux-g++:DEFINES += BUILD_STATIC
 
-load(../sonic-visualiser/sv.prf)
+load(../sv.prf)
 
 LIBPATH += /usr/local/lib
 
@@ -28,9 +28,9 @@
 
 TARGET = sonic-annotator
 
-DEPENDPATH += . ../sonic-visualiser i18n main
-INCLUDEPATH += . ../sonic-visualiser main
-LIBPATH = ../sonic-visualiser/audioio ../sonic-visualiser/data ../sonic-visualiser/plugin ../sonic-visualiser/rdf ../sonic-visualiser/transform ../sonic-visualiser/base ../sonic-visualiser/system $$LIBPATH
+DEPENDPATH += . .. i18n main
+INCLUDEPATH += . .. main
+LIBPATH = ../audioio ../data ../plugin ../rdf ../transform ../base ../system $$LIBPATH
 
 QMAKE_CXXFLAGS_RELEASE += -fmessage-length=80 -fdiagnostics-show-location=every-line
 
@@ -39,13 +39,13 @@
 #LIBS = -lsvaudioio -lsvdata -lsvtransform -lsvplugin -lsvrdf -lsvbase -lsvsystem  $$LIBS
 LIBS = -lsvdata -lsvtransform -lsvplugin -lsvrdf -lsvdata -lsvbase -lsvsystem  $$LIBS
 
-PRE_TARGETDEPS += ../sonic-visualiser/audioio/libsvaudioio.a \
-                  ../sonic-visualiser/data/libsvdata.a \
-                  ../sonic-visualiser/transform/libsvtransform.a \
-                  ../sonic-visualiser/plugin/libsvplugin.a \
-                  ../sonic-visualiser/rdf/libsvrdf.a \
-                  ../sonic-visualiser/base/libsvbase.a \
-                  ../sonic-visualiser/system/libsvsystem.a
+PRE_TARGETDEPS += ../audioio/libsvaudioio.a \
+                  ../data/libsvdata.a \
+                  ../transform/libsvtransform.a \
+                  ../plugin/libsvplugin.a \
+                  ../rdf/libsvrdf.a \
+                  ../base/libsvbase.a \
+                  ../system/libsvsystem.a
 
 OBJECTS_DIR = tmp_obj
 MOC_DIR = tmp_moc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sv.prf	Thu Dec 11 11:01:37 2008 +0000
@@ -0,0 +1,173 @@
+ 
+###
+### BEGIN CONFIGURABLE STUFF
+###
+
+CONFIG += release
+
+
+# Put your favourite optimization flags here.
+#
+# Don't use -ffast-math -- it does make things faster, but it
+# prevents isnan and isinf from working, and we need those.
+#
+# SV benefits a bit from SSE, but not from SSE2 (it doesn't do
+# very much in double precision).
+# 
+# Always define NDEBUG and NO_TIMING for release builds.
+# 
+QMAKE_CXXFLAGS_RELEASE += -DNDEBUG -DNO_TIMING -O3
+#linux-g++:QMAKE_CXXFLAGS_RELEASE += -march=pentium3 -msse -mmmx -ftree-vectorize -fomit-frame-pointer
+
+# To do a static build with gcc on Linux
+#
+linux-g++:LIBS += -Wl,-Bstatic
+linux-g++:DEFINES += BUILD_STATIC
+
+
+LIBPATH += /usr/local/lib
+INCLUDEPATH += /usr/local/include
+
+DEFINES += NO_SV_GUI # avoid inclusion of widgets/ in transform library (bad!)
+
+
+# These are testable on platforms with pkg-config.  If you don't have
+# pkg-config, edit the "If you don't have pkg-config" block below (see
+# comments).
+#
+PKGCONFIG_PACKAGES = vamp vamp-hostsdk oggz fishsound mad id3tag fftw3 fftw3f sndfile samplerate lrdf redland rasqal raptor 
+
+
+# No pkg-config test for QuickTime.  This library is optional, for
+# audio file import.  Note that if you compile in support for either
+# or both of libmad and libsndfile as well as for QuickTime, libmad
+# and libsndfile will be used in preference to QuickTime where
+# applicable.  For licensing reasons you may not redistribute binaries
+# of Sonic Visualiser built with QuickTime support, except for
+# platforms which include QuickTime as a standard part of the platform
+# (i.e. OS/X).
+#
+#DEFINES += HAVE_QUICKTIME
+#LIBS += -framework QuickTime
+
+
+!system(pkg-config --atleast-pkgconfig-version=0) {
+
+    # If you don't have pkg-config, or want to overrule it, comment
+    # out (or install) any of the following that you lack.  If you
+    # have pkg-config, you should be able to ignore all this provided
+    # the right symbols are defined in PKGCONFIG_PACKAGES above.
+    #
+    DEFINES += HAVE_OGGZ          # Optional -- to import .ogg files
+    DEFINES += HAVE_FISHSOUND     # Optional -- to import .ogg files
+    DEFINES += HAVE_MAD           # Optional -- to import .mp3 files
+    DEFINES += HAVE_ID3TAG        # Optional -- to import .mp3 file tags
+    DEFINES += HAVE_FFTW3F        # Optional -- but SV will be slower without it
+    DEFINES += HAVE_FFTW3         # Optional -- used by Rubber Band
+    #
+    LIBS    += -loggz -lfishsound
+    LIBS    += -lmad -lid3tag
+    LIBS    += -lfftw3f
+    LIBS    += -lfftw3
+
+    # These ones are mandatory.
+    # If you don't have them, you'll have to find them.
+    #
+    DEFINES += HAVE_VAMP         # Required -- for analysis plugins
+    DEFINES += HAVE_VAMP_HOSTSDK # Required -- for analysis plugins
+    DEFINES += HAVE_SNDFILE      # Required -- to import and export .wav files
+    DEFINES += HAVE_SAMPLERATE   # Required -- for resampling
+    DEFINES += HAVE_RASQAL       # Required -- for RDF
+    DEFINES += HAVE_REDLAND      # Required -- for RDF
+    #
+    LIBS    += -lvamp-hostsdk -lsndfile -lrdf -lrasqal -lraptor -lsamplerate
+
+}
+
+###
+### END CONFIGURABLE STUFF
+###
+
+system(pkg-config --atleast-pkgconfig-version=0) {
+
+    # If you have pkg-config, this block should locate all packages
+    # for you provided they have .pc files and are listed in
+    # PKGCONFIG_PACKAGES.
+    #
+    for(PKG, PKGCONFIG_PACKAGES) {
+        contains(SV_UNIT_PACKAGES, $$PKG) {
+            system(pkg-config --exists $$PKG) {
+                VERSION = $$system(pkg-config --modversion $$PKG)
+                PACKAGE_SYMBOL = $$system(echo $$PKG | tr '[a-z-]' '[A-Z_]' | tr '.' '_')
+                VERSION_SYMBOL = $$PACKAGE_SYMBOL'_VERSION'
+                DEFINES += HAVE_$$PACKAGE_SYMBOL
+                QMAKE_CXXFLAGS += -D"'"$$VERSION_SYMBOL='"'$$VERSION'"'"'"
+                QMAKE_CXXFLAGS +=  $$system(pkg-config --cflags $$PKG)
+                LIBS += $$system(pkg-config --libs $$PKG)
+                message("Using pkg-config package $$PKG with version $$VERSION")
+            } else {
+                message("WARNING: Failed to find pkg-config package $$PKG")
+            }
+        }
+    }
+}
+
+contains(SV_UNIT_PACKAGES, oggz) {
+    contains(DEFINES, HAVE_OGGZ) {
+        contains(DEFINES, HAVE_FISHSOUND) {
+            message("Including .ogg file import")
+        } else {
+            message("WARNING: .ogg file import will not be included")
+        }
+    } else {
+        message("WARNING: .ogg file import will not be included")
+    }
+}
+
+contains(SV_UNIT_PACKAGES, mad) {
+    contains(DEFINES, HAVE_MAD) {
+        message("Including .mp3 file import")
+    } else {
+        message("WARNING: .mp3 file import will not be included")
+    }
+}
+
+contains(SV_UNIT_PACKAGES, id3tag) {
+    contains(DEFINES, HAVE_ID3TAG) {
+        message("Including .mp3 file tag support")
+    } else {
+        message("WARNING: .mp3 file tag support will not be included")
+    }
+}
+
+contains(SV_UNIT_PACKAGES, fftw3f) {
+    contains(DEFINES, HAVE_FFTW3F) {
+ 	message("Using FFTW3f")
+    } else {
+	message("WARNING: FFTW3f not available, using slower FFT implementation")
+    }
+}
+
+contains(SV_UNIT_PACKAGES, vamp):!contains(DEFINES, HAVE_VAMP):error("Vamp plugin API required")
+contains(SV_UNIT_PACKAGES, vamp-hostsdk):!contains(DEFINES, HAVE_VAMP_HOSTSDK):error("Vamp plugin host SDK required")
+contains(SV_UNIT_PACKAGES, sndfile):!contains(DEFINES, HAVE_SNDFILE):error("sndfile library required")
+contains(SV_UNIT_PACKAGES, samplerate):!contains(DEFINES, HAVE_SAMPLERATE):error("libsamplerate required")
+contains(SV_UNIT_PACKAGES, rasqal):!contains(DEFINES, HAVE_RASQAL):error("Rasqal RDF query library required")
+contains(SV_UNIT_PACKAGES, redland):!contains(DEFINES, HAVE_REDLAND):error("Redland RDF datastore required")
+
+VERSION_CFLAGS += -D"'"SVNREV='"'$$system(svnversion -n .)'"'"'"
+
+QMAKE_CXXFLAGS_DEBUG += -DBUILD_DEBUG $$VERSION_CFLAGS
+QMAKE_CXXFLAGS_RELEASE += -DBUILD_RELEASE $$VERSION_CFLAGS
+
+LIBS -= -lpthread
+
+linux-g++ {
+    contains(DEFINES, BUILD_STATIC) {
+    	LIBS += -lFLAC -lxml2
+    }
+}
+
+# Restore dynamic linkage, in case we went static earlier
+linux-g++:LIBS += -Wl,-Bdynamic -lpthread -ldl
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/version.h	Thu Dec 11 11:01:37 2008 +0000
@@ -0,0 +1,1 @@
+#define RUNNER_VERSION "0.1"