diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2009-07-24 17:57:14 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-07-24 17:57:14 +0000 |
| commit | 2184ea08cda9721eb05d8e3282d79c0397e7437e (patch) | |
| tree | 506737d2a0a6c96a060a13da31ed76fd26c78bb5 /media-plugins | |
| parent | old (diff) | |
| download | gentoo-2-2184ea08cda9721eb05d8e3282d79c0397e7437e.tar.gz gentoo-2-2184ea08cda9721eb05d8e3282d79c0397e7437e.tar.bz2 gentoo-2-2184ea08cda9721eb05d8e3282d79c0397e7437e.zip | |
Fix building with GCC 4.4 wrt #276956.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'media-plugins')
3 files changed, 32 insertions, 11 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/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 } |