commit: e12bca59b061b7932769a28e3c6057046b614f2d
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri May 30 19:02:30 2025 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri May 30 19:02:30 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e12bca59
games-emulation/mupen64plus-core: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
games-emulation/mupen64plus-core/Manifest | 1 -
...e-2.5.9-debugger-fix-binutils-2.39-compat.patch | 53 ---------
...pen64plus-core-2.5.9-fix-gcc10-fno-common.patch | 20 ----
.../files/mupen64plus-core-2.5.9-pitch.patch | 29 -----
.../mupen64plus-core-2.5.9-r4.ebuild | 119 ---------------------
5 files changed, 222 deletions(-)
diff --git a/games-emulation/mupen64plus-core/Manifest
b/games-emulation/mupen64plus-core/Manifest
index 6644c1c40cbd..80873c1b8bc6 100644
--- a/games-emulation/mupen64plus-core/Manifest
+++ b/games-emulation/mupen64plus-core/Manifest
@@ -1,2 +1 @@
-DIST mupen64plus-core-src-2.5.9.tar.gz 1618486 BLAKE2B
6d43789873c6866dc7d268e4a2cc1febc4a8ce6615a51e4dabfc3d3715aaaa6bf8d7c157ddccd45ae3b57852388c591b86d1cf401c7d78962ec6780272ef912d
SHA512
8087211eb3301e356e1529c1702c965aca5e9191a5a3efe604f2e2f7470da44c8c3be506ba1f0aa96b209baa8faf011ca153566540e96c278fe63a330b791f20
DIST mupen64plus-core-src-2.6.0.tar.gz 1754271 BLAKE2B
69f63a965bf3172c661979022ca8b1c3dddd4d35ca4453233c883e85db9e988c56509fed44221a6ab6f513ac6d8400bd055227e37225a2636f6f3e919075feea
SHA512
2e43e4c337199afbc5ba4ae9b0490a133fd09ef1252390858ff9594f512b75a8a6a5b0331dc3eee794f9445484e6046b19a0bf6df17f21243c80960340f80f34
diff --git
a/games-emulation/mupen64plus-core/files/mupen64plus-core-2.5.9-debugger-fix-binutils-2.39-compat.patch
b/games-emulation/mupen64plus-core/files/mupen64plus-core-2.5.9-debugger-fix-binutils-2.39-compat.patch
deleted file mode 100644
index b87a259ff809..000000000000
---
a/games-emulation/mupen64plus-core/files/mupen64plus-core-2.5.9-debugger-fix-binutils-2.39-compat.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index d48d8830..e4792b4e 100755
---- a/projects/unix/Makefile
-+++ b/projects/unix/Makefile
-@@ -714,15 +714,19 @@ ifeq ($(DEBUGGER), 1)
- $(SRCDIR)/debugger/dbg_breakpoints.c
- LDLIBS += -lopcodes -lbfd
-
-- # UGLY libopcodes version check (we check for > 2.28)
-+ # UGLY libopcodes/libbfd version check (we check for >= 2.28 and >= 2.39)
- LIBOPCODES_VERSION := $(shell $(STRINGS) --version | head -n1 | rev | cut
-d ' ' -f1 | rev)
- LIBOPCODES_MAJOR := $(shell echo $(LIBOPCODES_VERSION) | cut -f1 -d.)
- LIBOPCODES_MINOR := $(shell echo $(LIBOPCODES_VERSION) | cut -f2 -d.)
- LIBOPCODES_POINT := $(shell echo $(LIBOPCODES_VERSION) | cut -f3 -d.)
- LIBOPCODES_GE_2_29 := $(shell [ $(LIBOPCODES_MAJOR) -gt 2 -o \(
$(LIBOPCODES_MAJOR) -eq 2 -a $(LIBOPCODES_MINOR) -ge 29 \) -o \(
$(LIBOPCODES_MAJOR) -eq 2 -a $(LIBOPCODES_MINOR) -eq 28 -a $(LIBOPCODES_POINT)
-ge 1 \) ] && echo true)
-+ LIBBFD_GE_2_39 := $(shell [ $(LIBOPCODES_MAJOR) -gt 2 -o \(
$(LIBOPCODES_MAJOR) -eq 2 -a $(LIBOPCODES_MINOR) -ge 29 \) -o \(
$(LIBOPCODES_MAJOR) -eq 2 -a $(LIBOPCODES_MINOR) -eq 39 -a $(LIBOPCODES_POINT)
-ge 1 \) ] && echo true)
- ifeq ($(LIBOPCODES_GE_2_29),true)
- CFLAGS += -DUSE_LIBOPCODES_GE_2_29
- endif
-+ ifeq ($(LIBBFD_GE_2_39),true)
-+ CFLAGS += -DUSE_LIBBFD_GE_2_39
-+ endif
- endif
-
- ifeq ($(OPENCV), 1)
-diff --git a/src/debugger/dbg_memory.c b/src/debugger/dbg_memory.c
-index e98bf081..32c2af27 100644
---- a/src/debugger/dbg_memory.c
-+++ b/src/debugger/dbg_memory.c
-@@ -97,9 +97,23 @@ static int read_memory_func(bfd_vma memaddr, bfd_byte
*myaddr, unsigned int leng
- return (0);
- }
-
-+#ifdef USE_LIBBFD_GE_2_39
-+static int fprintf_styled_nop(void *out __attribute__((unused)),
-+ enum disassembler_style s
__attribute__((unused)),
-+ const char *fmt __attribute__((unused)),
-+ ...)
-+{
-+ return 0;
-+}
-+#endif
-+
- void init_host_disassembler(void)
- {
-+#ifdef USE_LIBBFD_GE_2_39
-+ INIT_DISASSEMBLE_INFO(dis_info, stderr, process_opcode_out,
fprintf_styled_nop);
-+#else
- INIT_DISASSEMBLE_INFO(dis_info, stderr, process_opcode_out);
-+#endif
- dis_info.fprintf_func = (fprintf_ftype) process_opcode_out;
- dis_info.stream = stderr;
- dis_info.bytes_per_line=1;
diff --git
a/games-emulation/mupen64plus-core/files/mupen64plus-core-2.5.9-fix-gcc10-fno-common.patch
b/games-emulation/mupen64plus-core/files/mupen64plus-core-2.5.9-fix-gcc10-fno-common.patch
deleted file mode 100644
index cfc7d5a9fb49..000000000000
---
a/games-emulation/mupen64plus-core/files/mupen64plus-core-2.5.9-fix-gcc10-fno-common.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/device/r4300/idec.h
-+++ b/src/device/r4300/idec.h
-@@ -82,6 +82,6 @@
-
- #define IDEC_U53(r4300, iw, u53, u5) (void*)(((char*)(r4300)) +
idec_u53((iw), (u53), (u5)))
-
--const char* g_r4300_opcodes[R4300_OPCODES_COUNT];
-+extern const char* g_r4300_opcodes[R4300_OPCODES_COUNT];
-
- #endif
---- a/src/main/workqueue.h
-+++ b/src/main/workqueue.h
-@@ -27,7 +27,6 @@
-
- struct work_struct;
-
--struct work_struct *work;
- typedef void (*work_func_t)(struct work_struct *work);
- struct work_struct {
- work_func_t func;
diff --git
a/games-emulation/mupen64plus-core/files/mupen64plus-core-2.5.9-pitch.patch
b/games-emulation/mupen64plus-core/files/mupen64plus-core-2.5.9-pitch.patch
deleted file mode 100644
index 449e4252dae2..000000000000
--- a/games-emulation/mupen64plus-core/files/mupen64plus-core-2.5.9-pitch.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 8fac78d8cb54da960ca85a49547dcc4fb952457d Mon Sep 17 00:00:00 2001
-From: VarNepvius <[email protected]>
-Date: Tue, 6 Sep 2022 20:31:03 +0200
-Subject: [PATCH] Fix wrong pitch argument in call to SDL_CreateRGBSurfaceFrom.
-
----
- src/api/vidext_sdl2_compat.h | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/api/vidext_sdl2_compat.h b/src/api/vidext_sdl2_compat.h
-index 06d778dd9..071a64402 100644
---- a/src/api/vidext_sdl2_compat.h
-+++ b/src/api/vidext_sdl2_compat.h
-@@ -474,8 +474,14 @@ SDL_SetVideoMode(int width, int height, int bpp, Uint32
flags)
- if (SDL_GL_MakeCurrent(SDL_VideoWindow, SDL_VideoContext) < 0) {
- return NULL;
- }
-+
-+ /* Pitch: size of of line in bytes */
-+ /* Add 7 to bpp before division, to ensure correct rounding towards
infinity
-+ * in cases where bits per pixel do not cleanly divide by 8 (such as
15)
-+ */
-+ int pitch = (bpp + 7) / 8 * width;
- SDL_VideoSurface =
-- SDL_CreateRGBSurfaceFrom(NULL, width, height, bpp, 0, 0, 0, 0, 0);
-+ SDL_CreateRGBSurfaceFrom(NULL, width, height, bpp, pitch, 0, 0,
0, 0);
- if (!SDL_VideoSurface) {
- return NULL;
- }
diff --git a/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r4.ebuild
b/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r4.ebuild
deleted file mode 100644
index c9879d3b220f..000000000000
--- a/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r4.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-MY_P=${PN}-src-${PV}
-DESCRIPTION="A fork of Mupen64 Nintendo 64 emulator, core library"
-HOMEPAGE="https://www.mupen64plus.org/";
-SRC_URI="
-
https://github.com/mupen64plus/${PN}/releases/download/${PV}/${MY_P}.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2+"
-SLOT="0/2-sdl2"
-KEYWORDS="~amd64 ~x86"
-IUSE="debugger gles2-only lirc new-dynarec opencv +osd cpu_flags_x86_sse"
-REQUIRED_USE="gles2-only? ( !osd )"
-
-DEPEND="
- media-libs/libpng:=
- media-libs/libsdl2[joystick,opengl,video]
- sys-libs/zlib[minizip]
- gles2-only? ( media-libs/libsdl2[gles2] )
- lirc? ( app-misc/lirc )
- opencv? ( media-libs/opencv:= )
- osd? (
- media-fonts/dejavu
- media-libs/freetype:2
- virtual/opengl
- virtual/glu
- )
-"
-RDEPEND="
- ${DEPEND}
-"
-BDEPEND="
- cpu_flags_x86_sse? ( dev-lang/nasm )
- virtual/pkgconfig
-"
-
-PATCHES=(
- # https://github.com/mupen64plus/mupen64plus-core/pull/1015
- "${FILESDIR}"/${P}-debugger-fix-binutils-2.39-compat.patch
- "${FILESDIR}"/${P}-fix-gcc10-fno-common.patch
- "${FILESDIR}"/${P}-pitch.patch
-)
-
-src_prepare() {
- default
-
- # avoid implicitly appending CPU flags
- sed -i -e 's:-mmmx::g' -e 's:-msse::g' projects/unix/Makefile || die
- # fix building against opencv-4
- sed -i -e '/PKG_CONFIG/s:opencv:&4:' projects/unix/Makefile || die
-}
-
-src_compile() {
- MAKEARGS=(
- # Note: please keep this in sync in all of mupen64plus-*
packages
-
- -C projects/unix
-
- # this basically means: GNU userspace
- UNAME=Linux
-
- # verbose output
- V=1
-
- CROSS_COMPILE="${CHOST}-"
- CC="$(tc-getCC)"
- CXX="$(tc-getCXX)"
- PKG_CONFIG="$(tc-getPKG_CONFIG)"
- # usual CFLAGS, CXXFLAGS and LDFLAGS are respected
- # so we can leave OPTFLAGS empty
- OPTFLAGS=
-
- # paths, some of them are used at compile time
- PREFIX=/usr
- LIBDIR=/usr/$(get_libdir)
-
- # disable unwanted magic
- LDCONFIG=:
- INSTALL_STRIP_FLAG=
-
- # Package-specific stuff
-
- # CROSS_COMPILE causes it to look for ${CHOST}-sdl2-config...
- SDL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags sdl2)"
- SDL_LDLIBS="$($(tc-getPKG_CONFIG) --libs sdl2)"
-
- OSD=$(usex osd 1 0)
- NO_ASM=$(usex cpu_flags_x86_sse 0 1)
- LIRC=$(usex lirc 1 0)
- OPENCV=$(usex opencv 1 0)
- DEBUGGER=$(usex debugger 1 0)
- NEW_DYNAREC=$(usex new-dynarec 1 0)
- USE_GLES=$(usex gles2-only 1 0)
- )
-
- use amd64 && MAKEARGS+=( HOST_CPU=x86_64 )
- use x86 && MAKEARGS+=( HOST_CPU=i386 )
-
- emake "${MAKEARGS[@]}" all
-}
-
-src_install() {
- emake "${MAKEARGS[@]}" DESTDIR="${D}" install
- dodoc -r CREDITS README RELEASE
doc/{emuwiki-api-doc,new_dynarec.mediawiki}
-
- # replace bundled font with a symlink
- # TODO: fix the code to not rely on it
- rm "${ED}/usr/share/mupen64plus/font.ttf" || die
- if use osd; then
- dosym ../fonts/dejavu/DejaVuSans.ttf
/usr/share/mupen64plus/font.ttf
- fi
-}
