summaryrefslogtreecommitdiff
path: root/games-arcade
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-08-12 06:32:46 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-08-12 06:32:46 +0100
commit28e3d252dc8ac8a5635206dfefe1cfe05058d1db (patch)
treee75bce604750fb72e53ed3684059e2e5d2094509 /games-arcade
parentf625b9919a60a30f1bd860f7d1b2eac183ced593 (diff)
gentoo resync : 12.08.2018
Diffstat (limited to 'games-arcade')
-rw-r--r--games-arcade/Manifest.gzbin21388 -> 21393 bytes
-rw-r--r--games-arcade/abe/Manifest2
-rw-r--r--games-arcade/abe/abe-1.1-r1.ebuild6
-rw-r--r--games-arcade/methane/Manifest6
-rw-r--r--games-arcade/methane/files/methane-1.5.1-fullscreen.patch96
-rw-r--r--games-arcade/methane/files/methane-1.5.1-gcc5.patch34
-rw-r--r--games-arcade/methane/files/methane-1.5.1-gentoo.patch12
-rw-r--r--games-arcade/methane/methane-1.5.1-r1.ebuild (renamed from games-arcade/methane/methane-1.5.1.ebuild)32
8 files changed, 161 insertions, 27 deletions
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 94afce1fe249..59bdb11074d0 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
Binary files differ
diff --git a/games-arcade/abe/Manifest b/games-arcade/abe/Manifest
index db8c3ca31be0..889f01eadec9 100644
--- a/games-arcade/abe/Manifest
+++ b/games-arcade/abe/Manifest
@@ -3,5 +3,5 @@ AUX abe-1.1-format-security.patch 2601 BLAKE2B b918881d0de19eafca8da7a9cc47efdc5
AUX abe-1.1-format.patch 506 BLAKE2B 9c91f56e58701d26b3a5809b6a764bd1acc38f4628849171f06d61e2eec1f9ffb3076f0e35c4dd26199f110c679a8c66c4a05d297a1d62d3845cb28e47ee642c SHA512 e0ddbaad3034ab28198ddf8fd7cbebc0648c1a4d30e4d597c90fe3c9327194de579da92d5acbd1a6ab99a50f11c8967f4a5cdda00776f404175f060f8e210c24
AUX abe-1.1-settings.patch 336 BLAKE2B 093ab417049ce54d012557fd7df9dc59ebd6e6095b0983d465aba0813ae6bfbd2c1c76e5d82bd734481781289c26619ef4bd4cb3651b08655030d36adbb35e4e SHA512 a609ec800165859854a132cca4dc1a12407746b832eae2326889212bcf155076f89ceb980e9cf6c678cdd9f160368c915e617d72b7d26bde2ec7fb23a7c05218
DIST abe-1.1.tar.gz 3321075 BLAKE2B 2ab51bd9103e8954bbc27eceb81b4bb845ec84ee249f21aaefdc59df87689f865d3b62a8c2db9584b8361303028174b1a96b60e0caf88ee857f8ad0d3cd3d920 SHA512 6106fce9c72554596ac3f94551326381e98c0d40f7a5aa8ae7aeadaa234c113733e8df717bd1b18d2ba835f689982e859607c9d88ab2d59790ec00833a4e48c7
-EBUILD abe-1.1-r1.ebuild 1625 BLAKE2B f7a432819a6ab0f18979e394b21ddab7a720dac6d6170286def241e5c362e719ce9d14b19b262114fe33cb76dcc400d8261ec52334942438f3fcdcde519b21fc SHA512 99c54f52d343cc759ce3238e56b96e743d1c7f03ecabe4d088326a3fd31234947024c563722b3db0c88696ea53875721e8d2ba34ef1115a0bd7e1679192594f2
+EBUILD abe-1.1-r1.ebuild 1493 BLAKE2B 72b49f606d1d8f45d40c2503ed277c8dbd941d95080f1aa09b3603f9a9fbd3db7c8a3a241cfd92650cd4220d16964c1c28c16d9761758abbfe1028943c711098 SHA512 b8affa2e81ea77925460c427a006a10811efbeafc1dfd235c685178b5ef783a08439247b386307034d3e8ce2dc3d7b6ab6fe2f9ed00fffe5f8889fd4e4278bfd
MISC metadata.xml 326 BLAKE2B a19b06620dabc908c6b71603bf229a0bbfb5fc8cd604580394c13ddd522ef52261985942321a18b8ce643fee8ad5ff15c915aac3861264111f4dcbefe8406d56 SHA512 85695bf3253d22818b913db2dad61277afe8062258c1b5b80ab9604261304b9f5dd39a50a9565ee4361ea793eff0fa23562c4a20bb9ea63a3296514c33ec1788
diff --git a/games-arcade/abe/abe-1.1-r1.ebuild b/games-arcade/abe/abe-1.1-r1.ebuild
index 25fb312e3b54..e98e3af41b04 100644
--- a/games-arcade/abe/abe-1.1-r1.ebuild
+++ b/games-arcade/abe/abe-1.1-r1.ebuild
@@ -27,15 +27,15 @@ src_unpack() {
PATCHES=(
# From Fedora:
# Enable changing the video settings. Sent upstream 2 Apr 2006:
- # https://sourceforge.net/tracker/?func=detail&aid=1463202&group_id=70141&atid=526743
+ # https://sourceforge.net/p/abe/bugs/1/
"${FILESDIR}"/${P}-settings.patch
# Fix a double free() bug. Sent upstream 15 Mar 2011:
- # https://sourceforge.net/tracker/?func=detail&aid=3214269&group_id=70141&atid=526745
+ # https://sourceforge.net/p/abe/patches/1/
"${FILESDIR}"/${P}-doublefree.patch
# Fix an incorrect printf format specifier. Sent upstream 15 Mar 2011:
- # https://sourceforge.net/tracker/?func=detail&aid=3214270&group_id=70141&atid=526745
+ # https://sourceforge.net/p/abe/patches/2/
"${FILESDIR}"/${P}-format.patch
# Fix build failure with -Werror=format-security
diff --git a/games-arcade/methane/Manifest b/games-arcade/methane/Manifest
index 0a5c77f21481..b67e7fc1c38b 100644
--- a/games-arcade/methane/Manifest
+++ b/games-arcade/methane/Manifest
@@ -1,4 +1,6 @@
-AUX methane-1.5.1-gentoo.patch 2873 BLAKE2B 3cb70f3813614b9a82a56cbced6d8186969e4c098af7056be04b1cf29784a776476c03125e178d535ec2e6fcbe470cbb805e0fa3ba168c458020e9a8e9b6c018 SHA512 21d117144cd1bc1813cea80ed07f18f046a1600449bc1be231cec46e6a2c185c30b572ccdc921e8333e0d32ace2c65b1821c61a726f8ced4be094cafa5fb3768
+AUX methane-1.5.1-fullscreen.patch 2575 BLAKE2B 070ef125fd26fbfb3103ce27b729877f85f497a4e8ab0c7fd10e75410bc70d3c96b18d24215a3e36fd01b0ce276775da9585ae1e78cd7d4c648060e53b120639 SHA512 8cf757c5fff8577ab79bc2ca9c062b8ac710704449fd1b7cbe2071bd62ff3bd39cf6c83f78f1136b8780ef4f0477677d4f866f55d4b9af67e0c5ab58b5a208ac
+AUX methane-1.5.1-gcc5.patch 2193 BLAKE2B 6377bdf4375daed5b9bf37c64ef80a1a8e01a934286c49f7330be05f290e0ca5a55b871179a08b5361fa3559463a6305910f85a8e5ee68f205656988ffffdacb SHA512 fa61ca7f68ea27fdf3c9952595a72776652810a0158eb206a7144ea9dd0df61986573722e9beb8b3a56d82ca19edc1daebdd23594d8310e7f5a89b721eb844c7
+AUX methane-1.5.1-gentoo.patch 2885 BLAKE2B b1ff8db81d35a5f99028bd0e233f325052db84fb5495d8100309625541678cea6fcb3f4e684ea272377b6f2ed3f3710590c9604f8f6f637331b73b4c8d4d38c6 SHA512 e84412cd9df8a3946f60b0fdaeb59979a5a7720c7a730ab620f2279a7c68bfc81f979b095fd4c98e9d83fb58ffba018390c082287f3ef67f7421353b2b85012a
DIST methane-1.5.1.tgz 1057881 BLAKE2B c783d8153e96cbf0f8f3593cd5ddccd0a9ec8222f61667d411cd3be7159ecf5a3364ad0212b77590b256fc33094e7ea73b83bdcb048aaea6d506e3e146b1412a SHA512 3506f288179a127f8508bd9d4225618d8dcd93794c559822ed2836bb46a318ce3c199f951f564064091b1125375118f2d64c50a27059dcd0e49c8379fa8c3155
-EBUILD methane-1.5.1.ebuild 1095 BLAKE2B 99f469e627db95dcff7aac65e6395900cacaa473c253687b06f3b53509cfa70fa2763f94ab8c3a5675c0e958de8a6cf5a7f52ae2a8926c166aa82602a99fb10f SHA512 7a2ce47530e10eb6f614b338a40ebd670db1a1ac1eaf28ced845a61db021422c46c94f523e4b27b994e954a4b37d0e12bb377746a0379521e79d2ef60005d0f2
+EBUILD methane-1.5.1-r1.ebuild 974 BLAKE2B 129deb2f614366d5b9c08dcd87351be395c53a03f6ea2a8fd394512f21a912c24bd874c901244af5e4a2635f08dddbdac1ef1f637987966252749d100ed8ff97 SHA512 88e09680dab7dbd51b51061febbe572a7515d27606e1b55193323d2add438ed743e8710208fc027f0dc6542849a0af78ada7216ae5b33faa979f70c88f31acf1
MISC metadata.xml 330 BLAKE2B 29205dbe4c0acf2e057c19d5c24057eff9fd7727fee56876d2bf9705baf2613ba80c59a6bcaf80d2346629259d4287ae7697c63466aa4f053ab3105f7efad5bf SHA512 fbb2b283c78c2952bb974a7b247ad80e4d1a9c1d8af47fa13e3d48fc91c9372c09b04212c55c6b06bbc939ea55e64c42bdd6fbae7cbb60c8fa6ed60f48305960
diff --git a/games-arcade/methane/files/methane-1.5.1-fullscreen.patch b/games-arcade/methane/files/methane-1.5.1-fullscreen.patch
new file mode 100644
index 000000000000..8a12a6bc4891
--- /dev/null
+++ b/games-arcade/methane/files/methane-1.5.1-fullscreen.patch
@@ -0,0 +1,96 @@
+--- methane-1.5.1/sources/methane.cpp 2011-12-11 13:52:54.904083515 +0100
++++ methane-1.5.1.new/sources/methane.cpp 2011-12-11 13:51:27.174080706 +0100
+@@ -37,6 +37,7 @@
+
+ RenderTarget GLOBAL_RenderTarget = opengl2;
+ bool GLOBAL_SoundEnable = true;
++bool GLOBAL_FullScreenEnable = true;
+
+ //------------------------------------------------------------------------------
+ // Keyboard stuff
+@@ -60,6 +61,20 @@
+
+ int main(const std::vector<CL_String> &args)
+ {
++ unsigned int i;
++
++ for (i = 1; i < args.size(); i++)
++ {
++ if (args[i].compare("-w") == 0)
++ GLOBAL_FullScreenEnable = false;
++ else
++ fprintf(stderr,
++ "Unknown commandline parameter: '%s', ignoring\n\n"
++ "Valid parameters:\n"
++ "'-w': start in windowed mode\n",
++ args[i].c_str());
++ }
++
+ try
+ {
+ CL_SetupGL target_opengl2;
+@@ -105,8 +120,15 @@
+ CL_DisplayWindowDescription desc;
+ desc.set_title("Super Methane Brothers");
+ desc.set_size(CL_Size(SCR_WIDTH*2,SCR_HEIGHT*2), true);
+- desc.set_allow_resize(true);
++ if (GLOBAL_FullScreenEnable)
++ {
++ desc.set_fullscreen(true);
++ }
++ else
++ desc.set_allow_resize(true);
+ CL_DisplayWindow window(desc);
++ if (GLOBAL_FullScreenEnable)
++ window.hide_cursor();
+
+ CMethDoc Game(window);
+
+@@ -131,8 +154,6 @@
+ int last_time = CL_System::get_time();
+
+ int quit_flag = 0;
+- int disable_scale_flag = 0;
+- int full_screen_flag = 0;
+ int on_options_screen = 1;
+ int option_page = 0;
+ int game_speed = 60;
+@@ -281,7 +302,8 @@
+
+ bool get_options()
+ {
+- CL_DisplayWindow window("Methane Options", 640, 480);
++ CL_DisplayWindow window("Methane Options", 640, 480,
++ GLOBAL_FullScreenEnable);
+
+ // Connect the Window close event
+ CL_Slot slot_quit = window.sig_window_close().connect(this, &SuperMethaneBrothers::on_window_close);
+@@ -320,6 +342,12 @@
+ GLOBAL_RenderTarget = swrender;
+ }
+
++ if ( (LastKey == 'f') || (LastKey == 'F') )
++ {
++ LastKey = 0;
++ GLOBAL_FullScreenEnable = !GLOBAL_FullScreenEnable;
++ }
++
+ gc.clear(CL_Colorf(0.0f,0.0f,0.2f));
+
+ int ypos = 40;
+@@ -360,6 +388,15 @@
+ {
+ options_font.draw_text(gc, 10, ypos, "Audio - Disabled. Press 'A' to toggle");
+ }
++ ypos += 50;
++ if (GLOBAL_FullScreenEnable)
++ {
++ options_font.draw_text(gc, 10, ypos, "Full screen - Enabled. Press 'F' to modify");
++ }
++ else
++ {
++ options_font.draw_text(gc, 10, ypos, "Full screen - Disabled. Press 'F' to modify");
++ }
+
+ ypos += 100;
+ options_font.draw_text(gc, 10, ypos, "Press the spacebar to start");
diff --git a/games-arcade/methane/files/methane-1.5.1-gcc5.patch b/games-arcade/methane/files/methane-1.5.1-gcc5.patch
new file mode 100644
index 000000000000..51a69041429b
--- /dev/null
+++ b/games-arcade/methane/files/methane-1.5.1-gcc5.patch
@@ -0,0 +1,34 @@
+diff -up methane-1.5.1/sources/misc.cpp~ methane-1.5.1/sources/misc.cpp
+--- methane-1.5.1/sources/misc.cpp~ 2009-04-28 16:42:43.000000000 +0200
++++ methane-1.5.1/sources/misc.cpp 2015-06-19 13:40:13.695215411 +0200
+@@ -40,15 +40,15 @@ static PARTYOFFS party_08 = {SPR_ENDSPR_
+ static PARTYOFFS party_09 = {SPR_ENDSPR_1+0x09,0x0048,0x0002};
+ static PARTYOFFS party_0a = {SPR_ENDSPR_1+0x0a,0x0058,0x0002};
+ static PARTYOFFS party_0b = {SPR_ENDSPR_1+0x0b,0x0000,0x0000};
+-static PARTYOFFS party_0c = {SPR_ENDSPR_1+0x0c,0x0020,0xFFFFFFD0};
++static PARTYOFFS party_0c = {SPR_ENDSPR_1+0x0c,0x0020,(int)0xFFFFFFD0};
+ static PARTYOFFS party_0d = {SPR_ENDSPR_1+0x0d,0x0040,0x0000};
+ static PARTYOFFS party_0e = {SPR_ENDSPR_1+0x0e,0x0000,0x0000};
+-static PARTYOFFS party_0f = {SPR_ENDSPR_1+0x0f,0x005E,0xFFFFFFF2};
+-static PARTYOFFS party_10 = {SPR_ENDSPR_1+0x10,0x007E,0xFFFFFFFA};
+-static PARTYOFFS party_11 = {SPR_ENDSPR_1+0x11,0x008E,0xFFFFFFF9};
++static PARTYOFFS party_0f = {SPR_ENDSPR_1+0x0f,0x005E,(int)0xFFFFFFF2};
++static PARTYOFFS party_10 = {SPR_ENDSPR_1+0x10,0x007E,(int)0xFFFFFFFA};
++static PARTYOFFS party_11 = {SPR_ENDSPR_1+0x11,0x008E,(int)0xFFFFFFF9};
+ static PARTYOFFS party_12 = {SPR_ENDSPR_1+0x12,0x0092,0x000B};
+-static PARTYOFFS party_13 = {SPR_ENDSPR_1+0x13,0x00B2,0xFFFFFFFB};
+-static PARTYOFFS party_14 = {SPR_ENDSPR_1+0x14,0x00C2,0xFFFFFFFA};
++static PARTYOFFS party_13 = {SPR_ENDSPR_1+0x13,0x00B2,(int)0xFFFFFFFB};
++static PARTYOFFS party_14 = {SPR_ENDSPR_1+0x14,0x00C2,(int)0xFFFFFFFA};
+ static PARTYOFFS party_15 = {SPR_ENDSPR_1+0x15,0x0000,0x0000};
+ static PARTYOFFS party_16 = {SPR_ENDSPR_1+0x16,0x0020,0x0008};
+ static PARTYOFFS party_17 = {SPR_ENDSPR_1+0x17,0x0020,0x0000};
+@@ -57,7 +57,7 @@ static PARTYOFFS party_19 = {SPR_ENDSPR_
+ static PARTYOFFS party_1a = {SPR_ENDSPR_1+0x1a,0x0020,0x0000};
+ static PARTYOFFS party_1b = {SPR_ENDSPR_1+0x1b,0x0000,0x0010};
+ static PARTYOFFS party_1c = {SPR_ENDSPR_1+0x1c,0x0010,0x0};
+-static PARTYOFFS party_1d = {SPR_ENDSPR_1+0x1d,0x0030,0xFFFFFFF0};
++static PARTYOFFS party_1d = {SPR_ENDSPR_1+0x1d,0x0030,(int)0xFFFFFFF0};
+
+ static PARTYOFFS *party_group1[] = {
+ &party_00,&party_01,&party_02,&party_00,&party_03,&party_04,0};
diff --git a/games-arcade/methane/files/methane-1.5.1-gentoo.patch b/games-arcade/methane/files/methane-1.5.1-gentoo.patch
index 9e49ecdff25c..6d72a2ca7ed5 100644
--- a/games-arcade/methane/files/methane-1.5.1-gentoo.patch
+++ b/games-arcade/methane/files/methane-1.5.1-gentoo.patch
@@ -1,5 +1,5 @@
---- Makefile.old 2012-11-26 18:58:48.201837870 +0100
-+++ Makefile 2012-11-27 12:30:16.038998128 +0100
+--- a/Makefile.old 2012-11-26 18:58:48.201837870 +0100
++++ b/Makefile 2012-11-27 12:30:16.038998128 +0100
@@ -1,5 +1,5 @@
-METHANE_FLAGS = -DENABLE_SOUND `pkg-config --cflags clanCore-2.2 clanDisplay-2.2 clanApp-2.2 clanGL-2.2 clanGL1-2.2 clanSWRender-2.2 clanSound-2.2 clanMikMod-2.2`
-METHANE_LIBS = `pkg-config --libs clanCore-2.2 clanDisplay-2.2 clanApp-2.2 clanGL-2.2 clanGL1-2.2 clanSWRender-2.2 clanSound-2.2 clanMikMod-2.2`
@@ -25,8 +25,8 @@
+ $(CXX) ${CXXFLAGS} ${METHANE_FLAGS} -c $< -o $@
---- sources/methane.cpp.old 2012-11-27 13:49:22.993003266 +0100
-+++ sources/methane.cpp 2012-11-27 17:37:23.051913777 +0100
+--- a/sources/methane.cpp.old 2012-11-27 13:49:22.993003266 +0100
++++ b/sources/methane.cpp 2012-11-27 17:37:23.051913777 +0100
@@ -80,15 +80,15 @@
return 0;
}
@@ -49,8 +49,8 @@
}
// Set the video mode
---- sources/target.cpp.old 2012-11-28 21:34:32.666878913 +0100
-+++ sources/target.cpp 2012-11-28 21:35:16.371247221 +0100
+--- a/sources/target.cpp.old 2012-11-28 21:34:32.666878913 +0100
++++ b/sources/target.cpp 2012-11-28 21:35:16.371247221 +0100
@@ -132,7 +132,7 @@
CL_GraphicContext gc = m_pWindow->get_gc();
diff --git a/games-arcade/methane/methane-1.5.1.ebuild b/games-arcade/methane/methane-1.5.1-r1.ebuild
index 5eb599ba6769..d26feb258d71 100644
--- a/games-arcade/methane/methane-1.5.1.ebuild
+++ b/games-arcade/methane/methane-1.5.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit eutils flag-o-matic games
+EAPI=7
+inherit desktop
DESCRIPTION="Port from an old amiga game"
HOMEPAGE="http://methane.sourceforge.net/"
@@ -15,29 +15,31 @@ IUSE=""
RDEPEND="dev-games/clanlib:2.3[opengl,mikmod]"
DEPEND="${RDEPEND}
- virtual/pkgconfig"
+ virtual/pkgconfig
+"
src_prepare() {
- epatch "${FILESDIR}"/${P}-gentoo.patch
+ default
+
+ eapply "${FILESDIR}"/${P}-gentoo.patch
+
+ # From Fedora
+ eapply "${FILESDIR}"/${P}-gcc5.patch
+ eapply "${FILESDIR}"/${P}-fullscreen.patch
+
sed -i \
- -e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}:" \
+ -e "s:@GENTOO_DATADIR@:/usr/share:" \
sources/target.cpp || die
# fix weird parallel make issue wrt #450422
mkdir build || die
- append-cxxflags -Wno-narrowing # build with gcc5 (bug #573788)
}
src_install() {
- dogamesbin methane
- insinto "${GAMES_DATADIR}"/${PN}
+ dobin methane
+ insinto /usr/share/${PN}
doins resources/*
- dodir "${GAMES_STATEDIR}"
- touch "${D}/${GAMES_STATEDIR}"/methanescores
- fperms g+w "${GAMES_STATEDIR}"/methanescores
newicon docs/puff.gif ${PN}.gif
make_desktop_entry ${PN} "Super Methane Brothers" /usr/share/pixmaps/${PN}.gif
- dodoc authors.txt history.txt readme.txt
- dohtml docs/*
- prepgamesdirs
+ HTML_DOCS="docs/*" dodoc authors.txt history.txt readme.txt
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 03:27:50 +0000