Gentoo Archives: gentoo-commits

From: Ronny Gutbrod <gentoo@××××××××.de>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:master commit in: games-engines/fs2_open/files/, games-engines/fs2_open/
Date: Tue, 29 Mar 2022 00:23:08
Message-Id: 1648444814.362eb9a02bd4ea5450480edf44578018b7a2af51.tastytea@gentoo
1 commit: 362eb9a02bd4ea5450480edf44578018b7a2af51
2 Author: Jonas Frei <freijon <AT> pm <DOT> me>
3 AuthorDate: Mon Mar 28 05:20:04 2022 +0000
4 Commit: Ronny Gutbrod <gentoo <AT> tastytea <DOT> de>
5 CommitDate: Mon Mar 28 05:20:14 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=362eb9a0
7
8 games-engines/fs2_open: Added 'debug' USE flag
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Jonas Frei <freijon <AT> pm.me>
12
13 .../fs2_open/files/fs2_open-21.4.1-dont-override-ldflags.patch | 2 +-
14 games-engines/fs2_open/fs2_open-21.4.1-r2.ebuild | 9 +++++++--
15 games-engines/fs2_open/metadata.xml | 1 +
16 3 files changed, 9 insertions(+), 3 deletions(-)
17
18 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
19 index 7a45e1fda..74554ec8e 100644
20 --- a/games-engines/fs2_open/files/fs2_open-21.4.1-dont-override-ldflags.patch
21 +++ b/games-engines/fs2_open/files/fs2_open-21.4.1-dont-override-ldflags.patch
22 @@ -4,7 +4,7 @@
23 set(COMPILER_FLAGS "")
24 set(LINKER_FLAGS "")
25
26 -+# For C and C++, the values can be overwritten independently
27 ++# Don't ignore user-set LDFLAGS
28 +if(DEFINED ENV{LDFLAGS})
29 + set(LINKER_FLAGS $ENV{LDFLAGS})
30 +endif()
31
32 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
33 index d8305b305..beadddcbb 100644
34 --- a/games-engines/fs2_open/fs2_open-21.4.1-r2.ebuild
35 +++ b/games-engines/fs2_open/fs2_open-21.4.1-r2.ebuild
36 @@ -24,7 +24,7 @@ SRC_URI="
37 LICENSE="Unlicense MIT Boost-1.0"
38 SLOT="0"
39 KEYWORDS="~amd64"
40 -IUSE="discord"
41 +IUSE="debug discord"
42
43 DEPEND="
44 app-arch/lz4
45 @@ -64,11 +64,16 @@ src_prepare() {
46 use discord || eapply "${FILESDIR}/${P}-disable-discord.patch"
47 eapply_user
48 cmake_src_prepare
49 + use debug && CMAKE_BUILD_TYPE=Debug
50 }
51
52 src_install() {
53 exeinto "/opt/${PN}"
54 - doexe "${BUILD_DIR}/bin/${PN}_${_PV}"
55 + if use debug ; then
56 + doexe "${BUILD_DIR}/bin/${PN}_${_PV}-DEBUG"
57 + else
58 + doexe "${BUILD_DIR}/bin/${PN}_${_PV}"
59 + fi
60 insinto "/opt/${PN}"
61 doins "${BUILD_DIR}/bin/libRocketControls.so"
62 doins "${BUILD_DIR}/bin/libRocketControlsLua.so"
63
64 diff --git a/games-engines/fs2_open/metadata.xml b/games-engines/fs2_open/metadata.xml
65 index b1d632ca1..aef4fd67c 100644
66 --- a/games-engines/fs2_open/metadata.xml
67 +++ b/games-engines/fs2_open/metadata.xml
68 @@ -16,6 +16,7 @@
69 <bugs-to>https://github.com/scp-fs2open/fs2open.github.com/issues</bugs-to>
70 </upstream>
71 <use>
72 + <flag name="debug">Debug build to collect logfiles</flag>
73 <flag name="discord">Enable Discord RPC support</flag>
74 </use>
75 </pkgmetadata>