Fix building with GCC 4.4 wrt #276956.

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

4 files changed, 35 insertions, 23 deletions

diff --git a/media-plugins/vamp-libxtract-plugins/ChangeLog b/media-plugins/vamp-libxtract-plugins/ChangeLog
index f30a24578cc9..0351d8f62d1d 100644
--- a/media-plugins/vamp-libxtract-plugins/ChangeLog
+++ b/media-plugins/vamp-libxtract-plugins/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vamp-libxtract-plugins
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vamp-libxtract-plugins/ChangeLog,v 1.6 2008/02/11 00:09:18 tester Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vamp-libxtract-plugins/ChangeLog,v 1.7 2009/07/24 17:57:14 ssuominen Exp $
+
+  24 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  vamp-libxtract-plugins-0.4.2.20071019.ebuild,
+  +files/vamp-libxtract-plugins-0.4.2.20071019-gcc44.patch:
+  Fix building with GCC 4.4 wrt #276956.
 
   11 Feb 2008; Olivier Crête <tester@gentoo.org>
   vamp-libxtract-plugins-0.4.2.20071019.ebuild:
diff --git a/media-plugins/vamp-libxtract-plugins/Manifest b/media-plugins/vamp-libxtract-plugins/Manifest
index 852c722ff910..daaaac388104 100644
--- a/media-plugins/vamp-libxtract-plugins/Manifest
+++ b/media-plugins/vamp-libxtract-plugins/Manifest
@@ -1,14 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX vamp-libxtract-plugins-0.4.2.20071019-gcc44.patch 460 RMD160 6877c774d3a9549eb49e9282298f22da1d66a356 SHA1 5bbc3d71a0ac9c64e15cc1f96053812711d4e338 SHA256 e949cd83737ffa8e8250be95158d2d2a4288707f51e89ba9b06d7b3eb79a371a
 DIST vamp-libxtract-plugins-0.4.2.20071019.tar.gz 14980 RMD160 d8da4380eac6243bb5137a248ed3fd99f75da0a0 SHA1 0d294a35ebf6941f2331eafbb02ef9aef974807f SHA256 ca5e9690ce6252ca40a6b20ba539616ddca4137691ae6943732641f857ba6bac
-EBUILD vamp-libxtract-plugins-0.4.2.20071019.ebuild 966 RMD160 cfb1a27e8bca91f22706bdcd7374c0bee9e93da4 SHA1 ca9da105b65a4cca17633c17803ce173fcfbd0b1 SHA256 186a9e6a1d28ab8db663cea4a3c955a3a8eb40ceb929c811b1d0871a5249d52f
-MISC ChangeLog 1089 RMD160 c24e052f7a79a3274fba9ebe310cf42abc0f7e65 SHA1 7cbfafc97bf64ae18d6592bd57c9713a65ec9566 SHA256 e2623533b3b9da541dfb4219acfd659186176aa20494eeda33fdf0aa82377bd3
+EBUILD vamp-libxtract-plugins-0.4.2.20071019.ebuild 1052 RMD160 94beef1823eb7f15955ce784bf569a9c9fbd9ab7 SHA1 19e7a9cc2be699f980e996c1ba1c075cd410d039 SHA256 994937729bf8f7357f699c2fd3851a9fe2005b899b50336fabe9a4019fc9720b
+MISC ChangeLog 1296 RMD160 38715211ad37274cab71353cdd4120b60919b902 SHA1 7e6115b03b38dd821376eca9ad07616226c8493a SHA256 454a5149c9a10cfde3f5161ea54885c0e2455f5c5d66d6d3890943c210490ab7
 MISC metadata.xml 161 RMD160 2738d17827a71b5ccbadae4c4f909d2b57d147b0 SHA1 90201ddb830142147774cc7b7b5178fbd0a9af0c SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iD8DBQFHr5IzmOfEJZHYOKcRAnGmAKDlXLxPNFupr8SFT9XT1SZRAOX1kwCguYqr
-1CifiwlpyLE6vQGfaT6v/go=
-=eeuX
------END PGP SIGNATURE-----
diff --git a/media-plugins/vamp-libxtract-plugins/files/vamp-libxtract-plugins-0.4.2.20071019-gcc44.patch b/media-plugins/vamp-libxtract-plugins/files/vamp-libxtract-plugins-0.4.2.20071019-gcc44.patch
new file mode 100644
index 000000000000..d7eae06ff067
--- /dev/null
+++ b/media-plugins/vamp-libxtract-plugins/files/vamp-libxtract-plugins-0.4.2.20071019-gcc44.patch
@@ -0,0 +1,11 @@
+diff -ur vamp-libxtract-plugins-0.4.2.20071019.orig/plugins/XTractPlugin.cpp vamp-libxtract-plugins-0.4.2.20071019/plugins/XTractPlugin.cpp
+--- vamp-libxtract-plugins-0.4.2.20071019.orig/plugins/XTractPlugin.cpp	2007-10-19 17:17:17.000000000 +0300
++++ vamp-libxtract-plugins-0.4.2.20071019/plugins/XTractPlugin.cpp	2009-07-24 20:54:33.000000000 +0300
+@@ -16,6 +16,7 @@
+ 
+ #include "XTractPlugin.h"
+ 
++#include <cstdio>
+ #include <cassert>
+ #include <math.h>
+ 
diff --git a/media-plugins/vamp-libxtract-plugins/vamp-libxtract-plugins-0.4.2.20071019.ebuild b/media-plugins/vamp-libxtract-plugins/vamp-libxtract-plugins-0.4.2.20071019.ebuild
index 38b81928f41f..3bae9b0ea319 100644
--- a/media-plugins/vamp-libxtract-plugins/vamp-libxtract-plugins-0.4.2.20071019.ebuild
+++ b/media-plugins/vamp-libxtract-plugins/vamp-libxtract-plugins-0.4.2.20071019.ebuild
@@ -1,8 +1,9 @@
-# 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-plugins/vamp-libxtract-plugins/vamp-libxtract-plugins-0.4.2.20071019.ebuild,v 1.6 2008/02/11 00:09:18 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vamp-libxtract-plugins/vamp-libxtract-plugins-0.4.2.20071019.ebuild,v 1.7 2009/07/24 17:57:14 ssuominen Exp $
 
-inherit multilib toolchain-funcs
+EAPI=2
+inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="Low-level feature extraction plugins using Jamie Bullock's libxtract library to provide around 50 spectral and other features"
 HOMEPAGE="http://www.vamp-plugins.org/"
@@ -13,20 +14,24 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc ppc64 x86"
 IUSE=""
 
-DEPEND="=sci-libs/fftw-3*
+RDEPEND="=sci-libs/fftw-3*
 	media-libs/libxtract
 	media-libs/vamp-plugin-sdk"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc44.patch
+	sed -e "s/-O2 -march=pentium3 -mfpmath=sse/-fPIC -DPIC/" \
+		-e "s/ -Wl,-Bstatic//" -i Makefile
+}
 
 src_compile() {
 	tc-export CXX
-	sed -i -e "s/-O2 -march=pentium3 -mfpmath=sse/-fPIC -DPIC/" Makefile
-	sed -i -e "s/ -Wl,-Bstatic//" Makefile
-	emake || die "make failed"
+	emake || die "emake failed"
 }
 
 src_install() {
 	insinto /usr/$(get_libdir)/vamp
-	doins vamp-libxtract.{so,cat}
+	doins vamp-libxtract.{so,cat} || die "doins failed"
 	dodoc README STATUS
 }