commit: f3d40ac73a2fa7d6fba495862a5a72d5b78f1a81
Author: Jonas Frei <freijon <AT> pm <DOT> me>
AuthorDate: Thu Sep 25 03:33:33 2025 +0000
Commit: Jonas Frei <freijon <AT> pm <DOT> me>
CommitDate: Thu Sep 25 03:38:26 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f3d40ac7
games-engines/fs2_open: add 24.2.0
Signed-off-by: Jonas Frei <freijon <AT> pm.me>
games-engines/fs2_open/Manifest | 3 +
.../fs2_open/files/fs2_open-24.2.0-deps-fix.patch | 388 +++++++++++++++++++++
.../files/fs2_open-24.2.0-disable-discord.patch | 175 ++++++++++
.../files/fs2_open-24.2.0-dont-build-lz4.patch | 11 +
.../fs2_open-24.2.0-make-arch-independent.patch | 16 +
.../files/fs2_open-24.2.0-respect-flags.patch | 83 +++++
games-engines/fs2_open/fs2_open-24.2.0.ebuild | 107 ++++++
7 files changed, 783 insertions(+)
diff --git a/games-engines/fs2_open/Manifest b/games-engines/fs2_open/Manifest
index a9bf44968c..913d57a500 100644
--- a/games-engines/fs2_open/Manifest
+++ b/games-engines/fs2_open/Manifest
@@ -1,3 +1,6 @@
DIST fs2_open-24.0.2-ext_libRocket.tar.gz 2417905 BLAKE2B
0e5ac40b0e811b9213fb84f6f2f0ef38ad7d562ae671e865d96e40615c2d67213905ce153a69192c0b53a3e4f0d1aef077c0769e46d308adf9210c0c9d1fe7c2
SHA512
700e242ecb5207faf729ca7d23ac4f28be819c0ef7a0ba51ca18de1592f1016040cd5e4c1c75a573f91cea69dd43549966ac089804a52c0f1b0cfbaabefc4346
DIST fs2_open-24.0.2-ext_rpavlik-cmake-modules.tar.gz 267464 BLAKE2B
d63fa3867aad5fad7bd5d20845dd8d6a6698d59dc30dc511704f3c74bbe958bb6d36160bae3ef5c01027719c50d18e4d24209ea5811c6a52c5af4d3de2a587e9
SHA512
0bb03e2a1c0cafa80849163455cdb5fc5c7200e51f18f0354c36f251b51156f86a04a9f87cd17e2942d14ae8767d8df756062fbcff9b37f04e8399b2e37d306f
DIST fs2_open-24.0.2.tar.gz 12652011 BLAKE2B
f1ab67f8ceb9389a7087a1264897bc46748d8a7c18799941cca7acdbe64a718452fe755e6dc36067529e533ac881df2d6025147aa8e20aff8751e3a9eebbf1d0
SHA512
f0ffb5da42d0dba98f9f46432c09f8edc7e80f3e65a5d4c0ed9e2e37a26b63d67526982e7209edb6d6727b23d8ce1d75ccac6dcd8da74cd55f7e6fea52ad56d4
+DIST fs2_open-24.2.0-ext_libRocket.tar.gz 2417905 BLAKE2B
0e5ac40b0e811b9213fb84f6f2f0ef38ad7d562ae671e865d96e40615c2d67213905ce153a69192c0b53a3e4f0d1aef077c0769e46d308adf9210c0c9d1fe7c2
SHA512
700e242ecb5207faf729ca7d23ac4f28be819c0ef7a0ba51ca18de1592f1016040cd5e4c1c75a573f91cea69dd43549966ac089804a52c0f1b0cfbaabefc4346
+DIST fs2_open-24.2.0-ext_rpavlik-cmake-modules.tar.gz 267464 BLAKE2B
d63fa3867aad5fad7bd5d20845dd8d6a6698d59dc30dc511704f3c74bbe958bb6d36160bae3ef5c01027719c50d18e4d24209ea5811c6a52c5af4d3de2a587e9
SHA512
0bb03e2a1c0cafa80849163455cdb5fc5c7200e51f18f0354c36f251b51156f86a04a9f87cd17e2942d14ae8767d8df756062fbcff9b37f04e8399b2e37d306f
+DIST fs2_open-24.2.0.tar.gz 10958574 BLAKE2B
1990e7536ce71e1408806af60a8d6908ac23ba4137f26072610ab8259b17934930a7f6bfe2a3df5ab6a33aa2a6714d28c390ed49dca1a0fe04757bf1addff2ff
SHA512
4aa7420c6120568f1f414e719b56948329b1ccaeb01c63a012a28e4129d8365782e7ca54b7f5fde1157471de3c9d07943a111db042dcc21eabef0cc5c5722703
diff --git a/games-engines/fs2_open/files/fs2_open-24.2.0-deps-fix.patch
b/games-engines/fs2_open/files/fs2_open-24.2.0-deps-fix.patch
new file mode 100644
index 0000000000..b8f3aeda78
--- /dev/null
+++ b/games-engines/fs2_open/files/fs2_open-24.2.0-deps-fix.patch
@@ -0,0 +1,388 @@
+--- a/code/cfile/cfile.h
++++ b/code/cfile/cfile.h
+@@ -15,6 +15,7 @@
+
+ #include "globalincs/pstypes.h"
+
++#include <array>
+ #include <ctime>
+ #include <stdexcept>
+ #include <memory>
+--- a/code/cmdline/cmdline.h
++++ b/code/cmdline/cmdline.h
+@@ -13,6 +13,8 @@
+ #define FS_CMDLINE_HEADER_FILE
+
+ #include <tl/optional.hpp>
++#include <cstdint>
++#include "globalincs/vmallocator.h"
+
+ int parse_cmdline(int argc, char *argv[]);
+
+--- a/code/cutscene/ffmpeg/FFMPEGDecoder.h
++++ b/code/cutscene/ffmpeg/FFMPEGDecoder.h
+@@ -2,6 +2,8 @@
+
+ #include "cutscene/Decoder.h"
+
++#include <thread>
++
+ namespace cutscene {
+ namespace ffmpeg {
+ struct InputStream;
+--- a/code/gamehelp/gameplayhelp.h
++++ b/code/gamehelp/gameplayhelp.h
+@@ -7,7 +7,7 @@
+ *
+ */
+
+-
++#include <globalincs/vmallocator.h>
+
+ #ifndef __GAMEPLAY_HELP_H__
+ #define __GAMEPLAY_HELP_H__
+--- a/code/globalincs/utility.h
++++ b/code/globalincs/utility.h
+@@ -6,6 +6,7 @@
+
+ #include "globalincs/globals.h"
+ #include "globalincs/toolchain.h"
++#include "globalincs/vmallocator.h"
+
+
+ // Goober5000
+--- a/code/graphics/opengl/gropenglopenxr.h
++++ b/code/graphics/opengl/gropenglopenxr.h
+@@ -1,8 +1,11 @@
+ #pragma once
+
++#include <cstdint>
++#include <globalincs/vmallocator.h>
++
+ SCP_vector<const char*> gr_opengl_openxr_get_extensions();
+ bool gr_opengl_openxr_test_capabilities();
+ bool gr_opengl_openxr_create_session();
+ int64_t gr_opengl_openxr_get_swapchain_format(const SCP_vector<int64_t>&
allowed);
+ bool gr_opengl_openxr_acquire_swapchain_buffers();
+-bool gr_opengl_openxr_flip();
+\ No newline at end of file
++bool gr_opengl_openxr_flip();
+--- a/code/io/spacemouse.h
++++ b/code/io/spacemouse.h
+@@ -4,6 +4,8 @@
+ #include "math/vecmat.h"
+ #include "io/timer.h"
+
++#include <array>
++
+ struct hid_device_;
+ typedef hid_device_ hid_device;
+
+@@ -59,4 +61,4 @@ namespace io
+ static std::unique_ptr<SpaceMouse> searchSpaceMice(int
pollingFrequency = 10);
+ };
+ }
+-}
+\ No newline at end of file
++}
+--- a/code/libs/discord/discord.h
++++ b/code/libs/discord/discord.h
+@@ -1,5 +1,7 @@
+ #pragma once
+
++#include <globalincs/vmallocator.h>
++
+ namespace libs {
+ namespace discord {
+
+--- a/code/math/floating.h
++++ b/code/math/floating.h
+@@ -12,6 +12,7 @@
+ #ifndef _FLOATING_H
+ #define _FLOATING_H
+
++#include <algorithm>
+ #include <cmath>
+ #include <cfloat>
+ #include <limits>
+--- a/code/menuui/playermenu.cpp
++++ b/code/menuui/playermenu.cpp
+@@ -79,45 +79,45 @@ const char
*Player_select_background_mask_bitmap[GR_NUM_RESOLUTIONS] = {
+ #define PLAYER_SELECT_MAIN_HALL_OVERLAY NOX("MainHall1")
// main hall help overlay
+
+ // convenient struct for handling all button controls
+-struct barracks_buttons {
++struct barracks_buttons_alt {
+ const char *filename;
+ int x, y, xt, yt;
+ int hotspot;
+ UI_BUTTON button; // because we have a class inside this struct, we
need the constructor below..
+
+- barracks_buttons(const char *name, int x1, int y1, int xt1, int yt1,
int h) : filename(name), x(x1), y(y1), xt(xt1), yt(yt1), hotspot(h) {}
++ barracks_buttons_alt(const char *name, int x1, int y1, int xt1, int
yt1, int h) : filename(name), x(x1), y(y1), xt(xt1), yt(yt1), hotspot(h) {}
+ };
+
+-static barracks_buttons
Player_select_buttons[GR_NUM_RESOLUTIONS][NUM_PLAYER_SELECT_BUTTONS] = {
++static barracks_buttons_alt
Player_select_buttons[GR_NUM_RESOLUTIONS][NUM_PLAYER_SELECT_BUTTONS] = {
+ { // GR_640
+ // create, clone and delete (respectively)
+- barracks_buttons("CPB_00", 114, 205, 117,
240, 0),
+- barracks_buttons("CPB_01", 172, 205, 175,
240, 1),
+- barracks_buttons("CPB_02", 226, 205, 229,
240, 2),
++ barracks_buttons_alt("CPB_00", 114, 205, 117,
240, 0),
++ barracks_buttons_alt("CPB_01", 172, 205, 175,
240, 1),
++ barracks_buttons_alt("CPB_02", 226, 205, 229,
240, 2),
+
+ // scroll up, scroll down, and accept (respectively)
+- barracks_buttons("CPB_03", 429, 213, -1,
-1, 3),
+- barracks_buttons("CPB_04", 456, 213, -1,
-1, 4),
+- barracks_buttons("CPB_05", 481, 207, 484,
246, 5),
++ barracks_buttons_alt("CPB_03", 429, 213, -1,
-1, 3),
++ barracks_buttons_alt("CPB_04", 456, 213, -1,
-1, 4),
++ barracks_buttons_alt("CPB_05", 481, 207, 484,
246, 5),
+
+ // single player select and multiplayer select, respectively
+- barracks_buttons("CPB_06", 428, 82, 430,
108, 6),
+- barracks_buttons("CPB_07", 477, 82, 481,
108, 7)
++ barracks_buttons_alt("CPB_06", 428, 82, 430,
108, 6),
++ barracks_buttons_alt("CPB_07", 477, 82, 481,
108, 7)
+ },
+ { // GR_1024
+ // create, clone and delete (respectively)
+- barracks_buttons("2_CPB_00", 182, 328, 199, 384,
0),
+- barracks_buttons("2_CPB_01", 275, 328, 292, 384,
1),
+- barracks_buttons("2_CPB_02", 361, 328, 379, 384,
2),
++ barracks_buttons_alt("2_CPB_00", 182, 328, 199,
384, 0),
++ barracks_buttons_alt("2_CPB_01", 275, 328, 292,
384, 1),
++ barracks_buttons_alt("2_CPB_02", 361, 328, 379,
384, 2),
+
+ // scroll up, scroll down, and accept (respectively)
+- barracks_buttons("2_CPB_03", 686, 341, -1, -1,
3),
+- barracks_buttons("2_CPB_04", 729, 341, -1, -1,
4),
+- barracks_buttons("2_CPB_05", 770, 332, 787, 394,
5),
++ barracks_buttons_alt("2_CPB_03", 686, 341, -1,
-1, 3),
++ barracks_buttons_alt("2_CPB_04", 729, 341, -1,
-1, 4),
++ barracks_buttons_alt("2_CPB_05", 770, 332, 787,
394, 5),
+
+ // single player select and multiplayer select, respectively
+- barracks_buttons("2_CPB_06", 685, 132, 700, 173,
6),
+- barracks_buttons("2_CPB_07", 764, 132, 782, 173,
7)
++ barracks_buttons_alt("2_CPB_06", 685, 132, 700,
173, 6),
++ barracks_buttons_alt("2_CPB_07", 764, 132, 782,
173, 7)
+ }
+ };
+
+@@ -294,7 +294,7 @@ void player_select_set_controls(int gray)
+ void player_select_init()
+ {
+ int i;
+- barracks_buttons *b;
++ barracks_buttons_alt *b;
+ UI_WINDOW *w;
+
+ // start a looping ambient sound
+--- a/code/mission/missionhotkey.h
++++ b/code/mission/missionhotkey.h
+@@ -14,6 +14,8 @@
+
+ #include "globalincs/globals.h"
+
++#include <globalincs/vmallocator.h>
++
+ #define MAX_LINES MAX_SHIPS // retail was 200, bump it to match MAX_SHIPS
+
+ // Types of items that can be in the hotkey list
+--- a/code/missionui/chatbox.h
++++ b/code/missionui/chatbox.h
+@@ -12,7 +12,9 @@
+ #ifndef __FREESPACE_CHATBOX_H__
+ #define __FREESPACE_CHATBOX_H__
+
++#include "globalincs/pstypes.h"
+ #include "globalincs/globals.h"
++#include "globalincs/vmallocator.h"
+
+ // prototype
+ struct net_player;
+--- a/code/network/multi_mdns.h
++++ b/code/network/multi_mdns.h
+@@ -1,6 +1,8 @@
+ #ifndef MULTI_MDNS_H
+ #define MULTI_MDNS_H
+
++#include <array>
++
+ bool multi_mdns_query();
+ void multi_mdns_query_do();
+ void multi_mdns_query_close();
+--- a/code/network/multi_pxo.h
++++ b/code/network/multi_pxo.h
+@@ -7,7 +7,7 @@
+ *
+ */
+
+-
++#include <globalincs/vmallocator.h>
+
+ #ifndef _PARALLAX_ONLINE_HEADER_FILE
+ #define _PARALLAX_ONLINE_HEADER_FILE
+--- a/code/network/psnet2.h
++++ b/code/network/psnet2.h
+@@ -20,6 +20,7 @@
+ #include <netinet/in.h>
+ #include <cerrno>
+ #endif
++#include <iomanip>
+
+ #include "globalincs/pstypes.h"
+
+--- a/code/options/Ingame_Options.h
++++ b/code/options/Ingame_Options.h
+@@ -1,7 +1,9 @@
+ #pragma once
+
++#include <globalincs/vmallocator.h>
++
+ extern SCP_vector<std::pair<SCP_string, bool>> Option_categories;
+
+ void ingame_options_init();
+ void ingame_options_close();
+-void ingame_options_do_frame();
+\ No newline at end of file
++void ingame_options_do_frame();
+--- a/code/osapi/osapi.h
++++ b/code/osapi/osapi.h
+@@ -25,6 +25,7 @@
+ #include "globalincs/flagset.h"
+
+ #include <functional>
++#include <fstream>
+ #include <memory>
+
+ #include <SDL_events.h>
+--- a/code/osapi/osregistry.cpp
++++ b/code/osapi/osregistry.cpp
+@@ -478,17 +478,17 @@ typedef struct KeyValue
+ struct KeyValue *next;
+ } KeyValue;
+
+-typedef struct Section
++typedef struct IniSection
+ {
+ char *name;
+
+ struct KeyValue *pairs;
+- struct Section *next;
+-} Section;
++ struct IniSection *next;
++} IniSection;
+
+ typedef struct Profile
+ {
+- struct Section *sections;
++ struct IniSection *sections;
+ } Profile;
+
+ // For string config functions
+@@ -605,8 +605,8 @@ static Profile *profile_read(const char *file)
+ Profile *profile = (Profile *)vm_malloc(sizeof(Profile));
+ profile->sections = NULL;
+
+- Section **sp_ptr = &(profile->sections);
+- Section *sp = NULL;
++ IniSection **sp_ptr = &(profile->sections);
++ IniSection *sp = NULL;
+
+ KeyValue **kvp_ptr = NULL;
+
+@@ -623,7 +623,7 @@ static Profile *profile_read(const char *file)
+ *pend = 0;
+
+ if (*ptr) {
+- sp = (Section
*)vm_malloc(sizeof(Section));
++ sp = (IniSection
*)vm_malloc(sizeof(IniSection));
+ sp->next = NULL;
+
+ sp->name = vm_strdup(ptr);
+@@ -678,9 +678,9 @@ static void profile_free(Profile *profile)
+ if (profile == NULL)
+ return;
+
+- Section *sp = profile->sections;
++ IniSection *sp = profile->sections;
+ while (sp != NULL) {
+- Section *st = sp;
++ IniSection *st = sp;
+ KeyValue *kvp = sp->pairs;
+
+ while (kvp != NULL) {
+@@ -712,8 +712,8 @@ static Profile *profile_update(Profile *profile, const
char *section, const char
+
+ KeyValue *kvp;
+
+- Section **sp_ptr = &(profile->sections);
+- Section *sp = profile->sections;
++ IniSection **sp_ptr = &(profile->sections);
++ IniSection *sp = profile->sections;
+
+ while (sp != NULL) {
+ if (strcmp(section, sp->name) == 0) {
+@@ -761,7 +761,7 @@ static Profile *profile_update(Profile *profile, const
char *section, const char
+ }
+
+ /* section not found */
+- sp = (Section *)vm_malloc(sizeof(Section));
++ sp = (IniSection *)vm_malloc(sizeof(IniSection));
+ sp->next = NULL;
+ sp->name = vm_strdup(section);
+
+@@ -782,7 +782,7 @@ static char *profile_get_value(Profile *profile, const
char *section, const char
+ if (profile == NULL)
+ return NULL;
+
+- Section *sp = profile->sections;
++ IniSection *sp = profile->sections;
+
+ while (sp != NULL) {
+ if (stricmp(section, sp->name) == 0) {
+@@ -817,7 +817,7 @@ static void profile_save(Profile *profile, const char
*file)
+ if (fp == NULL)
+ return;
+
+- Section *sp = profile->sections;
++ IniSection *sp = profile->sections;
+
+ while (sp != NULL) {
+ sprintf(tmp, NOX("[%s]\n"), sp->name);
+--- a/code/scripting/api/LuaPromise.h
++++ b/code/scripting/api/LuaPromise.h
+@@ -2,6 +2,9 @@
+
+ #include "scripting/lua/LuaTypes.h"
+
++#include <functional>
++#include <memory>
++
+ namespace scripting {
+ namespace api {
+
+--- a/code/scripting/hook_conditions.h
++++ b/code/scripting/hook_conditions.h
+@@ -1,5 +1,6 @@
+ #pragma once
+
++#include <globalincs/vmallocator.h>
+ #include <linb/any.hpp>
+
+ class object;
+--- a/code/scripting/lua/LuaTypes.h
++++ b/code/scripting/lua/LuaTypes.h
+@@ -1,5 +1,8 @@
+ #pragma once
+
++#include <iostream>
++#include <vector>
++
+ namespace luacpp {
+ class LuaValue;
+
diff --git a/games-engines/fs2_open/files/fs2_open-24.2.0-disable-discord.patch
b/games-engines/fs2_open/files/fs2_open-24.2.0-disable-discord.patch
new file mode 100644
index 0000000000..b59ef21a3f
--- /dev/null
+++ b/games-engines/fs2_open/files/fs2_open-24.2.0-disable-discord.patch
@@ -0,0 +1,175 @@
+--- a/freespace2/freespace.cpp
++++ b/freespace2/freespace.cpp
+@@ -84,7 +84,6 @@
+ #include "io/timer.h"
+ #include "jumpnode/jumpnode.h"
+ #include "lab/labv2.h"
+-#include "libs/discord/discord.h"
+ #include "libs/ffmpeg/FFmpeg.h"
+ #include "lighting/lighting.h"
+ #include "lighting/lighting_profiles.h"
+@@ -1987,9 +1986,6 @@
+ #ifdef WITH_FFMPEG
+ libs::ffmpeg::initialize();
+ #endif
+- if (Discord_presence) {
+- libs::discord::init();
+- }
+ }
+
+ mod_table_post_process();
+--- a/code/source_groups.cmake
++++ b/code/source_groups.cmake
+@@ -706,11 +706,6 @@
+ libs/antlr/ErrorListener.h
+ )
+
+-add_file_folder("Libs\\\\Discord"
+- libs/discord/discord.cpp
+- libs/discord/discord.h
+-)
+-
+ if (FSO_BUILD_WITH_FFMPEG)
+ add_file_folder("Libs\\\\FFmpeg"
+ libs/ffmpeg/FFmpeg.cpp
+--- a/code/mod_table/mod_table.h
++++ b/code/mod_table/mod_table.h
+@@ -124,7 +124,6 @@
+ } Shadow_disable_overrides;
+ extern float Thruster_easing;
+ extern bool Always_use_distant_firepoints;
+-extern bool Discord_presence;
+ extern bool Hotkey_always_hide_hidden_ships;
+ extern bool Use_weapon_class_sounds_for_hits_to_player;
+ extern bool SCPUI_loads_hi_res_animations;
+--- a/code/mod_table/mod_table.cpp
++++ b/code/mod_table/mod_table.cpp
+@@ -12,7 +12,6 @@
+ #include "globalincs/version.h"
+ #include "graphics/shadows.h"
+ #include "localization/localize.h"
+-#include "libs/discord/discord.h"
+ #include "mission/missioncampaign.h"
+ #include "mission/missionload.h"
+ #include "mission/missionmessage.h"
+@@ -139,7 +138,6 @@ leadIndicatorBehavior Lead_indicator_behavior;
+ shadow_disable_overrides Shadow_disable_overrides {false, false, false,
false};
+ float Thruster_easing;
+ bool Always_use_distant_firepoints;
+-bool Discord_presence;
+ bool Hotkey_always_hide_hidden_ships;
+ bool Use_weapon_class_sounds_for_hits_to_player;
+ bool SCPUI_loads_hi_res_animations;
+@@ -156,29 +154,6 @@ bool Lua_API_returns_nil_instead_of_invalid_object;
+ bool Dont_show_callsigns_in_escort_list;
+ bool Fix_scripted_velocity;
+
+-static auto DiscordOption __UNUSED =
options::OptionBuilder<bool>("Game.Discord",
+- std::pair<const char*, int>{"Discord Presence", 1754},
+- std::pair<const char*, int>{"Toggle Discord Rich
Presence", 1755})
+- .category(std::make_pair("Game", 1824))
+- .default_val(Discord_presence)
+- .level(options::ExpertLevel::Advanced)
+- .importance(55)
+- .change_listener([](bool val, bool) {
+- if(Discord_presence){
+- if (!val) {
+- Discord_presence = false;
+- libs::discord::shutdown();
+- }
+- } else {
+- if (val) {
+- Discord_presence = true;
+- libs::discord::init();
+- }
+- }
+- return true;
+- })
+- .finish();
+-
+ void mod_table_set_version_flags();
+
+ void parse_mod_table(const char *filename)
+@@ -1372,10 +1347,6 @@ void parse_mod_table(const char *filename)
+ stuff_boolean(&Always_use_distant_firepoints);
+ }
+
+- if (optional_string("$Enable Discord rich presence:")) {
+- stuff_boolean(&Discord_presence);
+- }
+-
+ if (optional_string("$Always hide hidden ships in
hotkey list:")) {
+ stuff_boolean(&Hotkey_always_hide_hidden_ships);
+ }
+@@ -1595,7 +1566,6 @@ void mod_table_reset()
+ Lead_indicator_behavior = leadIndicatorBehavior::DEFAULT;
+ Thruster_easing = 0;
+ Always_use_distant_firepoints = false;
+- Discord_presence = true;
+ Hotkey_always_hide_hidden_ships = false;
+ Use_weapon_class_sounds_for_hits_to_player = false;
+ SCPUI_loads_hi_res_animations = true;
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -33,8 +33,6 @@
+ include(FFmpeg.cmake)
+ endif()
+
+-add_subdirectory(discord)
+-
+ include(libRocket.cmake)
+
+ add_subdirectory(libpcp)
+--- a/code/CMakeLists.txt
++++ b/code/CMakeLists.txt
+@@ -44,8 +44,6 @@
+
+ target_link_libraries(code PUBLIC md5)
+
+-target_link_libraries(code PUBLIC discord-rpc)
+-
+ target_link_libraries(code PUBLIC libRocket)
+
+ target_link_libraries(code PUBLIC pcp)
+--- a/code/scripting/api/libs/base.cpp
++++ b/code/scripting/api/libs/base.cpp
+@@ -8,7 +8,6 @@
+ #include "freespace.h"
+
+ #include "gamesequence/gamesequence.h"
+-#include "libs/discord/discord.h"
+ #include "mission/missiontraining.h"
+ #include "network/multi.h"
+ #include "parse/parselo.h"
+@@ -754,31 +753,6 @@
+ }
+
+
+-ADE_FUNC(setDiscordPresence,
+- l_Base,
+- "string DisplayText, [boolean Gameplay]",
+- "Sets the Discord presence to a specific string. If Gameplay is true
then the string is ignored and presence will "
+- "be set as if the player is in-mission. The latter will fail if the
player is not in a mission.",
+- nullptr,
+- "nothing")
+-{
+- const char* text;
+- bool gp = false;
+- if (!ade_get_args(L, "s|b", &text, &gp)) {
+- return ADE_RETURN_NIL;
+- }
+-
+- if (gp) {
+- if ((Game_mode & GM_IN_MISSION) != 0){
+- libs::discord::set_presence_gameplay();
+- }
+- } else {
+- libs::discord::set_presence_string(text);
+- }
+-
+- return ADE_RETURN_NIL;
+-}
+-
+ ADE_FUNC(hasFocus, l_Base, nullptr, "Returns if the game engine has focus or
not", "boolean", "True if the game has focus, false if it has been lost")
+ {
+ return ade_set_args(L, "b", os_foreground());
diff --git a/games-engines/fs2_open/files/fs2_open-24.2.0-dont-build-lz4.patch
b/games-engines/fs2_open/files/fs2_open-24.2.0-dont-build-lz4.patch
new file mode 100644
index 0000000000..db2ac5e538
--- /dev/null
+++ b/games-engines/fs2_open/files/fs2_open-24.2.0-dont-build-lz4.patch
@@ -0,0 +1,11 @@
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -53,8 +53,6 @@
+
+ add_subdirectory(optional)
+
+-ADD_SUBDIRECTORY(lz4)
+-
+ set(HIDAPI_WITH_LIBUSB OFF)
+ set(HIDAPI_WITH_HIDRAW ON)
+ add_subdirectory(hidapi)
diff --git
a/games-engines/fs2_open/files/fs2_open-24.2.0-make-arch-independent.patch
b/games-engines/fs2_open/files/fs2_open-24.2.0-make-arch-independent.patch
new file mode 100644
index 0000000000..d400762110
--- /dev/null
+++ b/games-engines/fs2_open/files/fs2_open-24.2.0-make-arch-independent.patch
@@ -0,0 +1,16 @@
+--- a/cmake/version.cmake
++++ b/cmake/version.cmake
+@@ -35,13 +35,6 @@
+ SET(FSO_BINARY_SUFFIX
"${FSO_VERSION_MAJOR}_${FSO_VERSION_MINOR}_${FSO_VERSION_BUILD}_${FSO_VERSION_REVISION_STR}")
+ ENDIF()
+
+-IF(IS_ARM64)
+- SET(FSO_BINARY_SUFFIX "${FSO_BINARY_SUFFIX}_arm64")
+-ELSEIF(IS_64BIT)
+- # This is a 64-bit builds
+- SET(FSO_BINARY_SUFFIX "${FSO_BINARY_SUFFIX}_x64")
+-ENDIF()
+-
+ IF (NOT "${FSO_INSTRUCTION_SET}" STREQUAL "")
+ SET(FSO_BINARY_SUFFIX "${FSO_BINARY_SUFFIX}_${FSO_INSTRUCTION_SET}")
+ ENDIF()
diff --git a/games-engines/fs2_open/files/fs2_open-24.2.0-respect-flags.patch
b/games-engines/fs2_open/files/fs2_open-24.2.0-respect-flags.patch
new file mode 100644
index 0000000000..d27003facf
--- /dev/null
+++ b/games-engines/fs2_open/files/fs2_open-24.2.0-respect-flags.patch
@@ -0,0 +1,83 @@
+https://bugs.gentoo.org/917418
+--- a/cmake/toolchain-clang.cmake
++++ b/cmake/toolchain-clang.cmake
+@@ -87,27 +87,12 @@ endif()
+ string(REGEX MATCH "-O[a-zA-Z|0-9]+" CXX_OPT_FLAG ${CXX_BASE_FLAGS})
+ string(REGEX MATCH "-O[a-zA-Z|0-9]+" C_OPT_FLAG ${C_BASE_FLAGS})
+
+-# If no user-set opt flag, set -O2 and -Og
+-if ("${CXX_OPT_FLAG}" STREQUAL "")
+- set(CXX_OPT_FLAG_RELEASE "-O2")
+- set(CXX_OPT_FLAG_DEBUG "-Og")
+-else()
+- set(CXX_OPT_FLAG_RELEASE "${CXX_OPT_FLAG}")
+- set(CXX_OPT_FLAG_DEBUG "${CXX_OPT_FLAG}")
+-endif()
+-if ("${C_OPT_FLAG}" STREQUAL "")
+- set(C_OPT_FLAG_RELEASE "-O2")
+- set(C_OPT_FLAG_DEBUG "-Og")
+-else()
+- set(C_OPT_FLAG_RELEASE "${C_OPT_FLAG}")
+- set(C_OPT_FLAG_DEBUG "${C_OPT_FLAG}")
+-endif()
+
+ set(CXX_FLAGS_RELEASE "${CXX_OPT_FLAG_RELEASE} -Wno-unused-variable
-Wno-unused-parameter")
+ set(C_FLAGS_RELEASE "${C_OPT_FLAG_RELEASE} -Wno-unused-variable
-Wno-unused-parameter")
+
+-set(CXX_FLAGS_DEBUG "${CXX_OPT_FLAG_DEBUG} -g -Wshadow")
+-set(C_FLAGS_DEBUG "${C_OPT_FLAG_DEBUG} -g -Wshadow")
++set(CXX_FLAGS_DEBUG "${CXX_OPT_FLAG_DEBUG} -Wshadow")
++set(C_FLAGS_DEBUG "${C_OPT_FLAG_DEBUG} -Wshadow")
+
+ # Always use the base flags and add our compiler flags at the back
+ set(CMAKE_CXX_FLAGS "${CXX_BASE_FLAGS} ${COMPILER_FLAGS}")
+@@ -134,7 +119,7 @@ if (SANITIZE_FLAGS)
+ endif()
+
+ set(CMAKE_EXE_LINKER_FLAGS_RELEASE "")
+-set(CMAKE_EXE_LINKER_FLAGS_DEBUG "-g -rdynamic")
++set(CMAKE_EXE_LINKER_FLAGS_DEBUG "")
+
+ if (FSO_FATAL_WARNINGS)
+ # Make warnings fatal if the right variable is set
+--- a/cmake/toolchain-gcc.cmake
++++ b/cmake/toolchain-gcc.cmake
+@@ -117,27 +117,12 @@ endif()
+ string(REGEX MATCH "-O[a-zA-Z|0-9]+" CXX_OPT_FLAG ${CXX_BASE_FLAGS})
+ string(REGEX MATCH "-O[a-zA-Z|0-9]+" C_OPT_FLAG ${C_BASE_FLAGS})
+
+-# If no user-set opt flag, set -O2 and -Og
+-if ("${CXX_OPT_FLAG}" STREQUAL "")
+- set(CXX_OPT_FLAG_RELEASE "-O2")
+- set(CXX_OPT_FLAG_DEBUG "-Og")
+-else()
+- set(CXX_OPT_FLAG_RELEASE "${CXX_OPT_FLAG}")
+- set(CXX_OPT_FLAG_DEBUG "${CXX_OPT_FLAG}")
+-endif()
+-if ("${C_OPT_FLAG}" STREQUAL "")
+- set(C_OPT_FLAG_RELEASE "-O2")
+- set(C_OPT_FLAG_DEBUG "-Og")
+-else()
+- set(C_OPT_FLAG_RELEASE "${C_OPT_FLAG}")
+- set(C_OPT_FLAG_DEBUG "${C_OPT_FLAG}")
+-endif()
+
+ set(CXX_FLAGS_RELEASE "${CXX_OPT_FLAG_RELEASE} -Wno-unused-variable
-Wno-unused-but-set-variable -Wno-array-bounds -Wno-empty-body -Wno-clobbered
-Wno-unused-parameter")
+ set(C_FLAGS_RELEASE "${C_OPT_FLAG_RELEASE} -Wno-unused-variable
-Wno-unused-but-set-variable -Wno-array-bounds -Wno-empty-body -Wno-clobbered
-Wno-unused-parameter")
+
+-set(CXX_FLAGS_DEBUG "${CXX_OPT_FLAG_DEBUG} -g -Wshadow")
+-set(C_FLAGS_DEBUG "${C_OPT_FLAG_DEBUG} -g -Wshadow")
++set(CXX_FLAGS_DEBUG "${CXX_OPT_FLAG_DEBUG} -Wshadow")
++set(C_FLAGS_DEBUG "${C_OPT_FLAG_DEBUG} -Wshadow")
+
+ # Always use the base flags and add our compiler flags at the back
+ set(CMAKE_CXX_FLAGS "${CXX_BASE_FLAGS} ${COMPILER_FLAGS}")
+@@ -161,7 +146,7 @@ if (SANITIZE_FLAGS)
+ endif()
+
+ set(CMAKE_EXE_LINKER_FLAGS_RELEASE "")
+-set(CMAKE_EXE_LINKER_FLAGS_DEBUG "-g")
++set(CMAKE_EXE_LINKER_FLAGS_DEBUG "")
+
+ if (GCC_GENERATE_GDB_INDEX)
+ # For pure debug binaries, generate a gdb index for better debugging
diff --git a/games-engines/fs2_open/fs2_open-24.2.0.ebuild
b/games-engines/fs2_open/fs2_open-24.2.0.ebuild
new file mode 100644
index 0000000000..0258f6288c
--- /dev/null
+++ b/games-engines/fs2_open/fs2_open-24.2.0.ebuild
@@ -0,0 +1,107 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="FreeSpace2 Source Code Project game engine"
+HOMEPAGE="https://github.com/scp-fs2open/fs2open.github.com/";
+
+# Replace "." with "_" in version
+_PV=${PV//./_}
+
+# Current hashes of external repositories:
+HASH_LIBROCKET="ecd648a43aff8a9f3daf064d75ca5725237d5b38"
+HASH_CMAKE_MODULES="7cef9577d6fc35057ea57f46b4986a8a28aeff50"
+
+SRC_URI="
+
https://github.com/scp-fs2open/fs2open.github.com/archive/refs/tags/release_${_PV}.tar.gz
-> ${P}.tar.gz
+
https://github.com/scp-fs2open/libRocket/archive/${HASH_LIBROCKET}.tar.gz ->
${P}-ext_libRocket.tar.gz
+
https://github.com/asarium/cmake-modules/archive/${HASH_CMAKE_MODULES}.tar.gz
-> ${P}-ext_rpavlik-cmake-modules.tar.gz
+"
+
+S="${WORKDIR}/fs2open.github.com-release_${_PV}"
+
+LICENSE="Unlicense MIT Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="clang debug discord"
+
+DEPEND="
+ app-arch/lz4:=
+ <dev-lang/lua-5.1.6:5.1
+ dev-libs/jansson:=
+ media-libs/freetype:2
+ media-libs/glu
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
+ media-libs/libsdl2[X]
+ media-libs/libtheora
+ media-libs/libvorbis
+ media-libs/mesa
+ media-libs/openal
+ media-video/ffmpeg:=
+ x11-libs/libX11
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ clang? ( llvm-core/clang )
+"
+PATCHES=(
+ "${FILESDIR}/${P}-deps-fix.patch"
+ "${FILESDIR}/${P}-dont-build-lz4.patch"
+ "${FILESDIR}/${P}-make-arch-independent.patch"
+ # bug 917418
+ "${FILESDIR}/${P}-respect-flags.patch"
+)
+
+CMAKE_BUILD_TYPE=Release
+
+src_unpack() {
+ unpack ${A}
+ mv libRocket-${HASH_LIBROCKET}/* "${S}/lib/libRocket/" || die
+ mv cmake-modules-${HASH_CMAKE_MODULES}/*
"${S}/cmake/external/rpavlik-cmake-modules/" || die
+}
+
+src_configure() {
+ if use clang ; then
+ # Force clang
+ einfo "Enforcing the use of clang due to USE=clang ..."
+ AR=llvm-ar
+ CC=${CHOST}-clang
+ CXX=${CHOST}-clang++
+ LDFLAGS+=" -fuse-ld=lld"
+ fi
+ cmake_src_configure
+}
+
+src_prepare() {
+ use discord || eapply "${FILESDIR}/${P}-disable-discord.patch"
+ eapply_user
+ cmake_src_prepare
+ use debug && CMAKE_BUILD_TYPE=Debug
+}
+
+src_install() {
+ exeinto "/opt/${PN}"
+ if use debug ; then
+ doexe "${BUILD_DIR}/bin/${PN}_${_PV}-DEBUG"
+ else
+ doexe "${BUILD_DIR}/bin/${PN}_${_PV}"
+ fi
+ insinto "/opt/${PN}"
+ doins "${BUILD_DIR}/bin/libRocketControls.so"
+ doins "${BUILD_DIR}/bin/libRocketControlsLua.so"
+ doins "${BUILD_DIR}/bin/libRocketCore.so"
+ doins "${BUILD_DIR}/bin/libRocketCoreLua.so"
+ doins "${BUILD_DIR}/bin/libRocketDebugger.so"
+ use discord && doins "${BUILD_DIR}/bin/libdiscord-rpc.so"
+}
+
+pkg_postinst() {
+ einfo "This package only generates the engine binary."
+ einfo "The retail Freespace 2 data is required to play the"
+ einfo "original game and most mods."
+}
