* [gentoo-commits] repo/proj/guru:master commit in: games-engines/fs2_open/files/, games-engines/fs2_open/
@ 2022-03-29 0:22 Ronny Gutbrod
0 siblings, 0 replies; 8+ messages in thread
From: Ronny Gutbrod @ 2022-03-29 0:22 UTC (permalink / raw
To: gentoo-commits
commit: bf56c1906d5f5d7dc119d812a9d0099347fc5d41
Author: Jonas Frei <freijon <AT> pm <DOT> me>
AuthorDate: Sun Mar 27 16:03:39 2022 +0000
Commit: Ronny Gutbrod <gentoo <AT> tastytea <DOT> de>
CommitDate: Sun Mar 27 16:03:39 2022 +0000
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 <freijon <AT> 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 000000000..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.000000000 +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"
)
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-engines/fs2_open/files/, games-engines/fs2_open/
@ 2022-03-29 0:22 Ronny Gutbrod
0 siblings, 0 replies; 8+ messages in thread
From: Ronny Gutbrod @ 2022-03-29 0:22 UTC (permalink / raw
To: gentoo-commits
commit: 362eb9a02bd4ea5450480edf44578018b7a2af51
Author: Jonas Frei <freijon <AT> pm <DOT> me>
AuthorDate: Mon Mar 28 05:20:04 2022 +0000
Commit: Ronny Gutbrod <gentoo <AT> tastytea <DOT> de>
CommitDate: Mon Mar 28 05:20:14 2022 +0000
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 <freijon <AT> 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 @@
<bugs-to>https://github.com/scp-fs2open/fs2open.github.com/issues</bugs-to>
</upstream>
<use>
+ <flag name="debug">Debug build to collect logfiles</flag>
<flag name="discord">Enable Discord RPC support</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-engines/fs2_open/files/, games-engines/fs2_open/
@ 2022-03-29 0:22 Ronny Gutbrod
0 siblings, 0 replies; 8+ messages in thread
From: Ronny Gutbrod @ 2022-03-29 0:22 UTC (permalink / raw
To: gentoo-commits
commit: 2f15e3e0fb583d7bc8668ebafde53da0d0b9dd91
Author: Jonas Frei <freijon <AT> pm <DOT> me>
AuthorDate: Sun Mar 27 19:56:47 2022 +0000
Commit: Ronny Gutbrod <gentoo <AT> tastytea <DOT> de>
CommitDate: Sun Mar 27 19:56:47 2022 +0000
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 <freijon <AT> 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 000000000..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.000000000 +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("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/lib/CMakeLists.txt 2022-03-27 21:03:27.287788070 +0200
++++ fs2_open/lib/CMakeLists.txt 2022-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.000000000 +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.000000000 +0100
-+++ fs2_open-21.4.1/lib/CMakeLists.txt 2022-03-26 11:34:48.746075280 +0100
+--- fs2_open/lib/CMakeLists.txt 2021-11-01 18:00:53.000000000 +0100
++++ fs2_open/lib/CMakeLists.txt 2022-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.000000000 +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.000000000 +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.cmake 2021-05-22 20:20:18.448441242 +0200
-+++ fs2_open-21.4.1/cmake/version.cmake 2021-05-22 20:21:05.493447003 +0200
+--- 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()
diff --git a/games-engines/fs2_open/files/fs2_open-21.4.1-version-fix.patch b/games-engines/fs2_open/files/fs2_open-21.4.1-version-fix.patch
index f3812dc8e..a9c2c845f 100644
--- a/games-engines/fs2_open/files/fs2_open-21.4.1-version-fix.patch
+++ b/games-engines/fs2_open/files/fs2_open-21.4.1-version-fix.patch
@@ -1,5 +1,5 @@
---- fs2_open-21.4.1/version_override.cmake 2022-03-25 22:22:13.424199518 +0100
-+++ fs2_open-21.4.1/version_override.cmake 2022-03-25 22:22:30.378200320 +0100
+--- fs2_open/version_override.cmake
++++ fs2_open/version_override.cmake
@@ -1,5 +1,5 @@
set(FSO_VERSION_MAJOR 21)
set(FSO_VERSION_MINOR 4)
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 2d1b5f674..d8305b305 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,6 +24,7 @@ SRC_URI="
LICENSE="Unlicense MIT Boost-1.0"
SLOT="0"
KEYWORDS="~amd64"
+IUSE="discord"
DEPEND="
app-arch/lz4
@@ -59,6 +60,12 @@ src_unpack() {
mv cmake-modules-${HASH_CMAKE_MODULES}/* "${S}/cmake/external/rpavlik-cmake-modules/" || die
}
+src_prepare() {
+ use discord || eapply "${FILESDIR}/${P}-disable-discord.patch"
+ eapply_user
+ cmake_src_prepare
+}
+
src_install() {
exeinto "/opt/${PN}"
doexe "${BUILD_DIR}/bin/${PN}_${_PV}"
@@ -68,7 +75,7 @@ src_install() {
doins "${BUILD_DIR}/bin/libRocketCore.so"
doins "${BUILD_DIR}/bin/libRocketCoreLua.so"
doins "${BUILD_DIR}/bin/libRocketDebugger.so"
- doins "${BUILD_DIR}/bin/libdiscord-rpc.so"
+ use discord && doins "${BUILD_DIR}/bin/libdiscord-rpc.so"
}
pkg_postinst() {
diff --git a/games-engines/fs2_open/metadata.xml b/games-engines/fs2_open/metadata.xml
index 2e56a6035..b1d632ca1 100644
--- a/games-engines/fs2_open/metadata.xml
+++ b/games-engines/fs2_open/metadata.xml
@@ -15,4 +15,7 @@
<remote-id type="github">scp-fs2open/fs2open.github.com</remote-id>
<bugs-to>https://github.com/scp-fs2open/fs2open.github.com/issues</bugs-to>
</upstream>
+ <use>
+ <flag name="discord">Enable Discord RPC support</flag>
+ </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-engines/fs2_open/files/, games-engines/fs2_open/
@ 2023-02-13 11:28 Andrew Ammerlaan
0 siblings, 0 replies; 8+ messages in thread
From: Andrew Ammerlaan @ 2023-02-13 11:28 UTC (permalink / raw
To: gentoo-commits
commit: b9319d9f21ed943afb53b800e91fa0d5bdfb293e
Author: Jonas Frei <freijon <AT> pm <DOT> me>
AuthorDate: Sat Feb 11 13:14:59 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Feb 11 13:14:59 2023 +0000
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 <freijon <AT> 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 0bb03e2a1c0cafa80849163455cdb5fc5c7200e51f18f0354c36f251b51156f86a04a9f87cd17e2942d14ae8767d8df756062fbcff9b37f04e8399b2e37d306f
+DIST fs2_open-23.0.0.tar.gz 12210430 BLAKE2B 95e5a4f328711a3915b2624941eb90810a19c4d8fe16edc0af47eec3cb1393be8379cd53f27cf378693ba711bd37f0fec360fda931ba17b883195f356a0f8dfc SHA512 efd3648986bb36f0b217ea033ab56ba7c1a705a0d9f16f0351a019d06276f68810729eb9749d1facbf8bc312114eb4e380b68049f5d30b410de2b28c5c67975e
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
deleted file mode 100644
index 95c186bf1..000000000
--- a/games-engines/fs2_open/files/fs2_open-21.4.1-disable-discord.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- 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.000000000 +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("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/lib/CMakeLists.txt 2022-03-27 21:03:27.287788070 +0200
-+++ fs2_open/lib/CMakeLists.txt 2022-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.000000000 +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
deleted file mode 100644
index 45ad91307..000000000
--- a/games-engines/fs2_open/files/fs2_open-21.4.1-dont-build-lz4.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- fs2_open/lib/CMakeLists.txt 2021-11-01 18:00:53.000000000 +0100
-+++ fs2_open/lib/CMakeLists.txt 2022-03-26 11:34:48.746075280 +0100
-@@ -50,5 +50,3 @@
- add_subdirectory(mdns)
-
- add_subdirectory(variant)
--
--ADD_SUBDIRECTORY(lz4)
-\ No newline at end of file
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
deleted file mode 100644
index 74554ec8e..000000000
--- a/games-engines/fs2_open/files/fs2_open-21.4.1-dont-override-ldflags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- fs2_open/cmake/toolchain-gcc.cmake 2021-11-01 18:00:53.000000000 +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 "")
-
-+# Don't ignore user-set LDFLAGS
-+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/files/fs2_open-21.4.1-version-fix.patch b/games-engines/fs2_open/files/fs2_open-21.4.1-version-fix.patch
deleted file mode 100644
index a9c2c845f..000000000
--- a/games-engines/fs2_open/files/fs2_open-21.4.1-version-fix.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- fs2_open/version_override.cmake
-+++ fs2_open/version_override.cmake
-@@ -1,5 +1,5 @@
- set(FSO_VERSION_MAJOR 21)
- set(FSO_VERSION_MINOR 4)
--set(FSO_VERSION_BUILD 0)
-+set(FSO_VERSION_BUILD 1)
- set(FSO_VERSION_REVISION 0)
- set(FSO_VERSION_REVISION_STR )
diff --git a/games-engines/fs2_open/files/fs2_open-22.0.0-disable-discord.patch b/games-engines/fs2_open/files/fs2_open-22.0.0-disable-discord.patch
deleted file mode 100644
index 1b145d7da..000000000
--- a/games-engines/fs2_open/files/fs2_open-22.0.0-disable-discord.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- 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.000000000 +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("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/lib/CMakeLists.txt 2022-03-27 21:03:27.287788070 +0200
-+++ fs2_open/lib/CMakeLists.txt 2022-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.000000000 +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"
-@@ -1987,8 +1987,6 @@
- #ifdef WITH_FFMPEG
- libs::ffmpeg::initialize();
- #endif
--
-- libs::discord::init();
- }
-
- nprintf(("General", "Ships.tbl is : %s\n", Game_ships_tbl_valid ? "VALID" : "INVALID!!!!"));
diff --git a/games-engines/fs2_open/files/fs2_open-22.0.0-dont-build-lz4.patch b/games-engines/fs2_open/files/fs2_open-22.0.0-dont-build-lz4.patch
deleted file mode 100644
index 60dc982a1..000000000
--- a/games-engines/fs2_open/files/fs2_open-22.0.0-dont-build-lz4.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- fs2_open/lib/CMakeLists.txt 2022-04-01 23:30:46.000000000 +0200
-+++ fs2_open/lib/CMakeLists.txt 2022-04-02 08:20:16.336924470 +0200
-@@ -52,5 +52,3 @@
- add_subdirectory(variant)
-
- add_subdirectory(any)
--
--ADD_SUBDIRECTORY(lz4)
-\ No newline at end of file
diff --git a/games-engines/fs2_open/files/fs2_open-22.0.0-make-arch-independent.patch b/games-engines/fs2_open/files/fs2_open-22.0.0-make-arch-independent.patch
deleted file mode 100644
index c2f5d7f36..000000000
--- a/games-engines/fs2_open/files/fs2_open-22.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/files/fs2_open-23.0.0-disable-discord.patch b/games-engines/fs2_open/files/fs2_open-23.0.0-disable-discord.patch
new file mode 100644
index 000000000..6dc01d4a4
--- /dev/null
+++ b/games-engines/fs2_open/files/fs2_open-23.0.0-disable-discord.patch
@@ -0,0 +1,107 @@
+--- 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<bool>("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<std::pair<SCP_string, gr_capability>> 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
new file mode 100644
index 000000000..49350a0dc
--- /dev/null
+++ b/games-engines/fs2_open/files/fs2_open-23.0.0-dont-build-lz4.patch
@@ -0,0 +1,9 @@
+--- 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-21.4.1-make-arch-independent.patch b/games-engines/fs2_open/files/fs2_open-23.0.0-make-arch-independent.patch
similarity index 100%
rename from games-engines/fs2_open/files/fs2_open-21.4.1-make-arch-independent.patch
rename to games-engines/fs2_open/files/fs2_open-23.0.0-make-arch-independent.patch
diff --git a/games-engines/fs2_open/fs2_open-21.4.1-r2.ebuild b/games-engines/fs2_open/fs2_open-23.0.0.ebuild
similarity index 88%
rename from games-engines/fs2_open/fs2_open-21.4.1-r2.ebuild
rename to games-engines/fs2_open/fs2_open-23.0.0.ebuild
index beadddcbb..8c63d4680 100644
--- a/games-engines/fs2_open/fs2_open-21.4.1-r2.ebuild
+++ b/games-engines/fs2_open/fs2_open-23.0.0.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
LICENSE="Unlicense MIT Boost-1.0"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="debug discord"
+IUSE="clang debug discord"
DEPEND="
app-arch/lz4
@@ -42,12 +42,13 @@ DEPEND="
media-video/ffmpeg
"
RDEPEND="${DEPEND}"
-BDEPEND=""
+BDEPEND="
+ dev-util/cmake
+ clang? ( sys-devel/clang:= )
+"
PATCHES=(
"${FILESDIR}/${P}-dont-build-lz4.patch"
- "${FILESDIR}/${P}-dont-override-ldflags.patch"
"${FILESDIR}/${P}-make-arch-independent.patch"
- "${FILESDIR}/${P}-version-fix.patch"
)
CMAKE_BUILD_TYPE=Release
@@ -60,6 +61,18 @@ src_unpack() {
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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-engines/fs2_open/files/, games-engines/fs2_open/
@ 2023-10-15 22:23 Haelwenn Monnier
0 siblings, 0 replies; 8+ messages in thread
From: Haelwenn Monnier @ 2023-10-15 22:23 UTC (permalink / raw
To: gentoo-commits
commit: 216c8e3036f6d635f7fe49a41ca9ac6af5083a1c
Author: Jonas Frei <freijon <AT> pm <DOT> me>
AuthorDate: Sat Oct 14 07:39:33 2023 +0000
Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Sat Oct 14 07:40:17 2023 +0000
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 <freijon <AT> 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 79300b64c0fd6b7f5c9b128b4355e3ec23dd8564b84c9abc29f5f326a3265f8e94fbc8b80252222958b9ecb088d795ec538403a80e229a7df13b919617b4f1ae 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 0000000000..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("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"
+@@ -135,7 +134,6 @@
+ 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;
+@@ -145,29 +143,6 @@
+ std::array<std::tuple<float, float>, 6> Fred_spacemouse_nonlinearity;
+ bool Randomize_particle_rotation;
+
+-static auto DiscordOption __UNUSED = options::OptionBuilder<bool>("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<std::pair<SCP_string, gr_capability>> req_render_ext_pairs = {
+@@ -1264,10 +1239,6 @@
+ 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);
+ }
+@@ -1440,7 +1411,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;
+--- 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-23.2.0-dont-build-lz4.patch b/games-engines/fs2_open/files/fs2_open-23.2.0-dont-build-lz4.patch
new file mode 100644
index 0000000000..db2ac5e538
--- /dev/null
+++ b/games-engines/fs2_open/files/fs2_open-23.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-23.2.0-make-arch-independent.patch b/games-engines/fs2_open/files/fs2_open-23.2.0-make-arch-independent.patch
new file mode 100644
index 0000000000..9dcb50cbbd
--- /dev/null
+++ b/games-engines/fs2_open/files/fs2_open-23.2.0-make-arch-independent.patch
@@ -0,0 +1,14 @@
+--- a/cmake/version.cmake
++++ b/cmake/version.cmake
+@@ -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.2.0.ebuild b/games-engines/fs2_open/fs2_open-23.2.0.ebuild
new file mode 100644
index 0000000000..8c63d4680d
--- /dev/null
+++ b/games-engines/fs2_open/fs2_open-23.2.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 2022 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/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
+"
+
+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
+ media-libs/libtheora
+ media-libs/libvorbis
+ media-libs/mesa
+ media-libs/openal
+ media-video/ffmpeg
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ dev-util/cmake
+ clang? ( sys-devel/clang:= )
+"
+PATCHES=(
+ "${FILESDIR}/${P}-dont-build-lz4.patch"
+ "${FILESDIR}/${P}-make-arch-independent.patch"
+)
+
+CMAKE_BUILD_TYPE=Release
+
+S="${WORKDIR}/fs2open.github.com-release_${_PV}"
+
+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."
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-engines/fs2_open/files/, games-engines/fs2_open/
@ 2023-11-06 14:18 David Roman
0 siblings, 0 replies; 8+ messages in thread
From: David Roman @ 2023-11-06 14:18 UTC (permalink / raw
To: gentoo-commits
commit: c75dddb2177840d3e3714e1979e232871371f235
Author: Jonas Frei <freijon <AT> pm <DOT> me>
AuthorDate: Fri Nov 3 20:00:51 2023 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Fri Nov 3 20:01:12 2023 +0000
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 <freijon <AT> 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 79300b64c0fd6b7f5c9b128b4355e3ec23dd8564b84c9abc29f5f326a3265f8e94fbc8b80252222958b9ecb088d795ec538403a80e229a7df13b919617b4f1ae 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 a/games-engines/fs2_open/fs2_open-23.2.0.ebuild b/games-engines/fs2_open/fs2_open-23.2.1.ebuild
similarity index 100%
rename from games-engines/fs2_open/fs2_open-23.2.0.ebuild
rename to games-engines/fs2_open/fs2_open-23.2.1.ebuild
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-engines/fs2_open/files/, games-engines/fs2_open/
@ 2023-11-16 10:05 David Roman
0 siblings, 0 replies; 8+ messages in thread
From: David Roman @ 2023-11-16 10:05 UTC (permalink / raw
To: gentoo-commits
commit: 7d9a1b2df949a03883e81d47bda176054480b14a
Author: Jonas Frei <freijon <AT> pm <DOT> me>
AuthorDate: Mon Nov 13 05:33:31 2023 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Mon Nov 13 05:35:14 2023 +0000
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 <freijon <AT> 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 0000000000..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 <freijon@pm.me>
+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 -Wno-unused-parameter")
++
++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_RELEASE ${CXX_FLAGS_RELEASE})
++set(CMAKE_C_FLAGS_RELEASE ${C_FLAGS_RELEASE})
+
+-set(CMAKE_CXX_FLAGS_DEBUG ${COMPILER_FLAGS_DEBUG})
+-set(CMAKE_C_FLAGS_DEBUG ${COMPILER_FLAGS_DEBUG})
++set(CMAKE_CXX_FLAGS_DEBUG ${CXX_FLAGS_DEBUG})
++set(CMAKE_C_FLAGS_DEBUG ${C_FLAGS_DEBUG})
+
+ set(CMAKE_EXE_LINKER_FLAGS "${LINKER_FLAGS}")
+
+--
+2.41.0
+
diff --git a/games-engines/fs2_open/fs2_open-23.2.1.ebuild b/games-engines/fs2_open/fs2_open-23.2.1-r1.ebuild
similarity index 98%
rename from games-engines/fs2_open/fs2_open-23.2.1.ebuild
rename to games-engines/fs2_open/fs2_open-23.2.1-r1.ebuild
index 8c63d4680d..aa639f9588 100644
--- a/games-engines/fs2_open/fs2_open-23.2.1.ebuild
+++ b/games-engines/fs2_open/fs2_open-23.2.1-r1.ebuild
@@ -48,6 +48,7 @@ BDEPEND="
"
PATCHES=(
"${FILESDIR}/${P}-dont-build-lz4.patch"
+ "${FILESDIR}/${P}-dont-ignore-user-cflags.patch"
"${FILESDIR}/${P}-make-arch-independent.patch"
)
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-engines/fs2_open/files/, games-engines/fs2_open/
@ 2024-07-01 13:50 David Roman
0 siblings, 0 replies; 8+ messages in thread
From: David Roman @ 2024-07-01 13:50 UTC (permalink / raw
To: gentoo-commits
commit: dbc770c6819624285f103e046077010174a5d3de
Author: Jonas Frei <freijon <AT> pm <DOT> me>
AuthorDate: Sun Jun 30 15:46:34 2024 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Sun Jun 30 15:55:41 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=dbc770c6
games-engines/fs2_open: drop 23.0.0
Signed-off-by: Jonas Frei <freijon <AT> pm.me>
games-engines/fs2_open/Manifest | 3 -
.../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 | 14 ---
games-engines/fs2_open/fs2_open-23.0.0.ebuild | 99 -------------------
5 files changed, 232 deletions(-)
diff --git a/games-engines/fs2_open/Manifest b/games-engines/fs2_open/Manifest
index a795abe59..9fa5ce792 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 6dc01d4a4..000000000
--- 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<bool>("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<std::pair<SCP_string, gr_capability>> 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 49350a0dc..000000000
--- 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 c2f5d7f36..000000000
--- 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 35e94af61..000000000
--- 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
- <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
- media-libs/libtheora
- media-libs/libvorbis
- media-libs/mesa
- media-libs/openal
- media-video/ffmpeg
-"
-RDEPEND="${DEPEND}"
-BDEPEND="clang? ( sys-devel/clang )"
-PATCHES=(
- "${FILESDIR}/${P}-dont-build-lz4.patch"
- "${FILESDIR}/${P}-make-arch-independent.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."
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-07-01 13:50 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-29 0:22 [gentoo-commits] repo/proj/guru:master commit in: games-engines/fs2_open/files/, games-engines/fs2_open/ Ronny Gutbrod
-- strict thread matches above, loose matches on Subject: below --
2022-03-29 0:22 Ronny Gutbrod
2022-03-29 0:22 Ronny Gutbrod
2023-02-13 11:28 Andrew Ammerlaan
2023-10-15 22:23 Haelwenn Monnier
2023-11-06 14:18 David Roman
2023-11-16 10:05 David Roman
2024-07-01 13:50 David Roman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox