Fix compile with GCC 4.4

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 26 insertions, 15 deletions

diff --git a/media-libs/rubberband/ChangeLog b/media-libs/rubberband/ChangeLog
index df35745bc331..277c660d8518 100644
--- a/media-libs/rubberband/ChangeLog
+++ b/media-libs/rubberband/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/rubberband
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/rubberband/ChangeLog,v 1.7 2009/03/16 21:01:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/rubberband/ChangeLog,v 1.8 2009/06/05 22:04:53 ssuominen Exp $
+
+  05 Jun 2009; Samuli Suominen <ssuominen@gentoo.org> rubberband-1.3.ebuild,
+  +files/rubberband-1.3-gcc44.patch:
+  Fix compile with GCC 4.4
 
 *rubberband-1.3 (16 Mar 2009)
 
diff --git a/media-libs/rubberband/Manifest b/media-libs/rubberband/Manifest
index 9ebfbecf6f6a..46b2b0899dd7 100644
--- a/media-libs/rubberband/Manifest
+++ b/media-libs/rubberband/Manifest
@@ -1,20 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX rubberband-1.0.1-gcc43.patch 2578 RMD160 bca3c77d95f8b766c44f2f5ad2f03f395b1bd531 SHA1 2c8337cbb355168dd040b8db3e271d0ede0ace25 SHA256 c1d0a9332bc0506835253b42ce80b3370e41a5a7382c707b168c908f44363fe6
 AUX rubberband-1.2-gcc43.patch 295 RMD160 9bd4e5b4bfec630e9b48b5c0284dd7cf7b73c48d SHA1 73481586410c0808a6c4d4c8a0dad12b33538c45 SHA256 214f87be4e5876d2a46db16712d0b65857e66129b164fa84cf2ff54891c886b2
+AUX rubberband-1.3-gcc44.patch 429 RMD160 605e32c2ae85002b6af8981cca0a053a888867fa SHA1 d5af0d6c9146ed030297fdd0182693994904fc47 SHA256 6c83350e5699d5c0b0de6b079213891a0efcd112c9faf6e25d6f5897056d7478
 DIST rubberband-1.0.1.tar.bz2 83620 RMD160 5d43ad769f4d6db667122610f7db97e645a583a8 SHA1 ba9ef643fdfa56d8976bf1417f7ddc0cd723623a SHA256 10a80d4b2e8320c6ecb6ce203461ff02e43a0654d6975072ec4d13b9599df212
 DIST rubberband-1.2.tar.bz2 98627 RMD160 0de0fe1d6a962170e51fa6515d16e7f3a330b4cf SHA1 e3a0f129bd45ac49f717a128f1f580f60ddfa523 SHA256 930182335d4857610331a52d3cfc7b42f12e17f9bdc5225cfc8bb4e51c15c1d2
 DIST rubberband-1.3.tar.bz2 94302 RMD160 29730bbb7e96440169eae6404873405d3da9fafa SHA1 a1a2fb45959953b0c58e91ca4340b869356ebff3 SHA256 2866afc5868508769ae6f0058506c4cd35634a6a5edefb53afe93ef5258c2b3c
 EBUILD rubberband-1.0.1.ebuild 1134 RMD160 80b6345ab11646fe64443c706fd3ded1c9156067 SHA1 497972d34ccb47d0db28f4ddea8b77d7ced9e044 SHA256 984a983b0160a8b71154ff97f81c36b6939c8943af401dfa6371c2253f82e187
 EBUILD rubberband-1.2.ebuild 1182 RMD160 17fcb805a122b9537cd32770d75daa59b1d3024f SHA1 ee9aeffedebbc870eca88cdb0f51bd8ebf5fc185 SHA256 cb92ac9cf5aabd34a57959f7a035a25815f6dd21d5d86ccf2fd259e9b58bd5ec
