--- rubberband-1.3.orig/Makefile.in +++ rubberband-1.3/Makefile.in @@ -2,12 +2,13 @@ CXX := @CXX@ CXXFLAGS := -DHAVE_FFTW3 -DFFTW_DOUBLE_ONLY -DNO_THREAD_CHECKS @CXXFLAGS@ @SRC_CFLAGS@ @SNDFILE_CFLAGS@ @FFTW_CFLAGS@ @Vamp_CFLAGS@ -Irubberband -Isrc $(OPTFLAGS) CFLAGS := @CFLAGS@ $(OPTFLAGS) -LDFLAGS := @LDFLAGS@ -lpthread $(LDFLAGS) +LDFLAGS := @LDFLAGS@ $(LDFLAGS) -LIBRARY_LIBS := @SRC_LIBS@ @FFTW_LIBS@ -PROGRAM_LIBS := @SNDFILE_LIBS@ $(LIBRARY_LIBS) -VAMP_PLUGIN_LIBS := @Vamp_LIBS@ $(LIBRARY_LIBS) -LADSPA_PLUGIN_LIBS := $(LIBRARY_LIBS) +LIBRARY_LIBS := @SRC_LIBS@ @FFTW_LIBS@ -lpthread +SELF_LIBS := -Llib -lrubberband +PROGRAM_LIBS := @SNDFILE_LIBS@ $(SELF_LIBS) +VAMP_PLUGIN_LIBS := @Vamp_LIBS@ $(SELF_LIBS) +LADSPA_PLUGIN_LIBS := $(SELF_LIBS) MKDIR := mkdir AR := ar @@ -110,20 +111,20 @@ VAMP_OBJECTS := $(VAMP_SOURCES:.cpp=.o) LADSPA_OBJECTS := $(LADSPA_SOURCES:.cpp=.o) -$(PROGRAM_TARGET): $(LIBRARY_OBJECTS) $(PROGRAM_OBJECTS) - $(CXX) -o $@ $^ $(PROGRAM_LIBS) $(LDFLAGS) +$(PROGRAM_TARGET): $(DYNAMIC_TARGET) $(PROGRAM_OBJECTS) + $(CXX) -o $@ $(PROGRAM_OBJECTS) $(PROGRAM_LIBS) $(LDFLAGS) $(STATIC_TARGET): $(LIBRARY_OBJECTS) $(AR) rsc $@ $^ $(DYNAMIC_TARGET): $(LIBRARY_OBJECTS) - $(CXX) $(DYNAMIC_LDFLAGS) $^ -o $@ $(LIBRARY_LIBS) $(LDFLAGS) + $(CXX) $(DYNAMIC_LDFLAGS) $^ -o $@ $(LIBRARY_LIBS) $(LIBRARY_LDFLAGS) $(LDFLAGS) -$(VAMP_TARGET): $(LIBRARY_OBJECTS) $(VAMP_OBJECTS) - $(CXX) $(VAMP_LDFLAGS) -o $@ $^ $(VAMP_PLUGIN_LIBS) $(LDFLAGS) +$(VAMP_TARGET): $(DYNAMIC_TARGET) $(VAMP_OBJECTS) + $(CXX) $(VAMP_LDFLAGS) -o $@ $(VAMP_OBJECTS) $(VAMP_PLUGIN_LIBS) $(LDFLAGS) -$(LADSPA_TARGET): $(LIBRARY_OBJECTS) $(LADSPA_OBJECTS) - $(CXX) $(LADSPA_LDFLAGS) -o $@ $^ $(LADSPA_PLUGIN_LIBS) $(LDFLAGS) +$(LADSPA_TARGET): $(DYNAMIC_TARGET) $(LADSPA_OBJECTS) + $(CXX) $(LADSPA_LDFLAGS) -o $@ $(LADSPA_OBJECTS) $(LADSPA_PLUGIN_LIBS) $(LDFLAGS) bin: $(MKDIR) $@ --- rubberband-1.3.orig/debian/rubberband-cli.links +++ rubberband-1.3/debian/rubberband-cli.links @@ -0,0 +1 @@ +usr/share/doc/librubberband2 usr/share/doc/rubberband-cli --- rubberband-1.3.orig/debian/rubberband.sgml +++ rubberband-1.3/debian/rubberband.sgml @@ -0,0 +1,305 @@ + manpage.1'. You may view + the manual page with: `docbook-to-man manpage.sgml | nroff -man | + less'. A typical entry in a Makefile or Makefile.am is: + +manpage.1: manpage.sgml + docbook-to-man $< > $@ + + + The docbook-to-man binary is found in the docbook-to-man package. + Please remember that if you create the nroff version in one of the + debian/rules file targets (such as build), you will need to include + docbook-to-man in your Build-Depends control field. + + --> + + + Szabolcs"> + Székelyi"> + + May 5, 2008"> + + 1"> + cc@mail.3d.hu"> + + RUBBERBAND"> + + + Debian"> + GNU"> + GPL"> +]> + + + +
+ &dhemail; +
+ + &dhfirstname; + &dhsurname; + + + 2008 + &dhusername; + + &dhdate; +
+ + &dhucpackage; + + &dhsection; + + + rubberband + + an audio time-stretching and pitch-shifting utility program + + + + &dhpackage; + + + + + + + + + DESCRIPTION + + This manual page documents briefly the + &dhpackage; command. + + Rubber Band is a program that permits you to change the + tempo and pitch of an audio recording independently of one + another. + + + + OPTIONS + + These programs follow the usual &gnu; command line syntax, + with long options starting with two dashes (`-'). A summary of + options is included below. + + You must specify at least one of the following time and + pitch ratio options. + + + + , X + + Stretch to X times original + duration, or + + + + , X + + Change tempo by multiple X (equivalent to --time 1/X) + + + + , X + + Raise pitch by X semitones, or + + + + , X + + Change frequency by multiple X + + + + + The following option provides a simple way to adjust the + sound. See below for more details. + + + + , N + + Crispness (N = 0,1,2,3,4,5); default 4 (see below) + + + + + The remaining options fine-tune the processing mode and + stretch algorithm. These are mostly included for test purposes; + the default settings and standard crispness parameter are + intended to provide the best sounding set of options for most + situations. + + + + , + + Aim for minimal time distortion (implied by -R) + + + + , + + Select realtime mode (implies -P --no-threads) + + + + + + No extra threads regardless of CPU and channel count + + + + + + Assume multi-CPU even if only one CPU is identified + + + + + + Disable phase resynchronisation at transients + + + + + + Band-limit phase resync to extreme frequencies + + + + + + Disable phase locking to peak frequencies + + + + + + Disable large-ratio softening of phase locking + + + + + + Use longer processing window (actual size may vary) + + + + + + Use shorter processing window + + + + N F + + Set internal freq threshold N (N = 0,1,2) to F Hz + + + + , N + + Select debug level (N = 0,1,2,3); default 0, full 3 + (N.B. debug level 3 includes audible ticks in output) + + + + , + + Suppress progress output + + + + , + + Show a list of available options + + + + + "Crispness" levels: + + + + 0 + + equivalent to --no-transients --no-peaklock --window-long + + + + 1 + + equivalent to --no-transients --no-peaklock + + + + 2 + + equivalent to --no-transients + + + + 3 + + equivalent to --bl-transients + + + + 4 + + default processing options + + + + 5 + + equivalent to --no-peaklock --window-short (may be suitable for drums) + + + + + + + AUTHOR + + Rubber Band was written by Chris Cannam <cannam@all-day-breakfast.com>. + + This manual page was written by &dhusername; <&dhemail;> for + the &debian; system (but may be used by others), because the + original program does not have a manual page. Permission is + granted to copy, distribute and/or modify this document under + the terms of the &gnu; General Public License, Version 2 any + later version published by the Free Software Foundation. + + On Debian systems, the complete text of the GNU General + Public License can be found in + /usr/share/common-licenses/GPL. + + +
+ + + + --- rubberband-1.3.orig/debian/rubberband-ladspa.links +++ rubberband-1.3/debian/rubberband-ladspa.links @@ -0,0 +1 @@ +usr/share/doc/librubberband2 usr/share/doc/rubberband-ladspa --- rubberband-1.3.orig/debian/rubberband-vamp.install +++ rubberband-1.3/debian/rubberband-vamp.install @@ -0,0 +1 @@ +usr/lib/vamp --- rubberband-1.3.orig/debian/rules +++ rubberband-1.3/debian/rules @@ -0,0 +1,85 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +config.status: configure + dh_testdir + +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess config.guess +endif + ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" + + +build: build-stamp +build-stamp: config.status + dh_testdir + + $(MAKE) + + docbook-to-man debian/rubberband.sgml > debian/rubberband.1 + + touch $@ + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + + [ ! -f Makefile ] || $(MAKE) distclean + rm -f config.sub config.guess config.status config.log Makefile + + rm -f debian/rubberband.1 + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install + +# ln -s librubberband.so.$(version) debian/tmp/usr/lib/librubberband.so + + +binary-indep: build install + +binary-arch: build install + dh_testdir + dh_testroot + dh_installdirs -A + dh_installchangelogs -plibrubberband2 + dh_installdocs -plibrubberband2 + dh_install -A --sourcedir=debian/tmp + dh_installman -A + dh_link -A + dh_strip -A + dh_compress -A + dh_fixperms -A + dh_makeshlibs -plibrubberband2 + dh_installdeb -A + dh_shlibdeps -A + dh_gencontrol -A + dh_md5sums -A + dh_builddeb -A + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- rubberband-1.3.orig/debian/rubberband-cli.install +++ rubberband-1.3/debian/rubberband-cli.install @@ -0,0 +1 @@ +usr/bin/rubberband --- rubberband-1.3.orig/debian/compat +++ rubberband-1.3/debian/compat @@ -0,0 +1 @@ +5 --- rubberband-1.3.orig/debian/rubberband-ladspa.install +++ rubberband-1.3/debian/rubberband-ladspa.install @@ -0,0 +1 @@ +usr/lib/ladspa --- rubberband-1.3.orig/debian/watch +++ rubberband-1.3/debian/watch @@ -0,0 +1,18 @@ +version=3 + +# Uncomment to examine a Webpage +# +#http://www.example.com/downloads.php rubberband-(.*)\.tar\.gz + +opts="uversionmangle=s/-executable-.*//" http://www.breakfastquay.com/rubberband/ files/rubberband-(.*)\.tar\.bz2 + +# Uncomment to examine a Webserver directory +#http://www.example.com/pub/rubberband-(.*)\.tar\.gz + +# Uncommment to examine a FTP server +#ftp://ftp.example.com/pub/rubberband-(.*)\.tar\.gz debian uupdate + +# Uncomment to find new files on sourceforge, for devscripts >= 2.9 +# http://sf.net/rubberband/rubberband-(.*)\.tar\.gz + + --- rubberband-1.3.orig/debian/changelog +++ rubberband-1.3/debian/changelog @@ -0,0 +1,35 @@ +rubberband (1.3-1.1build1) lucid; urgency=low + + * No-change rebuild against libvamp-sdk2. + + -- Martin Pitt Thu, 01 Apr 2010 10:58:01 +0200 + +rubberband (1.3-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix build with gcc-4.4 using patch from Martin Michlmayr (Closes: + #505338) + + -- Christoph Egger Fri, 25 Dec 2009 22:13:19 +0100 + +rubberband (1.3-1) unstable; urgency=low + + * New upstream release + + -- Székelyi Szabolcs Thu, 16 Apr 2009 14:08:25 +0200 + +rubberband (1.2-1) unstable; urgency=low + + * Uploaded to Debian (Closes: #457480) + * New upstream release (fixes gcc-4.3 build failure) + * debian/copyright: added license texts from files under + src/bsd-3rdparty + + -- Székelyi Szabolcs Fri, 01 Aug 2008 21:12:05 +0200 + +rubberband (1.0.1-1) unstable; urgency=low + + * Initial release (Closes: #457480) + + -- Székelyi Szabolcs Tue, 15 Apr 2008 17:49:31 +0000 + --- rubberband-1.3.orig/debian/librubberband2.docs +++ rubberband-1.3/debian/librubberband2.docs @@ -0,0 +1 @@ +README --- rubberband-1.3.orig/debian/copyright +++ rubberband-1.3/debian/copyright @@ -0,0 +1,119 @@ +This package was debianized by Székelyi Szabolcs on +Tue, 15 Apr 2008 17:49:31 +0000. + +It was downloaded from http://www.breakfastquay.com/rubberband/ + +Upstream Author: + + Chris Cannam + +Copyright: + + Copyright (C) 2007 Chris Cannam + +License: + + This package 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. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + + +This software includes code licensed under different licenses: + +src/bsd-3rdparty/float_cast/float_cast.h + + Copyright (C) 2001 Erik de Castro Lopo + + Permission to use, copy, modify, distribute, and sell this file for any + purpose is hereby granted without fee, provided that the above copyright + and this permission notice appear in all copies. No representations are + made about the suitability of this software for any purpose. It is + provided "as is" without express or implied warranty. + + +src/bsd-3rdparty/getopt/getopt.c + + Copyright (c) 1987, 1993, 1994 + The Regents of the University of California. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: + This product includes software developed by the University of + California, Berkeley and its contributors. + 4. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + +src/bsd-3rdparty/getopt/getopt.h, +src/bsd-3rdparty/getopt/getopt_long.c + + Copyright (c) 2000 The NetBSD Foundation, Inc. + All rights reserved. + + This code is derived from software contributed to The NetBSD Foundation + by Dieter Baron and Thomas Klausner. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: + This product includes software developed by the NetBSD + Foundation, Inc. and its contributors. + 4. Neither the name of The NetBSD Foundation nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + + +The Debian packaging is (C) 2008, Székelyi Szabolcs and +is licensed under the GPL, see above. --- rubberband-1.3.orig/debian/librubberband-dev.install +++ rubberband-1.3/debian/librubberband-dev.install @@ -0,0 +1,4 @@ +usr/include/* +usr/lib/lib*.a +usr/lib/lib*.so +usr/lib/pkgconfig/* --- rubberband-1.3.orig/debian/rubberband-cli.manpages +++ rubberband-1.3/debian/rubberband-cli.manpages @@ -0,0 +1 @@ +debian/rubberband.1 --- rubberband-1.3.orig/debian/rubberband-vamp.links +++ rubberband-1.3/debian/rubberband-vamp.links @@ -0,0 +1 @@ +usr/share/doc/librubberband2 usr/share/doc/rubberband-vamp --- rubberband-1.3.orig/debian/librubberband-dev.links +++ rubberband-1.3/debian/librubberband-dev.links @@ -0,0 +1 @@ +usr/share/doc/librubberband2 usr/share/doc/librubberband-dev --- rubberband-1.3.orig/debian/librubberband2.install +++ rubberband-1.3/debian/librubberband2.install @@ -0,0 +1 @@ +usr/lib/librubberband.so.* --- rubberband-1.3.orig/debian/control +++ rubberband-1.3/debian/control @@ -0,0 +1,86 @@ +Source: rubberband +Priority: extra +Section: sound +Maintainer: Székelyi Szabolcs +Build-Depends: debhelper (>= 5), autotools-dev, pkg-config, vamp-plugin-sdk, libsamplerate0-dev, libsndfile1-dev, libfftw3-dev, ladspa-sdk, docbook-to-man +Standards-Version: 3.8.0 +Homepage: http://www.breakfastquay.com/rubberband/ + +Package: librubberband2 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: an audio time-stretching and pitch-shifting library + Rubber Band is a library and utility program that permits you to + change the tempo and pitch of an audio recording independently of one + another. + +Package: librubberband-dev +Section: libdevel +Architecture: any +Depends: librubberband2 (= ${binary:Version}) +Description: an audio time-stretching and pitch-shifting library (development files) + Rubber Band is a library and utility program that permits you to + change the tempo and pitch of an audio recording independently of one + another. + . + This package contains development files for linking against + librubberband, along with the static version of the library. API + documentation is available at + http://www.breakfastquay.com/rubberband/code-doc/ . + +Package: rubberband-cli +Section: sound +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: an audio time-stretching and pitch-shifting utility + Rubber Band is a library and utility program that permits you to + change the tempo and pitch of an audio recording independently of one + another. + . + This package contains a command-line utility that can be used to + exploit Rubber Band's capabilities. + +Package: rubberband-ladspa +Section: sound +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: a LADSPA plugin for audio pitch-shifting + Rubber Band is a library and utility program that permits you to + change the tempo and pitch of an audio recording independently of one + another. + . + This package contains a LADSPA plugin that can change the pitch of a + sound in real-time. + +Package: rubberband-vamp +Section: sound +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Vamp plugins using Rubber Band + Rubber Band is a library and utility program that permits you to + change the tempo and pitch of an audio recording independently of one + another. + . + This package contains the following Vamp plugins: + . + * increments (Output Increments): Output time increment for each + input step + . + * aggregate_increments (Accumulated Output Increments): Accumulated + output time increments + . + * divergence (Divergence from Linear): Difference between actual + output time and the output time for a theoretical linear stretch + . + * phaseresetdf (Phase Reset Detection Function): Curve whose peaks + are used to identify transients for phase reset points + . + * smoothedphaseresetdf (Smoothed Phase Reset Detection Function): + Phase reset curve smoothed for peak picking + . + * phaseresetpoints (Phase Reset Points): Points estimated as + transients at which phase reset occurs + . + * timesyncpoints (Time Sync Points): Salient points which stretcher + aims to place with strictly correct timing --- rubberband-1.3.orig/src/sysutils.cpp +++ rubberband-1.3/src/sysutils.cpp @@ -22,6 +22,7 @@ #else /* !__APPLE__, !_WIN32 */ #include #include +#include #endif /* !__APPLE__, !_WIN32 */ #endif /* !_WIN32 */ --- rubberband-1.3.orig/src/vamp/RubberBandVampPlugin.cpp +++ rubberband-1.3/src/vamp/RubberBandVampPlugin.cpp @@ -17,6 +17,7 @@ #include "StretchCalculator.h" #include "sysutils.h" +#include #include using std::string;