--- mixxx-1.7.1.orig/debian/mixxx.install +++ mixxx-1.7.1/debian/mixxx.install @@ -0,0 +1,3 @@ +usr/bin +usr/share/pixmaps +usr/share/applications --- mixxx-1.7.1.orig/debian/control +++ mixxx-1.7.1/debian/control @@ -0,0 +1,36 @@ +Source: mixxx +Section: sound +Priority: optional +Maintainer: Paul Brossier +Uploaders: Free Ekanayaka +Build-Depends: debhelper (>= 7.0.0), scons, pkg-config, docbook-to-man, libgl1-mesa-dev, libglu1-mesa-dev, libqt4-opengl-dev | libqt4-dev, libjack-dev, libsoundtouch-dev, portaudio19-dev, libid3tag0-dev, libmad0-dev, libogg-dev, libsndfile1-dev, libvorbis-dev, libexpat-dev, dpatch, libdjconsole-dev, libaudiofile-dev, imagemagick +Standards-Version: 3.8.3 +Homepage: http://mixxx.sourceforge.net/ + +Package: mixxx +Section: sound +Architecture: any +Depends: mixxx-data (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} +Suggests: pdf-viewer +Description: Digital Disc Jockey Interface + Mixxx is a digital DJ system, where wave, ogg and mp3 files can be mixed on a + computer for use in live performances. Filters, crossfader, and speed control + are provided. Mixxx can sync the 2 streams automatically, using an algorithm + to detect the beat. + . + Mixxx works with Jack or OSS, can be controlled from the GUI or from external + controllers, including MIDI devices and joysticks, and supports skins. + +Package: mixxx-data +Section: sound +Architecture: all +Description: Digital Disc Jockey Interface -- data files + This package provides images and skin configuration files required for mixxx. + . + Mixxx is a digital DJ system, where wave, ogg and mp3 files can be mixed on a + computer for use in live performances. Filters, crossfader, and speed control + are provided. Mixxx can sync the 2 streams automatically, using an algorithm + to detect the beat. + . + Mixxx works with Jack or OSS, can be controlled from the GUI or from external + controllers, including MIDI devices and joysticks, and supports skins. --- mixxx-1.7.1.orig/debian/mixxx.links +++ mixxx-1.7.1/debian/mixxx.links @@ -0,0 +1 @@ +usr/share/doc/mixxx-data/Mixxx-Manual.pdf usr/share/doc/mixxx/Mixxx-Manual.pdf --- mixxx-1.7.1.orig/debian/menu +++ mixxx-1.7.1/debian/menu @@ -0,0 +1,7 @@ +?package(mixxx): \ + needs="X11" \ + section="Applications/Sound" \ + title="Mixxx" \ + command="/usr/bin/mixxx" \ + icon="/usr/share/pixmaps/mixxx.xpm" \ + icon16x16="/usr/share/pixmaps/mixxx-16.xpm" --- mixxx-1.7.1.orig/debian/mixxx-data.docs +++ mixxx-1.7.1/debian/mixxx-data.docs @@ -0,0 +1 @@ +Mixxx-Manual.pdf --- mixxx-1.7.1.orig/debian/mixxx.docs +++ mixxx-1.7.1/debian/mixxx.docs @@ -0,0 +1 @@ +README --- mixxx-1.7.1.orig/debian/README.source +++ mixxx-1.7.1/debian/README.source @@ -0,0 +1,5 @@ +This package uses dpatch to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +Read more about this on /usr/share/doc/dpatch/README.source.gz --- mixxx-1.7.1.orig/debian/watch +++ mixxx-1.7.1/debian/watch @@ -0,0 +1,3 @@ +version=2 +http://www.mixxx.org/download.php \ + http://downloads.mixxx.org/mixxx-.*/mixxx-(.*)-src.tar.gz --- mixxx-1.7.1.orig/debian/rules +++ mixxx-1.7.1/debian/rules @@ -0,0 +1,111 @@ +#!/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 + +include /usr/share/dpatch/dpatch.make + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +build: build-stamp + +build-stamp: patch-stamp + dh_testdir + + # create icons + convert res/images/mixxx-icon.png -geometry 32x32 mixxx.xpm + convert res/images/mixxx-icon.png -geometry 16x16 mixxx-16.xpm + + # Add here commands to compile the package. + scons install_root=$(CURDIR)/debian/tmp/usr qtdir=/usr/share/qt4 prefix=/usr djconsole=1 + docbook-to-man debian/mixxx.sgml > mixxx.1 + + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + rm -f mixxx.1 + + # Add here commands to clean up after the build process. + #scons clean + # hand cleaning! + rm -rf src/.configure.def src/.moc src/.obj src/.summary.log src/.ui src/mixxx src/a.out src/Makefile + rm -f src/qt4.pyc + rm -rf .sconf_temp + rm -f `find -P . -name '*.o'` + rm -f mixxx + rm -f .sconsign.dblite + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs + + # Add here commands to install the package into debian/mixxx. + mkdir -p $(CURDIR)/debian/tmp/usr + scons install_root=$(CURDIR)/debian/tmp/usr qtdir=/usr/share/qt4 prefix=/usr djconsole=1 install + + find $(CURDIR)/debian/tmp \( -name COPYING -o -name Thumbs.db \ + -o -name shifter.sh -o -name '*.xsl' -o -name '*.php' \) \ + -exec rm -f {} \; + find $(CURDIR)/debian/tmp -name '*.js' -exec chmod -x {} \; + + dh_install -ptmp debian/mixxx.desktop usr/share/applications + dh_install -ptmp mixxx.xpm usr/share/pixmaps + dh_install -ptmp mixxx-16.xpm usr/share/pixmaps + dh_install --sourcedir=$(CURDIR)/debian/tmp + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installexamples +# dh_install + dh_installmenu +# dh_installdebconf +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_installinit +# dh_installcron +# dh_installinfo + dh_installman mixxx.1 + dh_link + dh_strip + dh_compress -Xpdf + dh_fixperms +# dh_perl +# dh_python +# dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install patch unpatch configure --- mixxx-1.7.1.orig/debian/mixxx.sgml +++ mixxx-1.7.1/debian/mixxx.sgml @@ -0,0 +1,132 @@ + 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. + + --> + + + Paul"> + Brossier"> + + November 26, 2004"> + + 1"> + piem@altern.org"> + + MIXXX"> + + + Debian"> + GNU"> + GPL"> +]> + + + +
+ &dhemail; +
+ + &dhfirstname; + &dhsurname; + + + 2003 + &dhusername; + + &dhdate; + + + &dhucpackage; + + &dhsection; + + + &dhpackage; + + a Digital Disc Jockey Interface + + + + &dhpackage; + + + + DESCRIPTION + + This manual page documents briefly the &dhpackage; command. + + &dhpackage; is a digital DJ system, where wave, + ogg and mp3 files can be mixed on a computer for use in live performances. + Filters, crossfader, and speed control are provided. &dhpackage; can sync + the 2 streams automatically, using an algorithm to detect the beat. + + &dhpackage; works with Jack or OSS and can be controlled through the GUI + and with external controllers, including MIDI devices and joysticks. The + GUI supports skins. + + This manual page was written for the &debian; distribution because + the original program does not have a manual page. Instead, it has + documentation in the pdf format; see below. + + + + OPTIONS + + This program takes no command line argument. + + + + SEE ALSO + + /usr/share/doc/mixxx/Mixxx-Manual.pdf + + The program is fully documented in the above pdf file. + + + + AUTHOR + + This manual page was written by &dhusername; (&dhemail;) for the + &debian; system (but may be used by others). 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. + + + + + + + --- mixxx-1.7.1.orig/debian/compat +++ mixxx-1.7.1/debian/compat @@ -0,0 +1 @@ +7 --- mixxx-1.7.1.orig/debian/mixxx-data.install +++ mixxx-1.7.1/debian/mixxx-data.install @@ -0,0 +1 @@ +usr/share/mixxx --- mixxx-1.7.1.orig/debian/changelog +++ mixxx-1.7.1/debian/changelog @@ -0,0 +1,118 @@ +mixxx (1.7.1-1) unstable; urgency=low + + * New upstream release (closes: #519517, #427291, #500859) + * Bugs closed in previous versions (closes: #480233, #397385) + * Acknowledge NMUed bugs (closes: #375752, #435950, #499572, #523692), + thanks to Free, Steinar, and Barry + * debian/control + - added Homepage field + - add Build-depends on imagemagick + - add Build-Depends on libsountouch-dev + - bump Standard-Version + - bump build-depends to debhelper >= 7.0.0 + * debian/rules + - create and install mixxx.xpm 32x32 + - remove COPYING, shifter.sh, xsl, php, and Thumbs.db files from skins + - make sure js files are not executables + - use dh_prep instead of dh_clean -k + * debian/README.source: add reference to dpatch + * debian/mixxx.desktop: improve comment + * debian/menu: update section to Applications/Sound + * debian/compat: bump to 7 + * debian/copyright: updated to list copyright of each external libs + * debian/patches/10_soundtouch.dpatch: use packaged libsoundtouch + (not activated yet, needs 1.4.1) + * debian/patches/10_uptodate_configure.dpatch: update config.{sub,guess} + + -- Paul Brossier Fri, 30 Oct 2009 12:13:34 +0100 + +mixxx (1.6.1-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Remove unnecessary build-dep on libglib1.2. (Closes: #523692). + * Update desktop file. (Closes: #499572). + * Update deprecated xlibmesa-gl1-dev with libgl1-mesa-dev. + + -- Barry deFreese Sat, 17 Oct 2009 13:36:19 -0400 + +mixxx (1.6.1-1) unstable; urgency=low + + * New Upstream Version + + -- Free Ekanayaka Sat, 15 Nov 2008 00:00:37 +0100 + +mixxx (1.6.0-1) unstable; urgency=low + + * New upstream release (Closes: #496184) + + -- Free Ekanayaka Tue, 26 Aug 2008 00:53:21 +0100 + +mixxx (1.6.0~beta3-2) unstable; urgency=low + + * Build depend on libqt4-opengl-dev only if available, otherwise use + libqt4-dev (makes backports easier) + + -- Free Ekanayaka Mon, 09 Jun 2008 08:27:28 +0100 + +mixxx (1.6.0~beta3-1) unstable; urgency=low + + * New upstream release + * Build depends on libqt4-opengl-dev (Closes: #482238), thanks + to Peter Green + * Fixed bashism in debian/rules (Closes: #478408), thanks to Chris + Lamb + * Fixed FTBFS if built twice in a row (Closes: #483901) thanks + to Peter Green + + -- Free Ekanayaka Thu, 05 Jun 2008 00:21:45 +0100 + +mixxx (1.6.0~beta2-1) unstable; urgency=low + + * New upstream release + + -- Free Ekanayaka Fri, 04 Apr 2008 12:02:15 +0200 + +mixxx (1.6.0~beta1-1) unstable; urgency=low + + * New upstream release + * debian/patched: + - dropped typos.patch (fixed upstream) + * debian/control: + - build depend on libqt4-dev and scons + + -- Free Ekanayaka Thu, 27 Dec 2007 09:53:41 +0000 + +mixxx (1.5.0.1-1) unstable; urgency=low + + * New upstream release (Closes: #424972) + * debian/control: + - depend on portaudio 19, djconsole and libaudiofile + - added myself to uploaders + - use source:Version instead of Source:Version (Closes: #435950) + * debian/rules: + - use dpatch to manage diffs + - enable ALSA (Closes: #397386) + + -- Free Ekanayaka Tue, 18 Dec 2007 13:01:13 +0000 + +mixxx (1.4.2-1.1) unstable; urgency=high + + * Non-maintainer upload. + * Replace unsatisfiable build-dependency on xlibmesa-glu-dev by + libglu1-mesa-dev; fixes FTBFS. (Closes: #374590) + + -- Steinar H. Gunderson Wed, 28 Jun 2006 00:23:04 +0200 + +mixxx (1.4.2-1) unstable; urgency=low + + * Initial Release (closes: #227017). + * Modified src/mixxx.pro to be happier on debian + * Added #ifdef __vbrheadersdk__ to src/soundsourcemp3.c + * Removed non-free files in lib/gplot and lib/vbrheadersdk + * Converted png to xpm to add to menu icon, added .desktop + * Disable directRendering check to avoid crash when Visual=Simple + * Prevent latency slider to try setting the latency to 0 + * Correct a typo on 'rendering' in mixxxview.cpp + + -- Paul Brossier Sat, 13 Aug 2005 00:14:24 +0100 + --- mixxx-1.7.1.orig/debian/copyright +++ mixxx-1.7.1/debian/copyright @@ -0,0 +1,143 @@ +This package was debianized by Paul Brossier on +Fri, 26 Nov 2004 12:55:35 +0000. + +It was downloaded from http://mixxx.sourceforge.net/ + +Copyright: + Mixxx + Copyright (C) 2000-2004 Haste Andersen and Mixxx developers + +Upstream Authors: Tue Haste Andersen + and Ken Haste Andersen + +nCut v1.1, Skin for Mixxx 1.5.0: + + Copyright (C) 2007 Frank Willascheck; fw74@gmx.de + +License: + +Mixxx is released under the GNU General Public License Version 2 or above: + + You are free to distribute this software under the terms of the GNU General + Public License. On Debian systems, the complete text of the GNU General Public + License can be found in the file `/usr/share/common-licenses/GPL-2'. + +Additional copyrights and licenses: + +The following files are included in the original tarball (but not always used +in the binary package): + +lib/cmetrics: + + Copyright 2007 John Sully. + + CMetrics is released under the GNU General Public License version 2 or + above. + +lib/fidlib-0.9.9 + + Copyright (c) 2002-2004 Jim Peters . + + Fidlib is released under the GNU Lesser General Public License (LGPL) version + 2.1 as published by the Free Software Foundation. See the file + /usr/share/common-licenses/LGPL-2.1 for details. + +lib/gtest-1.3.0: + + Copyright 2008, Google Inc. + + Google test is distributed under a revised BSD license: + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * 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. + * Neither the name of Google Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT + OWNER 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. + +lib/kissfft: + + Copyright (c) 2003-2004 Mark Borgerding + + Kissfft is distributed under a revised BSD license: + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + * 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. + * Neither the author nor the names of any contributors may be used to + endorse or promote products derived from this software without specific + prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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. + +lib/ladspa: + + Copyright (C) 2000-2002 Richard W.E. Furse, Paul Barton-Davis, + Stefan Westerfeld. + + Ladspa is released under the GNU General Public License version 2 or + above. + +lib/libsamplerate + + Copyright (C) 2002,2003 Erik de Castro Lopo + + Libsamplerate is released under the GNU General Public License version 2 or + above. + +lib/scratchlib: + + Copyright (C) 2006 Stefan Langhammer + Thomas Rogg + + Scratchlib is released under the GNU General Public License version 2 or + above. + +lib/soundtouch-1.4.1: + + Copyright (c) Olli Parviainen + + SoundTouch is released under the GNU Lesser General Public License (LGPL) + version 2.1 as published by the Free Software Foundation. See the file + /usr/share/common-licenses/LGPL-2.1 for details. + +lib/xwax: + + Copyright (C) 2008 Mark Hills + + Scratchlib is released under the GNU General Public License version 2 or + above. + --- mixxx-1.7.1.orig/debian/mixxx.desktop +++ mixxx-1.7.1/debian/mixxx.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Mixxx +Comment=a digital disc jockey interface +Exec=mixxx +Terminal=false +Icon=mixxx-icon +Type=Application +Categories=AudioVideo;Audio; --- mixxx-1.7.1.orig/debian/dirs +++ mixxx-1.7.1/debian/dirs @@ -0,0 +1 @@ +usr/bin --- mixxx-1.7.1.orig/debian/patches/10_uptodate_configure.dpatch +++ mixxx-1.7.1/debian/patches/10_uptodate_configure.dpatch @@ -0,0 +1,28 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_uptodate_configure.dpatch by Paul Brossier +## +## DP: Patch config.sub and config.guess to use up-to-date versions + +@DPATCH@ +--- a/lib/gtest-1.3.0/build-aux/config.sub 2009-10-14 18:29:16.000000000 +0200 ++++ b/lib/gtest-1.3.0/build-aux/config.sub 2009-10-30 11:54:06.000000000 +0100 +@@ -1,4 +1,8 @@ + #! /bin/sh ++if [ -x /usr/share/misc/config.sub ]; then ++ exec /usr/share/misc/config.sub "$@" ++fi ++ + # Configuration validation subroutine script. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, + # 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +--- a/lib/gtest-1.3.0/build-aux/config.guess 2009-10-30 11:54:57.000000000 +0100 ++++ b/lib/gtest-1.3.0/build-aux/config.guess 2009-10-30 11:55:17.000000000 +0100 +@@ -1,4 +1,8 @@ + #! /bin/sh ++if [ -x /usr/share/misc/config.guess ]; then ++ exec /usr/share/misc/config.guess "$@" ++fi ++ + # Attempt to guess a canonical system name. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, + # 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. --- mixxx-1.7.1.orig/debian/patches/10_soundtouch.dpatch +++ mixxx-1.7.1/debian/patches/10_soundtouch.dpatch @@ -0,0 +1,62 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_soundtouch.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: use system soundtouch instead of recompiling it + +@DPATCH@ +--- a/src/SConscript 2009-10-28 18:08:09.000000000 +0100 ++++ b/src/SConscript 2009-10-28 18:13:40.000000000 +0100 +@@ -771,28 +771,30 @@ + + #SoundTouch + #XXX this should be done with a subsconscript +-env.Append(CPPPATH=['#lib/soundtouch-1.4.1']) +-sources += Split("""engine/enginebufferscalest.cpp +- #lib/soundtouch-1.4.1/SoundTouch.cpp +- #lib/soundtouch-1.4.1/TDStretch.cpp +- #lib/soundtouch-1.4.1/RateTransposer.cpp +- #lib/soundtouch-1.4.1/AAFilter.cpp +- #lib/soundtouch-1.4.1/FIFOSampleBuffer.cpp +- #lib/soundtouch-1.4.1/FIRFilter.cpp +- #lib/soundtouch-1.4.1/PeakFinder.cpp +- #lib/soundtouch-1.4.1/BPMDetect.cpp +- """) +- +-if 'win' in platform: +- if platform == 'win32': +- sources += Split("""#lib/soundtouch-1.4.1/cpu_detect_x86_win.cpp""") +- if platform == 'win64': +- sources += Split("""#lib/soundtouch-1.4.1/cpu_detect_x64_win.cpp""") +-else: +- if machine == 'x86_64': +- sources += Split("""#lib/soundtouch-1.4.1/cpu_detect_x64_gcc.cpp""") +- else: +- sources += Split("""#lib/soundtouch-1.4.1/cpu_detect_x86_gcc.cpp""") ++#env.Append(CPPPATH=['#lib/soundtouch-1.4.1']) ++#sources += Split("""engine/enginebufferscalest.cpp ++# #lib/soundtouch-1.4.1/SoundTouch.cpp ++# #lib/soundtouch-1.4.1/TDStretch.cpp ++# #lib/soundtouch-1.4.1/RateTransposer.cpp ++# #lib/soundtouch-1.4.1/AAFilter.cpp ++# #lib/soundtouch-1.4.1/FIFOSampleBuffer.cpp ++# #lib/soundtouch-1.4.1/FIRFilter.cpp ++# #lib/soundtouch-1.4.1/PeakFinder.cpp ++# #lib/soundtouch-1.4.1/BPMDetect.cpp ++# """) ++# ++#if 'win' in platform: ++# if platform == 'win32': ++# sources += Split("""#lib/soundtouch-1.4.1/cpu_detect_x86_win.cpp""") ++# if platform == 'win64': ++# sources += Split("""#lib/soundtouch-1.4.1/cpu_detect_x64_win.cpp""") ++#else: ++# if machine == 'x86_64': ++# sources += Split("""#lib/soundtouch-1.4.1/cpu_detect_x64_gcc.cpp""") ++# else: ++# sources += Split("""#lib/soundtouch-1.4.1/cpu_detect_x86_gcc.cpp""") ++env.Append(CPPPATH = [ ARGUMENTS.get('prefix', '/usr/local') + '/include/soundtouch' ]) ++env.Append(LIBS = 'SoundTouch') + + + #KissFFT --- mixxx-1.7.1.orig/debian/patches/20_norpath.dpatch +++ mixxx-1.7.1/debian/patches/20_norpath.dpatch @@ -0,0 +1,20 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20_norpath.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: no rpath please + +@DPATCH@ +--- a/src/SConscript 2009-10-14 18:29:18.000000000 +0200 ++++ b/src/SConscript 2009-10-30 02:48:19.000000000 +0100 +@@ -736,9 +736,8 @@ + else: + env.Append(CCFLAGS = Split(""" -pipe -Wall -W -g """)) # omghax + env.Append(LINKFLAGS = Split(""" -pipe -Wall -W -g""")) +- if platform != 'osx': ++ if platform != 'osx' and platform != 'linux': + env.Append(LINKFLAGS = "-Wl,-rpath,$QTDIR/lib") +- env.Append(LINKFLAGS = "-Wl,-rpath,$QTDIR/lib") + env.Append(CPPDEFINES = "_REENTRANT") + + #Uic these guys (they're moc'd automatically after this) - Generates the code for the QT UI forms --- mixxx-1.7.1.orig/debian/patches/00list +++ mixxx-1.7.1/debian/patches/00list @@ -0,0 +1,3 @@ +10_uptodate_configure.dpatch +#10_soundtouch.dpatch +20_norpath.dpatch