-EBUILD rubberband-1.3.ebuild 1101 RMD160 ca87d8a6be8c5fcfba2f1cd27882a3576d82e0a0 SHA1 1065589910a12f12a3a163e021ef8d88a930fc92 SHA256 64e842adb33a1d28cf5f5103d60f58ee3c3deb9f43b074656b5c66a076d88df2
-MISC ChangeLog 1102 RMD160 9e3502309b1d34343665cd3b808001266d6cfa1c SHA1 a216cd048af638dfbf00b7bb7cbd4b3591b83b3d SHA256 5b7653db30326a359468906003a29ca7c1e4bb309bf69320b19ae892c067cd59
+EBUILD rubberband-1.3.ebuild 1168 RMD160 72645bb46da64676a04f36eba8a9b0a246291e12 SHA1 2e1dd7c29439d69b9f88d39ceb87dd491d2c1571 SHA256 3934082b0adc50c09e292404352665f678eee3adfc13910a3cf61fe711b7041a
+MISC ChangeLog 1245 RMD160 77eb01967f36f389b655596bcd4965fa90593323 SHA1 d6d0a13aa295001e4a912aa816de408574d627fa SHA256 f9fddcb38c97fb70c18aac6633e09f64e7040ee7213baef5afe7013efc57b9b3
 MISC metadata.xml 161 RMD160 2738d17827a71b5ccbadae4c4f909d2b57d147b0 SHA1 90201ddb830142147774cc7b7b5178fbd0a9af0c SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
-
-iEYEARECAAYFAkm+vkMACgkQvFcC4BYPU0qVCQCfZMeaXqf1N5wEeMQD5h0aqmXN
-4xAAn3RPPYlVd5tKps0fI1sZUxbAn/VC
-=fyfR
------END PGP SIGNATURE-----
diff --git a/media-libs/rubberband/files/rubberband-1.3-gcc44.patch b/media-libs/rubberband/files/rubberband-1.3-gcc44.patch
new file mode 100644
index 000000000000..7a6106eace24
--- /dev/null
+++ b/media-libs/rubberband/files/rubberband-1.3-gcc44.patch
@@ -0,0 +1,11 @@
+diff -ur rubberband-1.3.orig/src/vamp/RubberBandVampPlugin.cpp rubberband-1.3/src/vamp/RubberBandVampPlugin.cpp
+--- rubberband-1.3.orig/src/vamp/RubberBandVampPlugin.cpp	2009-03-01 23:55:47.000000000 +0200
++++ rubberband-1.3/src/vamp/RubberBandVampPlugin.cpp	2009-06-06 01:05:25.000000000 +0300
+@@ -17,6 +17,7 @@
+ #include "StretchCalculator.h"
+ #include "sysutils.h"
+ 
++#include <cstdio>
+ #include <cmath>
+ 
+ using std::string;
diff --git a/media-libs/rubberband/rubberband-1.3.ebuild b/media-libs/rubberband/rubberband-1.3.ebuild
index 22f9bc61c33f..9f0f227e7a98 100644
--- a/media-libs/rubberband/rubberband-1.3.ebuild
+++ b/media-libs/rubberband/rubberband-1.3.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/rubberband/rubberband-1.3.ebuild,v 1.1 2009/03/16 21:01:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/rubberband/rubberband-1.3.ebuild,v 1.2 2009/06/05 22:04:53 ssuominen Exp $
 
+EAPI=2
 inherit eutils multilib
 
 DESCRIPTION="An audio time-stretching and pitch-shifting library and utility program"
@@ -21,6 +22,10 @@ RDEPEND="media-libs/vamp-plugin-sdk
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc44.patch
+}
+
 src_install() {
 	emake INSTALL_BINDIR="${D}/usr/bin" \
 		INSTALL_INCDIR="${D}/usr/include/rubberband" \
@@ -29,6 +34,6 @@ src_install() {
 		INSTALL_LADSPADIR="${D}/usr/$(get_libdir)/ladspa" \
 		INSTALL_LRDFDIR="${D}/usr/share/ladspa/rdf" \
 		INSTALL_PKGDIR="${D}/usr/$(get_libdir)/pkgconfig" \
-		install || die "make install failed"
+		install || die "emake install failed"
 	dodoc README
 }