4 files changed, 108 insertions, 0 deletions
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index b24a52e60416..251a7147cc32 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/nestopia-jg/Manifest b/games-emulation/nestopia-jg/Manifest
index a8bdc9a302ea..234608c0837b 100644
--- a/games-emulation/nestopia-jg/Manifest
+++ b/games-emulation/nestopia-jg/Manifest
@@ -1,6 +1,8 @@
+AUX nestopia-jg-1.52.1-odr.patch 1508 BLAKE2B 7fa12bff3b1597ee96e1055f6f53d96a4ca76a9e6cbf29f078df878fab0fb564fbd16cb854cd983d7b9c32f4ed5b0c43c363518f9d734619626c1af47c811d0f SHA512 aa83d7a64d855c09aeb078f7452d6030c49df657659e23f5a8ae74f3001bad134ed689f9ce8fd71c40f1ad14f2d44aec411b552e4ec1c91455599bb87d0ca302
 DIST nestopia-1.52.0.tar.bz2 451267 BLAKE2B a70e1251a5b9dcb17a5d8e8233c12cc90189a0471aa3faf955c15d7331e44c4a67d6ddd101326820c219c3b5e09780a7191a45c14267e6da156d968a5b9bfce0 SHA512 5b2876ec3dcc90b94b99184d964bdeee8f194e07f8b8efeb9f425a118c3cc51e3d54901d922988047bfcb7fa5f3be97ed4e694c1451046a98e99678625d1f6f4
 DIST nestopia-1.52.1.tar.bz2 660171 BLAKE2B 1c5c17d84bb13b19703cd552d844cf42d8d7e72f72b9879cf10249cd091a5d3db0cef5be9afc04728a57d1fdd3f8c4d1ed7105b872ea4df114c30dd8e69fd5be SHA512 b9c606a9becd094bd1bec1aa8d57f57eb596aefaa91a4e09a10c17535c1e38c1b17a56160ffa48b2e240fb7e7d56a4227ffdf3ea0ef6dc401d347bc7e498d015
 EBUILD nestopia-jg-1.52.0.ebuild 899 BLAKE2B b28832fc70b7b04cbbc1206d3d6195624080bf3d69fdb7547c8f1eb49cbef01d17d10a84b2915ff68435548b8efe90b43334493957011cae3882d3d80079dacb SHA512 d055158116550a5c57cc4f5b2bb0aa98778a0c538c4ed6a45137e102f6a5988f084610fe3c82f452b278604038713be46bc2d70c5fd72ab55d342ea4b38b997d
+EBUILD nestopia-jg-1.52.1-r1.ebuild 976 BLAKE2B a64b5aa4169cda2fc9459da5618ce24126f0a82bac3ad2888d9f54fe7a0fa5c004322d83183f2240accfd9057e265028363b6d2ab416dbca6b48c52f92016995 SHA512 0c1c0a3564c3e1fc5abc10861a95c8a31ec97c20b6aa4e0f02247577d98cf5b8812a28960062146257c912fb9d5763532d71df7e500be913f882c7cd649d4ffe
 EBUILD nestopia-jg-1.52.1.ebuild 899 BLAKE2B b28832fc70b7b04cbbc1206d3d6195624080bf3d69fdb7547c8f1eb49cbef01d17d10a84b2915ff68435548b8efe90b43334493957011cae3882d3d80079dacb SHA512 d055158116550a5c57cc4f5b2bb0aa98778a0c538c4ed6a45137e102f6a5988f084610fe3c82f452b278604038713be46bc2d70c5fd72ab55d342ea4b38b997d
 EBUILD nestopia-jg-9999.ebuild 899 BLAKE2B b28832fc70b7b04cbbc1206d3d6195624080bf3d69fdb7547c8f1eb49cbef01d17d10a84b2915ff68435548b8efe90b43334493957011cae3882d3d80079dacb SHA512 d055158116550a5c57cc4f5b2bb0aa98778a0c538c4ed6a45137e102f6a5988f084610fe3c82f452b278604038713be46bc2d70c5fd72ab55d342ea4b38b997d
 MISC metadata.xml 817 BLAKE2B 47dbf60c4058974b2a3fe8a0a8d800e436d4a9cfe4af71cbdf36b77583b7f3766de2120e50c13129b5c61c5fbbb2930567b25133ff2ea2e9ab514f626e091ec3 SHA512 2a57f9aa3201ee331e8bd9d28d52996ac232cc6b0f4e411c73c91838c1623deaa83ae9245c438fb328aa7e29b2a386caf31cd8f1142a9bb6d88b227e85f40950
