Use external libsoundtouch wrt #315349 by Alex Barker.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 129 insertions, 2 deletions

diff --git a/media-sound/mixxx/ChangeLog b/media-sound/mixxx/ChangeLog
index d72099640877..5ceca5c729c0 100644
--- a/media-sound/mixxx/ChangeLog
+++ b/media-sound/mixxx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/mixxx
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/ChangeLog,v 1.50 2010/03/16 17:45:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/ChangeLog,v 1.51 2010/04/27 18:47:45 ssuominen Exp $
+
+*mixxx-1.7.2-r1 (27 Apr 2010)
+
+  27 Apr 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +mixxx-1.7.2-r1.ebuild, +files/mixxx-1.7.2-external_libsoundtouch.patch:
+  Use external libsoundtouch wrt #315349 by Alex Barker.
 
 *mixxx-1.7.2 (16 Mar 2010)
 
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 0828e3f71a70..572efc729ed7 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,6 +1,8 @@
+AUX mixxx-1.7.2-external_libsoundtouch.patch 1815 RMD160 c4a9fbb3b46f8c2aefe0f5580adc4289f773b766 SHA1 6db8978bbebfdd9ff0161023330d2068b4025a5c SHA256 cc7c7fd4a93a178807f5cdea20df423f7e7817237695b4df8e66d73a839d8572
 DIST mixxx-1.6.0-src.tar.gz 7285308 RMD160 d0046d8e98b1530f15821eb2d11ee4af82f87e44 SHA1 268d5ed18f4a21185a5496abe0acac12d06242ae SHA256 b57d999f82ab508291692c28ced5190f0391bcab3f85f98a8211a643c82335cb
 DIST mixxx-1.7.2-src.tar.gz 8758842 RMD160 a1aa7faf5392aa2da7365ea755e745ecb4eeb324 SHA1 594b5940a562b8b720bf555961cb8cf4c9c1b96d SHA256 d263e0c0f1ebbb264522cd5cbcbba4a6b262d6f8a0b373222452c307a4acc5f4
 EBUILD mixxx-1.6.0.ebuild 2168 RMD160 63a7511846a6d0aaf7223483bb99eb013fcafdbe SHA1 bed504b67b617a09f3533f38a776507774948810 SHA256 4bc9eae09de76006748b4a4d55af0e2049a76b7583694c56e1566afae8fd1a20
+EBUILD mixxx-1.7.2-r1.ebuild 1963 RMD160 7789b53f7909d29f2bd306aed7a399e0f3d05f88 SHA1 1ff36501599f4d646822b5babda1a52c7fbc8370 SHA256 58116b48ce45231d412b534bf94162ef8ddf8a636d1848d3996ec7cdb5921927
 EBUILD mixxx-1.7.2.ebuild 1863 RMD160 dadaea89c951b7ba9daad3ef5d9a5c5a5a079ff4 SHA1 3d45d1da2432f3c8f54ca9d731a2ef5e149d7987 SHA256 1dd5c32f3e88e1b3a27906de4999c68e9327bf40386770555dc1c1de4fe17fe3
-MISC ChangeLog 7151 RMD160 4726fa3c3ef37e4d656267b2fa50354985d4e96f SHA1 929dd73ed9c5b00f988281b2602e17664fdc2eab SHA256 2b6a23b8c5539fd3bf8b0f71699bc812c7dcc5a212775950b5dfdfd3d41f3fc9
+MISC ChangeLog 7369 RMD160 ba7a74896988a1b7927b1cb7824079a6b60f8567 SHA1 83436dfa3f94333dd476fddac07e8b2ce2bf2d27 SHA256 4e3dcfd2b151670491b15c11f7a3558c81cffba1cc2dbd722ac296351bbf7629
 MISC metadata.xml 613 RMD160 0ce89893a529880d4434b7ba6bd580f9d5e94871 SHA1 ec415837b0ca4babafeabd95fb2ed8a69b51bd71 SHA256 a690fb76b0b49175a9da7a08d7dc5374842ea0f3d90a6ebb62b984e3776fc712
