public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/methane] rawhide: Update to v3.0.0
@ 2026-07-15 18:04 Artur Frenszek-Iwicki
0 siblings, 0 replies; only message in thread
From: Artur Frenszek-Iwicki @ 2026-07-15 18:04 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/methane
Branch : rawhide
Commit : 53fe74baca6bc0b9dce853c92b869d504b5db64e
Author : Artur Frenszek-Iwicki <fedora@svgames.pl>
Date : 2026-07-02T21:35:18+02:00
Stats : +69/-311 in 9 file(s)
URL : https://src.fedoraproject.org/rpms/methane/c/53fe74baca6bc0b9dce853c92b869d504b5db64e?branch=rawhide
Log:
Update to v3.0.0
---
diff --git a/.gitignore b/.gitignore
index 04d7827..802f98f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
methane-1.5.0.tgz
/methane-1.5.1.tgz
+/Methane-v3.0.0.tar.gz
diff --git a/0000-missing-includes.patch b/0000-missing-includes.patch
new file mode 100644
index 0000000..3a66dd1
--- /dev/null
+++ b/0000-missing-includes.patch
@@ -0,0 +1,39 @@
+diff --git a/Sources/TinyClan/Core/IOData/file_help.cpp b/Sources/TinyClan/Core/IOData/file_help.cpp
+index 7138bdf..29a0aef 100644
+--- a/Sources/TinyClan/Core/IOData/file_help.cpp
++++ b/Sources/TinyClan/Core/IOData/file_help.cpp
+@@ -35,6 +35,7 @@
+
+ #ifndef WIN32
+ #include <sys/stat.h>
++#include <unistd.h>
+ #endif
+
+ namespace clan
+diff --git a/Sources/TinyClan/Core/IOData/path_help.cpp b/Sources/TinyClan/Core/IOData/path_help.cpp
+index d42343f..0f46f98 100644
+--- a/Sources/TinyClan/Core/IOData/path_help.cpp
++++ b/Sources/TinyClan/Core/IOData/path_help.cpp
+@@ -43,6 +43,7 @@
+
+ #ifndef WIN32
+ #include <cstring>
++#include <unistd.h>
+ #endif
+
+ namespace clan
+diff --git a/Sources/TinyClan/Core/Text/console_logger.cpp b/Sources/TinyClan/Core/Text/console_logger.cpp
+index d7db41d..58a47f3 100644
+--- a/Sources/TinyClan/Core/Text/console_logger.cpp
++++ b/Sources/TinyClan/Core/Text/console_logger.cpp
+@@ -32,6 +32,10 @@
+ #include "API/Core/Text/string_help.h"
+ #include "API/Core/Text/string_format.h"
+
++#ifndef WIN32
++#include <unistd.h>
++#endif
++
+ namespace clan
+ {
+ ConsoleLogger::ConsoleLogger()
diff --git a/methane-1.5.1-clanlib-23.patch b/methane-1.5.1-clanlib-23.patch
deleted file mode 100644
index 39729df..0000000
--- a/methane-1.5.1-clanlib-23.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- methane-1.5.1/Makefile 2011-04-05 09:21:14.000000000 +0200
-+++ methane-1.5.1.new/Makefile 2011-12-11 13:55:15.253088027 +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`
-+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
-
---- methane-1.5.1/sources/methane.cpp 2011-12-11 14:18:38.301132904 +0100
-+++ methane-1.5.1.new/sources/methane.cpp 2011-12-11 14:15:32.669126965 +0100
-@@ -105,15 +105,15 @@
- return 0;
- }
-
-- CL_AutoPtr<CL_SetupSound> setup_sound;
-- CL_AutoPtr<CL_SoundOutput> sound_output;
-- CL_AutoPtr<CL_SetupMikMod> setup_mikmod;
-+ CL_UniquePtr<CL_SetupSound> setup_sound;
-+ CL_UniquePtr<CL_SoundOutput> sound_output;
-+ CL_UniquePtr<CL_SetupMikMod> 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<CL_SetupSound>(new CL_SetupSound));
-+ sound_output = cl_move(CL_UniquePtr<CL_SoundOutput>(new CL_SoundOutput(44100)));
-+ setup_mikmod = cl_move(CL_UniquePtr<CL_SetupMikMod>(new CL_SetupMikMod));
- }
-
- // Set the video mode
diff --git a/methane-1.5.1-gcc5.patch b/methane-1.5.1-gcc5.patch
deleted file mode 100644
index 51a6904..0000000
--- a/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/methane-fullscreen.patch b/methane-fullscreen.patch
deleted file mode 100644
index 8a12a6b..0000000
--- a/methane-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<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/methane-highscore.patch b/methane-highscore.patch
deleted file mode 100644
index 7ccf414..0000000
--- a/methane-highscore.patch
+++ /dev/null
@@ -1,127 +0,0 @@
---- methane-1.5.1/sources/doc.cpp 2011-04-05 09:08:02.000000000 +0200
-+++ methane-1.5.1.new/sources/doc.cpp 2011-12-11 13:35:23.888049882 +0100
-@@ -15,6 +15,9 @@
- #include "doc.h"
- #include "target.h"
- #include "snddef.h"
-+#include <stdio.h>
-+
-+extern FILE *methanescoresfptr;
-
- //------------------------------------------------------------------------------
- //! \brief Initialise Document
-@@ -110,28 +113,14 @@
- //------------------------------------------------------------------------------
- void CMethDoc::LoadScores(void)
- {
-- CL_String dirname = CL_Directory::get_appdata("clanlib", "methane", "1.5", false);
--
-- try
-- {
-- CL_File file(dirname+"highscores");
-- HISCORES *hs;
-- int cnt;
-- for (cnt=0, hs=m_GameTarget.m_Game.m_HiScores; cnt<MAX_HISCORES; cnt++, hs++)
-- {
-- char buffer[5];
-- file.read(buffer, 4, true);
-- buffer[4] = 0;
-- int score = file.read_int32();
--
-- m_GameTarget.m_Game.InsertHiScore( score, buffer );
-+ size_t ign;
-
-- }
-- }
-- catch(CL_Exception& exception)
-- {
-- }
-+ if (!methanescoresfptr) return; // No scores available
-
-+ rewind(methanescoresfptr);
-+ ign = fread(m_GameTarget.m_Game.m_HiScores, sizeof(HISCORES),
-+ MAX_HISCORES, methanescoresfptr);
-+ ign++;
- }
-
- //------------------------------------------------------------------------------
-@@ -139,21 +128,12 @@
- //------------------------------------------------------------------------------
- void CMethDoc::SaveScores(void)
- {
-- CL_String dirname = CL_Directory::get_appdata("clanlib", "methane", "1.5");
-+ size_t ign;
-
-- try
-- {
-- CL_File file(dirname+"highscores", CL_File::create_always, CL_File::access_write);
-- HISCORES *hs;
-- int cnt;
-- for (cnt=0, hs=m_GameTarget.m_Game.m_HiScores; cnt<MAX_HISCORES; cnt++, hs++)
-- {
-- file.write(hs->name, 4, true);
-- file.write_int32(hs->score);
-- }
-- }
-- catch(CL_Exception& exception)
-- {
-- }
--}
-+ if (!methanescoresfptr) return; // No scores available
-
-+ rewind(methanescoresfptr);
-+ ign = fwrite(m_GameTarget.m_Game.m_HiScores, sizeof(HISCORES),
-+ MAX_HISCORES, methanescoresfptr);
-+ ign++;
-+}
---- methane-1.5.1/sources/methane.cpp 2011-04-05 09:08:02.000000000 +0200
-+++ methane-1.5.1.new/sources/methane.cpp 2011-12-11 13:38:30.252055844 +0100
-@@ -12,6 +12,14 @@
- //------------------------------------------------------------------------------
- // Methane brothers main source file
- //------------------------------------------------------------------------------
-+#ifndef _GNU_SOURCE
-+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
-+#endif
-+#include <unistd.h>
-+#include <string.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+
- #include <ClanLib/core.h>
- #include <ClanLib/application.h>
- #include <ClanLib/display.h>
-@@ -25,6 +33,8 @@
-
- #include "doc.h"
-
-+FILE *methanescoresfptr = NULL;
-+
- RenderTarget GLOBAL_RenderTarget = opengl2;
- bool GLOBAL_SoundEnable = true;
-
-@@ -238,6 +248,8 @@
- last_time = last_time + game_speed;
- }
- Game.SaveScores();
-+ if (methanescoresfptr)
-+ fclose(methanescoresfptr);
- }
- catch(CL_Exception& exception)
- {
-@@ -367,6 +379,15 @@
- public:
- static int main(const std::vector<CL_String> &args)
- {
-+ gid_t realgid = getgid();
-+
-+ methanescoresfptr = fopen("/var/games/methane.scores", "r+");
-+
-+ if (setresgid(-1, realgid, realgid) != 0) {
-+ perror("Could not drop setgid privileges. Aborting.");
-+ exit(1);
-+ }
-+
- CL_SetupCore setup_core;
- CL_SetupDisplay setup_display;
-
diff --git a/methane.desktop b/methane.desktop
index eaa47d8..a3e6f8e 100644
--- a/methane.desktop
+++ b/methane.desktop
@@ -71,7 +71,7 @@ GenericName[zh_CN]=街机游戏
GenericName[zh_TW]=電子遊戲
GenericName[zu]=Umdlalo womhhume
Comment=Converted from the Amiga by its original author
-Exec=methane-wrapper
+Exec=methane
Icon=methane
Terminal=false
StartupNotify=false
diff --git a/methane.spec b/methane.spec
index 74ea92c..8247f75 100644
--- a/methane.spec
+++ b/methane.spec
@@ -1,21 +1,28 @@
Name: methane
-Version: 1.5.1
-Release: 39%{?dist}
+Version: 3.0.0
+Release: 1%{?dist}
Summary: Super Methane Brothers
# Automatically converted from old format: GPLv2+ - review is highly recommended.
License: GPL-2.0-or-later
URL: http://methane.sourceforge.net/
-Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz
+Source0: https://github.com/rombust/Methane/archive/v%{version}/Methane-v%{version}.tar.gz
Source1: %{name}.desktop
Source2: %{name}.png
-Patch1: methane-highscore.patch
-Patch2: methane-fullscreen.patch
-Patch3: methane-1.5.1-clanlib-23.patch
-Patch4: methane-1.5.1-gcc5.patch
-BuildRequires: make
-BuildRequires: gcc gcc-c++
-BuildRequires: ClanLib-devel >= 2.3 desktop-file-utils
-Requires: hicolor-icon-theme opengl-games-utils
+
+Patch0: 0000-missing-includes.patch
+
+BuildRequires: cmake
+BuildRequires: desktop-file-utils
+BuildRequires: gcc
+BuildRequires: gcc-c++
+BuildRequires: libappstream-glib
+
+BuildRequires: alsa-lib-devel
+BuildRequires: libX11-devel
+BuildRequires: libXinerama-devel
+BuildRequires: vulkan-devel
+
+Requires: hicolor-icon-theme
%description
Super Methane Brothers is a platform game converted from the Amiga by
@@ -23,20 +30,20 @@ its original author.
%prep
-%autosetup -p1
+%autosetup -p1 -n Methane-%{version}
+%cmake
%build
-make CXXFLAGS="$RPM_OPT_FLAGS"
+%cmake_build
%install
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_var}/games
-install -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}
+install -m 755 %{__cmake_builddir}/%{name} $RPM_BUILD_ROOT%{_bindir}
cp -a resources $RPM_BUILD_ROOT%{_datadir}/%{name}
-ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
touch $RPM_BUILD_ROOT%{_var}/games/%{name}.scores
# below is the desktop file and icon stuff.
@@ -74,7 +81,7 @@ SentUpstream: 2014-09-24
Bad guys are harmless in this state.
Puff and Blow must suck the floating gas clouds into their guns and blast
them out against a vertical surface.
- bThe Bad guys then turn into bonuses which can be collected.
+ The Bad guys then turn into bonuses which can be collected.
</p>
</description>
<url type="homepage">http://methane.sourceforge.net/</url>
@@ -85,10 +92,9 @@ SentUpstream: 2014-09-24
EOF
%files
-%doc authors.txt docs history.txt readme.txt
+%doc authors.txt docs history.txt README.md
%license copying.txt
%attr(2755,root,games) %{_bindir}/%{name}
-%{_bindir}/%{name}-wrapper
%{_datadir}/%{name}
%{_datadir}/appdata/%{name}.appdata.xml
%{_datadir}/applications/%{name}.desktop
@@ -97,6 +103,9 @@ EOF
%changelog
+* Thu Jul 02 2026 Artur Frenszek-Iwicki <fedora@svgames.pl> - 3.0.0-1
+- Update to v3.0.0
+
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.1-39
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
diff --git a/sources b/sources
index 548d22c..71e5dbb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7e4258e326478678c2332388eab2ed14 methane-1.5.1.tgz
+SHA512 (Methane-v3.0.0.tar.gz) = a3a504d988182436653f775547e3eb56f1a8f020f13c5ef37eb8313140686d71946460c53cb3d32f5b4ac35dab748ceca7e7286da339645a30d6424452330b50
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-07-15 18:04 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-15 18:04 [rpms/methane] rawhide: Update to v3.0.0 Artur Frenszek-Iwicki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox