fix build with latest libsoundtouch

Package-Manager: portage-2.2.0_alpha53/cvs/Linux x86_64

4 files changed, 30 insertions, 11 deletions

diff --git a/media-sound/ardour/ChangeLog b/media-sound/ardour/ChangeLog
index f67da903837a..48097e2bf2fe 100644
--- a/media-sound/ardour/ChangeLog
+++ b/media-sound/ardour/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/ardour
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.95 2011/07/29 07:23:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.96 2011/09/04 12:30:34 aballier Exp $
+
+  04 Sep 2011; Alexis Ballier <aballier@gentoo.org> ardour-2.8.11-r20.ebuild,
+  +files/ardour-2.8.11-soundtouch.patch:
+  fix build with latest libsoundtouch
 
 *ardour-2.8.11-r20 (29 Jul 2011)
 
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index c2c0cbdf1630..8c77139d4d5e 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,21 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX ardour-2.8.11-flags.patch 926 RMD160 34041cec7cfc8129a9ac2317b4503012597b3c32 SHA1 abf40321d624e54b19f0b1c3ade462470d9167b1 SHA256 1b4762c15c329dbc89dba7149358ba5f82670f4d3e550dc166d55dda4e243304
 AUX ardour-2.8.11-gcc46.patch 733 RMD160 5cd27f140f4472dbb4075f879e0d625741ec45cc SHA1 1020199bd01e1569d93ac7dac9b98cc2e4bf4b84 SHA256 dcb04ef9b313f78b5bd08b585c22c429967d54e0fb776381e823a53568d12c9e
 AUX ardour-2.8.11-ldpath.patch 1374 RMD160 8fd64a2b9ada4199c4a54725010160a371d60f56 SHA1 bf588f6c5c74e84f704bccbe6d91e4a93e970ff1 SHA256 b39b71d9f9466632a320c3ad5d85ad2577f2507878bf7f6df564a8d43f66486b
 AUX ardour-2.8.11-raptor2.patch 1907 RMD160 2eaf98541027f4d8959d56029f58df984b327ac6 SHA1 51036e73280cc2cef3d90bbac72b54090f5788fa SHA256 e94b0364680d5fc3b2b960412fc8af3241806a9369fc86fd147438fc836cf23c
+AUX ardour-2.8.11-soundtouch.patch 710 RMD160 af40c5ef37ebef6f924fd4560f54f43cf31ecfc8 SHA1 ae729d0332d7fd486b13bd2dacfe95e9f9f0d7a5 SHA256 4e62791188a3435b69ef0b679a80de880b4156f690f59acb2ee9b23053e0752e
 AUX ardour-2.8.11-syslibs.patch 3855 RMD160 38cc2928697d2d3b55a1fa725d401571fc78a0ff SHA1 0eface5e152ecc4913b0e1d28fb22f0804c2919c SHA256 2d528d26fec29288ccb130eadda8816c781b921d922b7d948791b407623154ef
 AUX ardour-2.8.11-type.patch 311 RMD160 a9305313e02f26be3433396b10c9f58d92bb9133 SHA1 8d23326758377229df2194a3e1cb8ea84477c2c9 SHA256 53dc7f5066cfe51c3a390e0c902d6d4590b07d49a20630be105e20c10fece24d
 DIST ardour-2.8.11.tar.bz2 3322518 RMD160 e3567d1f5b8d0eb230b86951b7b8653b4344bff8 SHA1 e04f0d9aacd929565386f8027807d881bdf8fca6 SHA256 6a743f42b795bb66179dd467c9b8e417e99d38fa915159155dd582709b563b73
 EBUILD ardour-2.8.11-r1.ebuild 2127 RMD160 00ac467793bffa1ac520e500e4de92bde6d97c41 SHA1 80f76ce509c52ffa53dd3f77d600aa772fb25d4d SHA256 733ae402de100f396095288f2f4634bc378e6300298bb92b57b0565da4e7c715
