summaryrefslogtreecommitdiff
path: root/games-action/dxx-rebirth
diff options
context:
space:
mode:
Diffstat (limited to 'games-action/dxx-rebirth')
-rw-r--r--games-action/dxx-rebirth/Manifest3
-rw-r--r--games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild4
-rw-r--r--games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-gcc-12.patch25
3 files changed, 31 insertions, 1 deletions
diff --git a/games-action/dxx-rebirth/Manifest b/games-action/dxx-rebirth/Manifest
index f369c36dead3..8784aede800d 100644
--- a/games-action/dxx-rebirth/Manifest
+++ b/games-action/dxx-rebirth/Manifest
@@ -1,4 +1,5 @@
+AUX dxx-rebirth-0.61.0_pre20210623-gcc-12.patch 1204 BLAKE2B 3482928a1ec1ca2020b77dbbea64f485bb40537c24373b01068a907f1abde7d3bea5d1e165c7f467256e4c1663e62c49c47845760df04e6093e06019ae25bf5d SHA512 33d213c7225bd0be1e2eea9ace068b5a7ffc28e3ce034014000e88b7c741dcaddbe44947fced67dfe3a9af8277df3dc196145433da3898d9572ea1a171603b5d
DIST dxx-rebirth_20210623-src.tar.xz 1340044 BLAKE2B f16a8904d777559e789d719bc0d6d2dbb7d26c1128984117b6c64a334ae589dd5806439cc51e458a583e1b6cc831dae7c51bf7bd3fbc972989b0ce4e5b932a4e SHA512 150d873fa045df6fb2f9bb70334d08eeae0cc7a639e825f1352fed28501ab9541a27bf3395fc1929bc8d76ed9126b038eed67c5a01657f43116da4663e929821
-EBUILD dxx-rebirth-0.61.0_pre20210623.ebuild 8510 BLAKE2B 5ac2e634297aefb3dbbc79f4b5c4a0e9696444b2ceb18c4fc33174ef91dffbbb1ea5a5a9cd6e1ad8b8e66c2e2d70f9be1bd45668035eb61cd84f1a41292f220d SHA512 78f4d473907674716b7c567657eb0be0210630918526583b9200c1ae84cfd4a39b1b05fe8fa41891ae0845b0f5bffad297a88dbb5af6c17962e9833cf0932893
+EBUILD dxx-rebirth-0.61.0_pre20210623.ebuild 8556 BLAKE2B 3d72ae79935c614705cdc8536f8d9e27a5b8f52e83cfc78d2fd0bbf02f6ab6732a2d1ebffe4b41fcd83a492f68ce78cf7ad12e42982fee8f4e4b2588a27743fb SHA512 63f35a5fdafa3e396c50e68871e1185ff951d8033c7f0a95cd710b77b2e17fbd74daa29b2296b87b34ed836ab286986efdac548f4dbfcddb56d815fcbed78923
EBUILD dxx-rebirth-9999.ebuild 8546 BLAKE2B 9634616c01b562de777d19f309dc197a152cf453368292dcd0824a454e6568d37420471d04140fc1de4f41a9b1488595f106b5e8d06fea4957be8f85dd3a1868 SHA512 b3e95904bfd97b86ada1d91bdd9d9669f47e8856c9decadcbdfdc8547d1e537d8314608c9fc97e766c47ffe9ed943185ae2d739358a28b75b885388ecd9767f7
MISC metadata.xml 2538 BLAKE2B fd07b7eed8d0b484312d4ee54a6b13834b823ee2cd23eb8e5cef93a5b44b4311c2eee97946fed8d303883142b65243dbbefab921a7e01a111bc5126334230113 SHA512 9d07f6718f74adddcd9e3041758e29e456d62c8808c30f2e6963872a9d647491dea380134951973eeaad63dea0fb88710a5b6fc8e37461f011e6d8aea0e69693
diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
index 853ff1d1f770..f703b0ade70e 100644
--- a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
+++ b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
@@ -162,6 +162,10 @@ BDEPEND="virtual/pkgconfig"
# and therefore requires a rebuild when changed.
#IUSE_RUNTIME="flac l10n_de midi mp3 opl3-musicpack sc55-musicpack vorbis"
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc-12.patch
+)
+
dxx_scons() {
# Always build profile `m`. If use editor, also build profile `e`.
# Set most variables in the default anonymous profile. Only
diff --git a/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-gcc-12.patch b/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-gcc-12.patch
new file mode 100644
index 000000000000..3681385976a6
--- /dev/null
+++ b/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-gcc-12.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/894678
+https://github.com/dxx-rebirth/dxx-rebirth/commit/092daecb6118b3c072c71a8bea24f119e300bd49
+
+From 092daecb6118b3c072c71a8bea24f119e300bd49 Mon Sep 17 00:00:00 2001
+From: Kp <kp@valhallalegends.com>
+Date: Sat, 28 May 2022 21:04:37 +0000
+Subject: [PATCH] Use static_cast<> to convert player_marker_num to
+ game_marker_index
+
+gcc-12 rejects the list initialization syntax. Switch to static_cast<>,
+which generates equivalent code.
+
+Reported-by: dbermond <https://github.com/dxx-rebirth/dxx-rebirth/issues/638>
+--- a/similar/main/automap.cpp
++++ b/similar/main/automap.cpp
+@@ -370,7 +370,7 @@ game_marker_index convert_player_marker_index_to_game_marker_index(const game_mo
+ return static_cast<game_marker_index>((player_num * MAX_DROP_MULTI_COOP) + static_cast<unsigned>(player_marker_num));
+ if (game_mode & GM_MULTI)
+ return static_cast<game_marker_index>((player_num * MAX_DROP_MULTI_COMPETITIVE) + static_cast<unsigned>(player_marker_num));
+- return game_marker_index{player_marker_num};
++ return static_cast<game_marker_index>(player_marker_num);
+ }
+
+ unsigned d_marker_state::get_markers_per_player(const game_mode_flags game_mode, const unsigned max_numplayers)
+