[gentoo-commits] repo/gentoo:master commit in: games-emulation/melonds-jg/files/, games-emulation/melonds-jg/

[gentoo-commits] repo/gentoo:master commit in: games-emulation/melonds-jg/files/, games-emulation/melonds-jg/

[Sam James]

commit:     697ed03f38a540bd44f16dbffbdabe59e9ead5a4
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Sat Nov 11 22:09:19 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Nov 12 06:38:01 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=697ed03f

games-emulation/melonds-jg: fix gcc-14 build issue

Closes: https://bugs.gentoo.org/917164
Upstream-PR: https://github.com/melonDS-emu/melonDS/pull/1874
Upstream-Commit: https://github.com/melonDS-emu/melonDS/commit/e63e29ca91ba5fc1630634fbb9f064b9cce6cc1f
Upstream-Commit: https://gitlab.com/jgemu/melonds/-/commit/e63e29ca91ba5fc1630634fbb9f064b9cce6cc1f
Signed-off-by: orbea <orbea <AT> riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/33773
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../melonds-jg/files/melonds-jg-0.9.5-gcc14.patch  | 29 ++++++++++++++++++++++
 games-emulation/melonds-jg/melonds-jg-0.9.5.ebuild |  1 +
 2 files changed, 30 insertions(+)

diff --git a/games-emulation/melonds-jg/files/melonds-jg-0.9.5-gcc14.patch b/games-emulation/melonds-jg/files/melonds-jg-0.9.5-gcc14.patch
new file mode 100644
index 000000000000..05da67488333
--- /dev/null
+++ b/games-emulation/melonds-jg/files/melonds-jg-0.9.5-gcc14.patch
@@ -0,0 +1,29 @@
+Bug: https://bugs.gentoo.org/917164
+Upstream-PR: https://github.com/melonDS-emu/melonDS/pull/1874
+Upstream-Commit: https://github.com/melonDS-emu/melonDS/commit/e63e29ca91ba5fc1630634fbb9f064b9cce6cc1f
+Upstream-Commit: https://gitlab.com/jgemu/melonds/-/commit/e63e29ca91ba5fc1630634fbb9f064b9cce6cc1f
+
+From e63e29ca91ba5fc1630634fbb9f064b9cce6cc1f Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Sat, 11 Nov 2023 10:31:10 -0800
+Subject: [PATCH] DSi_Camera: fix gcc-14 build issue
+
+melonDS/src/DSi_Camera.cpp:190:23: error: 'clamp' is not a member of 'std'
+  190 |             r1 = std::clamp(r1, 0, 255); g1 = std::clamp(g1, 0, 255); b1 = std::clamp(b1, 0, 255);
+      |                       ^~~~~
+---
+ src/DSi_Camera.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/DSi_Camera.cpp b/src/DSi_Camera.cpp
+index 749162932..2b259c590 100644
+--- a/src/DSi_Camera.cpp
++++ b/src/DSi_Camera.cpp
+@@ -16,6 +16,7 @@
+     with melonDS. If not, see http://www.gnu.org/licenses/.
+ */
+ 
++#include <algorithm>
+ #include <stdio.h>
+ #include <string.h>
+ #include "DSi.h"

diff --git a/games-emulation/melonds-jg/melonds-jg-0.9.5.ebuild b/games-emulation/melonds-jg/melonds-jg-0.9.5.ebuild
index 1ccecbcaaa0a..b55b19caed6b 100644
--- a/games-emulation/melonds-jg/melonds-jg-0.9.5.ebuild
+++ b/games-emulation/melonds-jg/melonds-jg-0.9.5.ebuild
@@ -35,6 +35,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${P}-format.patch
+	"${FILESDIR}"/${P}-gcc14.patch # 917164
 	"${FILESDIR}"/${P}-teakra-no-test_generator.patch # 914196
 )