commit: 7d3a275c4d3a648219cf757d3ec160e082557c2e Author: orbea <orbea <AT> riseup <DOT> net> AuthorDate: Thu Mar 21 01:41:04 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Mar 21 02:15:45 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d3a275c
games-emulation/bsnes-jg: fix strict aliasing Closes: https://bugs.gentoo.org/926077 Upstream-PR: https://github.com/LIJI32/SameBoy/pull/593 Upstream-Commit: https://github.com/LIJI32/SameBoy/commit/8739da61c013e20e1cc94f0619c622a65c713408 Upstream-PR: https://gitlab.com/jgemu/bsnes/-/merge_requests/419 Upstream-Commit: https://gitlab.com/jgemu/bsnes/-/commit/966545bb79cc9810fbcedbe34fd52f7b9b5ef04e Signed-off-by: orbea <orbea <AT> riseup.net> Closes: https://github.com/gentoo/gentoo/pull/35847 Signed-off-by: Sam James <sam <AT> gentoo.org> games-emulation/bsnes-jg/bsnes-jg-1.1.2-r2.ebuild | 53 +++++++++++++++++ .../files/bsnes-jg-1.1.2-strict-aliasing.patch | 67 ++++++++++++++++++++++ 2 files changed, 120 insertions(+) diff --git a/games-emulation/bsnes-jg/bsnes-jg-1.1.2-r2.ebuild b/games-emulation/bsnes-jg/bsnes-jg-1.1.2-r2.ebuild new file mode 100644 index 000000000000..fe035e7a3b86 --- /dev/null +++ b/games-emulation/bsnes-jg/bsnes-jg-1.1.2-r2.ebuild @@ -0,0 +1,53 @@ +# 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 bsnes" +HOMEPAGE="https://gitlab.com/jgemu/bsnes"; +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="ISC GPL-3+ LGPL-2.1+ MIT ZLIB" +SLOT="1" + +DEPEND=" + media-libs/jg:1= + media-libs/libsamplerate +" +RDEPEND=" + ${DEPEND} + games-emulation/jgrf +" +BDEPEND=" + virtual/pkgconfig +" + +PATCHES=( + # https://bugs.gentoo.org/891201#c9 + "${FILESDIR}"/${P}-endianness.patch + # https://bugs.gentoo.org/926077 + "${FILESDIR}"/${P}-strict-aliasing.patch +) + +src_compile() { + emake CC="$(tc-getCC)" 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)" +} diff --git a/games-emulation/bsnes-jg/files/bsnes-jg-1.1.2-strict-aliasing.patch b/games-emulation/bsnes-jg/files/bsnes-jg-1.1.2-strict-aliasing.patch new file mode 100644 index 000000000000..106ea27730da --- /dev/null +++ b/games-emulation/bsnes-jg/files/bsnes-jg-1.1.2-strict-aliasing.patch @@ -0,0 +1,67 @@ +https://bugs.gentoo.org/926077 +https://github.com/LIJI32/SameBoy/pull/593 +https://gitlab.com/jgemu/bsnes/-/merge_requests/419 +https://gitlab.com/jgemu/bsnes/-/commit/966545bb79cc9810fbcedbe34fd52f7b9b5ef04e + +From 966545bb79cc9810fbcedbe34fd52f7b9b5ef04e Mon Sep 17 00:00:00 2001 +From: Lior Halphon <lij...@gmail.com> +Date: Sat, 9 Mar 2024 11:08:01 -0800 +Subject: [PATCH 1/2] Avoid strict aliasing violations. Closes #593 + +Backported from: + +https://github.com/LIJI32/SameBoy/commit/8739da61c013e20e1cc94f0619c622a65c713408 +--- + deps/gb/apu.c | 4 ++-- + deps/gb/apu.h | 11 +++++++++++ + 2 files changed, 13 insertions(+), 2 deletions(-) + +diff --git a/deps/gb/apu.c b/deps/gb/apu.c +index e621e82a..0f0ed16b 100644 +--- a/deps/gb/apu.c ++++ b/deps/gb/apu.c +@@ -100,7 +100,7 @@ static void update_sample(GB_gameboy_t *gb, GB_channel_t index, int8_t value, un + output.left = output.right = 0; + } + +- if (*(uint32_t *)&(gb->apu_output.current_sample[index]) != *(uint32_t *)&output) { ++ if (gb->apu_output.current_sample[index].packed != output.packed) { + refresh_channel(gb, index, cycles_offset); + gb->apu_output.current_sample[index] = output; + } +@@ -131,7 +131,7 @@ static void update_sample(GB_gameboy_t *gb, GB_channel_t index, int8_t value, un + if (likely(!gb->apu_output.channel_muted[index])) { + output = (GB_sample_t){(0xF - value * 2) * left_volume, (0xF - value * 2) * right_volume}; + } +- if (*(uint32_t *)&(gb->apu_output.current_sample[index]) != *(uint32_t *)&output) { ++ if (gb->apu_output.current_sample[index].packed != output.packed) { + refresh_channel(gb, index, cycles_offset); + gb->apu_output.current_sample[index] = output; + } +diff --git a/deps/gb/apu.h b/deps/gb/apu.h +index c8700c80..15b54a87 100644 +--- a/deps/gb/apu.h ++++ b/deps/gb/apu.h +@@ -25,11 +25,22 @@ + + /* APU ticks are 2MHz, triggered by an internal APU clock. */ + ++#ifdef GB_INTERNAL ++typedef union ++{ ++ struct { ++ int16_t left; ++ int16_t right; ++ }; ++ uint32_t packed; ++} GB_sample_t; ++#else + typedef struct + { + int16_t left; + int16_t right; + } GB_sample_t; ++#endif + + typedef struct + {
