diff options
author | Samuli Suominen <drac@gentoo.org> | 2008-04-22 19:09:43 +0000 |
---|---|---|
committer | Samuli Suominen <drac@gentoo.org> | 2008-04-22 19:09:43 +0000 |
commit | 66b70581b99d2e20fa70332a710055e95c8048e2 (patch) | |
tree | 27675813a07f136456a9a9b021e8e54634378623 /media-sound/muse | |
parent | Add ~ia64 (diff) | |
download | gentoo-2-66b70581b99d2e20fa70332a710055e95c8048e2.tar.gz gentoo-2-66b70581b99d2e20fa70332a710055e95c8048e2.tar.bz2 gentoo-2-66b70581b99d2e20fa70332a710055e95c8048e2.zip |
Fix for GCC 4.3 by Peter Alfredsen wrt #218923.
(Portage version: 2.1.5_rc6)
Diffstat (limited to 'media-sound/muse')
-rw-r--r-- | media-sound/muse/ChangeLog | 6 | ||||
-rw-r--r-- | media-sound/muse/files/muse-0.9.2-gcc43.patch | 16 | ||||
-rw-r--r-- | media-sound/muse/muse-0.9.2.ebuild | 5 |
3 files changed, 24 insertions, 3 deletions
diff --git a/media-sound/muse/ChangeLog b/media-sound/muse/ChangeLog index 48b1caf59a15..e0263d706db8 100644 --- a/media-sound/muse/ChangeLog +++ b/media-sound/muse/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/muse # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/muse/ChangeLog,v 1.23 2008/02/01 15:09:17 drac Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/muse/ChangeLog,v 1.24 2008/04/22 19:09:42 drac Exp $ + + 22 Apr 2008; Samuli Suominen <drac@gentoo.org> + +files/muse-0.9.2-gcc43.patch, muse-0.9.2.ebuild: + Fix for GCC 4.3 by Peter Alfredsen wrt #218923. 01 Feb 2008; Samuli Suominen <drac@gentoo.org> -files/muse-0.9.1-include.patch, -files/muse-0.9.1-miscfixes.patch, diff --git a/media-sound/muse/files/muse-0.9.2-gcc43.patch b/media-sound/muse/files/muse-0.9.2-gcc43.patch new file mode 100644 index 000000000000..ec58eac62015 --- /dev/null +++ b/media-sound/muse/files/muse-0.9.2-gcc43.patch @@ -0,0 +1,16 @@ +diff -NrU5 MuSE-0.9.2.orig/src/libmpeg/mpegtoraw.cc MuSE-0.9.2/src/libmpeg/mpegtoraw.cc +--- MuSE-0.9.2.orig/src/libmpeg/mpegtoraw.cc 2008-04-22 20:39:47.000000000 +0200 ++++ MuSE-0.9.2/src/libmpeg/mpegtoraw.cc 2008-04-22 20:53:44.000000000 +0200 +@@ -417,11 +417,11 @@ + if(loader->eof())return seterrorcode(SOUND_ERROR_FINISH); + + return true; + } + +-#include <iostream.h> ++#include <iostream> + // Convert mpeg to raw + bool Mpegtoraw::run(int frames) { + clearrawdata(); + if(frames<0)lastfrequency=0; + diff --git a/media-sound/muse/muse-0.9.2.ebuild b/media-sound/muse/muse-0.9.2.ebuild index a826b0105f07..1425bd0dac28 100644 --- a/media-sound/muse/muse-0.9.2.ebuild +++ b/media-sound/muse/muse-0.9.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/muse/muse-0.9.2.ebuild,v 1.5 2008/02/01 10:38:54 drac Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/muse/muse-0.9.2.ebuild,v 1.6 2008/04/22 19:09:42 drac Exp $ inherit eutils @@ -28,7 +28,8 @@ S=${WORKDIR}/${MY_P} src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}"/${P}-asneeded.patch + epatch "${FILESDIR}"/${P}-asneeded.patch \ + "${FILESDIR}"/${P}-gcc43.patch } src_compile() { |