From 7ff386f7c4eb0e581363dc828b3ab526bcb8dd33 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Thu, 19 Mar 2026 21:38:00 -0400 Subject: [PATCH] games-emulation/zsnes: drop 2.0.12 Signed-off-by: Ionen Wolkens --- games-emulation/zsnes/Manifest | 1 - .../zsnes/files/zsnes-2.0.12-initc.patch | 28 -------- .../zsnes/files/zsnes-2.0.9-cc-quotes.patch | 8 --- .../zsnes/files/zsnes-2.0.9-gentoo-zlib.patch | 12 ---- games-emulation/zsnes/zsnes-2.0.12.ebuild | 66 ------------------- 5 files changed, 115 deletions(-) delete mode 100644 games-emulation/zsnes/files/zsnes-2.0.12-initc.patch delete mode 100644 games-emulation/zsnes/files/zsnes-2.0.9-cc-quotes.patch delete mode 100644 games-emulation/zsnes/files/zsnes-2.0.9-gentoo-zlib.patch delete mode 100644 games-emulation/zsnes/zsnes-2.0.12.ebuild diff --git a/games-emulation/zsnes/Manifest b/games-emulation/zsnes/Manifest index 4cf9b9bd213c2..ba3bc2d2cf9f9 100644 --- a/games-emulation/zsnes/Manifest +++ b/games-emulation/zsnes/Manifest @@ -1,2 +1 @@ -DIST zsnes-2.0.12.tar.gz 963569 BLAKE2B c11496cb5f08930dac23598ade337d9ab5d41f484b8f0ad68b1f01832d3d5ef078d65b3d639719b23eaaaf4406248eb47959b582ab7b96b142993ff532c1f3d2 SHA512 f321582a32a334cb32d9276c88c03db7d99c7ccce67a73a777bea6d66f3551a3013d1cfd38fda37867fb2424cde79ca4220894b27615f0f5c5a6de8ffaef037a DIST zsnes-2.1.0.tar.gz 1209591 BLAKE2B f0bc9de0cad3ee52b552a66be3dea43d63d8587b21ae016685a5917d0939b4939d51088feba8f6afc3cb881ab85d37fc2af55ef952b477a90fba87adf0d9af4e SHA512 65169452bc9f31dbb2282960c57fe804980776ebd5d46cfec9e59240d3fb40f11a6720db5a77e8e3d58c2ca6b260a97ac68ed98b162aa3a6ac79458dfaef242b diff --git a/games-emulation/zsnes/files/zsnes-2.0.12-initc.patch b/games-emulation/zsnes/files/zsnes-2.0.12-initc.patch deleted file mode 100644 index d6ce00b93db0f..0000000000000 --- a/games-emulation/zsnes/files/zsnes-2.0.12-initc.patch +++ /dev/null @@ -1,28 +0,0 @@ -# https://github.com/xyproto/zsnes/issues/19#issuecomment-1710906677 -# https://github.com/TrashRaccoonSnuffy/zsnes/commit/f77ec1a0 - -Author: Sneed <127693805+TrashRaccoonSnuffy@users.noreply.github.com> -Date: Thu, 7 Sep 2023 21:06:10 -0300 - - Fix a buffer overflow - ---- a/initc.c -+++ b/initc.c -@@ -1364,7 +1364,7 @@ void clearmem(void) - } - - extern uint8_t BRRBuffer[]; --extern uint8_t echoon0; -+extern uint8_t echoon0[]; - extern uint32_t PHdspsave; - extern uint32_t PHdspsave2; - s4 echobuf[22500]; -@@ -1373,7 +1373,7 @@ extern uint8_t DSPMem[256]; - void clearvidsound() - { - memset(BRRBuffer, 0, PHdspsave); -- memset(&echoon0, 0, PHdspsave2); -+ memset(echoon0, 0, PHdspsave2); - memset(&echobuf, 0, sizeof(echobuf)); - memset(spcBuffera, 0, 65536 * 4 + 4096); - memset(DSPMem, 0, 256); diff --git a/games-emulation/zsnes/files/zsnes-2.0.9-cc-quotes.patch b/games-emulation/zsnes/files/zsnes-2.0.9-cc-quotes.patch deleted file mode 100644 index d2615149601b7..0000000000000 --- a/games-emulation/zsnes/files/zsnes-2.0.9-cc-quotes.patch +++ /dev/null @@ -1,8 +0,0 @@ -Does not expect CC may have arguments rather than being in CFLAGS, e.g. -m32 ---- a/Makefile -+++ b/Makefile -@@ -355,3 +355,3 @@ - @echo '===> PSR $@' -- $(Q)./$(PSR) $(CFGDEFS) -gcc $(CC_TARGET) -compile -flags '$(CFLAGS)' -cheader $@ -fname $(*F) $(@:.h=.o) $< -+ $(Q)./$(PSR) $(CFGDEFS) -gcc '$(CC_TARGET)' -compile -flags '$(CFLAGS)' -cheader $@ -fname $(*F) $(@:.h=.o) $< - diff --git a/games-emulation/zsnes/files/zsnes-2.0.9-gentoo-zlib.patch b/games-emulation/zsnes/files/zsnes-2.0.9-gentoo-zlib.patch deleted file mode 100644 index a5b5f584e1774..0000000000000 --- a/games-emulation/zsnes/files/zsnes-2.0.9-gentoo-zlib.patch +++ /dev/null @@ -1,12 +0,0 @@ -Gentoo-specific workaround due to https://bugs.gentoo.org/383179 ---- a/zip/zunzip.h -+++ b/zip/zunzip.h -@@ -48,4 +48,8 @@ - #include - -+#ifndef OF -+#define OF _Z_OF -+#endif -+ - #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP) - /* like the STRICT of WIN32, we define a pointer that cannot be converted diff --git a/games-emulation/zsnes/zsnes-2.0.12.ebuild b/games-emulation/zsnes/zsnes-2.0.12.ebuild deleted file mode 100644 index 8312bb851390a..0000000000000 --- a/games-emulation/zsnes/zsnes-2.0.12.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 2021-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit desktop flag-o-matic multilib toolchain-funcs xdg - -DESCRIPTION="Fork of the classic Super Nintendo emulator" -HOMEPAGE="https://github.com/xyproto/zsnes/ https://www.zsnes.com/" -SRC_URI="https://github.com/xyproto/zsnes/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="custom-cflags" - -RDEPEND=" - media-libs/libglvnd[X,abi_x86_32(-)] - media-libs/libpng:=[abi_x86_32(-)] - media-libs/libsdl[abi_x86_32(-),joystick,opengl,sound,video] - virtual/zlib:=[abi_x86_32(-)] - x11-libs/libX11[abi_x86_32(-)]" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto" -BDEPEND=" - dev-lang/nasm - virtual/zlib:= - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-2.0.9-cc-quotes.patch - "${FILESDIR}"/${PN}-2.0.9-gentoo-zlib.patch - "${FILESDIR}"/${P}-initc.patch -) - -src_compile() { - # Makefile forces many CFLAGS that are questionable, but zsnes' ancient x86 - # asm is fragile, not pic safe (bug #427104), broken by F_S=3 (formerly - # broken with =2 as well), and can be affected by -march=* and similar. - # Stick to upstream's choices, this is non-portable either way. - if use !custom-cflags; then - strip-flags - append-cppflags -U_FORTIFY_SOURCE # to disable =3, Makefile enables =2 - fi - - # used to build and run parsegen at build time (uses zlib wrt BDEPEND) - tc-export_build_env BUILD_CXX - local buildcxx="${BUILD_CXX} ${BUILD_CXXFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS}" - - use amd64 && multilib_toolchain_setup x86 - tc-export CC CXX - append-cflags "${CPPFLAGS}" - append-cxxflags "${CPPFLAGS}" - - emake CXX_HOST="${buildcxx}" -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install - - dodoc README.md TODO.md - - newicon icons/64x64x32.png ${PN}.png - make_desktop_entry ${PN} ${PN^^} -}