summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2009-05-30 16:25:54 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2009-05-30 16:25:54 +0000
commit5ca8e241638b3a2f8edc3a3ab65e001e61e78d4b (patch)
tree4bb9229641fd63af9e5432a56af72008663258ec
parentRemove versions that are not stable candidates. (diff)
downloadgentoo-2-5ca8e241638b3a2f8edc3a3ab65e001e61e78d4b.tar.gz
gentoo-2-5ca8e241638b3a2f8edc3a3ab65e001e61e78d4b.tar.bz2
gentoo-2-5ca8e241638b3a2f8edc3a3ab65e001e61e78d4b.zip
add patch for building with gcc43 - submitted by fox via bug #271222
(Portage version: 2.1.6.11/cvs/Linux i686)
-rw-r--r--games-arcade/ultrastar-ng/ChangeLog6
-rw-r--r--games-arcade/ultrastar-ng/files/ultrastar-ng-0.2.1-gcc43.patch14
-rw-r--r--games-arcade/ultrastar-ng/ultrastar-ng-0.2.1-r1.ebuild3
3 files changed, 21 insertions, 2 deletions
diff --git a/games-arcade/ultrastar-ng/ChangeLog b/games-arcade/ultrastar-ng/ChangeLog
index ba3dee47898d..07a8aaadb3e4 100644
--- a/games-arcade/ultrastar-ng/ChangeLog
+++ b/games-arcade/ultrastar-ng/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-arcade/ultrastar-ng
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/ultrastar-ng/ChangeLog,v 1.7 2009/04/29 20:09:17 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/ultrastar-ng/ChangeLog,v 1.8 2009/05/30 16:25:54 mr_bones_ Exp $
+
+ 30 May 2009; Michael Sterrett <mr_bones_@gentoo.org>
+ +files/ultrastar-ng-0.2.1-gcc43.patch, ultrastar-ng-0.2.1-r1.ebuild:
+ add patch for building with gcc43 - submitted by fox via bug #271222
09 Feb 2009; Michael Sterrett <mr_bones_@gentoo.org>
ultrastar-ng-0.2.1-r1.ebuild:
diff --git a/games-arcade/ultrastar-ng/files/ultrastar-ng-0.2.1-gcc43.patch b/games-arcade/ultrastar-ng/files/ultrastar-ng-0.2.1-gcc43.patch
new file mode 100644
index 000000000000..a946de382a29
--- /dev/null
+++ b/games-arcade/ultrastar-ng/files/ultrastar-ng-0.2.1-gcc43.patch
@@ -0,0 +1,14 @@
+--- audio/audio_dev_tone.cpp 2007-11-04 12:44:26.000000000 +0100
++++ audio/audio_dev_tone.cpp.patched 2009-05-23 13:50:51.690432280 +0200
+@@ -54,9 +54,10 @@
+ double freq = 440.0, amplitude = 0.1, phase = 0.0;
+ using namespace boost::spirit;
+ using namespace boost::lambda;
++ placeholder1_type arg1;
+ if (!parse(tonestr.c_str(),
+ !(limit_d(1.0, s.rate() / 2.0)[real_p][assign_a(freq)]) >> *(!ch_p('.') >> (
+- str_p("amplitude(") >> (max_limit_d(0.0)[real_p][var(amplitude) = bind(static_cast<double(*)(double, double)>(std::pow), 10.0, _1 / 20.0)] | real_p[assign_a(amplitude)]) |
++ str_p("amplitude(") >> (max_limit_d(0.0)[real_p][var(amplitude) = bind(static_cast<double(*)(double, double)>(std::pow), 10.0, arg1 / 20.0)] | real_p[assign_a(amplitude)]) |
+ str_p("phase(") >> limit_d(0.0, 1.0)[real_p][assign_a(phase)]
+ ) >> ')')
+ ).full)
diff --git a/games-arcade/ultrastar-ng/ultrastar-ng-0.2.1-r1.ebuild b/games-arcade/ultrastar-ng/ultrastar-ng-0.2.1-r1.ebuild
index 5584aaecd09a..4e444160540d 100644
--- a/games-arcade/ultrastar-ng/ultrastar-ng-0.2.1-r1.ebuild
+++ b/games-arcade/ultrastar-ng/ultrastar-ng-0.2.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/ultrastar-ng/ultrastar-ng-0.2.1-r1.ebuild,v 1.7 2009/04/29 20:09:17 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/ultrastar-ng/ultrastar-ng-0.2.1-r1.ebuild,v 1.8 2009/05/30 16:25:54 mr_bones_ Exp $
EAPI=2
inherit autotools eutils games
@@ -47,6 +47,7 @@ S=${WORKDIR}/${MY_P}
src_prepare() {
epatch "${FILESDIR}"/${P}-bash4.patch # bug #267316
+ epatch "${FILESDIR}"/${P}-gcc43.patch # bug #271222
touch docs/ultrastarng.6 # no, don't try to rebuild the man page
eautoreconf
}