From dbc770c6819624285f103e046077010174a5d3de Mon Sep 17 00:00:00 2001 From: Jonas Frei Date: Sun, 30 Jun 2024 17:46:34 +0200 Subject: [PATCH] games-engines/fs2_open: drop 23.0.0 Signed-off-by: Jonas Frei --- games-engines/fs2_open/Manifest | 3 - .../fs2_open-23.0.0-disable-discord.patch | 107 ------------------ .../fs2_open-23.0.0-dont-build-lz4.patch | 9 -- ...s2_open-23.0.0-make-arch-independent.patch | 14 --- games-engines/fs2_open/fs2_open-23.0.0.ebuild | 99 ---------------- 5 files changed, 232 deletions(-) delete mode 100644 games-engines/fs2_open/files/fs2_open-23.0.0-disable-discord.patch delete mode 100644 games-engines/fs2_open/files/fs2_open-23.0.0-dont-build-lz4.patch delete mode 100644 games-engines/fs2_open/files/fs2_open-23.0.0-make-arch-independent.patch delete mode 100644 games-engines/fs2_open/fs2_open-23.0.0.ebuild diff --git a/games-engines/fs2_open/Manifest b/games-engines/fs2_open/Manifest index a795abe598..9fa5ce7927 100644 --- a/games-engines/fs2_open/Manifest +++ b/games-engines/fs2_open/Manifest @@ -1,6 +1,3 @@ -DIST fs2_open-23.0.0-ext_libRocket.tar.gz 2417905 BLAKE2B 0e5ac40b0e811b9213fb84f6f2f0ef38ad7d562ae671e865d96e40615c2d67213905ce153a69192c0b53a3e4f0d1aef077c0769e46d308adf9210c0c9d1fe7c2 SHA512 700e242ecb5207faf729ca7d23ac4f28be819c0ef7a0ba51ca18de1592f1016040cd5e4c1c75a573f91cea69dd43549966ac089804a52c0f1b0cfbaabefc4346 -DIST fs2_open-23.0.0-ext_rpavlik-cmake-modules.tar.gz 267464 BLAKE2B d63fa3867aad5fad7bd5d20845dd8d6a6698d59dc30dc511704f3c74bbe958bb6d36160bae3ef5c01027719c50d18e4d24209ea5811c6a52c5af4d3de2a587e9 SHA512 0bb03e2a1c0cafa80849163455cdb5fc5c7200e51f18f0354c36f251b51156f86a04a9f87cd17e2942d14ae8767d8df756062fbcff9b37f04e8399b2e37d306f -DIST fs2_open-23.0.0.tar.gz 12210430 BLAKE2B 95e5a4f328711a3915b2624941eb90810a19c4d8fe16edc0af47eec3cb1393be8379cd53f27cf378693ba711bd37f0fec360fda931ba17b883195f356a0f8dfc SHA512 efd3648986bb36f0b217ea033ab56ba7c1a705a0d9f16f0351a019d06276f68810729eb9749d1facbf8bc312114eb4e380b68049f5d30b410de2b28c5c67975e DIST fs2_open-23.2.1-ext_libRocket.tar.gz 2417905 BLAKE2B 0e5ac40b0e811b9213fb84f6f2f0ef38ad7d562ae671e865d96e40615c2d67213905ce153a69192c0b53a3e4f0d1aef077c0769e46d308adf9210c0c9d1fe7c2 SHA512 700e242ecb5207faf729ca7d23ac4f28be819c0ef7a0ba51ca18de1592f1016040cd5e4c1c75a573f91cea69dd43549966ac089804a52c0f1b0cfbaabefc4346 DIST fs2_open-23.2.1-ext_rpavlik-cmake-modules.tar.gz 267464 BLAKE2B d63fa3867aad5fad7bd5d20845dd8d6a6698d59dc30dc511704f3c74bbe958bb6d36160bae3ef5c01027719c50d18e4d24209ea5811c6a52c5af4d3de2a587e9 SHA512 0bb03e2a1c0cafa80849163455cdb5fc5c7200e51f18f0354c36f251b51156f86a04a9f87cd17e2942d14ae8767d8df756062fbcff9b37f04e8399b2e37d306f DIST fs2_open-23.2.1.tar.gz 12091345 BLAKE2B a03179842d53dd429969b2863ab53f613b52bf70ff50d0991e0dd36a73ee0a2374a0d09e95a13410add9f8c4b955a49e9894b35b5ccb92982c63e06daec5694a SHA512 dfb4fe7c0f8048730e91e754754e26677706bb391c4d88ff7f4f6090d931db9dc2ca616dcd552d213d7c7de5b597a5cc43ab6bad0f422bc3e78dcbc15f64600b diff --git a/games-engines/fs2_open/files/fs2_open-23.0.0-disable-discord.patch b/games-engines/fs2_open/files/fs2_open-23.0.0-disable-discord.patch deleted file mode 100644 index 6dc01d4a49..0000000000 --- a/games-engines/fs2_open/files/fs2_open-23.0.0-disable-discord.patch +++ /dev/null @@ -1,107 +0,0 @@ ---- fs2_open/freespace2/freespace.cpp 2023-02-11 13:13:50.000000000 +0100 -+++ fs2_open/freespace2/freespace.cpp 2023-02-11 13:32:41.501644997 +0100 -@@ -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(); ---- fs2_open/code/source_groups.cmake 2023-02-11 13:13:50.000000000 +0100 -+++ fs2_open/code/source_groups.cmake 2023-02-11 13:53:03.901702823 +0100 -@@ -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 ---- fs2_open/code/mod_table/mod_table.h 2023-02-11 13:13:50.000000000 +0100 -+++ fs2_open/code/mod_table/mod_table.h 2023-02-11 13:57:44.162716081 +0100 -@@ -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; ---- fs2_open/code/mod_table/mod_table.cpp 2023-02-11 13:13:50.000000000 +0100 -+++ fs2_open/code/mod_table/mod_table.cpp 2023-02-11 13:57:15.745714737 +0100 -@@ -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" -@@ -128,34 +127,10 @@ - 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; - --static auto DiscordOption = options::OptionBuilder("Other.Discord", "Discord Presence", "Toggle Discord Rich Presence") -- .category("Other") -- .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(); -- return true; -- } -- } else { -- if (val) { -- Discord_presence = true; -- libs::discord::init(); -- return true; -- } -- } -- return false; -- }) -- .finish(); -- - void mod_table_set_version_flags(); - - SCP_vector> req_render_ext_pairs = { -@@ -1128,9 +1103,6 @@ - if (optional_string("$Use distant firepoint for all turrets:")){ - 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); -@@ -1285,7 +1257,6 @@ - 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; diff --git a/games-engines/fs2_open/files/fs2_open-23.0.0-dont-build-lz4.patch b/games-engines/fs2_open/files/fs2_open-23.0.0-dont-build-lz4.patch deleted file mode 100644 index 49350a0dc5..0000000000 --- a/games-engines/fs2_open/files/fs2_open-23.0.0-dont-build-lz4.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- fs2_open/lib/CMakeLists.txt 2023-02-11 13:13:50.000000000 +0100 -+++ fs2_open/lib/CMakeLists.txt 2023-02-11 13:45:46.251682120 +0100 -@@ -55,6 +55,4 @@ - - add_subdirectory(optional) - --ADD_SUBDIRECTORY(lz4) -- - ADD_SUBDIRECTORY(imgui) diff --git a/games-engines/fs2_open/files/fs2_open-23.0.0-make-arch-independent.patch b/games-engines/fs2_open/files/fs2_open-23.0.0-make-arch-independent.patch deleted file mode 100644 index c2f5d7f36c..0000000000 --- a/games-engines/fs2_open/files/fs2_open-23.0.0-make-arch-independent.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- fs2_open/cmake/version.cmake 2021-05-22 20:20:18.448441242 +0200 -+++ fs2_open/cmake/version.cmake 2021-05-22 20:21:05.493447003 +0200 -@@ -35,11 +35,6 @@ - SET(FSO_BINARY_SUFFIX "${FSO_VERSION_MAJOR}_${FSO_VERSION_MINOR}_${FSO_VERSION_BUILD}_${FSO_VERSION_REVISION_STR}") - ENDIF() - --IF(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/fs2_open-23.0.0.ebuild b/games-engines/fs2_open/fs2_open-23.0.0.ebuild deleted file mode 100644 index 35e94af61f..0000000000 --- a/games-engines/fs2_open/fs2_open-23.0.0.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -# Replace "." with "_" in version -_PV=${PV//./_} - -# Current hashes of external repositories: -HASH_LIBROCKET="ecd648a43aff8a9f3daf064d75ca5725237d5b38" -HASH_CMAKE_MODULES="7cef9577d6fc35057ea57f46b4986a8a28aeff50" - -DESCRIPTION="FreeSpace2 Source Code Project game engine" -HOMEPAGE="https://github.com/scp-fs2open/fs2open.github.com/" -SRC_URI=" - https://github.com/scp-fs2open/fs2open.github.com/archive/refs/tags/release_${_PV}.tar.gz -> ${P}.tar.gz - https://github.com/asarium/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 -