[gentoo-commits] repo/gentoo:master commit in: games-puzzle/biniax2/, games-puzzle/biniax2/files/
commit: 1c717da145549d35dd267860e242bff77ade4780
Author: Ionen Wolkens gentoo org>
AuthorDate: Wed Jun 9 11:18:33 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Wed Jun 9 11:26:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c717da1
games-puzzle/biniax2: fix -fno-common, EAPI-7 bump
Also:
- update SRC_URI
- don't call gcc directly
- revbump for [sound,video] to libsdl (game crashes without both)
Thanks to Samuel Bauer for -fno-common fix
Closes: https://bugs.gentoo.org/795078
Signed-off-by: Ionen Wolkens gentoo.org>
games-puzzle/biniax2/biniax2-1.30-r2.ebuild| 49 ++
.../biniax2/files/biniax2-1.30-build.patch | 9
.../biniax2/files/biniax2-1.30-fno-common.patch| 17
3 files changed, 66 insertions(+), 9 deletions(-)
diff --git a/games-puzzle/biniax2/biniax2-1.30-r2.ebuild
b/games-puzzle/biniax2/biniax2-1.30-r2.ebuild
new file mode 100644
index 000..719216968d7
--- /dev/null
+++ b/games-puzzle/biniax2/biniax2-1.30-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop toolchain-funcs
+
+DESCRIPTION="Logic game with arcade and tactics modes"
+HOMEPAGE="http://biniax.com/";
+SRC_URI="http://www.tuzsuzov.com/biniax/${P}-fullsrc.tar.gz";
+S="${WORKDIR}"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ media-libs/libsdl[sound,video]
+ media-libs/sdl-image[png]
+ media-libs/sdl-mixer[mod]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-build.patch
+ "${FILESDIR}"/${P}-dotfiles.patch
+ "${FILESDIR}"/${P}-fno-common.patch
+)
+
+src_prepare() {
+ default
+
+ rm data/Thumbs.db || die
+
+ sed -i "s|data/|/usr/share/${PN}/|" desktop/{gfx,snd}.c || die
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)"
+}
+
+src_install() {
+ dobin ${PN}
+
+ insinto /usr/share/${PN}
+ doins -r data/.
+
+ doicon "${FILESDIR}"/${PN}.xpm
+ make_desktop_entry ${PN} Biniax-2
+}
diff --git a/games-puzzle/biniax2/files/biniax2-1.30-build.patch
b/games-puzzle/biniax2/files/biniax2-1.30-build.patch
index cce8abe91a9..168ba6bfa79 100644
--- a/games-puzzle/biniax2/files/biniax2-1.30-build.patch
+++ b/games-puzzle/biniax2/files/biniax2-1.30-build.patch
@@ -1,14 +1,5 @@
--- a/makefile
+++ b/makefile
-@@ -4,7 +4,7 @@
- # To execute the game you need the runtimes of SDL, SDL_mixer and SDL_image.
-
- FLAGS=-W -WALL
--CC=gcc
-+CC?=gcc
- FILES=biniax.c hof.c desktop/cfg.c desktop/gfx.c desktop/snd.c desktop/inp.c
desktop/sys.c
- INCLUDES=-I . -I desktop
- LINKTO=-lSDL -lSDL_mixer -lSDL_image
@@ -12,4 +12,4 @@
TARGET=biniax2
diff --git a/games-puzzle/biniax2/files/biniax2-1.30-fno-common.patch
b/games-puzzle/biniax2/files/biniax2-1.30-fno-common.patch
new file mode 100644
index 000..73206f0c78d
--- /dev/null
+++ b/games-puzzle/biniax2/files/biniax2-1.30-fno-common.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/795078
+--- a/desktop/inp.c
b/desktop/inp.c
+@@ -37,4 +37,5 @@
+
**/
+
++BNX_INP _Inp;
+
+ BNX_BOOL inpInit()
+--- a/desktop/inp.h
b/desktop/inp.h
+@@ -70,5 +70,4 @@
+ } BNX_INP;
+
+-BNX_INP _Inp;
+
+
/**
[gentoo-commits] repo/gentoo:master commit in: games-puzzle/biniax2/, games-puzzle/biniax2/files/
commit: ff0c3a61cc4810203d8874799451d9ff20647c41
Author: Pacho Ramos gentoo org>
AuthorDate: Sat Apr 14 21:36:26 2018 +
Commit: Pacho Ramos gentoo org>
CommitDate: Sat Apr 14 21:38:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff0c3a61
games-puzzle/biniax2: Stop using games.eclass
Package-Manager: Portage-2.3.28, Repoman-2.3.9
games-puzzle/biniax2/biniax2-1.30-r1.ebuild| 42 ++
.../biniax2/files/biniax2-1.30-build.patch | 4 +--
.../biniax2/files/biniax2-1.30-dotfiles.patch | 16 -
3 files changed, 52 insertions(+), 10 deletions(-)
diff --git a/games-puzzle/biniax2/biniax2-1.30-r1.ebuild
b/games-puzzle/biniax2/biniax2-1.30-r1.ebuild
new file mode 100644
index 000..e4710407e8e
--- /dev/null
+++ b/games-puzzle/biniax2/biniax2-1.30-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop
+
+DESCRIPTION="Logic game with arcade and tactics modes"
+HOMEPAGE="http://biniax.com/";
+SRC_URI="http://mordred.dir.bg/biniax/${P}-fullsrc.tar.gz";
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="media-libs/libsdl
+ media-libs/sdl-image[png]
+ media-libs/sdl-mixer[mod]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"
+
+src_prepare() {
+ default
+
+ rm -f data/Thumbs.db
+ sed -i \
+ -e "s:data/:/usr/share/${PN}/:" \
+ desktop/{gfx,snd}.c \
+ || die
+ eapply \
+ "${FILESDIR}"/${P}-build.patch \
+ "${FILESDIR}"/${P}-dotfiles.patch
+}
+
+src_install() {
+ dobin ${PN}
+ insinto "/usr/share/${PN}"
+ doins -r data/*
+ doicon "${FILESDIR}"/${PN}.xpm
+ make_desktop_entry ${PN} Biniax-2
+}
diff --git a/games-puzzle/biniax2/files/biniax2-1.30-build.patch
b/games-puzzle/biniax2/files/biniax2-1.30-build.patch
index 26c053c2e98..cce8abe91a9 100644
--- a/games-puzzle/biniax2/files/biniax2-1.30-build.patch
+++ b/games-puzzle/biniax2/files/biniax2-1.30-build.patch
@@ -1,5 +1,5 @@
makefile
-+++ makefile
+--- a/makefile
b/makefile
@@ -4,7 +4,7 @@
# To execute the game you need the runtimes of SDL, SDL_mixer and SDL_image.
diff --git a/games-puzzle/biniax2/files/biniax2-1.30-dotfiles.patch
b/games-puzzle/biniax2/files/biniax2-1.30-dotfiles.patch
index 2cd212d6857..00391677ce8 100644
--- a/games-puzzle/biniax2/files/biniax2-1.30-dotfiles.patch
+++ b/games-puzzle/biniax2/files/biniax2-1.30-dotfiles.patch
@@ -1,5 +1,5 @@
biniax.c
-+++ biniax.c
+--- a/biniax.c
b/biniax.c
@@ -47,6 +47,8 @@
INCLUDES
**/
@@ -18,8 +18,8 @@
cfgInit();
hofInit();
if ( gfxInit() == BNX_FALSE )
desktop/cfg.c
-+++ desktop/cfg.c
+--- a/desktop/cfg.c
b/desktop/cfg.c
@@ -36,7 +36,7 @@
**/
@@ -29,8 +29,8 @@
struct BNX_SETUP
{
game.h
-+++ game.h
+--- a/game.h
b/game.h
@@ -37,7 +37,7 @@
DEFINITIONS
**/
@@ -40,8 +40,8 @@
/**
CONSTANTS
hof.c
-+++ hof.c
+--- a/hof.c
b/hof.c
@@ -34,7 +34,7 @@
#define chCursor '_' /* Cursor ON */
#define chSpace ' ' /* Cursor OFF*/