diff --git a/media-sound/mixxx/files/mixxx-1.7.2-external_libsoundtouch.patch b/media-sound/mixxx/files/mixxx-1.7.2-external_libsoundtouch.patch
new file mode 100644
index 000000000000..d0ec9b08d2d4
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-1.7.2-external_libsoundtouch.patch
@@ -0,0 +1,47 @@
+http://bugs.gentoo.org/show_bug.cgi?id=315349
+
+--- src/SConscript
++++ src/SConscript
+@@ -737,9 +737,6 @@
+ else:
+ 	env.Append(CCFLAGS = Split(""" -pipe -Wall -W -g """)) # omghax
+ 	env.Append(LINKFLAGS = Split(""" -pipe -Wall -W -g"""))
+-	if platform != 'osx':
+-		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
+@@ -772,29 +769,9 @@
+ 
+ #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""")
+-
++sources += Split("""engine/enginebufferscalest.cpp""")
++env.Append(CPPPATH = [ ARGUMENTS.get('prefix', '/usr/local') + '/include/soundtouch' ])
++env.Append(LIBS = 'SoundTouch')
+ 
+ #KissFFT
+ env.Append(CPPPATH=['#lib/kissfft'])
diff --git a/media-sound/mixxx/mixxx-1.7.2-r1.ebuild b/media-sound/mixxx/mixxx-1.7.2-r1.ebuild
new file mode 100644
index 000000000000..37c074bda25d
--- /dev/null
+++ b/media-sound/mixxx/mixxx-1.7.2-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-1.7.2-r1.ebuild,v 1.1 2010/04/27 18:47:45 ssuominen Exp $
+
+EAPI=2
+inherit eutils multilib
+
+DESCRIPTION="a QT based Digital DJ tool"
+HOMEPAGE="http://mixxx.sourceforge.net"
+SRC_URI="http://downloads.mixxx.org/${P}/${P}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="debug +hifieq ipod ladspa pulseaudio shout tonal +vinylcontrol"
+
+RDEPEND="media-libs/libmad
+	media-libs/libid3tag
+	media-libs/libvorbis
+	media-libs/libsndfile
+	>=media-libs/portaudio-19_pre
+	virtual/opengl
+	virtual/glu
+	x11-libs/qt-gui:4
+	x11-libs/qt-svg:4
+	x11-libs/qt-opengl:4
+	>=media-libs/libsoundtouch-1.4.0
+	ladspa? ( media-libs/ladspa-sdk )
+	pulseaudio? ( media-sound/pulseaudio )
+	shout? ( media-libs/libshout )"
+DEPEND="${RDEPEND}
+	dev-util/scons
+	dev-util/pkgconfig"
+
+pkg_setup() {
+	mysconsargs="prefix=/usr
+		qtdir=/usr/$(get_libdir)/qt4
+		djconsole=0
+		djconsole_legacy=0
+		optimize=0
+		install_root=${D}/usr"
+
+	use hifieq && mysconsargs+=" hifieq=1" || mysconsargs+=" hifieq=0"
+	use ipod && mysconsargs+=" ipod=1" || mysconsargs+=" ipod=0"
+	use ladspa && mysconsargs+=" ladspa=1" || mysconsargs+=" ladspa=0"
+	use vinylcontrol && mysconsargs+=" vinylcontrol=1" || mysconsargs+=" vinylcontrol=0"
+	use shout && mysconsargs+=" shoutcast=1" || mysconsargs+=" shoutcast=0"
+	use debug && mysconsargs+=" cmetrics=1" || mysconsargs+=" cmetrics=0"
+	use tonal && mysconsargs+=" tonal=1" || mysconsargs+=" tonal=0"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-external_libsoundtouch.patch
+	sed -i \
+		-e 's:-O3::g' \
+		lib/cmetrics/SConscript || die
+
+	use pulseaudio || sed -i -e 's:pasuspender ::' src/mixxx.desktop
+}
+
+src_compile() {
+	scons ${mysconsargs} || die
+}
+
+src_install() {
+	scons ${mysconsargs} install || die
+
+	dodoc README*
+
+	insinto /usr/share/doc/${PF}/pdf
+	doins Mixxx-Manual.pdf
+}