[gentoo-commits] repo/proj/guru:master commit in: games-engines/fs2_open/files/, games-engines/fs2_open/
commit: 7d9a1b2df949a03883e81d47bda176054480b14a
Author: Jonas Frei pm me>
AuthorDate: Mon Nov 13 05:33:31 2023 +
Commit: David Roman gmail com>
CommitDate: Mon Nov 13 05:35:14 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7d9a1b2d
games-engines/fs2_open: Added patch to respect -O flags, fixes 887671
This new patch is to be removed on the next release, it was implemented
upstream.
Closes: https://bugs.gentoo.org/887671
Signed-off-by: Jonas Frei pm.me>
.../fs2_open-23.2.1-dont-ignore-user-cflags.patch | 117 +
...pen-23.2.1.ebuild => fs2_open-23.2.1-r1.ebuild} | 1 +
2 files changed, 118 insertions(+)
diff --git
a/games-engines/fs2_open/files/fs2_open-23.2.1-dont-ignore-user-cflags.patch
b/games-engines/fs2_open/files/fs2_open-23.2.1-dont-ignore-user-cflags.patch
new file mode 100644
index 00..c0f29d05f8
--- /dev/null
+++ b/games-engines/fs2_open/files/fs2_open-23.2.1-dont-ignore-user-cflags.patch
@@ -0,0 +1,117 @@
+From 3ebdc51c4814648c2171440484c2d429899d3ab4 Mon Sep 17 00:00:00 2001
+From: Jonas Frei
+Date: Tue, 7 Nov 2023 21:21:28 +0100
+Subject: [PATCH] Don't ignore user-set -O* flags
+
+---
+ cmake/toolchain-clang.cmake | 37 +
+ cmake/toolchain-gcc.cmake | 34 --
+ 2 files changed, 57 insertions(+), 14 deletions(-)
+
+--- a/cmake/toolchain-clang.cmake
b/cmake/toolchain-clang.cmake
+@@ -83,20 +83,41 @@ if(SUPPORTS_SHIFT_NEGATIVE_VALUE)
+ set(COMPILER_FLAGS "${COMPILER_FLAGS} -Wno-shift-negative-value")
+ endif()
+
+-set(COMPILER_FLAGS_RELEASE "-O2 -Wno-unused-variable -Wno-unused-parameter")
++# Check if there is a user-set optimisation flag
++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(COMPILER_FLAGS_DEBUG "-Og -g -Wshadow")
++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")
+
+-# Always use the base flags and add our compiler flags at the bacl
++set(CXX_FLAGS_DEBUG "${CXX_OPT_FLAG_DEBUG} -g -Wshadow")
++set(C_FLAGS_DEBUG "${C_OPT_FLAG_DEBUG} -g -Wshadow")
++
++# Always use the base flags and add our compiler flags at the back
+ set(CMAKE_CXX_FLAGS "${CXX_BASE_FLAGS} ${COMPILER_FLAGS}")
+ set(CMAKE_C_FLAGS "${C_BASE_FLAGS} ${COMPILER_FLAGS}")
+
+-set(CMAKE_CXX_FLAGS_RELEASE ${COMPILER_FLAGS_RELEASE})
+-set(CMAKE_C_FLAGS_RELEASE ${COMPILER_FLAGS_RELEASE})
+-
+-set(CMAKE_CXX_FLAGS_DEBUG ${COMPILER_FLAGS_DEBUG})
+-set(CMAKE_C_FLAGS_DEBUG ${COMPILER_FLAGS_DEBUG})
++set(CMAKE_CXX_FLAGS_RELEASE ${CXX_FLAGS_RELEASE})
++set(CMAKE_C_FLAGS_RELEASE ${C_FLAGS_RELEASE})
+
++set(CMAKE_CXX_FLAGS_DEBUG ${CXX_FLAGS_DEBUG})
++set(CMAKE_C_FLAGS_DEBUG ${C_FLAGS_DEBUG})
+
+ set(CMAKE_EXE_LINKER_FLAGS "")
+
+diff --git a/cmake/toolchain-gcc.cmake b/cmake/toolchain-gcc.cmake
+index ca740832e..78577038c 100644
+--- a/cmake/toolchain-gcc.cmake
b/cmake/toolchain-gcc.cmake
+@@ -113,19 +113,41 @@ if(SUPPORTS_STRINGOP_TRUNCATION)
+ set(COMPILER_FLAGS "${COMPILER_FLAGS} -Wno-stringop-overflow")
+ endif()
+
+-set(COMPILER_FLAGS_RELEASE "-O2 -Wno-unused-variable
-Wno-unused-but-set-variable -Wno-array-bounds -Wno-empty-body -Wno-clobbered
-Wno-unused-parameter")
++# Check if there is a user-set optimisation flag
++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})
+
+-set(COMPILER_FLAGS_DEBUG "-Og -g -Wshadow")
++# 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
[gentoo-commits] repo/proj/guru:master commit in: games-engines/fs2_open/files/, games-engines/fs2_open/
commit: c75dddb2177840d3e3714e1979e232871371f235
Author: Jonas Frei pm me>
AuthorDate: Fri Nov 3 20:00:51 2023 +
Commit: David Roman gmail com>
CommitDate: Fri Nov 3 20:01:12 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c75dddb2
games-engines/fs2_open: add 23.2.1, drop 23.2.0
Signed-off-by: Jonas Frei pm.me>
games-engines/fs2_open/Manifest | 6 +++---
...-disable-discord.patch => fs2_open-23.2.1-disable-discord.patch} | 0
0-dont-build-lz4.patch => fs2_open-23.2.1-dont-build-lz4.patch} | 0
...ndependent.patch => fs2_open-23.2.1-make-arch-independent.patch} | 0
.../fs2_open/{fs2_open-23.2.0.ebuild => fs2_open-23.2.1.ebuild} | 0
5 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/games-engines/fs2_open/Manifest b/games-engines/fs2_open/Manifest
index 45d23ae1f0..9725841702 100644
--- a/games-engines/fs2_open/Manifest
+++ b/games-engines/fs2_open/Manifest
@@ -1,6 +1,6 @@
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.0-ext_libRocket.tar.gz 2417905 BLAKE2B
0e5ac40b0e811b9213fb84f6f2f0ef38ad7d562ae671e865d96e40615c2d67213905ce153a69192c0b53a3e4f0d1aef077c0769e46d308adf9210c0c9d1fe7c2
SHA512
700e242ecb5207faf729ca7d23ac4f28be819c0ef7a0ba51ca18de1592f1016040cd5e4c1c75a573f91cea69dd43549966ac089804a52c0f1b0cfbaabefc4346
-DIST fs2_open-23.2.0-ext_rpavlik-cmake-modules.tar.gz 267464 BLAKE2B
d63fa3867aad5fad7bd5d20845dd8d6a6698d59dc30dc511704f3c74bbe958bb6d36160bae3ef5c01027719c50d18e4d24209ea5811c6a52c5af4d3de2a587e9
SHA512
0bb03e2a1c0cafa80849163455cdb5fc5c7200e51f18f0354c36f251b51156f86a04a9f87cd17e2942d14ae8767d8df756062fbcff9b37f04e8399b2e37d306f
-DIST fs2_open-23.2.0.tar.gz 12088343 BLAKE2B
79300b64c0fd6b7f5c9b128b4355e3ec23dd8564b84c9abc29f5f326a3265f8e94fbc8b8025958b9ecb088d795ec538403a80e229a7df13b919617b4f1ae
SHA512
64c632e44b827b3f1141f98f965dc747b922245557133a0451c4744883a97cd6d353013b49f65be06ebefe30c5f81fbdb1a56161687308f1a2c3be02d71cd9f5
+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.2.0-disable-discord.patch
b/games-engines/fs2_open/files/fs2_open-23.2.1-disable-discord.patch
similarity index 100%
rename from games-engines/fs2_open/files/fs2_open-23.2.0-disable-discord.patch
rename to games-engines/fs2_open/files/fs2_open-23.2.1-disable-discord.patch
diff --git a/games-engines/fs2_open/files/fs2_open-23.2.0-dont-build-lz4.patch
b/games-engines/fs2_open/files/fs2_open-23.2.1-dont-build-lz4.patch
similarity index 100%
rename from games-engines/fs2_open/files/fs2_open-23.2.0-dont-build-lz4.patch
rename to games-engines/fs2_open/files/fs2_open-23.2.1-dont-build-lz4.patch
diff --git
a/games-engines/fs2_open/files/fs2_open-23.2.0-make-arch-independent.patch
b/games-engines/fs2_open/files/fs2_open-23.2.1-make-arch-independent.patch
similarity index 100%
rename from
games-engines/fs2_open/files/fs2_open-23.2.0-make-arch-independent.patch
rename to
games-engines/fs2_open/files/fs2_open-23.2.1-make-arch-independent.patch
diff --git
[gentoo-commits] repo/proj/guru:master commit in: games-engines/fs2_open/files/, games-engines/fs2_open/
commit: 216c8e3036f6d635f7fe49a41ca9ac6af5083a1c
Author: Jonas Frei pm me>
AuthorDate: Sat Oct 14 07:39:33 2023 +
Commit: Haelwenn Monnier hacktivis me>
CommitDate: Sat Oct 14 07:40:17 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=216c8e30
games-engines/fs2_open: add 23.2.0
Signed-off-by: Jonas Frei pm.me>
games-engines/fs2_open/Manifest| 3 +
.../files/fs2_open-23.2.0-disable-discord.patch| 175 +
.../files/fs2_open-23.2.0-dont-build-lz4.patch | 11 ++
.../fs2_open-23.2.0-make-arch-independent.patch| 14 ++
games-engines/fs2_open/fs2_open-23.2.0.ebuild | 103
5 files changed, 306 insertions(+)
diff --git a/games-engines/fs2_open/Manifest b/games-engines/fs2_open/Manifest
index 7003d611c5..668c54b081 100644
--- a/games-engines/fs2_open/Manifest
+++ b/games-engines/fs2_open/Manifest
@@ -4,3 +4,6 @@ DIST fs2_open-22.2.0.tar.gz 10690003 BLAKE2B
9d751407ee06877e27e18a9295370ed2c97
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.0-ext_libRocket.tar.gz 2417905 BLAKE2B
0e5ac40b0e811b9213fb84f6f2f0ef38ad7d562ae671e865d96e40615c2d67213905ce153a69192c0b53a3e4f0d1aef077c0769e46d308adf9210c0c9d1fe7c2
SHA512
700e242ecb5207faf729ca7d23ac4f28be819c0ef7a0ba51ca18de1592f1016040cd5e4c1c75a573f91cea69dd43549966ac089804a52c0f1b0cfbaabefc4346
+DIST fs2_open-23.2.0-ext_rpavlik-cmake-modules.tar.gz 267464 BLAKE2B
d63fa3867aad5fad7bd5d20845dd8d6a6698d59dc30dc511704f3c74bbe958bb6d36160bae3ef5c01027719c50d18e4d24209ea5811c6a52c5af4d3de2a587e9
SHA512
0bb03e2a1c0cafa80849163455cdb5fc5c7200e51f18f0354c36f251b51156f86a04a9f87cd17e2942d14ae8767d8df756062fbcff9b37f04e8399b2e37d306f
+DIST fs2_open-23.2.0.tar.gz 12088343 BLAKE2B
79300b64c0fd6b7f5c9b128b4355e3ec23dd8564b84c9abc29f5f326a3265f8e94fbc8b8025958b9ecb088d795ec538403a80e229a7df13b919617b4f1ae
SHA512
64c632e44b827b3f1141f98f965dc747b922245557133a0451c4744883a97cd6d353013b49f65be06ebefe30c5f81fbdb1a56161687308f1a2c3be02d71cd9f5
diff --git a/games-engines/fs2_open/files/fs2_open-23.2.0-disable-discord.patch
b/games-engines/fs2_open/files/fs2_open-23.2.0-disable-discord.patch
new file mode 100644
index 00..90154f817a
--- /dev/null
+++ b/games-engines/fs2_open/files/fs2_open-23.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("LibsDiscord"
+- libs/discord/discord.cpp
+- libs/discord/discord.h
+-)
+-
+ if (FSO_BUILD_WITH_FFMPEG)
+ add_file_folder("LibsFFmpeg"
+ 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"
+@@ -135,7 +134,6 @@
+ shadow_disable_overrides Shadow_disable_overrides {false,
[gentoo-commits] repo/proj/guru:master commit in: games-engines/fs2_open/files/, games-engines/fs2_open/
commit: b9319d9f21ed943afb53b800e91fa0d5bdfb293e Author: Jonas Frei pm me> AuthorDate: Sat Feb 11 13:14:59 2023 + Commit: Andrew Ammerlaan gentoo org> CommitDate: Sat Feb 11 13:14:59 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b9319d9f games-engines/fs2_open: add 23.0.0, drop 21.4.1-r2 Signed-off-by: Jonas Frei pm.me> games-engines/fs2_open/Manifest| 6 +- .../files/fs2_open-21.4.1-disable-discord.patch| 55 --- .../files/fs2_open-21.4.1-dont-build-lz4.patch | 9 -- .../fs2_open-21.4.1-dont-override-ldflags.patch| 14 --- .../files/fs2_open-21.4.1-version-fix.patch| 9 -- .../files/fs2_open-22.0.0-disable-discord.patch| 55 --- .../files/fs2_open-22.0.0-dont-build-lz4.patch | 9 -- .../fs2_open-22.0.0-make-arch-independent.patch| 14 --- .../files/fs2_open-23.0.0-disable-discord.patch| 107 + .../files/fs2_open-23.0.0-dont-build-lz4.patch | 9 ++ ...=> fs2_open-23.0.0-make-arch-independent.patch} | 0 ...pen-21.4.1-r2.ebuild => fs2_open-23.0.0.ebuild} | 21 +++- 12 files changed, 136 insertions(+), 172 deletions(-) diff --git a/games-engines/fs2_open/Manifest b/games-engines/fs2_open/Manifest index 612408bc3..2535f772c 100644 --- a/games-engines/fs2_open/Manifest +++ b/games-engines/fs2_open/Manifest @@ -1,9 +1,9 @@ -DIST fs2_open-21.4.1-ext_libRocket.tar.gz 2417905 BLAKE2B 0e5ac40b0e811b9213fb84f6f2f0ef38ad7d562ae671e865d96e40615c2d67213905ce153a69192c0b53a3e4f0d1aef077c0769e46d308adf9210c0c9d1fe7c2 SHA512 700e242ecb5207faf729ca7d23ac4f28be819c0ef7a0ba51ca18de1592f1016040cd5e4c1c75a573f91cea69dd43549966ac089804a52c0f1b0cfbaabefc4346 -DIST fs2_open-21.4.1-ext_rpavlik-cmake-modules.tar.gz 267464 BLAKE2B d63fa3867aad5fad7bd5d20845dd8d6a6698d59dc30dc511704f3c74bbe958bb6d36160bae3ef5c01027719c50d18e4d24209ea5811c6a52c5af4d3de2a587e9 SHA512 0bb03e2a1c0cafa80849163455cdb5fc5c7200e51f18f0354c36f251b51156f86a04a9f87cd17e2942d14ae8767d8df756062fbcff9b37f04e8399b2e37d306f -DIST fs2_open-21.4.1.tar.gz 10441595 BLAKE2B ae59cea98420cbdd6f18832fa0b8ba332993db03a53cbea43a96827dc4c7da375b14694ce60b1633d8275daa88ac32029be7b8211b7efd427baaffdd784720d9 SHA512 a4e6821ee2513cabf8b521f672c36c45aca8fc83fd6901ba19f2c0c0c27b3516c60dabfec1bfae43d82da94c628b9160c447ce853c9927dbb5901c7298986226 DIST fs2_open-22.0.0-ext_libRocket.tar.gz 2417905 BLAKE2B 0e5ac40b0e811b9213fb84f6f2f0ef38ad7d562ae671e865d96e40615c2d67213905ce153a69192c0b53a3e4f0d1aef077c0769e46d308adf9210c0c9d1fe7c2 SHA512 700e242ecb5207faf729ca7d23ac4f28be819c0ef7a0ba51ca18de1592f1016040cd5e4c1c75a573f91cea69dd43549966ac089804a52c0f1b0cfbaabefc4346 DIST fs2_open-22.0.0-ext_rpavlik-cmake-modules.tar.gz 267464 BLAKE2B d63fa3867aad5fad7bd5d20845dd8d6a6698d59dc30dc511704f3c74bbe958bb6d36160bae3ef5c01027719c50d18e4d24209ea5811c6a52c5af4d3de2a587e9 SHA512 0bb03e2a1c0cafa80849163455cdb5fc5c7200e51f18f0354c36f251b51156f86a04a9f87cd17e2942d14ae8767d8df756062fbcff9b37f04e8399b2e37d306f DIST fs2_open-22.0.0.tar.gz 10573800 BLAKE2B b75bd9e44679bf2ad441178b7f8175f4429e321d2feeddf2cf5b4391e51f82c15250c36b73f3750326b1cd3ce71ae319042f57432d48a41b5abab9e30a4a76ba SHA512 e57972348073571947ff88e5a392ae0b4eec9d81cbcfe3d0ff3c2b844dd676cb33f727ddb32a0544e9cd3f1ae9b614429ea137b8921ef625fad27a53f1875081 DIST fs2_open-22.2.0-ext_libRocket.tar.gz 2417905 BLAKE2B 0e5ac40b0e811b9213fb84f6f2f0ef38ad7d562ae671e865d96e40615c2d67213905ce153a69192c0b53a3e4f0d1aef077c0769e46d308adf9210c0c9d1fe7c2 SHA512 700e242ecb5207faf729ca7d23ac4f28be819c0ef7a0ba51ca18de1592f1016040cd5e4c1c75a573f91cea69dd43549966ac089804a52c0f1b0cfbaabefc4346 DIST fs2_open-22.2.0-ext_rpavlik-cmake-modules.tar.gz 267464 BLAKE2B d63fa3867aad5fad7bd5d20845dd8d6a6698d59dc30dc511704f3c74bbe958bb6d36160bae3ef5c01027719c50d18e4d24209ea5811c6a52c5af4d3de2a587e9 SHA512 0bb03e2a1c0cafa80849163455cdb5fc5c7200e51f18f0354c36f251b51156f86a04a9f87cd17e2942d14ae8767d8df756062fbcff9b37f04e8399b2e37d306f DIST fs2_open-22.2.0.tar.gz 10690003 BLAKE2B 9d751407ee06877e27e18a9295370ed2c97a48ac65c65757ea57ee1f1d7ba36e07cddb9812a62a763eefb842d5df71151243a81e97aa664a8c3123b7b7913255 SHA512 e72ad40f8f52430549f76330f8b34255ae68fff53ced76f56b04ef19d7ce510026c3bb38fcebdb6f3bfaf7db59ca89df5686e8480e883e01b6408d21cb08cc77 +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
[gentoo-commits] repo/proj/guru:master commit in: games-engines/fs2_open/files/, games-engines/fs2_open/
commit: 362eb9a02bd4ea5450480edf44578018b7a2af51
Author: Jonas Frei pm me>
AuthorDate: Mon Mar 28 05:20:04 2022 +
Commit: Ronny Gutbrod tastytea de>
CommitDate: Mon Mar 28 05:20:14 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=362eb9a0
games-engines/fs2_open: Added 'debug' USE flag
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Jonas Frei pm.me>
.../fs2_open/files/fs2_open-21.4.1-dont-override-ldflags.patch | 2 +-
games-engines/fs2_open/fs2_open-21.4.1-r2.ebuild | 9 +++--
games-engines/fs2_open/metadata.xml | 1 +
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git
a/games-engines/fs2_open/files/fs2_open-21.4.1-dont-override-ldflags.patch
b/games-engines/fs2_open/files/fs2_open-21.4.1-dont-override-ldflags.patch
index 7a45e1fda..74554ec8e 100644
--- a/games-engines/fs2_open/files/fs2_open-21.4.1-dont-override-ldflags.patch
+++ b/games-engines/fs2_open/files/fs2_open-21.4.1-dont-override-ldflags.patch
@@ -4,7 +4,7 @@
set(COMPILER_FLAGS "")
set(LINKER_FLAGS "")
-+# For C and C++, the values can be overwritten independently
++# Don't ignore user-set LDFLAGS
+if(DEFINED ENV{LDFLAGS})
+set(LINKER_FLAGS $ENV{LDFLAGS})
+endif()
diff --git a/games-engines/fs2_open/fs2_open-21.4.1-r2.ebuild
b/games-engines/fs2_open/fs2_open-21.4.1-r2.ebuild
index d8305b305..beadddcbb 100644
--- a/games-engines/fs2_open/fs2_open-21.4.1-r2.ebuild
+++ b/games-engines/fs2_open/fs2_open-21.4.1-r2.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
LICENSE="Unlicense MIT Boost-1.0"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="discord"
+IUSE="debug discord"
DEPEND="
app-arch/lz4
@@ -64,11 +64,16 @@ 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}"
- doexe "${BUILD_DIR}/bin/${PN}_${_PV}"
+ 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"
diff --git a/games-engines/fs2_open/metadata.xml
b/games-engines/fs2_open/metadata.xml
index b1d632ca1..aef4fd67c 100644
--- a/games-engines/fs2_open/metadata.xml
+++ b/games-engines/fs2_open/metadata.xml
@@ -16,6 +16,7 @@
https://github.com/scp-fs2open/fs2open.github.com/issues
+ Debug build to collect logfiles
Enable Discord RPC support
[gentoo-commits] repo/proj/guru:master commit in: games-engines/fs2_open/files/, games-engines/fs2_open/
commit: 2f15e3e0fb583d7bc8668ebafde53da0d0b9dd91
Author: Jonas Frei pm me>
AuthorDate: Sun Mar 27 19:56:47 2022 +
Commit: Ronny Gutbrod tastytea de>
CommitDate: Sun Mar 27 19:56:47 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2f15e3e0
games-engines/fs2_open: Added 'discord' USE flag
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Jonas Frei pm.me>
.../files/fs2_open-21.4.1-disable-discord.patch| 55 ++
.../files/fs2_open-21.4.1-dont-build-lz4.patch | 4 +-
.../fs2_open-21.4.1-dont-override-ldflags.patch| 4 +-
.../fs2_open-21.4.1-make-arch-independent.patch| 4 +-
.../files/fs2_open-21.4.1-version-fix.patch| 4 +-
games-engines/fs2_open/fs2_open-21.4.1-r2.ebuild | 9 +++-
games-engines/fs2_open/metadata.xml| 3 ++
7 files changed, 74 insertions(+), 9 deletions(-)
diff --git a/games-engines/fs2_open/files/fs2_open-21.4.1-disable-discord.patch
b/games-engines/fs2_open/files/fs2_open-21.4.1-disable-discord.patch
new file mode 100644
index 0..95c186bf1
--- /dev/null
+++ b/games-engines/fs2_open/files/fs2_open-21.4.1-disable-discord.patch
@@ -0,0 +1,55 @@
+--- fs2_open/code/CMakeLists.txt 2022-03-27 21:03:27.290788070 +0200
fs2_open/code/CMakeLists.txt 2022-03-27 21:06:50.271782416 +0200
+@@ -41,8 +41,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)
+--- fs2_open/code/source_groups.cmake 2021-11-01 18:00:53.0 +0100
fs2_open/code/source_groups.cmake 2022-03-27 21:35:47.595734025 +0200
+@@ -705,11 +705,6 @@
+ libs/antlr/ErrorListener.h
+ )
+
+-add_file_folder("LibsDiscord"
+- libs/discord/discord.cpp
+- libs/discord/discord.h
+-)
+-
+ if (FSO_BUILD_WITH_FFMPEG)
+ add_file_folder("LibsFFmpeg"
+ libs/ffmpeg/FFmpeg.cpp
+--- fs2_open/lib/CMakeLists.txt2022-03-27 21:03:27.287788070 +0200
fs2_open/lib/CMakeLists.txt2022-03-27 21:07:12.849781787 +0200
+@@ -33,8 +33,6 @@
+ include(FFmpeg.cmake)
+ endif()
+
+-add_subdirectory(discord)
+-
+ include(libRocket.cmake)
+
+ add_subdirectory(libpcp)
+--- fs2_open/freespace2/freespace.cpp 2021-11-01 18:00:53.0 +0100
fs2_open/freespace2/freespace.cpp 2022-03-27 21:07:50.111780749 +0200
+@@ -83,7 +83,6 @@
+ #include "jumpnode/jumpnode.h"
+ #include "lab/labv2.h"
+ #include "lab/wmcgui.h" //So that GUI_System can be initialized
+-#include "libs/discord/discord.h"
+ #include "libs/ffmpeg/FFmpeg.h"
+ #include "lighting/lighting.h"
+ #include "localization/localize.h"
+@@ -1940,8 +1939,6 @@
+ libs::ffmpeg::initialize();
+ #endif
+
+- libs::discord::init();
+-
+ nprintf(("General", "Ships.tbl is : %s\n", Game_ships_tbl_valid ?
"VALID" : "INVALID"));
+ nprintf(("General", "Weapons.tbl is : %s\n", Game_weapons_tbl_valid ?
"VALID" : "INVALID"));
+
diff --git a/games-engines/fs2_open/files/fs2_open-21.4.1-dont-build-lz4.patch
b/games-engines/fs2_open/files/fs2_open-21.4.1-dont-build-lz4.patch
index bfae2ea39..45ad91307 100644
--- a/games-engines/fs2_open/files/fs2_open-21.4.1-dont-build-lz4.patch
+++ b/games-engines/fs2_open/files/fs2_open-21.4.1-dont-build-lz4.patch
@@ -1,5 +1,5 @@
fs2_open-21.4.1/lib/CMakeLists.txt 2021-11-01 18:00:53.0 +0100
-+++ fs2_open-21.4.1/lib/CMakeLists.txt 2022-03-26 11:34:48.746075280 +0100
+--- fs2_open/lib/CMakeLists.txt2021-11-01 18:00:53.0 +0100
fs2_open/lib/CMakeLists.txt2022-03-26 11:34:48.746075280 +0100
@@ -50,5 +50,3 @@
add_subdirectory(mdns)
diff --git
a/games-engines/fs2_open/files/fs2_open-21.4.1-dont-override-ldflags.patch
b/games-engines/fs2_open/files/fs2_open-21.4.1-dont-override-ldflags.patch
index c75458ded..7a45e1fda 100644
--- a/games-engines/fs2_open/files/fs2_open-21.4.1-dont-override-ldflags.patch
+++ b/games-engines/fs2_open/files/fs2_open-21.4.1-dont-override-ldflags.patch
@@ -1,5 +1,5 @@
fs2_open-21.4.1/cmake/toolchain-gcc.cmake 2021-11-01 18:00:53.0
+0100
-+++ fs2_open-21.4.1/cmake/toolchain-gcc.cmake 2022-03-27 17:52:26.738107292
+0200
+--- fs2_open/cmake/toolchain-gcc.cmake 2021-11-01 18:00:53.0 +0100
fs2_open/cmake/toolchain-gcc.cmake 2022-03-27 17:52:26.738107292 +0200
@@ -27,6 +27,11 @@
set(COMPILER_FLAGS "")
set(LINKER_FLAGS "")
diff --git
a/games-engines/fs2_open/files/fs2_open-21.4.1-make-arch-independent.patch
b/games-engines/fs2_open/files/fs2_open-21.4.1-make-arch-independent.patch
index e03b59bb3..c2f5d7f36 100644
--- a/games-engines/fs2_open/files/fs2_open-21.4.1-make-arch-independent.patch
+++ b/games-engines/fs2_open/files/fs2_open-21.4.1-make-arch-independent.patch
@@ -1,5 +1,5 @@
fs2_open-21.4.1/cmake/version.cmake2021-05-22 20:20:18.448441242
+0200
-+++
[gentoo-commits] repo/proj/guru:master commit in: games-engines/fs2_open/files/, games-engines/fs2_open/
commit: bf56c1906d5f5d7dc119d812a9d0099347fc5d41
Author: Jonas Frei pm me>
AuthorDate: Sun Mar 27 16:03:39 2022 +
Commit: Ronny Gutbrod tastytea de>
CommitDate: Sun Mar 27 16:03:39 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=bf56c190
games-engines/fs2_open: Added patch to fix linker QA issue
Closes: https://bugs.gentoo.org/836249
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Jonas Frei pm.me>
.../files/fs2_open-21.4.1-dont-override-ldflags.patch | 14 ++
...fs2_open-21.4.1-r1.ebuild => fs2_open-21.4.1-r2.ebuild} | 1 +
2 files changed, 15 insertions(+)
diff --git
a/games-engines/fs2_open/files/fs2_open-21.4.1-dont-override-ldflags.patch
b/games-engines/fs2_open/files/fs2_open-21.4.1-dont-override-ldflags.patch
new file mode 100644
index 0..c75458ded
--- /dev/null
+++ b/games-engines/fs2_open/files/fs2_open-21.4.1-dont-override-ldflags.patch
@@ -0,0 +1,14 @@
+--- fs2_open-21.4.1/cmake/toolchain-gcc.cmake 2021-11-01 18:00:53.0
+0100
fs2_open-21.4.1/cmake/toolchain-gcc.cmake 2022-03-27 17:52:26.738107292
+0200
+@@ -27,6 +27,11 @@
+ set(COMPILER_FLAGS "")
+ set(LINKER_FLAGS "")
+
++# For C and C++, the values can be overwritten independently
++if(DEFINED ENV{LDFLAGS})
++set(LINKER_FLAGS $ENV{LDFLAGS})
++endif()
++
+ if (GCC_USE_GOLD)
+ OPTION(GCC_INCREMENTAL_LINKING "Use incremental linking" OFF)
+ set(LINKER_FLAGS "${LINKER_FLAGS} -fuse-ld=gold")
diff --git a/games-engines/fs2_open/fs2_open-21.4.1-r1.ebuild
b/games-engines/fs2_open/fs2_open-21.4.1-r2.ebuild
similarity index 97%
rename from games-engines/fs2_open/fs2_open-21.4.1-r1.ebuild
rename to games-engines/fs2_open/fs2_open-21.4.1-r2.ebuild
index d96915f96..2d1b5f674 100644
--- a/games-engines/fs2_open/fs2_open-21.4.1-r1.ebuild
+++ b/games-engines/fs2_open/fs2_open-21.4.1-r2.ebuild
@@ -44,6 +44,7 @@ RDEPEND="${DEPEND}"
BDEPEND=""
PATCHES=(
"${FILESDIR}/${P}-dont-build-lz4.patch"
+ "${FILESDIR}/${P}-dont-override-ldflags.patch"
"${FILESDIR}/${P}-make-arch-independent.patch"
"${FILESDIR}/${P}-version-fix.patch"
)
