commit: ce2e3812cc5855aa85df4c16bc5cd6b4562f10c3
Author: Andrew Udvare gmail com>
AuthorDate: Mon Jul 17 18:41:57 2023 +
Commit: Michał Górny gentoo org>
CommitDate: Tue Jul 18 06:02:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce2e3812
games-emulation/mupen64plus-core: fix USE=debugger with >=binutils-2.39
Signed-off-by: Andrew Udvare gmail.com>
Closes: https://bugs.gentoo.org/904162
Closes: https://github.com/gentoo/gentoo/pull/31933
Signed-off-by: Michał Górny gentoo.org>
...e-2.5.9-debugger-fix-binutils-2.39-compat.patch | 53 ++
...-r3.ebuild => mupen64plus-core-2.5.9-r4.ebuild} | 4 +-
2 files changed, 56 insertions(+), 1 deletion(-)
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
new file mode 100644
index ..b87a259ff809
--- /dev/null
+++
b/games-emulation/mupen64plus-core/files/mupen64plus-core-2.5.9-debugger-fix-binutils-2.39-compat.patch
@@ -0,0 +1,53 @@
+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/mupen64plus-core-2.5.9-r3.ebuild
b/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r4.ebuild
similarity index 94%
rename from games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r3.ebuild
rename to games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r4.ebuild
index 38e80fb81924..c9879d3b220f 100644
--- a/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r3.ebuild
+++ b/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -42,6 +42,8 @@ BDEPEND="
"
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
)
