From 71e206c31e948709a88fafc342bd2d8695942aa5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 10 Mar 2023 00:03:27 +0000 Subject: gentoo auto-resync : 10:03:2023 - 00:03:27 --- games-arcade/methane/Manifest | 5 -- .../methane/files/methane-1.5.1-fullscreen.patch | 96 ---------------------- .../methane/files/methane-1.5.1-gcc5.patch | 34 -------- .../methane/files/methane-1.5.1-gentoo.patch | 62 -------------- games-arcade/methane/methane-1.5.1-r1.ebuild | 49 ----------- 5 files changed, 246 deletions(-) delete mode 100644 games-arcade/methane/files/methane-1.5.1-fullscreen.patch delete mode 100644 games-arcade/methane/files/methane-1.5.1-gcc5.patch delete mode 100644 games-arcade/methane/files/methane-1.5.1-gentoo.patch delete mode 100644 games-arcade/methane/methane-1.5.1-r1.ebuild (limited to 'games-arcade/methane') diff --git a/games-arcade/methane/Manifest b/games-arcade/methane/Manifest index cd082448fbde..6171e8c90aee 100644 --- a/games-arcade/methane/Manifest +++ b/games-arcade/methane/Manifest @@ -1,10 +1,5 @@ -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 2663 BLAKE2B 63e289531655cfa760f8345fb530778cd2b8d4c68dc3ea59bec908fd1ad3c1dfebcd39735578706596cf8392bd67757c78ba1082fc45a50ca2aafb9c2b8dd430 SHA512 56ab2a112336ce6a73b4de5788497f5a12c2eb23e4711afad8406375a1e3b33a70d42a412bc5d6530f27f584584e01f177b951f266abdbdd16ef48e343623fde AUX methane-2.0.1-makefile.patch 1431 BLAKE2B 317719dff5db1c9225a34cb48768e480f57eee2af17e21d8cd90b6994b975446969659670e6e4bd59f51b6246fcc87b2fe4f2323ef0353af4aa8a5b52c75c88e SHA512 3a56e628d9d3ffc702826d0404bc1707f8d409acdd75064a8df7ce9f6d5ed6acf93f4bac6ffdfcdae06c6c0ce895a497f6c03ef58d7269f7aa0a79048c98b096 -DIST methane-1.5.1.tgz 1057881 BLAKE2B c783d8153e96cbf0f8f3593cd5ddccd0a9ec8222f61667d411cd3be7159ecf5a3364ad0212b77590b256fc33094e7ea73b83bdcb048aaea6d506e3e146b1412a SHA512 3506f288179a127f8508bd9d4225618d8dcd93794c559822ed2836bb46a318ce3c199f951f564064091b1125375118f2d64c50a27059dcd0e49c8379fa8c3155 DIST methane-2.0.1.tar.gz 1058487 BLAKE2B 2fc450c03dbbd57439b22e8e6ac8eebd2db18f97a3338180decdc0a437207b581a00e664e6353595c9eb50c16f7d9fead96bddf6ca50b67326ecea6dd4bb935a SHA512 96b005eb5964185adea89aa43afda375c474db8088a132b2d46a843a1eca6ba91f83bf41277a3f3cfa24c4f9b9dae7098527414284fd0521e92a34c225e06bd9 DIST methane.png 4034 BLAKE2B b10ebd8ca4bf2f6330aa89e3adb77a14bb183bf3d0dd40e305c87d58e0a6a4249662cdee8a457fc3df93a9c0b0daecf0dd8cb307c33a6b5f6e48543062b1b18f SHA512 a56e453c9971b8819904f19af4ed3e417ef0538f87bfa121918c8fa4f93c14ba922b7d29584f0c69497a7b56585a92a7df902997cf18f6f2672c31c960ea7772 -EBUILD methane-1.5.1-r1.ebuild 1007 BLAKE2B 6cbafc97d23676f9c730b76cb69e76d3f738db7b80583bf3099947e1fb051b1d88e06c68d9308159512908e534a72632fc4ebf582295137c92cf39b73fb988f2 SHA512 f1727b4835aadbd0d78af7f2b82d950edcd12599f622022d83d96e7b0905368b29e3896d9695ef8c4dc38be2ad42910b0c8f108a35abf4ff06f87cb71bc686c5 EBUILD methane-2.0.1.ebuild 913 BLAKE2B dd08878d4e5661c60cc08636f2c7d3109bb70f147a85fa8b2abfb6af4defcc112822112da270ec716ec3fd7b6681f42f5d0ef8cecf1d4117c003d964a5548938 SHA512 be4e42fe5baee5f25b045be3e96dd2268c86da8851e2e938f307732fc670b9b1c7c3c66a78bf6170573bc158e4611bd4f4581d2880d7e1b7b7919c8625b88d0a MISC metadata.xml 386 BLAKE2B ad398e6a96148c9ad446561ebf3db06c0d0331181422772c3d71dbb46c232dc9bd0a83367a021b4375bed1010ccdeb403f2323aae521a4f776671d97c6355b2c SHA512 a1a286b7722ef07e39177dba6f1ef79bd5f3d1b49a75b80fdba92c6c32f028d97f9e790dc6650133df4f59e43c67b2ff93801f9cddedbc105200c91ec6fbc6bc diff --git a/games-arcade/methane/files/methane-1.5.1-fullscreen.patch b/games-arcade/methane/files/methane-1.5.1-fullscreen.patch deleted file mode 100644 index 8a12a6bc4891..000000000000 --- a/games-arcade/methane/files/methane-1.5.1-fullscreen.patch +++ /dev/null @@ -1,96 +0,0 @@ ---- 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 &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 deleted file mode 100644 index 51a69041429b..000000000000 --- a/games-arcade/methane/files/methane-1.5.1-gcc5.patch +++ /dev/null @@ -1,34 +0,0 @@ -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 deleted file mode 100644 index 26a1b438c8a8..000000000000 --- a/games-arcade/methane/files/methane-1.5.1-gentoo.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -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` -+METHANE_FLAGS = -DENABLE_SOUND `${PKG_CONFIG} --cflags clanCore-2.3 clanDisplay-2.3 clanApp-2.3 clanGL-2.3 clanGL1-2.3 clanSWRender-2.3 clanSound-2.3 clanMikMod-2.3` -+METHANE_LIBS = `${PKG_CONFIG} --libs clanCore-2.3 clanDisplay-2.3 clanApp-2.3 clanGL-2.3 clanGL1-2.3 clanSWRender-2.3 clanSound-2.3 clanMikMod-2.3` - - OBJF = build/game.o build/baddie.o build/methane.o build/target.o build/maps.o build/gfxoff.o build/mapdata.o build/objlist.o build/doc.o build/bitdraw.o build/global.o build/suck.o build/power.o build/goodie.o build/bititem.o build/player.o build/weapon.o build/bitgroup.o build/boss.o build/sound.o build/gasobj.o build/misc.o - -@@ -10,7 +10,7 @@ - @echo "=================================" - - methane: ${OBJF} -- g++ ${CXXFLAGS} ${OBJF} -o methane ${METHANE_LIBS} -+ $(CXX) ${LDFLAGS} ${CXXFLAGS} ${OBJF} -o methane ${METHANE_LIBS} - - clean: - @rm -Rf build -@@ -23,6 +23,6 @@ - build/%.o : sources/%.cpp - @echo " Compiling $<..." - @if [ ! -d build ]; then mkdir build; fi -- gcc ${CXXFLAGS} ${METHANE_FLAGS} -c $< -o $@ -+ $(CXX) ${CXXFLAGS} ${METHANE_FLAGS} -c $< -o $@ - - ---- a/sources/methane.cpp -+++ b/sources/methane.cpp -@@ -80,15 +80,15 @@ - return 0; - } - -- CL_AutoPtr setup_sound; -- CL_AutoPtr sound_output; -- CL_AutoPtr setup_mikmod; -+ CL_UniquePtr setup_sound; -+ CL_UniquePtr sound_output; -+ CL_UniquePtr setup_mikmod; - - if (GLOBAL_SoundEnable) - { -- setup_sound = new CL_SetupSound; -- sound_output = new CL_SoundOutput(44100); -- setup_mikmod = new CL_SetupMikMod; -+ setup_sound = cl_move(CL_UniquePtr(new CL_SetupSound)); -+ sound_output = cl_move(CL_UniquePtr(new CL_SoundOutput(44100))); -+ setup_mikmod = cl_move(CL_UniquePtr(new CL_SetupMikMod)); - } - - // Set the video mode ---- a/sources/target.cpp -+++ b/sources/target.cpp -@@ -132,7 +132,7 @@ - CL_GraphicContext gc = m_pWindow->get_gc(); - - // Find the resources directory: -- CL_String resource_dir = CL_Directory::get_resourcedata("methane"); -+ CL_String resource_dir = "@GENTOO_DATADIR@/methane/"; - CL_String dataname("page_01.png"); - CL_String filename = resource_dir + dataname; - if (!CL_FileHelp::file_exists(filename)) diff --git a/games-arcade/methane/methane-1.5.1-r1.ebuild b/games-arcade/methane/methane-1.5.1-r1.ebuild deleted file mode 100644 index 7d0a032b4ccc..000000000000 --- a/games-arcade/methane/methane-1.5.1-r1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop toolchain-funcs - -DESCRIPTION="Port from an old amiga game" -HOMEPAGE="http://methane.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND="dev-games/clanlib:2.3[opengl,mikmod]" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${P}-gentoo.patch - # From Fedora - "${FILESDIR}"/${P}-gcc5.patch - "${FILESDIR}"/${P}-fullscreen.patch -) - -src_prepare() { - default - - sed -i \ - -e "s:@GENTOO_DATADIR@:/usr/share:" \ - sources/target.cpp || die - - tc-export CXX PKG_CONFIG - - # fix weird parallel make issue wrt #450422 - mkdir build || die -} - -src_install() { - dobin methane - - insinto /usr/share/${PN} - doins resources/* - - newicon docs/puff.gif ${PN}.gif - make_desktop_entry ${PN} "Super Methane Brothers" /usr/share/pixmaps/${PN}.gif - HTML_DOCS="docs/*" dodoc authors.txt history.txt readme.txt -} -- cgit v1.2.3