summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2008-04-22 19:09:43 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2008-04-22 19:09:43 +0000
commitd49448da5f0eda7331cb85ffe101dc0d5f2cff49 (patch)
treed4c0ded2d84b8f4638937418fa52fac16f7964a2 /media-sound/muse
parentAdd ~ia64 (diff)
downloadhistorical-d49448da5f0eda7331cb85ffe101dc0d5f2cff49.tar.gz
historical-d49448da5f0eda7331cb85ffe101dc0d5f2cff49.tar.bz2
historical-d49448da5f0eda7331cb85ffe101dc0d5f2cff49.zip
Fix for GCC 4.3 by Peter Alfredsen wrt #218923.
Package-Manager: portage-2.1.5_rc6
Diffstat (limited to 'media-sound/muse')
-rw-r--r--media-sound/muse/ChangeLog6
-rw-r--r--media-sound/muse/Manifest5
-rw-r--r--media-sound/muse/files/muse-0.9.2-gcc43.patch16
-rw-r--r--media-sound/muse/muse-0.9.2.ebuild5
4 files changed, 27 insertions, 5 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/Manifest b/media-sound/muse/Manifest
index 4a7c0f931f80..d2667af54839 100644
--- a/media-sound/muse/Manifest
+++ b/media-sound/muse/Manifest
@@ -1,5 +1,6 @@
AUX muse-0.9.2-asneeded.patch 280 RMD160 2ab8ad01862b7dbeacfa16f78ac24d6743e0688a SHA1 24f01a41ff2c48244ac67e20ff07900f6a229045 SHA256 82100d43cc1ae62b913eb115de05a0c9c4d44c19475f432c41bc8183852c68ed
+AUX muse-0.9.2-gcc43.patch 507 RMD160 9e9240b5501d33b8e9ba5e8259d6051d23e36702 SHA1 4d47adab0f715d9ebe4b651cc3f383d02fcd4b71 SHA256 e831bf9396a18676c5f393a6f00960b5bac75486e8ba5e617bd89452968f154a
DIST MuSE-0.9.2.tar.gz 1420411 RMD160 05e156c44abbf48f26b30f6204c4524a760606d2 SHA1 b953f19a29ead39cc1723d07b5bf10ad1453afb2 SHA256 270f95b3a4f9d11bea04d5db4b3868aee1fa78177da0b5d9a74f26c4cfa5e197
-EBUILD muse-0.9.2.ebuild 1038 RMD160 b58673829a381594da4afe3d265ae14b42cbbcb7 SHA1 6898f70e6c07409bf0357badc168ac5dfc47b873 SHA256 9c7232e2c5c2ec17b3f33b4c919b4f4ded4e5766aa63e1ec4760db5318a7426d
-MISC ChangeLog 2993 RMD160 f4b8bf973cb7c7a16a993bc775e49a98e67c664d SHA1 c7ee489933de69151eea8036faa0d900580dd619 SHA256 34c24cf625aa33e18a8563e3599256c14d36386a5b2701a3e2a7e69c70b41be4
+EBUILD muse-0.9.2.ebuild 1073 RMD160 2e7bd1bb36ca3e6422f1291671befb6687a1879c SHA1 c273f9e1cba4d1fa13a5087911756ab8e7581bdc SHA256 859b7a9680c8c5183db65ce10c010aee0cebfae12ad89102accdad8c5633d166
+MISC ChangeLog 3145 RMD160 c9c86f7c7cc2e4c579e438c062f71fa82675f67b SHA1 130d6a652da04d610abe53863e55e42bf9b5ebbc SHA256 488db03bdb23fea08617ddfdf46290c18f8703d7a76b255b2bdd5b7dab61efe4
MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
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() {