* [gentoo-commits] repo/gentoo:master commit in: games-emulation/melonds-jg/, games-emulation/melonds-jg/files/
@ 2023-01-15 14:16 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2023-01-15 14:16 UTC (permalink / raw
To: gentoo-commits
commit: 80785a22ccda05ce057bf44f7402337b2a85da7b
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Wed Dec 28 01:17:04 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 14:16:13 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80785a22
games-emulation/melonds-jg: New package, v0.9.5
Upstream-PR: https://github.com/melonDS-emu/melonDS/pull/1532
Upstream-Commit: https://github.com/melonDS-emu/melonDS/commit/bd9c614cebe47f809ae125a4bf59649191332a3a
Upstream-Commit: https://gitlab.com/jgemu/melonds/-/commit/bd9c614cebe47f809ae125a4bf59649191332a3a
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-emulation/melonds-jg/Manifest | 1 +
.../melonds-jg/files/melonds-jg-0.9.5-format.patch | 27 +++++++++++
games-emulation/melonds-jg/melonds-jg-0.9.5.ebuild | 53 ++++++++++++++++++++++
games-emulation/melonds-jg/melonds-jg-9999.ebuild | 49 ++++++++++++++++++++
games-emulation/melonds-jg/metadata.xml | 21 +++++++++
5 files changed, 151 insertions(+)
diff --git a/games-emulation/melonds-jg/Manifest b/games-emulation/melonds-jg/Manifest
new file mode 100644
index 000000000000..73472a76c4df
--- /dev/null
+++ b/games-emulation/melonds-jg/Manifest
@@ -0,0 +1 @@
+DIST melonds-0.9.5.tar.bz2 5396317 BLAKE2B 4f834c1037b0a1f2e6acdc52bc0b974107343485cdfeff35d16520afb46895abec3046fa9c91c53b6c02855b19af39a64bfc98722887e5090eb0b051ae0d106b SHA512 11a0a71b20e516f426f6fa6dbb46418c5afdd34997d2943a91149f527ca81c7c9a76db8460439e7593e245df92799a69a76dc426eea14a01383ce0a8c1a4b473
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
new file mode 100644
index 000000000000..f107b6b20335
--- /dev/null
+++ b/games-emulation/melonds-jg/files/melonds-jg-0.9.5-format.patch
@@ -0,0 +1,27 @@
+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 <54966017+carmiker@users.noreply.github.com>
+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/melonds-jg-0.9.5.ebuild b/games-emulation/melonds-jg/melonds-jg-0.9.5.ebuild
new file mode 100644
index 000000000000..72f8d74e4dd2
--- /dev/null
+++ b/games-emulation/melonds-jg/melonds-jg-0.9.5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+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"
+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
+)
+
+src_compile() {
+ 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)"
+}
diff --git a/games-emulation/melonds-jg/melonds-jg-9999.ebuild b/games-emulation/melonds-jg/melonds-jg-9999.ebuild
new file mode 100644
index 000000000000..44ef9ee4e7eb
--- /dev/null
+++ b/games-emulation/melonds-jg/melonds-jg-9999.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+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"
+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
+"
+
+src_compile() {
+ 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)"
+}
diff --git a/games-emulation/melonds-jg/metadata.xml b/games-emulation/melonds-jg/metadata.xml
new file mode 100644
index 000000000000..010aa0b949dc
--- /dev/null
+++ b/games-emulation/melonds-jg/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM 'https://www.gentoo.org/dtd/metadata.dtd'>
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>orbea@riseup.net</email>
+ <name>orbea</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription>
+ melonDS is an emulator for the Nintendo DS and DSi. The
+ Jolly Good API port is designed for use with content for
+ the Nintendo DS.
+ </longdescription>
+ <upstream>
+ <bugs-to>https://gitlab.com/jgemu/melonds/-/issues</bugs-to>
+ <remote-id type="gitlab">jgemu/melonds</remote-id>
+ </upstream>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/melonds-jg/, games-emulation/melonds-jg/files/
@ 2023-09-15 6:00 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2023-09-15 6:00 UTC (permalink / raw
To: gentoo-commits
commit: cf57ed6790be934bfc32398f3d10865da24b1ab0
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Thu Sep 14 19:12:46 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 15 05:57:11 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf57ed67
games-emulation/melonds-jg: fix i686 build issue
On a crossdev environment with x86_64-pc-linux-musl host and
i686-pc-linux-musl build a static assert fails in the vendored teakra
test_generator.cpp, but teakra was modified by the melonds upstream
enough that a system version is not possible.
However the jollygood port doesn't actually use any of the code in
test_generator.cpp so it can be simply removed from the build. As this
is unused code a revdump is not required.
Closes: https://bugs.gentoo.org/914196
Upstream-PR: https://gitlab.com/jgemu/melonds/-/merge_requests/9
Upstream-Commit: https://gitlab.com/jgemu/melonds/-/commit/0953b8874187bfdd35a0bf787c3bdbb6cc65dc9d
Signed-off-by: orbea <orbea <AT> riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/32784
Signed-off-by: Sam James <sam <AT> gentoo.org>
...melonds-jg-0.9.5-teakra-no-test_generator.patch | 38 ++++++++++++++++++++++
games-emulation/melonds-jg/melonds-jg-0.9.5.ebuild | 1 +
2 files changed, 39 insertions(+)
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
new file mode 100644
index 000000000000..a482e93a52fe
--- /dev/null
+++ b/games-emulation/melonds-jg/files/melonds-jg-0.9.5-teakra-no-test_generator.patch
@@ -0,0 +1,38 @@
+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 <orbea@riseup.net>
+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
index 56734daea220..b7c9f13cf065 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}-teakra-no-test_generator.patch # 914196
)
src_compile() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-09-15 6:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-15 6:00 [gentoo-commits] repo/gentoo:master commit in: games-emulation/melonds-jg/, games-emulation/melonds-jg/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-01-15 14:16 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox