From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- games-arcade/blockrage/Manifest | 5 +- games-arcade/blockrage/blockrage-0.2.3-r1.ebuild | 30 +++++++ games-arcade/blockrage/blockrage-0.2.3.ebuild | 29 ------- .../blockrage/files/blockrage-0.2.3-config.patch | 8 +- .../blockrage/files/blockrage-0.2.3-statx.patch | 92 ++++++++++++++++++++++ 5 files changed, 129 insertions(+), 35 deletions(-) create mode 100644 games-arcade/blockrage/blockrage-0.2.3-r1.ebuild delete mode 100644 games-arcade/blockrage/blockrage-0.2.3.ebuild create mode 100644 games-arcade/blockrage/files/blockrage-0.2.3-statx.patch (limited to 'games-arcade/blockrage') diff --git a/games-arcade/blockrage/Manifest b/games-arcade/blockrage/Manifest index 293f2aa66814..1357ed688e6f 100644 --- a/games-arcade/blockrage/Manifest +++ b/games-arcade/blockrage/Manifest @@ -1,4 +1,5 @@ -AUX blockrage-0.2.3-config.patch 949 BLAKE2B c45af2acebc7e4c1f0bed710cec317f88e7a40fdcba1420f4349c1bf20aec95bc1f72b8d95411129bb05c51ffae373e87449ca974bca922b906915ac3bc0e4d1 SHA512 41b9446bbd0f1a5f0c9c740a3208ed01ec0f6b80bbce0c68e4e24b05b6e5c3bd22a308bc2ef72969dab95faffe20a9456a07e62e110378b4ad2034f9f7676f16 +AUX blockrage-0.2.3-config.patch 957 BLAKE2B f4a15ec3d7387c1e97c087c809ab441d062c1841f2dd785b57e98aa050dcb19248c83448184051a599af507c81d70c38d1423b91e3fc50cde143aadcce8dbdc3 SHA512 1e0abaf36ccdf531e75cbd6c4aea40bf5b2983270a64737db8ea63f0dd4dca283366271dd9d45e0231e1094088cd7a39d22f539ed402335ca4b3dcf7606739c2 +AUX blockrage-0.2.3-statx.patch 3402 BLAKE2B 88241189ac6728e3db5888e6623faea0210cccbe53352219dc90ea912339a5e308912246c2e9ed47e69258a46d6f66c1d70ed63afb65d678089b4dec12ab6933 SHA512 8a78c8152c5b805ea61f2675041072ac50f036978876e380ba19e7a62654c9d71a5ff8ccb18a7723cb509eb462f0fe0d0c44f8829929864241edc62f88a71ce5 DIST blockrage-0.2.3.tar.gz 75620 BLAKE2B f54e0f2e30e36b9c9692c28a4cb894305cb9e0eaae31873073899aeafaa1a032c56533840c5094ff60e3e9eb09587fc9cc83b8469f39952ce483369243f5fcc1 SHA512 20ad63cb75f6f3afe482b54c5dc0487615ed9ac9a43fa3819b1da43f343c8dde6c3eb817b46b586bbfdca6ad9c9e9cb3c220f5ab536397e407250daf9fd61aa2 -EBUILD blockrage-0.2.3.ebuild 618 BLAKE2B 805c5fc2794b9f6d6534422f8978425341ea8c250ce6b44779e091de79790bbec6629a10b2380c097f1356579318e02c1351610a4caca8123e28c85ea961ed42 SHA512 66e66aea0193e31aaa72eaf85d647370057c657960370a2181330349a69eec1e83c37a4737b0d9fccf85d8f442c2d44ce97b0a93a1f6d5ba0feb6163c2fd2b6e +EBUILD blockrage-0.2.3-r1.ebuild 634 BLAKE2B dedf2fd103aa43a92628c64aea7e9dd7c4648d572d4de0d20e222382db448d220bff908a8a39c3f20f70c5c4e9589e1b90aa4bf80a3f9052953b75f4bc126604 SHA512 a45dd69c37716b6b0f32c199cb143653c6b838760e7d6efa4c405706803618018fde78640be8f3860b870418f6ced5485cba218e55106042d4edc3637551174b MISC metadata.xml 332 BLAKE2B d8f4b60da9720f0cb44633c89a5c7b50f360391b4970766eab87518b669864266718a21c5ef835c122b5c088e1b747f3ce0bff7f4aa06a84528c4f2d52691dfe SHA512 f0109e967113083a663e0128ab444ca44860eef79d3bf3f2950ee27ae5c3eceb0b11ad8cc3a5dd5cd1883623a87978473f2d20387aa8f61c22c11b1b77344b32 diff --git a/games-arcade/blockrage/blockrage-0.2.3-r1.ebuild b/games-arcade/blockrage/blockrage-0.2.3-r1.ebuild new file mode 100644 index 000000000000..5e57e04ca851 --- /dev/null +++ b/games-arcade/blockrage/blockrage-0.2.3-r1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="Falling-blocks arcade game with a 2-player hotseat mode" +HOMEPAGE="http://blockrage.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND="media-libs/libsdl[video]" +RDEPEND="${DEPEND}" + +DOCS=( ChangeLog KNOWN_BUGS README TODO ) + +PATCHES=( + # Removing error due to wrong detection of cross-compile mode + "${FILESDIR}"/${P}-config.patch + "${FILESDIR}"/${P}-statx.patch +) + +src_configure() { + tc-export CC + default +} diff --git a/games-arcade/blockrage/blockrage-0.2.3.ebuild b/games-arcade/blockrage/blockrage-0.2.3.ebuild deleted file mode 100644 index 62aa1d3692a6..000000000000 --- a/games-arcade/blockrage/blockrage-0.2.3.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils games - -DESCRIPTION="Falling-blocks arcade game with a 2-player hotseat mode" -HOMEPAGE="http://blockrage.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="media-libs/libsdl[video]" -RDEPEND=${DEPEND} - -# Removing error due to wrong detection of cross-compile mode -DOCS=( ChangeLog KNOWN_BUGS README TODO ) - -src_prepare() { - epatch "${FILESDIR}/${P}"-config.patch -} - -src_install() { - default - prepgamesdirs -} diff --git a/games-arcade/blockrage/files/blockrage-0.2.3-config.patch b/games-arcade/blockrage/files/blockrage-0.2.3-config.patch index dc1875fc28e8..f1b3e5bde119 100644 --- a/games-arcade/blockrage/files/blockrage-0.2.3-config.patch +++ b/games-arcade/blockrage/files/blockrage-0.2.3-config.patch @@ -1,5 +1,5 @@ ---- configure -+++ configure +--- a/configure ++++ b/configure @@ -40,7 +40,7 @@ SOUND_OPT= @@ -17,8 +17,8 @@ fi;; --bindir=*) bindir="$cfg_optarg";; ---- src/Makefile.in -+++ src/Makefile.in +--- a/src/Makefile.in ++++ b/src/Makefile.in @@ -1,7 +1,7 @@ OBJS = main.o gfxout.o gfxlib.o menus.o keyboard.o bg.o sound.o global.o timer.o diff --git a/games-arcade/blockrage/files/blockrage-0.2.3-statx.patch b/games-arcade/blockrage/files/blockrage-0.2.3-statx.patch new file mode 100644 index 000000000000..95459e0984e6 --- /dev/null +++ b/games-arcade/blockrage/files/blockrage-0.2.3-statx.patch @@ -0,0 +1,92 @@ +Thanks-to: samuel.bauer +https://bugs.gentoo.org/669598 +--- a/src/main.c ++++ b/src/main.c +@@ -102,7 +102,7 @@ + + int immedstart; + int quit; +-static int statx[6],staty[6]; ++static int stat_x[6],stat_y[6]; + int diffx,diffy; /* coordinates of the difficulty level display box */ + int ts_x0,ts_x1; /* x-coordinates of the top-ten names(ts_x0) & scores(ts_x1) */ + int no_of_sets; +@@ -191,14 +191,14 @@ + + static void game_drawscore(player_t *p, int bgvcpy) { + if(bgvcpy) { +- v_drawscrarea(bmp_game[players-1].data,statx[1],staty[1], ++ v_drawscrarea(bmp_game[players-1].data,stat_x[1],stat_y[1], + strpixlen("0000000",FONT_HIGHLIGHTED),font[FONT_HIGHLIGHTED].ch); + } + t_align=T_LEFT; +- v_printf(statx[1],staty[1],FONT_HIGHLIGHTED,"%07d",p->score); ++ v_printf(stat_x[1],stat_y[1],FONT_HIGHLIGHTED,"%07d",p->score); + + if(bgvcpy) { +- virt_cpyarea(statx[1],staty[1], ++ virt_cpyarea(stat_x[1],stat_y[1], + strpixlen("00000000",FONT_HIGHLIGHTED),font[FONT_HIGHLIGHTED].ch); + } + } +@@ -206,28 +206,28 @@ + static void game_drawlevelnum(int bgvcpy) { + + if(bgvcpy) { +- v_drawscrarea(bmp_game[players-1].data,statx[3],staty[3], ++ v_drawscrarea(bmp_game[players-1].data,stat_x[3],stat_y[3], + strpixlen("00",FONT_HIGHLIGHTED),font[FONT_HIGHLIGHTED].ch); + } + t_align=T_LEFT; +- v_printf(statx[3],staty[3],FONT_HIGHLIGHTED,"%02d",level); ++ v_printf(stat_x[3],stat_y[3],FONT_HIGHLIGHTED,"%02d",level); + + if(bgvcpy) { +- virt_cpyarea(statx[3],staty[3], ++ virt_cpyarea(stat_x[3],stat_y[3], + strpixlen("00",FONT_HIGHLIGHTED),font[FONT_HIGHLIGHTED].ch); + } + } + + static void game_drawblocksleft(int bgvcpy) { + if(bgvcpy) { +- v_drawscrarea(bmp_game[players-1].data,statx[5],staty[5], ++ v_drawscrarea(bmp_game[players-1].data,stat_x[5],stat_y[5], + strpixlen("00",FONT_HIGHLIGHTED),font[FONT_HIGHLIGHTED].ch); + } + t_align=T_LEFT; +- v_printf(statx[5],staty[5],FONT_HIGHLIGHTED,"%02d",blocksleft); ++ v_printf(stat_x[5],stat_y[5],FONT_HIGHLIGHTED,"%02d",blocksleft); + + if(bgvcpy) { +- virt_cpyarea(statx[5],staty[5], ++ virt_cpyarea(stat_x[5],stat_y[5], + strpixlen("00",FONT_HIGHLIGHTED),font[FONT_HIGHLIGHTED].ch); + } + } +@@ -371,9 +371,9 @@ + void game_statistics_draw(void) { + if(players==1) { + t_align=T_LEFT; +- v_print(statx[0],staty[0],FONT_NORMAL,"Score:"); +- v_print(statx[2],staty[2],FONT_NORMAL,"Level:"); +- v_print(statx[4],staty[4],FONT_NORMAL,"Blocks:"); ++ v_print(stat_x[0],stat_y[0],FONT_NORMAL,"Score:"); ++ v_print(stat_x[2],stat_y[2],FONT_NORMAL,"Level:"); ++ v_print(stat_x[4],stat_y[4],FONT_NORMAL,"Blocks:"); + game_drawlevelnum(0); + game_drawblocksleft(0); + game_drawscore(&(player[0]),0); +@@ -1530,9 +1530,9 @@ + fscanf(f,"%d %d %d %d %d %d",&nx_x0[0],&nx_y0[0], + &nx_x0[1],&nx_y0[1],&nx_x0[2],&nx_y0[2]); + +- fscanf(f,"%d %d %d %d",&statx[0],&staty[0],&statx[1],&staty[1]); +- fscanf(f,"%d %d %d %d",&statx[2],&staty[2],&statx[3],&staty[3]); +- fscanf(f,"%d %d %d %d",&statx[4],&staty[4],&statx[5],&staty[5]); ++ fscanf(f,"%d %d %d %d",&stat_x[0],&stat_y[0],&stat_x[1],&stat_y[1]); ++ fscanf(f,"%d %d %d %d",&stat_x[2],&stat_y[2],&stat_x[3],&stat_y[3]); ++ fscanf(f,"%d %d %d %d",&stat_x[4],&stat_y[4],&stat_x[5],&stat_y[5]); + + fscanf(f,"%d %d",&diffx,&diffy); + fscanf(f,"%d %d",&ts_x0,&ts_x1); -- cgit v1.2.3