| 1 |
commit: b581f310212bf0254f21f4de3aa5b3c368ec9389 |
| 2 |
Author: Peter-Levine <plevine457 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Fri Apr 7 20:51:24 2017 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Apr 16 18:57:38 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b581f310 |
| 7 |
|
| 8 |
games-arcade/retrobattle: Fix building with GCC-6 (bug #614398) |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/4384 |
| 12 |
|
| 13 |
.../retrobattle/files/retrobattle-1.0.0-gcc6.patch | 22 ++++++++++++++++++++++ |
| 14 |
games-arcade/retrobattle/retrobattle-1.0.0.ebuild | 4 ++-- |
| 15 |
2 files changed, 24 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/games-arcade/retrobattle/files/retrobattle-1.0.0-gcc6.patch b/games-arcade/retrobattle/files/retrobattle-1.0.0-gcc6.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..19974e36ea5 |
| 20 |
--- /dev/null |
| 21 |
+++ b/games-arcade/retrobattle/files/retrobattle-1.0.0-gcc6.patch |
| 22 |
@@ -0,0 +1,22 @@ |
| 23 |
+--- a/src/GameLogic.h |
| 24 |
++++ b/src/GameLogic.h |
| 25 |
+@@ -52,8 +52,8 @@ |
| 26 |
+ /* Fixed interval time-based animation */ |
| 27 |
+ static const int maximumFrameRate = 60; |
| 28 |
+ static const int minimumFrameRate = 15; |
| 29 |
+- static const float updateInterval = 1.0 / maximumFrameRate; |
| 30 |
+- static const float maxCyclesPerFrame = maximumFrameRate / minimumFrameRate; |
| 31 |
++ static const float updateInterval; |
| 32 |
++ static const float maxCyclesPerFrame; |
| 33 |
+ |
| 34 |
+ float lastFrameTime; |
| 35 |
+ float cyclesLeftOver; |
| 36 |
+--- a/src/GameLogic.cc |
| 37 |
++++ b/src/GameLogic.cc |
| 38 |
+@@ -206,3 +206,6 @@ |
| 39 |
+ { |
| 40 |
+ sprintf(buf, "%s/data/gfx/%s", datadir, file); |
| 41 |
+ } |
| 42 |
++ |
| 43 |
++const float GameLogic::updateInterval = 1.0 / maximumFrameRate; |
| 44 |
++const float GameLogic::maxCyclesPerFrame = maximumFrameRate / minimumFrameRate; |
| 45 |
|
| 46 |
diff --git a/games-arcade/retrobattle/retrobattle-1.0.0.ebuild b/games-arcade/retrobattle/retrobattle-1.0.0.ebuild |
| 47 |
index ad00348dd59..eed0252ed1e 100644 |
| 48 |
--- a/games-arcade/retrobattle/retrobattle-1.0.0.ebuild |
| 49 |
+++ b/games-arcade/retrobattle/retrobattle-1.0.0.ebuild |
| 50 |
@@ -1,4 +1,4 @@ |
| 51 |
-# Copyright 1999-2015 Gentoo Foundation |
| 52 |
+# Copyright 1999-2017 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
|
| 55 |
EAPI=5 |
| 56 |
@@ -22,7 +22,7 @@ RDEPEND="${DEPEND}" |
| 57 |
S=${WORKDIR}/${MY_P}/src |
| 58 |
|
| 59 |
src_prepare() { |
| 60 |
- epatch "${FILESDIR}"/${P}-{build,sound}.patch |
| 61 |
+ epatch "${FILESDIR}"/${P}-{build,sound,gcc6}.patch |
| 62 |
} |
| 63 |
|
| 64 |
src_install() { |
Archives