commit: 6e2736d0838c6466150d580a5f992cdc67a12589 Author: orbea <orbea <AT> riseup <DOT> net> AuthorDate: Sat Nov 15 17:23:10 2025 +0000 Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> CommitDate: Sun Nov 16 01:46:11 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e2736d0
games-emulation/melonds-jg: drop 0.9.5 Signed-off-by: orbea <orbea <AT> riseup.net> Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org> games-emulation/melonds-jg/Manifest | 1 - .../melonds-jg/files/melonds-jg-0.9.5-format.patch | 27 ---------- .../melonds-jg/files/melonds-jg-0.9.5-gcc14.patch | 29 ---------- ...melonds-jg-0.9.5-teakra-no-test_generator.patch | 38 ------------- games-emulation/melonds-jg/melonds-jg-0.9.5.ebuild | 63 ---------------------- 5 files changed, 158 deletions(-) diff --git a/games-emulation/melonds-jg/Manifest b/games-emulation/melonds-jg/Manifest index 3e69c2189a40..de646d256f34 100644 --- a/games-emulation/melonds-jg/Manifest +++ b/games-emulation/melonds-jg/Manifest @@ -1,2 +1 @@ -DIST melonds-0.9.5.tar.bz2 5396317 BLAKE2B 4f834c1037b0a1f2e6acdc52bc0b974107343485cdfeff35d16520afb46895abec3046fa9c91c53b6c02855b19af39a64bfc98722887e5090eb0b051ae0d106b SHA512 11a0a71b20e516f426f6fa6dbb46418c5afdd34997d2943a91149f527ca81c7c9a76db8460439e7593e245df92799a69a76dc426eea14a01383ce0a8c1a4b473 DIST melonds-1.0.0.tar.bz2 6597733 BLAKE2B 9e6c394cee6fef5140426d93c325e517890b34978f79abea37e504005db6e63252a5f0db6e9047b253e9564ebe11cf255e092d68c05382c9be56fddacec464fd SHA512 addceb5d3d1906b310439fb1a7479a0833f4f3ce7ef0bf1ef8ce267766c36e7862a38c4b8e1bd867c8c0aaede472f317b27db916061abb809914bc0822448c6b diff --git a/games-emulation/melonds-jg/files/melonds-jg-0.9.5-format.patch b/games-emulation/melonds-jg/files/melonds-jg-0.9.5-format.patch deleted file mode 100644 index f107b6b20335..000000000000 --- a/games-emulation/melonds-jg/files/melonds-jg-0.9.5-format.patch +++ /dev/null @@ -1,27 +0,0 @@ -Upstream-PR: https://github.com/melonDS-emu/melonDS/pull/1532 -Upstream-Commit: https://github.com/melonDS-emu/melonDS/commit/bd9c614cebe47f809ae125a4bf59649191332a3a -melonds-jg-Commit: https://gitlab.com/jgemu/melonds/-/commit/bd9c614cebe47f809ae125a4bf59649191332a3a - -From bd9c614cebe47f809ae125a4bf59649191332a3a Mon Sep 17 00:00:00 2001 -From: Rupert Carmichael <[email protected]> -Date: Fri, 30 Dec 2022 15:13:39 -0500 -Subject: [PATCH] Wifi: -Wformat warning caused by missing printf argument - (#1532) - ---- - src/Wifi.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Wifi.cpp b/src/Wifi.cpp -index c2614e7..5373187 100644 ---- a/src/Wifi.cpp -+++ b/src/Wifi.cpp -@@ -872,7 +872,7 @@ bool ProcessTX(TXSlot* slot, int num) - } - - if ((num != 5) && (RAM[slot->Addr+4] > 0)) -- printf("SLOT %d RETRY COUNTER %d\n", RAM[slot->Addr+4]); -+ printf("SLOT %d RETRY COUNTER %d\n", num, RAM[slot->Addr+4]); - - // set TX addr - IOPORT(W_RXTXAddr) = slot->Addr >> 1; 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 deleted file mode 100644 index 05da67488333..000000000000 --- a/games-emulation/melonds-jg/files/melonds-jg-0.9.5-gcc14.patch +++ /dev/null @@ -1,29 +0,0 @@ -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 <[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-jg/files/melonds-jg-0.9.5-teakra-no-test_generator.patch b/games-emulation/melonds-jg/files/melonds-jg-0.9.5-teakra-no-test_generator.patch deleted file mode 100644 index a482e93a52fe..000000000000 --- a/games-emulation/melonds-jg/files/melonds-jg-0.9.5-teakra-no-test_generator.patch +++ /dev/null @@ -1,38 +0,0 @@ -https://bugs.gentoo.org/914196 -https://gitlab.com/jgemu/melonds/-/merge_requests/9 -https://gitlab.com/jgemu/melonds/-/commit/0953b8874187bfdd35a0bf787c3bdbb6cc65dc9d - -From 0953b8874187bfdd35a0bf787c3bdbb6cc65dc9d Mon Sep 17 00:00:00 2001 -From: orbea <[email protected]> -Date: Thu, 14 Sep 2023 09:58:18 -0700 -Subject: [PATCH] jollygood: don't build teakra's test_generator.cpp -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This is unused in the jollygood core and causes build failures for i686. - -As reproduced on Gentoo: - -In file included from /usr/i686-pc-linux-musl/tmp/portage/games-emulation/melonds-jg-0.9.5/work/melonds-0.9.5/jollygood/../src/teakra/src/test_generator.cpp:10: -/usr/i686-pc-linux-musl/tmp/portage/games-emulation/melonds-jg-0.9.5/work/melonds-0.9.5/jollygood/../src/teakra/src/test.h:37:32: error: static assertion failed - 37 | static_assert(sizeof(TestCase) == 4312); - | ~~~~~~~~~~~~~~~~~^~~~~~~ -/usr/i686-pc-linux-musl/tmp/portage/games-emulation/melonds-jg-0.9.5/work/melonds-0.9.5/jollygood/../src/teakra/src/test.h:37:32: note: the comparison reduces to ‘(4308 == 4312)’ -make: *** [Makefile:169: objs/src/teakra/src/test_generator.o] Error 1 ---- - jollygood/Makefile | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/jollygood/Makefile b/jollygood/Makefile -index 03f34a1..c206f05 100644 ---- a/jollygood/Makefile -+++ b/jollygood/Makefile -@@ -68,7 +68,6 @@ CXXSRCS := src/teakra/src/ahbm.cpp \ - src/teakra/src/parser.cpp \ - src/teakra/src/processor.cpp \ - src/teakra/src/teakra.cpp \ -- src/teakra/src/test_generator.cpp \ - src/teakra/src/timer.cpp \ - src/ARCodeFile.cpp \ - src/AREngine.cpp \ diff --git a/games-emulation/melonds-jg/melonds-jg-0.9.5.ebuild b/games-emulation/melonds-jg/melonds-jg-0.9.5.ebuild deleted file mode 100644 index e85a48508359..000000000000 --- a/games-emulation/melonds-jg/melonds-jg-0.9.5.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs flag-o-matic - -MY_PN=${PN%-*} -MY_P=${MY_PN}-${PV} -DESCRIPTION="Jolly Good Port of melonDS" -HOMEPAGE="https://gitlab.com/jgemu/melonds"; -if [[ "${PV}" == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.com/jgemu/${MY_PN}.git"; -else - SRC_URI="https://gitlab.com/jgemu/${MY_PN}/-/archive/${PV}/${MY_P}.tar.bz2"; - S="${WORKDIR}/${MY_P}" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" -fi - -LICENSE="BSD-1 BSD-2 GPL-3+ MIT Unlicense public-domain" -SLOT="1" - -DEPEND=" - media-libs/jg:1= - media-libs/libsamplerate -" -RDEPEND=" - ${DEPEND} - games-emulation/jgrf -" -BDEPEND=" - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${P}-format.patch - "${FILESDIR}"/${P}-gcc14.patch # 917164 - "${FILESDIR}"/${P}-teakra-no-test_generator.patch # 914196 -) - -src_compile() { - # -Werror=strict-aliasing - # https://bugs.gentoo.org/931907 - # - # Not trivial to fix and its a problem in melonds upstream. - # Its also uncertain if this port will be updated in the future. - append-flags -fno-strict-aliasing - filter-lto - - emake -C jollygood \ - CC="$(tc-getCC)" \ - CXX="$(tc-getCXX)" \ - PKG_CONFIG="$(tc-getPKG_CONFIG)" -} - -src_install() { - emake -C jollygood install \ - DESTDIR="${D}" \ - PREFIX="${EPREFIX}"/usr \ - DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" -}
