[gentoo-commits] repo/gentoo:master commit in: games-arcade/retrobattle/
commit: f820b218e398948a1c51a969b1822f0ab91508d8
Author: Sam James gentoo org>
AuthorDate: Sun Apr 4 06:14:30 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Apr 4 06:32:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f820b218
games-arcade/retrobattle: eutils->wrapper
Signed-off-by: Sam James gentoo.org>
.../retrobattle/retrobattle-1.0.0-r1.ebuild | 21 -
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/games-arcade/retrobattle/retrobattle-1.0.0-r1.ebuild
b/games-arcade/retrobattle/retrobattle-1.0.0-r1.ebuild
index e283c6299a0..7bbb9fa2dc2 100644
--- a/games-arcade/retrobattle/retrobattle-1.0.0-r1.ebuild
+++ b/games-arcade/retrobattle/retrobattle-1.0.0-r1.ebuild
@@ -1,29 +1,32 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit desktop eutils
+inherit desktop wrapper
MY_P="${PN}-src-${PV}"
DESCRIPTION="A NES-like platform arcade game"
HOMEPAGE="http://remar.se/andreas/retrobattle/;
SRC_URI="http://remar.se/andreas/retrobattle/files/${MY_P}.tar.bz2;
+S="${WORKDIR}/${MY_P}/src"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
+
# test is incomplete
RESTRICT="test"
-DEPEND="media-libs/libsdl[X,sound,video]
- media-libs/sdl-mixer[wav]"
+DEPEND="
+ media-libs/libsdl[X,sound,video]
+ media-libs/sdl-mixer[wav]
+"
RDEPEND="${DEPEND}"
-S="${WORKDIR}/${MY_P}/src"
-
-PATCHES=( "${FILESDIR}"/${P}-{build,sound,gcc6}.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-{build,sound,gcc6}.patch
+)
src_install() {
insinto /usr/share/${PN}
[gentoo-commits] repo/gentoo:master commit in: games-arcade/retrobattle/
commit: cf9e0c104d5b2ae5b333a09bbb69c2665f8efc2a
Author: Marty E. Plummer startmail com>
AuthorDate: Fri Aug 3 01:23:49 2018 +
Commit: James Le Cuirot gentoo org>
CommitDate: Mon Aug 27 21:23:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf9e0c10
games-arcade/retrobattle: add explicit desktop inheritance
eutils may not always inherit desktop
Package-Manager: Portage-2.3.44, Repoman-2.3.10
games-arcade/retrobattle/retrobattle-1.0.0-r1.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/games-arcade/retrobattle/retrobattle-1.0.0-r1.ebuild
b/games-arcade/retrobattle/retrobattle-1.0.0-r1.ebuild
index 411ae4f5701..e283c6299a0 100644
--- a/games-arcade/retrobattle/retrobattle-1.0.0-r1.ebuild
+++ b/games-arcade/retrobattle/retrobattle-1.0.0-r1.ebuild
@@ -2,7 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit eutils
+
+inherit desktop eutils
MY_P="${PN}-src-${PV}"
DESCRIPTION="A NES-like platform arcade game"
[gentoo-commits] repo/gentoo:master commit in: games-arcade/retrobattle/
commit: d81b89ce24dd6a97f345d5358bde2659db35c734
Author: Pacho Ramos gentoo org>
AuthorDate: Mon Apr 23 18:41:19 2018 +
Commit: Pacho Ramos gentoo org>
CommitDate: Mon Apr 23 19:17:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d81b89ce
games-arcade/retrobattle: Drop old
Package-Manager: Portage-2.3.31, Repoman-2.3.9
games-arcade/retrobattle/retrobattle-1.0.0.ebuild | 40 ---
1 file changed, 40 deletions(-)
diff --git a/games-arcade/retrobattle/retrobattle-1.0.0.ebuild
b/games-arcade/retrobattle/retrobattle-1.0.0.ebuild
deleted file mode 100644
index 08d9cc1ccf3..000
--- a/games-arcade/retrobattle/retrobattle-1.0.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-MY_P="${PN}-src-${PV}"
-DESCRIPTION="A NES-like platform arcade game"
-HOMEPAGE="http://remar.se/andreas/retrobattle/;
-SRC_URI="http://remar.se/andreas/retrobattle/files/${MY_P}.tar.bz2;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-# test is incomplete
-RESTRICT="test"
-
-DEPEND="media-libs/libsdl[X,sound,video]
- media-libs/sdl-mixer[wav]"
-RDEPEND="${DEPEND}"
-S=${WORKDIR}/${MY_P}/src
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-{build,sound,gcc6}.patch
-}
-
-src_install() {
- insinto "${GAMES_DATADIR}"/${PN}
- doins -r "${WORKDIR}"/${MY_P}/data
-
- # wrapper to pass datadir location
- newgamesbin "${WORKDIR}"/${MY_P}/${PN} ${PN}.bin
- games_make_wrapper ${PN} "${PN}.bin \"${GAMES_DATADIR}/${PN}\""
-
- make_desktop_entry ${PN}
- dodoc "${WORKDIR}"/${MY_P}/{manual.txt,README}
-
- prepgamesdirs
-}
[gentoo-commits] repo/gentoo:master commit in: games-arcade/retrobattle/files/, games-arcade/retrobattle/
commit: 2d20544a8bbe0b4c552bc35387618484139dfbee
Author: Pacho Ramos gentoo org>
AuthorDate: Mon Apr 23 18:41:09 2018 +
Commit: Pacho Ramos gentoo org>
CommitDate: Mon Apr 23 19:17:18 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d20544a
games-arcade/retrobattle: Stop using games.eclass
Package-Manager: Portage-2.3.31, Repoman-2.3.9
.../retrobattle/files/retrobattle-1.0.0-gcc6.patch | 8 ++---
.../retrobattle/retrobattle-1.0.0-r1.ebuild| 36 ++
2 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/games-arcade/retrobattle/files/retrobattle-1.0.0-gcc6.patch
b/games-arcade/retrobattle/files/retrobattle-1.0.0-gcc6.patch
index 19974e36ea5..62af1f4718e 100644
--- a/games-arcade/retrobattle/files/retrobattle-1.0.0-gcc6.patch
+++ b/games-arcade/retrobattle/files/retrobattle-1.0.0-gcc6.patch
@@ -1,5 +1,5 @@
a/src/GameLogic.h
-+++ b/src/GameLogic.h
+--- src/GameLogic.h
src/GameLogic.h
@@ -52,8 +52,8 @@
/* Fixed interval time-based animation */
static const int maximumFrameRate = 60;
@@ -11,8 +11,8 @@
float lastFrameTime;
float cyclesLeftOver;
a/src/GameLogic.cc
-+++ b/src/GameLogic.cc
+--- src/GameLogic.cc
src/GameLogic.cc
@@ -206,3 +206,6 @@
{
sprintf(buf, "%s/data/gfx/%s", datadir, file);
diff --git a/games-arcade/retrobattle/retrobattle-1.0.0-r1.ebuild
b/games-arcade/retrobattle/retrobattle-1.0.0-r1.ebuild
new file mode 100644
index 000..411ae4f5701
--- /dev/null
+++ b/games-arcade/retrobattle/retrobattle-1.0.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils
+
+MY_P="${PN}-src-${PV}"
+DESCRIPTION="A NES-like platform arcade game"
+HOMEPAGE="http://remar.se/andreas/retrobattle/;
+SRC_URI="http://remar.se/andreas/retrobattle/files/${MY_P}.tar.bz2;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+# test is incomplete
+RESTRICT="test"
+
+DEPEND="media-libs/libsdl[X,sound,video]
+ media-libs/sdl-mixer[wav]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}/src"
+
+PATCHES=( "${FILESDIR}"/${P}-{build,sound,gcc6}.patch )
+
+src_install() {
+ insinto /usr/share/${PN}
+ doins -r "${WORKDIR}"/${MY_P}/data
+
+ newbin "${WORKDIR}"/${MY_P}/${PN} ${PN}.bin
+ make_wrapper ${PN} "${PN}.bin \"/usr/share/${PN}\""
+
+ make_desktop_entry ${PN}
+ dodoc "${WORKDIR}"/${MY_P}/{manual.txt,README}
+}
[gentoo-commits] repo/gentoo:master commit in: games-arcade/retrobattle/, games-arcade/retrobattle/files/
commit: b581f310212bf0254f21f4de3aa5b3c368ec9389
Author: Peter-Levine gmail com>
AuthorDate: Fri Apr 7 20:51:24 2017 +
Commit: David Seifert gentoo org>
CommitDate: Sun Apr 16 18:57:38 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b581f310
games-arcade/retrobattle: Fix building with GCC-6 (bug #614398)
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4384
.../retrobattle/files/retrobattle-1.0.0-gcc6.patch | 22 ++
games-arcade/retrobattle/retrobattle-1.0.0.ebuild | 4 ++--
2 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/games-arcade/retrobattle/files/retrobattle-1.0.0-gcc6.patch
b/games-arcade/retrobattle/files/retrobattle-1.0.0-gcc6.patch
new file mode 100644
index 000..19974e36ea5
--- /dev/null
+++ b/games-arcade/retrobattle/files/retrobattle-1.0.0-gcc6.patch
@@ -0,0 +1,22 @@
+--- a/src/GameLogic.h
b/src/GameLogic.h
+@@ -52,8 +52,8 @@
+ /* Fixed interval time-based animation */
+ static const int maximumFrameRate = 60;
+ static const int minimumFrameRate = 15;
+- static const float updateInterval = 1.0 / maximumFrameRate;
+- static const float maxCyclesPerFrame = maximumFrameRate / minimumFrameRate;
++ static const float updateInterval;
++ static const float maxCyclesPerFrame;
+
+ float lastFrameTime;
+ float cyclesLeftOver;
+--- a/src/GameLogic.cc
b/src/GameLogic.cc
+@@ -206,3 +206,6 @@
+ {
+ sprintf(buf, "%s/data/gfx/%s", datadir, file);
+ }
++
++const float GameLogic::updateInterval = 1.0 / maximumFrameRate;
++const float GameLogic::maxCyclesPerFrame = maximumFrameRate /
minimumFrameRate;
diff --git a/games-arcade/retrobattle/retrobattle-1.0.0.ebuild
b/games-arcade/retrobattle/retrobattle-1.0.0.ebuild
index ad00348dd59..eed0252ed1e 100644
--- a/games-arcade/retrobattle/retrobattle-1.0.0.ebuild
+++ b/games-arcade/retrobattle/retrobattle-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -22,7 +22,7 @@ RDEPEND="${DEPEND}"
S=${WORKDIR}/${MY_P}/src
src_prepare() {
- epatch "${FILESDIR}"/${P}-{build,sound}.patch
+ epatch "${FILESDIR}"/${P}-{build,sound,gcc6}.patch
}
src_install() {