diff --git a/games-emulation/nestopia-jg/files/nestopia-jg-1.52.1-odr.patch b/games-emulation/nestopia-jg/files/nestopia-jg-1.52.1-odr.patch
new file mode 100644
index 000000000000..286dfb0394d8
--- /dev/null
+++ b/games-emulation/nestopia-jg/files/nestopia-jg-1.52.1-odr.patch
@@ -0,0 +1,56 @@
+https://bugs.gentoo.org/945404
+https://gitlab.com/jgemu/nestopia/-/commit/7f6b5bf12e02011533c054d587dba6297defe868
+
+From 7f6b5bf12e02011533c054d587dba6297defe868 Mon Sep 17 00:00:00 2001
+From: Rupert Carmichael <5050061-carmiker@users.noreply.gitlab.com>
+Date: Sat, 30 Nov 2024 11:24:58 -0500
+Subject: [PATCH] NstVideoRenderer: Move filter disable defines into the Video
+ API header
+
+---
+ src/NstVideoRenderer.cpp | 6 ------
+ src/api/NstApiVideo.hpp  | 5 +++++
+ 2 files changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/src/NstVideoRenderer.cpp b/src/NstVideoRenderer.cpp
+index 22ac092..e55d264 100644
+--- a/src/NstVideoRenderer.cpp
++++ b/src/NstVideoRenderer.cpp
+@@ -22,18 +22,12 @@
+ //
+ ////////////////////////////////////////////////////////////////////////////////////////
+ 
+-#define NST_NO_SCALEX 1
+-#define NST_NO_HQ2X 1
+-#define NST_NO_2XSAI 1
+-#define NST_NO_XBR 1
+-
+ #include <cstring>
+ #include <cmath>
+ #include <new>
+ #include "NstCore.hpp"
+ #include "NstAssert.hpp"
+ #include "NstFpuPrecision.hpp"
+-#include "api/NstApiVideo.hpp"
+ #include "NstVideoRenderer.hpp"
+ #include "NstVideoFilterNone.hpp"
+ 
+diff --git a/src/api/NstApiVideo.hpp b/src/api/NstApiVideo.hpp
+index 4b137ae..30bd9fb 100644
+--- a/src/api/NstApiVideo.hpp
++++ b/src/api/NstApiVideo.hpp
+@@ -39,6 +39,11 @@
+ #pragma warning( disable : 4512 )
+ #endif
+ 
++#define NST_NO_SCALEX 1
++#define NST_NO_HQ2X 1
++#define NST_NO_2XSAI 1
++#define NST_NO_XBR 1
++
+ namespace Nes
+ {
+ 	namespace Core
+-- 
+GitLab
+
diff --git a/games-emulation/nestopia-jg/nestopia-jg-1.52.1-r1.ebuild b/games-emulation/nestopia-jg/nestopia-jg-1.52.1-r1.ebuild
new file mode 100644
index 000000000000..1ec464e48f55
--- /dev/null
+++ b/games-emulation/nestopia-jg/nestopia-jg-1.52.1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2022-2024 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 Fork of Nestopia"
+HOMEPAGE="https://gitlab.com/jgemu/nestopia"
+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="GPL-2+"
+SLOT="1"
+
+DEPEND="
+	media-libs/jg:1=
+"
+RDEPEND="
+	${DEPEND}
+	games-emulation/jgrf
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# https://bugs.gentoo.org/945404
+	"${FILESDIR}"/${P}-odr.patch
+)
+
+src_compile() {
+	emake CXX="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)"
+}
+
+src_install() {
+	emake install \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}"/usr \
+		DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+}