Fix compile with GCC 4.4

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

4 files changed, 26 insertions, 17 deletions

diff --git a/media-libs/vamp-plugin-sdk/ChangeLog b/media-libs/vamp-plugin-sdk/ChangeLog
index 3751274f1237..eb96cae0b6a2 100644
--- a/media-libs/vamp-plugin-sdk/ChangeLog
+++ b/media-libs/vamp-plugin-sdk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/vamp-plugin-sdk
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vamp-plugin-sdk/ChangeLog,v 1.24 2008/12/13 11:39:11 aballier Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vamp-plugin-sdk/ChangeLog,v 1.25 2009/06/05 21:58:49 ssuominen Exp $
+
+  05 Jun 2009; Samuli Suominen <ssuominen@gentoo.org>
+  vamp-plugin-sdk-2.0.ebuild, +files/vamp-plugin-sdk-2.0-gcc44.patch:
+  Fix compile with GCC 4.4
 
   13 Dec 2008; Alexis Ballier <aballier@gentoo.org>
   vamp-plugin-sdk-2.0.ebuild:
diff --git a/media-libs/vamp-plugin-sdk/Manifest b/media-libs/vamp-plugin-sdk/Manifest
index 1161cde3cd52..3e60329d4067 100644
--- a/media-libs/vamp-plugin-sdk/Manifest
+++ b/media-libs/vamp-plugin-sdk/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX vamp-plugin-sdk-1.3-stdcplusplus.patch 609 RMD160 06fe2522a23567debe74292c04c4240e801d043f SHA1 3f8a362515e746bd94b8f3b3cf0ebd81670f107d SHA256 72df29cc5115657a419fe357db0b2f977a647e80f348a93afda2e1c143d3d83b
+AUX vamp-plugin-sdk-2.0-gcc44.patch 509 RMD160 53f7aa1b558d1d7dc24a141208e94411da8c7db2 SHA1 5fff243acf6776461b9fd3a158c50c4725093a46 SHA256 c6accba3c7b2762f502fccb854d6264fcd69b206753016a902f68687c2b141f2
 DIST vamp-plugin-sdk-1.3.tar.gz 73334 RMD160 b20df92d2ca459d81eabcacee548c8cf86a2e9ce SHA1 152fa3fe8b43d893cf18bf6a9081e97bb2e4d830 SHA256 7d8b44aa46e47d4ecdd3a7c4ba61778d3bdc626857c18c8e9ae3fa8b206b8da4
 DIST vamp-plugin-sdk-2.0.tar.gz 147954 RMD160 02cfbba5d6eab3b7722dd3c0711ab4d94d6da1e5 SHA1 479833b59883e9af94d26ce5ab5f014f305dcc5e SHA256 775630029db8fea08b77cc8ca6342b4d5deefe56a688aeb74928ad3f781bb1af
 EBUILD vamp-plugin-sdk-1.3.ebuild 1446 RMD160 0112829188df20df871cdbdf3676de6fca2bb2bb SHA1 5280214267f67627dc0eabd0794037e4e97db247 SHA256 d9f31ca853dde5abc834e021492d50d4eeb41f2e28e2226b79f1ac6e6bdec50a
-EBUILD vamp-plugin-sdk-2.0.ebuild 1392 RMD160 34fbcd31ea6c9c3bf3d9d76db79213de5cc84214 SHA1 8f5c00033e247c3b544cca69110cd32019aab425 SHA256 1e492eba97fdfa87609642ae735643242f497e1e077d9e40506dbaf3181713e1
-MISC ChangeLog 3569 RMD160 129f73a7e93aacb1ebe01811dbdeca8eca5fca5a SHA1 6312af52f4b1a0dbbcae992713dccd4b1a01ae5e SHA256 93ed4ed803862d86bd5fb4219d035710fb2eed80d6f998a0545cfd9eb40b86f7
+EBUILD vamp-plugin-sdk-2.0.ebuild 1431 RMD160 bfdf21e1527e0e1ba59d116648617f24ef65344b SHA1 6a21fec0b218c28fde4fb4232c20cfa25b71cdea SHA256 eb3c979df3f8ebb12df4563e382f06b3d8dcfe2441cc6d459267846a2b438dd0
+MISC ChangeLog 3722 RMD160 1549e7b053205c98fb170571ef8f0ff40c5a45e4 SHA1 d9dcf5e71f57a32921a3ce2a47d2c84ae5095bee SHA256 b4b7ce3c3d8f87550ec1403da3e537515cee40e1aa7b65efe9fdf0ebf47173f8
 MISC metadata.xml 161 RMD160 2738d17827a71b5ccbadae4c4f909d2b57d147b0 SHA1 90201ddb830142147774cc7b7b5178fbd0a9af0c SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAklDnuYACgkQvFcC4BYPU0p9jACcC72eVRaOaKRQwFJxsbHdIvDJ
-FfAAn23vXzd3gz7RyCHjXDFc1pIa4MEh
-=U9s+
------END PGP SIGNATURE-----
diff --git a/media-libs/vamp-plugin-sdk/files/vamp-plugin-sdk-2.0-gcc44.patch b/media-libs/vamp-plugin-sdk/files/vamp-plugin-sdk-2.0-gcc44.patch
new file mode 100644
index 000000000000..f559a7da9666
--- /dev/null
+++ b/media-libs/vamp-plugin-sdk/files/vamp-plugin-sdk-2.0-gcc44.patch
@@ -0,0 +1,14 @@
+diff -ur vamp-plugin-sdk-2.0.orig/examples/FixedTempoEstimator.cpp vamp-plugin-sdk-2.0/examples/FixedTempoEstimator.cpp
+--- vamp-plugin-sdk-2.0.orig/examples/FixedTempoEstimator.cpp	2008-12-01 13:48:41.000000000 +0200
++++ vamp-plugin-sdk-2.0/examples/FixedTempoEstimator.cpp	2009-06-06 00:57:58.000000000 +0300
+@@ -43,9 +43,9 @@
+ 
+ using Vamp::RealTime;
+ 
++#include <cstdio>
+ #include <cmath>
+ 
+-
+ class FixedTempoEstimator::D
+ // this class just avoids us having to declare any data members in the header
+ {
diff --git a/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.0.ebuild b/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.0.ebuild
index c8eebcdd7ffb..b07aef713c5a 100644
--- a/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.0.ebuild
+++ b/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.0.ebuild,v 1.2 2008/12/13 11:39:11 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.0.ebuild,v 1.3 2009/06/05 21:58:49 ssuominen Exp $
 
 inherit toolchain-funcs eutils multilib
 
@@ -20,7 +20,7 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
+	epatch "${FILESDIR}"/${P}-gcc44.patch
 	# multilib for default search paths
 	sed -i -e "s:/usr/lib/vamp:/usr/$(get_libdir)/vamp:" src/vamp-hostsdk/PluginHostAdapter.cpp || die "sed failed"
 }