-EBUILD ardour-2.8.11-r20.ebuild 2166 RMD160 4e853d2e1c052472ac3c0b52ceef860647db5ea0 SHA1 39df2e0c57ff54966e15c5a74f1e80972e61f7f2 SHA256 752909b68fb214e5d2fd3859e48255d7afb74fff89381fbbb2cba152015415a1
-MISC ChangeLog 15242 RMD160 0142ba195487ee451b037a1192b6a8702c8d822f SHA1 0d332cb36dbbe55cb65e023fc4ae2e147659327c SHA256 1793171e54a281ad0a2c41da561fe79b13f3d91672b450bfa51195511b0cfcc1
+EBUILD ardour-2.8.11-r20.ebuild 2213 RMD160 73470dc36b2ba8f00256687dca10c24ccd92a706 SHA1 b7d2b76a6a8e30ccd9d2ca8c2195d380dc0fbba1 SHA256 4a6865985b0c7654514db74165ba85b37b96731fdb721f26117f52ec3b912a7d
+MISC ChangeLog 15399 RMD160 cc03b1051cfa927e82de977892d1c09dfbfad851 SHA1 ad0d13f0536d62ec3a58a5670a9feb4df8164859 SHA256 bf2d0aebd53ed6d867538dd9d3c17fc6ddf6cb65c2395289db10ec469649f8e2
 MISC metadata.xml 234 RMD160 afe6939b1787409c4946aa2fad554d1eb9edfc66 SHA1 91fd230154e1eb9712e8345f24cf3595a247b3a0 SHA256 20428aad08fee2f7a7507f1b456c7ee3ebccd0eba59b90bd70d78b972d2b0799
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk4yX2cACgkQXkR9YqOcLPFM9wD+OGqKRkG1mVz1Y51W/xBg6XBb
-jEYT4vdcqQozvBgUx3MA/iy03NlfHGJe4djBJZTWCTn2jirtK5qKL2XERIzcpKWo
-=ZoMQ
+iEYEARECAAYFAk5jb3AACgkQvFcC4BYPU0q1+ACdH0halrcVrJ5TggeCXBlG5BAJ
+nPoAn3SCzGAbXjjxPNyePefKmJbV7ieY
+=4IkU
 -----END PGP SIGNATURE-----
diff --git a/media-sound/ardour/ardour-2.8.11-r20.ebuild b/media-sound/ardour/ardour-2.8.11-r20.ebuild
index 2b9a407eda74..b79c41f70396 100644
--- a/media-sound/ardour/ardour-2.8.11-r20.ebuild
+++ b/media-sound/ardour/ardour-2.8.11-r20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-2.8.11-r20.ebuild,v 1.1 2011/07/29 07:23:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-2.8.11-r20.ebuild,v 1.2 2011/09/04 12:30:34 aballier Exp $
 
 EAPI=4
 inherit eutils flag-o-matic toolchain-funcs scons-utils
@@ -26,7 +26,7 @@ RDEPEND="media-libs/aubio
 	>=media-libs/libsndfile-1.0.18
 	>=media-libs/libsamplerate-0.1
 	>=media-libs/rubberband-1.6.0
-	media-libs/libsoundtouch
+	>=media-libs/libsoundtouch-1.6.0
 	media-libs/flac
 	media-libs/raptor:2
 	>=media-libs/liblrdf-0.4.0-r20
@@ -54,7 +54,8 @@ src_prepare() {
 		"${FILESDIR}"/${P}-syslibs.patch \
 		"${FILESDIR}"/${P}-type.patch \
 		"${FILESDIR}"/${P}-ldpath.patch \
-		"${FILESDIR}"/${P}-raptor2.patch
+		"${FILESDIR}"/${P}-raptor2.patch \
+		"${FILESDIR}"/${P}-soundtouch.patch
 
 	if [[ ($(gcc-major-version) -eq 4 && $(gcc-minor-version) -ge 6) ]]; then
 		epatch "${FILESDIR}"/${P}-gcc46.patch
diff --git a/media-sound/ardour/files/ardour-2.8.11-soundtouch.patch b/media-sound/ardour/files/ardour-2.8.11-soundtouch.patch
new file mode 100644
index 000000000000..88a86e7f4e91
--- /dev/null
+++ b/media-sound/ardour/files/ardour-2.8.11-soundtouch.patch
@@ -0,0 +1,13 @@
+Index: ardour-2.8.11/SConstruct
+===================================================================
+--- ardour-2.8.11.orig/SConstruct
++++ ardour-2.8.11/SConstruct
+@@ -1063,7 +1063,7 @@ if env['SYSLIBS']:
+ 
+ #    libraries['flowcanvas'] = LibraryInfo(LIBS='flowcanvas', LIBPATH='#/libs/flowcanvas', CPPPATH='#libs/flowcanvas')
+     libraries['soundtouch'] = LibraryInfo()
+-    libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs soundtouch-1.0')
++    libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs soundtouch')
+     # Comment the previous line and uncomment this for old versions of Debian:
+     #libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch')
+