commit: 831def21f26427feb8a3b137e1d20254276b00a8 Author: Maciej Barć <xgqt <AT> gentoo <DOT> org> AuthorDate: Sun Dec 10 16:57:28 2023 +0000 Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org> CommitDate: Sun Dec 10 17:08:56 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=831def21
games-emulation/melonds: include algorithm Bug: https://github.com/melonDS-emu/melonDS/pull/1874 Closes: https://bugs.gentoo.org/918666 Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org> .../files/melonds-0.9.5-DSi_Camera-algorithm.patch | 24 ++++++++++++++++++++++ games-emulation/melonds/melonds-0.9.5-r4.ebuild | 13 +++++++++--- 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/games-emulation/melonds/files/melonds-0.9.5-DSi_Camera-algorithm.patch b/games-emulation/melonds/files/melonds-0.9.5-DSi_Camera-algorithm.patch new file mode 100644 index 000000000000..17971f1327c0 --- /dev/null +++ b/games-emulation/melonds/files/melonds-0.9.5-DSi_Camera-algorithm.patch @@ -0,0 +1,24 @@ +From e63e29ca91ba5fc1630634fbb9f064b9cce6cc1f Mon Sep 17 00:00:00 2001 +From: orbea <[email protected]> +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/melonds-0.9.5-r4.ebuild b/games-emulation/melonds/melonds-0.9.5-r4.ebuild index a2ea52c0b297..5171a6bad8ec 100644 --- a/games-emulation/melonds/melonds-0.9.5-r4.ebuild +++ b/games-emulation/melonds/melonds-0.9.5-r4.ebuild @@ -38,10 +38,17 @@ RDEPEND=" net-libs/libpcap net-libs/libslirp " -DEPEND="${RDEPEND}" -BDEPEND="kde-frameworks/extra-cmake-modules:0" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + kde-frameworks/extra-cmake-modules:0 +" -PATCHES=( "${FILESDIR}"/${P}-no-ccache-detection.patch ) +PATCHES=( + "${FILESDIR}/${PN}-0.9.5-DSi_Camera-algorithm.patch" + "${FILESDIR}/${PN}-0.9.5-no-ccache-detection.patch" +) # used for JIT recompiler QA_EXECSTACK="usr/bin/melonDS"
