Accepting request 1311713 from Emulators

- Boost.System is headers only since 1.69 (stub library removed in 1.89) (forwarded request 1310917 from adkorte) OBS-URL: https://build.opensuse.org/request/show/1311713 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mupen64plus?expand=0&rev=6
- Boost.System is headers only since 1.69 (stub library removed in 1.89)
2025-10-16 15:39:34 +00:00 · 2025-10-16 13:30:22 +00:00 · 2025-09-02 15:59:11 +00:00 · 2025-09-02 07:11:29 +00:00 · 2025-03-04 17:32:37 +00:00 · 2025-03-03 22:47:01 +00:00
10 changed files with 147 additions and 416 deletions
--- a/don-t-put-globals-in-include-files.patch
+++ b/don-t-put-globals-in-include-files.patch
@@ -1,37 +0,0 @@
-From bd3e16223de6ff41b5b8855da5b09400ac36220b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
-Date: Mon, 30 Nov 2020 10:55:52 +0100
-Subject: [PATCH] don't put globals in include files
-
---
- source/mupen64plus-core/src/device/r4300/idec.h | 2 +-
- source/mupen64plus-core/src/main/workqueue.h    | 1 -
- 2 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/source/mupen64plus-core/src/device/r4300/idec.h b/source/mupen64plus-core/src/device/r4300/idec.h
-index 60a6b0066b9b..ddbded5e2350 100644
--- a/source/mupen64plus-core/src/device/r4300/idec.h
-+++ b/source/mupen64plus-core/src/device/r4300/idec.h
-@@ -82,6 +82,6 @@ size_t idec_u53(uint32_t iw, uint8_t u53, uint8_t* u5);
- 
- #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
-diff --git a/source/mupen64plus-core/src/main/workqueue.h b/source/mupen64plus-core/src/main/workqueue.h
-index d5093a5338c3..2af257a452d6 100644
--- a/source/mupen64plus-core/src/main/workqueue.h
-+++ b/source/mupen64plus-core/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;
-- 
-2.26.0
-
--- a/mupen64plus-CVE-2025-9688.patch
+++ b/mupen64plus-CVE-2025-9688.patch
@@ -0,0 +1,32 @@
+From 3984137fc0c44110f1ef876adb008885b05a6e18 Mon Sep 17 00:00:00 2001
+From: Giles <Giles_Anderson@outlook.com>
+Date: Sun, 9 Mar 2025 19:43:55 +0800
+Subject: [PATCH] fix integer overflow in write_is_viewer
+
+---
+ src/device/cart/is_viewer.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/source/mupen64plus-core/src/device/cart/is_viewer.c b/source/mupen64plus-core/src/device/cart/is_viewer.c
+index d3522401d..c8f442e65 100644
+--- a/source/mupen64plus-core/src/device/cart/is_viewer.c
+++ b/source/mupen64plus-core/src/device/cart/is_viewer.c
+@@ -55,13 +55,15 @@ void write_is_viewer(void* opaque, uint32_t address, uint32_t value, uint32_t ma
+     {
+         if (word > 0)
+         {
+-            /* make sure we don't overflow the buffer */
+-            if (is_viewer->buffer_pos + word > IS_BUFFER_SIZE)
+            /* make sure we don't overflow the integer or the buffer  */
+            if (is_viewer->buffer_pos > IS_BUFFER_SIZE 
+                || word > IS_BUFFER_SIZE
+                || is_viewer->buffer_pos + word > IS_BUFFER_SIZE )
+             {
+                 /* reset buffer */
+                 memset(is_viewer->output_buffer, 0, IS_BUFFER_SIZE);
+                 is_viewer->buffer_pos = 0;
+-                DebugMessage(M64MSG_WARNING, "IS64: prevented buffer overflow, cleared buffer");
+                DebugMessage(M64MSG_WARNING, "IS64: prevented integer overflow, cleared buffer");
+                 return;
+             }
+ 
--- a/mupen64plus-binutils-2_29.patch
+++ b/mupen64plus-binutils-2_29.patch
@@ -1,19 +1,23 @@
-diff -Nru mupen64plus-bundle-src-2.5.9.orig/source/mupen64plus-core/projects/unix/Makefile mupen64plus-bundle-src-2.5.9/source/mupen64plus-core/projects/unix/Makefile
--- mupen64plus-bundle-src-2.5.9.orig/source/mupen64plus-core/projects/unix/Makefile	2019-02-10 19:25:29.000000000 +0100
-+++ mupen64plus-bundle-src-2.5.9/source/mupen64plus-core/projects/unix/Makefile	2019-04-10 08:40:29.508072103 +0200
-@@ -653,15 +653,7 @@
+diff -Nru a/source/mupen64plus-core/projects/unix/Makefile b/source/mupen64plus-core/projects/unix/Makefile
+--- a/source/mupen64plus-core/projects/unix/Makefile	2019-02-10 19:25:29.000000000 +0100
+++ b/source/mupen64plus-core/projects/unix/Makefile	2019-04-10 08:40:29.508072103 +0200
+@@ -732,19 +732,7 @@ 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)
+-  LIBOPCODES_POINT := $(shell echo $(LIBOPCODES_VERSION) | cut -f3 -d. | sed 's/^$$/0/')
+-  LIBOPCODES_GE_2_29 := $(shell [ $(LIBOPCODES_MAJOR) -gt 2 -o \( $(LIBOPCODES_MAJOR) -eq 2 -a $(LIBOPCODES_MINOR) -ge 28 \) -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 39 \) -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
 +  CFLAGS += -DUSE_LIBOPCODES_GE_2_29
 endif
 
--- a/mupen64plus-bundle-src-2.5.9.tar.gz
+++ b/mupen64plus-bundle-src-2.5.9.tar.gz
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d5243ddc00388ee2e538b3826a78a719dec2bd5da54ac6f3344fed861fb141a8
-size 2869710
--- a/mupen64plus-bundle-src-2.6.0.tar.gz
+++ b/mupen64plus-bundle-src-2.6.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:297e17180cd76a7b8ea809d1a1be2c98ed5c7352dc716965a80deb598b21e131
+size 3019059
--- a/mupen64plus-fix-cflags.patch
+++ b/mupen64plus-fix-cflags.patch
@@ -1,63 +1,50 @@
-diff -Nru mupen64plus-bundle-src-2.5.9.orig/source/mupen64plus-audio-sdl/projects/unix/Makefile mupen64plus-bundle-src-2.5.9/source/mupen64plus-audio-sdl/projects/unix/Makefile
--- mupen64plus-bundle-src-2.5.9.orig/source/mupen64plus-audio-sdl/projects/unix/Makefile	2019-02-10 19:25:31.000000000 +0100
-+++ mupen64plus-bundle-src-2.5.9/source/mupen64plus-audio-sdl/projects/unix/Makefile	2019-04-10 08:17:50.787318336 +0200
-@@ -96,7 +96,7 @@
+diff -Nru a/source/mupen64plus-audio-sdl/projects/unix/Makefile b/source/mupen64plus-audio-sdl/projects/unix/Makefile
+--- a/source/mupen64plus-audio-sdl/projects/unix/Makefile	2019-02-10 19:25:31.000000000 +0100
+++ b/source/mupen64plus-audio-sdl/projects/unix/Makefile	2019-04-10 08:17:50.787318336 +0200
+@@ -99,7 +99,7 @@ OBJDIR = _obj$(POSTFIX)
 # base CFLAGS, LDLIBS, and LDFLAGS
 OPTFLAGS ?= -O3 -flto
 WARNFLAGS ?= -Wall
-CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -ffast-math -fno-strict-aliasing -fvisibility=hidden -I../../src
-+CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -fno-strict-aliasing -fvisibility=hidden -I../../src
+-CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -ffast-math -fno-strict-aliasing -fvisibility=hidden -I$(SRCDIR)
+CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -fno-strict-aliasing -fvisibility=hidden -I$(SRCDIR)
 LDFLAGS += $(SHARED)
 
 # Since we are building a shared library, we must compile with -fPIC on some architectures
-diff -Nru mupen64plus-bundle-src-2.5.9.orig/source/mupen64plus-core/projects/unix/Makefile mupen64plus-bundle-src-2.5.9/source/mupen64plus-core/projects/unix/Makefile
--- mupen64plus-bundle-src-2.5.9.orig/source/mupen64plus-core/projects/unix/Makefile	2019-02-10 19:25:29.000000000 +0100
-+++ mupen64plus-bundle-src-2.5.9/source/mupen64plus-core/projects/unix/Makefile	2019-04-10 08:18:03.379436469 +0200
-@@ -136,7 +136,7 @@
+diff -Nru a/source/mupen64plus-input-sdl/projects/unix/Makefile b/source/mupen64plus-input-sdl/projects/unix/Makefile
+--- a/source/mupen64plus-input-sdl/projects/unix/Makefile	2019-02-10 19:25:31.000000000 +0100
+++ b/source/mupen64plus-input-sdl/projects/unix/Makefile	2019-04-10 08:18:17.007564319 +0200
+@@ -96,7 +96,7 @@ OBJDIR = _obj$(POSTFIX)
 # base CFLAGS, LDLIBS, and LDFLAGS
 OPTFLAGS ?= -O3 -flto
 WARNFLAGS ?= -Wall
-CFLAGS += -ffast-math -fno-strict-aliasing -fvisibility=hidden -I../../src -I../../src/asm_defines -DM64P_PARALLEL
-+CFLAGS += -fno-strict-aliasing -fvisibility=hidden -I../../src -I../../src/asm_defines -DM64P_PARALLEL
- CXXFLAGS += -fvisibility-inlines-hidden
- LDLIBS +=  -lm
- 
-diff -Nru mupen64plus-bundle-src-2.5.9.orig/source/mupen64plus-input-sdl/projects/unix/Makefile mupen64plus-bundle-src-2.5.9/source/mupen64plus-input-sdl/projects/unix/Makefile
--- mupen64plus-bundle-src-2.5.9.orig/source/mupen64plus-input-sdl/projects/unix/Makefile	2019-02-10 19:25:31.000000000 +0100
-+++ mupen64plus-bundle-src-2.5.9/source/mupen64plus-input-sdl/projects/unix/Makefile	2019-04-10 08:18:17.007564319 +0200
-@@ -93,7 +93,7 @@
- # base CFLAGS, LDLIBS, and LDFLAGS
- OPTFLAGS ?= -O3 -flto
- WARNFLAGS ?= -Wall
-CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -ffast-math -fno-strict-aliasing -fvisibility=hidden -I../../src -D_GNU_SOURCE=1
-+CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -fno-strict-aliasing -fvisibility=hidden -I../../src -D_GNU_SOURCE=1
+-CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -ffast-math -fno-strict-aliasing -fvisibility=hidden -I$(SRCDIR) -D_GNU_SOURCE=1
+CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -fno-strict-aliasing -fvisibility=hidden -I$(SRCDIR) -D_GNU_SOURCE=1
 LDFLAGS += $(SHARED)
 LDLIBS += -lm
- 
-diff -Nru mupen64plus-bundle-src-2.5.9.orig/source/mupen64plus-rsp-hle/projects/unix/Makefile mupen64plus-bundle-src-2.5.9/source/mupen64plus-rsp-hle/projects/unix/Makefile
--- mupen64plus-bundle-src-2.5.9.orig/source/mupen64plus-rsp-hle/projects/unix/Makefile	2019-02-10 19:25:32.000000000 +0100
-+++ mupen64plus-bundle-src-2.5.9/source/mupen64plus-rsp-hle/projects/unix/Makefile	2019-04-10 08:18:35.683739529 +0200
-@@ -130,7 +130,7 @@
+
+diff -Nru a/source/mupen64plus-rsp-hle/projects/unix/Makefile b/source/mupen64plus-rsp-hle/projects/unix/Makefile
+--- a/source/mupen64plus-rsp-hle/projects/unix/Makefile	2019-02-10 19:25:32.000000000 +0100
+++ b/source/mupen64plus-rsp-hle/projects/unix/Makefile	2019-04-10 08:18:35.683739529 +0200
+@@ -147,7 +147,7 @@ OBJDIR = _obj$(POSTFIX)
 # base CFLAGS, LDLIBS, and LDFLAGS
 OPTFLAGS ?= -O3 -flto
 WARNFLAGS ?= -Wall
-CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -ffast-math -fno-strict-aliasing -fvisibility=hidden -I../../src
-+CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -fno-strict-aliasing -fvisibility=hidden -I../../src
+-CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -ffast-math -fno-strict-aliasing -fvisibility=hidden -I$(SRCDIR)
+CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -fno-strict-aliasing -fvisibility=hidden -I$(SRCDIR)
 LDFLAGS += $(SHARED)
 
 # Since we are building a shared library, we must compile with -fPIC on some architectures
-diff -Nru mupen64plus-bundle-src-2.5.9.orig/source/mupen64plus-video-glide64mk2/projects/unix/Makefile mupen64plus-bundle-src-2.5.9/source/mupen64plus-video-glide64mk2/projects/unix/Makefile
--- mupen64plus-bundle-src-2.5.9.orig/source/mupen64plus-video-glide64mk2/projects/unix/Makefile	2019-02-10 19:25:35.000000000 +0100
-+++ mupen64plus-bundle-src-2.5.9/source/mupen64plus-video-glide64mk2/projects/unix/Makefile	2019-04-10 08:19:37.404318580 +0200
-@@ -134,15 +134,11 @@
+diff -Nru a/source/mupen64plus-video-glide64mk2/projects/unix/Makefile b/source/mupen64plus-video-glide64mk2/projects/unix/Makefile
+--- a/source/mupen64plus-video-glide64mk2/projects/unix/Makefile	2019-02-10 19:25:35.000000000 +0100
+++ b/source/mupen64plus-video-glide64mk2/projects/unix/Makefile	2019-04-10 08:19:37.404318580 +0200
+@@ -151,14 +151,10 @@ OBJDIR = _obj$(POSTFIX)
 # base CFLAGS, LDLIBS, and LDFLAGS
 OPTFLAGS ?= -O3 -flto
 WARNFLAGS ?= -Wall -Wno-unused-function
-CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -ffast-math -fno-strict-aliasing -fvisibility=hidden -I../../src -I../../src/Glitch64/inc -DGCC
-+CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -fno-strict-aliasing -fvisibility=hidden -I../../src -I../../src/Glitch64/inc -DGCC
- CXXFLAGS += -fvisibility-inlines-hidden -std=gnu++0x
+-CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -ffast-math -fno-strict-aliasing -fvisibility=hidden -I$(SRCDIR) -I$(SRCDIR)/Glitch64/inc -DGCC
+CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -fno-strict-aliasing -fvisibility=hidden -I$(SRCDIR) -I$(SRCDIR)/Glitch64/inc -DGCC
+ CXXFLAGS += -fvisibility-inlines-hidden -std=gnu++17
 LDFLAGS += $(SHARED)
- BOOST_SUFFIX ?=
 
 -ifeq ($(CPU), X86)
 -  CFLAGS +=  -mmmx -msse
@@ -66,15 +53,15 @@ diff -Nru mupen64plus-bundle-src-2.5.9.orig/source/mupen64plus-video-glide64mk2/
 # Since we are building a shared library, we must compile with -fPIC on some architectures
 # On 32-bit x86 systems we do not want to use -fPIC because we don't have to and it has a big performance penalty on this arch
 ifeq ($(PIC), 1)
-diff -Nru mupen64plus-bundle-src-2.5.9.orig/source/mupen64plus-video-rice/projects/unix/Makefile mupen64plus-bundle-src-2.5.9/source/mupen64plus-video-rice/projects/unix/Makefile
--- mupen64plus-bundle-src-2.5.9.orig/source/mupen64plus-video-rice/projects/unix/Makefile	2019-02-10 19:25:33.000000000 +0100
-+++ mupen64plus-bundle-src-2.5.9/source/mupen64plus-video-rice/projects/unix/Makefile	2019-04-10 08:19:01.863985145 +0200
-@@ -120,14 +120,10 @@
+diff -Nru a/source/mupen64plus-video-rice/projects/unix/Makefile b/source/mupen64plus-video-rice/projects/unix/Makefile
+--- a/source/mupen64plus-video-rice/projects/unix/Makefile	2019-02-10 19:25:33.000000000 +0100
+++ b/source/mupen64plus-video-rice/projects/unix/Makefile	2019-04-10 08:19:01.863985145 +0200
+@@ -144,14 +144,10 @@ OBJDIR = _obj$(POSTFIX)
 # base CFLAGS, LDLIBS, and LDFLAGS
 OPTFLAGS ?= -O3 -flto
 WARNFLAGS ?= -Wall
-CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -ffast-math -fno-strict-aliasing -fvisibility=hidden -I../../src
-+CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -fno-strict-aliasing -fvisibility=hidden -I../../src
+-CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -ffast-math -fno-strict-aliasing -fvisibility=hidden -I$(SRCDIR)
+CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -fno-strict-aliasing -fvisibility=hidden -I$(SRCDIR)
 CXXFLAGS += -fvisibility-inlines-hidden
 LDFLAGS += $(SHARED)
 
--- a/mupen64plus-libboost-1.85.patch
+++ b/mupen64plus-libboost-1.85.patch
@@ -1,240 +0,0 @@
-diff -Pdpru mupen64plus-bundle-src-2.5.9.orig/source/mupen64plus-video-glide64mk2/src/GlideHQ/TxCache.cpp mupen64plus-bundle-src-2.5.9/source/mupen64plus-video-glide64mk2/src/GlideHQ/TxCache.cpp
--- mupen64plus-bundle-src-2.5.9.orig/source/mupen64plus-video-glide64mk2/src/GlideHQ/TxCache.cpp	2019-02-10 21:25:35.000000000 +0300
-+++ mupen64plus-bundle-src-2.5.9/source/mupen64plus-video-glide64mk2/src/GlideHQ/TxCache.cpp	2024-06-06 19:45:49.991946187 +0300
-@@ -237,7 +237,7 @@ TxCache::save(const wchar_t *path, const
-     /* dump cache to disk */
-     char cbuf[MAX_PATH];
- 
-    boost::filesystem::wpath cachepath(path);
-+    boost::filesystem::path cachepath(path);
-     boost::filesystem::create_directory(cachepath);
- 
-     /* Ugly hack to enable fopen/gzopen in Win9x */
-@@ -330,7 +330,7 @@ TxCache::load(const wchar_t *path, const
-   /* find it on disk */
-   char cbuf[MAX_PATH];
- 
-  boost::filesystem::wpath cachepath(path);
-+  boost::filesystem::path cachepath(path);
- 
- #ifdef BOOST_WINDOWS_API
-   wchar_t curpath[MAX_PATH];
-diff -Pdpru mupen64plus-bundle-src-2.5.9.orig/source/mupen64plus-video-glide64mk2/src/GlideHQ/TxHiResCache.cpp mupen64plus-bundle-src-2.5.9/source/mupen64plus-video-glide64mk2/src/GlideHQ/TxHiResCache.cpp
--- mupen64plus-bundle-src-2.5.9.orig/source/mupen64plus-video-glide64mk2/src/GlideHQ/TxHiResCache.cpp	2019-02-10 21:25:35.000000000 +0300
-+++ mupen64plus-bundle-src-2.5.9/source/mupen64plus-video-glide64mk2/src/GlideHQ/TxHiResCache.cpp	2024-06-06 19:45:51.258610300 +0300
-@@ -65,8 +65,8 @@ TxHiResCache::~TxHiResCache()
-   if ((_options & DUMP_HIRESTEXCACHE) && !_haveCache && !_abortLoad) {
-     /* dump cache to disk */
-     std::wstring filename = _ident + L"_HIRESTEXTURES.dat";
-    boost::filesystem::wpath cachepath(_cachepath);
-    cachepath /= boost::filesystem::wpath(L"glidehq");
-+    boost::filesystem::path cachepath(_cachepath);
-+    cachepath /= boost::filesystem::path(L"glidehq");
-     int config = _options & (HIRESTEXTURES_MASK|COMPRESS_HIRESTEX|COMPRESSION_MASK|TILE_HIRESTEX|FORCE16BPP_HIRESTEX|GZ_HIRESTEXCACHE|LET_TEXARTISTS_FLY);
- 
-     TxCache::save(cachepath.wstring().c_str(), filename.c_str(), config);
-@@ -107,8 +107,8 @@ TxHiResCache::TxHiResCache(int maxwidth,
-   if (_options & DUMP_HIRESTEXCACHE) {
-     /* find it on disk */
-     std::wstring filename = _ident + L"_HIRESTEXTURES.dat";
-    boost::filesystem::wpath cachepath(_cachepath);
-    cachepath /= boost::filesystem::wpath(L"glidehq");
-+    boost::filesystem::path cachepath(_cachepath);
-+    cachepath /= boost::filesystem::path(L"glidehq");
-     int config = _options & (HIRESTEXTURES_MASK|COMPRESS_HIRESTEX|COMPRESSION_MASK|TILE_HIRESTEX|FORCE16BPP_HIRESTEX|GZ_HIRESTEXCACHE|LET_TEXARTISTS_FLY);
- 
-     _haveCache = TxCache::load(cachepath.wstring().c_str(), filename.c_str(), config);
-@@ -132,7 +132,7 @@ TxHiResCache::load(boolean replace) /* 0
- 
-     if (!replace) TxCache::clear();
- 
-    boost::filesystem::wpath dir_path(_datapath);
-+    boost::filesystem::path dir_path(_datapath);
- 
-     switch (_options & HIRESTEXTURES_MASK) {
-     case GHQ_HIRESTEXTURES:
-@@ -149,8 +149,8 @@ TxHiResCache::load(boolean replace) /* 0
-       INFO(80, L"  usage of only 2) and 3) highly recommended!\n");
-       INFO(80, L"  folder names must be in US-ASCII characters!\n");
- 
-      dir_path /= boost::filesystem::wpath(L"hires_texture");
-      dir_path /= boost::filesystem::wpath(_ident);
-+      dir_path /= boost::filesystem::path(L"hires_texture");
-+      dir_path /= boost::filesystem::path(_ident);
-       loadHiResTextures(dir_path, replace);
-       break;
-     case JABO_HIRESTEXTURES:
-@@ -164,7 +164,7 @@ TxHiResCache::load(boolean replace) /* 0
- }
- 
- boolean
-TxHiResCache::loadHiResTextures(boost::filesystem::wpath dir_path, boolean replace)
-+TxHiResCache::loadHiResTextures(boost::filesystem::path dir_path, boolean replace)
- {
-   uint32_t last, now, diff;
-   DBG_INFO(80, L"-----\n");
-@@ -224,7 +224,7 @@ TxHiResCache::loadHiResTextures(boost::f
-     }
- 
-     DBG_INFO(80, L"-----\n");
-    DBG_INFO(80, L"file: %ls\n", it->path().leaf().c_str());
-+    DBG_INFO(80, L"file: %ls\n", it->path().filename().c_str());
- 
-     int width = 0, height = 0;
-     uint16 format = 0;
-@@ -257,8 +257,8 @@ TxHiResCache::loadHiResTextures(boost::f
-     /* read in Rice's file naming convention */
- #define CRCFMTSIZ_LEN 13
- #define PALCRC_LEN 9
-    //wcstombs(fname, it->path().leaf().c_str(), MAX_PATH);
-    strncpy(fname, it->path().leaf().string().c_str(), sizeof(fname));
-+    //wcstombs(fname, it->path().filename().c_str(), MAX_PATH);
-+    strncpy(fname, it->path().filename().string().c_str(), sizeof(fname));
-     fname[sizeof(fname) - 1] = '\0';
-     /* XXX case sensitivity fiasco!
-      * files must use _a, _rgb, _all, _allciByRGBA, _ciByRGBA, _ci
-@@ -276,7 +276,7 @@ TxHiResCache::loadHiResTextures(boost::f
- #if !DEBUG
-       INFO(80, L"-----\n");
-       INFO(80, L"path: %ls\n", dir_path.string().c_str());
-      INFO(80, L"file: %ls\n", it->path().leaf().c_str());
-+      INFO(80, L"file: %ls\n", it->path().filename().c_str());
- #endif
-       INFO(80, L"Error: not png or bmp or dds!\n");
-       continue;
-@@ -295,7 +295,7 @@ TxHiResCache::loadHiResTextures(boost::f
- #if !DEBUG
-       INFO(80, L"-----\n");
-       INFO(80, L"path: %ls\n", dir_path.string().c_str());
-      INFO(80, L"file: %ls\n", it->path().leaf().c_str());
-+      INFO(80, L"file: %ls\n", it->path().filename().c_str());
- #endif
-       INFO(80, L"Error: not Rice texture naming convention!\n");
-       continue;
-@@ -304,7 +304,7 @@ TxHiResCache::loadHiResTextures(boost::f
- #if !DEBUG
-       INFO(80, L"-----\n");
-       INFO(80, L"path: %ls\n", dir_path.string().c_str());
-      INFO(80, L"file: %ls\n", it->path().leaf().c_str());
-+      INFO(80, L"file: %ls\n", it->path().filename().c_str());
- #endif
-       INFO(80, L"Error: crc32 = 0!\n");
-       continue;
-@@ -319,7 +319,7 @@ TxHiResCache::loadHiResTextures(boost::f
- #if !DEBUG
-         INFO(80, L"-----\n");
-         INFO(80, L"path: %ls\n", dir_path.string().c_str());
-        INFO(80, L"file: %ls\n", it->path().leaf().c_str());
-+        INFO(80, L"file: %ls\n", it->path().filename().c_str());
- #endif
-         INFO(80, L"Error: already cached! duplicate texture!\n");
-         continue;
-@@ -355,7 +355,7 @@ TxHiResCache::loadHiResTextures(boost::f
- #if !DEBUG
-           INFO(80, L"-----\n");
-           INFO(80, L"path: %ls\n", dir_path.string().c_str());
-          INFO(80, L"file: %ls\n", it->path().leaf().c_str());
-+          INFO(80, L"file: %ls\n", it->path().filename().c_str());
- #endif
-           INFO(80, L"Error: missing _rgb.*! _a.* must be paired with _rgb.*!\n");
-           continue;
-@@ -396,7 +396,7 @@ TxHiResCache::loadHiResTextures(boost::f
- #if !DEBUG
-           INFO(80, L"-----\n");
-           INFO(80, L"path: %ls\n", dir_path.string().c_str());
-          INFO(80, L"file: %ls\n", it->path().leaf().c_str());
-+          INFO(80, L"file: %ls\n", it->path().filename().c_str());
- #endif
-           if (!tex) {
-             INFO(80, L"Error: missing _rgb.*!\n");
-@@ -448,7 +448,7 @@ TxHiResCache::loadHiResTextures(boost::f
- #if !DEBUG
-           INFO(80, L"-----\n");
-           INFO(80, L"path: %ls\n", dir_path.string().c_str());
-          INFO(80, L"file: %ls\n", it->path().leaf().c_str());
-+          INFO(80, L"file: %ls\n", it->path().filename().c_str());
- #endif
-           INFO(80, L"Warning: missing _a.*! only using _rgb.*. treat as opaque texture.\n");
-           int i;
-@@ -495,7 +495,7 @@ TxHiResCache::loadHiResTextures(boost::f
- #if !DEBUG
-           INFO(80, L"-----\n");
-           INFO(80, L"path: %ls\n", dir_path.string().c_str());
-          INFO(80, L"file: %ls\n", it->path().leaf().c_str());
-+          INFO(80, L"file: %ls\n", it->path().filename().c_str());
- #endif
-           INFO(80, L"Error: W:H aspect ratio range not 8:1 - 1:8!\n");
-           continue;
-@@ -507,7 +507,7 @@ TxHiResCache::loadHiResTextures(boost::f
- #if !DEBUG
-           INFO(80, L"-----\n");
-           INFO(80, L"path: %ls\n", dir_path.string().c_str());
-          INFO(80, L"file: %ls\n", it->path().leaf().c_str());
-+          INFO(80, L"file: %ls\n", it->path().filename().c_str());
- #endif
-           INFO(80, L"Error: not power of 2 size!\n");
-           continue;
-@@ -520,7 +520,7 @@ TxHiResCache::loadHiResTextures(boost::f
- #if !DEBUG
-       INFO(80, L"-----\n");
-       INFO(80, L"path: %ls\n", dir_path.string().c_str());
-      INFO(80, L"file: %ls\n", it->path().leaf().c_str());
-+      INFO(80, L"file: %ls\n", it->path().filename().c_str());
- #endif
-       INFO(80, L"Error: load failed!\n");
-       continue;
-@@ -539,7 +539,7 @@ TxHiResCache::loadHiResTextures(boost::f
- #if !DEBUG
-       INFO(80, L"-----\n");
-       INFO(80, L"path: %ls\n", dir_path.string().c_str());
-      INFO(80, L"file: %ls\n", it->path().leaf().c_str());
-+      INFO(80, L"file: %ls\n", it->path().filename().c_str());
- #endif
-       INFO(80, L"Error: not width * height > 4 or 8bit palette color or 32bpp or dxt1 or dxt3 or dxt5!\n");
-       continue;
-@@ -1017,7 +1017,7 @@ TxHiResCache::loadHiResTextures(boost::f
- #if !DEBUG
-       INFO(80, L"-----\n");
-       INFO(80, L"path: %ls\n", dir_path.string().c_str());
-      INFO(80, L"file: %ls\n", it->path().leaf().c_str());
-+      INFO(80, L"file: %ls\n", it->path().filename().c_str());
- #endif
-       if (tex) {
-         free(tex);
-diff -Pdpru mupen64plus-bundle-src-2.5.9.orig/source/mupen64plus-video-glide64mk2/src/GlideHQ/TxHiResCache.h mupen64plus-bundle-src-2.5.9/source/mupen64plus-video-glide64mk2/src/GlideHQ/TxHiResCache.h
--- mupen64plus-bundle-src-2.5.9.orig/source/mupen64plus-video-glide64mk2/src/GlideHQ/TxHiResCache.h	2019-02-10 21:25:35.000000000 +0300
-+++ mupen64plus-bundle-src-2.5.9/source/mupen64plus-video-glide64mk2/src/GlideHQ/TxHiResCache.h	2024-06-06 19:45:52.361941410 +0300
-@@ -47,7 +47,7 @@ private:
-   TxImage *_txImage;
-   TxQuantize *_txQuantize;
-   TxReSample *_txReSample;
-  boolean loadHiResTextures(boost::filesystem::wpath dir_path, boolean replace);
-+  boolean loadHiResTextures(boost::filesystem::path dir_path, boolean replace);
- public:
-   ~TxHiResCache();
-   TxHiResCache(int maxwidth, int maxheight, int maxbpp, int options,
-diff -Pdpru mupen64plus-bundle-src-2.5.9.orig/source/mupen64plus-video-glide64mk2/src/GlideHQ/TxTexCache.cpp mupen64plus-bundle-src-2.5.9/source/mupen64plus-video-glide64mk2/src/GlideHQ/TxTexCache.cpp
--- mupen64plus-bundle-src-2.5.9.orig/source/mupen64plus-video-glide64mk2/src/GlideHQ/TxTexCache.cpp	2019-02-10 21:25:35.000000000 +0300
-+++ mupen64plus-bundle-src-2.5.9/source/mupen64plus-video-glide64mk2/src/GlideHQ/TxTexCache.cpp	2024-06-06 19:45:53.458605866 +0300
-@@ -37,8 +37,8 @@ TxTexCache::~TxTexCache()
-   if (_options & DUMP_TEXCACHE) {
-     /* dump cache to disk */
-     std::wstring filename = _ident + L"_MEMORYCACHE.dat";
-    boost::filesystem::wpath cachepath(_cachepath);
-    cachepath /= boost::filesystem::wpath(L"glidehq");
-+    boost::filesystem::path cachepath(_cachepath);
-+    cachepath /= boost::filesystem::path(L"glidehq");
-     int config = _options & (FILTER_MASK|ENHANCEMENT_MASK|COMPRESS_TEX|COMPRESSION_MASK|FORCE16BPP_TEX|GZ_TEXCACHE);
- 
-     TxCache::save(cachepath.wstring().c_str(), filename.c_str(), config);
-@@ -58,8 +58,8 @@ TxTexCache::TxTexCache(int options, int
-   if (_options & DUMP_TEXCACHE) {
-     /* find it on disk */
-     std::wstring filename = _ident + L"_MEMORYCACHE.dat";
-    boost::filesystem::wpath cachepath(_cachepath);
-    cachepath /= boost::filesystem::wpath(L"glidehq");
-+    boost::filesystem::path cachepath(_cachepath);
-+    cachepath /= boost::filesystem::path(L"glidehq");
-     int config = _options & (FILTER_MASK|ENHANCEMENT_MASK|COMPRESS_TEX|COMPRESSION_MASK|FORCE16BPP_TEX|GZ_TEXCACHE);
- 
-     TxCache::load(cachepath.wstring().c_str(), filename.c_str(), config);
--- a/mupen64plus-ppc64le-aarch64.patch
+++ b/mupen64plus-ppc64le-aarch64.patch
@@ -1,6 +1,6 @@
-diff -Pdpru mupen64plus-bundle-src-2.5.9.orig/source/mupen64plus-core/projects/unix/Makefile mupen64plus-bundle-src-2.5.9/source/mupen64plus-core/projects/unix/Makefile
--- mupen64plus-bundle-src-2.5.9.orig/source/mupen64plus-core/projects/unix/Makefile	2019-02-10 21:25:29.000000000 +0300
-+++ mupen64plus-bundle-src-2.5.9/source/mupen64plus-core/projects/unix/Makefile	2021-12-09 14:57:39.027842063 +0300
+diff -Pdpru a/source/mupen64plus-core/projects/unix/Makefile b/source/mupen64plus-core/projects/unix/Makefile
+--- a/source/mupen64plus-core/projects/unix/Makefile	2019-02-10 21:25:29.000000000 +0300
+++ b/source/mupen64plus-core/projects/unix/Makefile	2021-12-09 14:57:39.027842063 +0300
@@ -89,6 +89,13 @@ ifneq ("$(filter ppc64 powerpc64,$(HOST_
   NO_ASM := 1
   $(warning Architecture "$(HOST_CPU)" not officially supported.)
@@ -15,28 +15,25 @@ diff -Pdpru mupen64plus-bundle-src-2.5.9.orig/source/mupen64plus-core/projects/u
 ifneq ("$(filter arm%,$(HOST_CPU))","")
   ifeq ("$(filter arm%b,$(HOST_CPU))","")
     CPU := ARM
-@@ -124,10 +131,14 @@ ifneq ("$(filter mips,$(HOST_CPU))","")
+@@ -142,10 +142,14 @@ ifneq ("$(filter mips,$(HOST_CPU))","")
   $(warning Architecture "$(HOST_CPU)" not officially supported.)
 endif
 ifneq ("$(filter aarch64,$(HOST_CPU))","")
 -    CPU := ARM
-    ARCH_DETECTED := 64BITS
-    PIC ?= 1
-    NEW_DYNAREC := 1
-+  CPU := AARCH
-+  ARCH_DETECTED := 64BITS
-+  PIC ?= 1
-+  NEW_DYNAREC := 1
-+  ifeq ($(NEON), 1)
-+    CFLAGS += -mfpu=neon -mfloat-abi=hard
-+  endif
-+  $(warning Architecture "$(HOST_CPU)" not officially supported.)
+    CPU := AARCH
+     ARCH_DETECTED := 64BITS
+     PIC ?= 1
+     NEW_DYNAREC := 1
+   ifeq ($(NEON), 1)
+     CFLAGS += -mfpu=neon -mfloat-abi=hard
+   endif
+   $(warning Architecture "$(HOST_CPU)" not officially supported.)
 endif
- ifeq ("$(CPU)","NONE")
-   $(error CPU type "$(HOST_CPU)" not supported.  Please file bug report at 'https://github.com/mupen64plus/mupen64plus-core/issues')
-diff -Pdpru mupen64plus-bundle-src-2.5.9.orig/source/mupen64plus-rsp-hle/projects/unix/Makefile mupen64plus-bundle-src-2.5.9/source/mupen64plus-rsp-hle/projects/unix/Makefile
--- mupen64plus-bundle-src-2.5.9.orig/source/mupen64plus-rsp-hle/projects/unix/Makefile	2019-02-10 21:25:32.000000000 +0300
-+++ mupen64plus-bundle-src-2.5.9/source/mupen64plus-rsp-hle/projects/unix/Makefile	2021-12-09 14:45:42.243817220 +0300
+ ifneq ("$(filter riscv64,$(HOST_CPU))","")
+     CPU := RISCV64
+diff -Pdpru a/source/mupen64plus-rsp-hle/projects/unix/Makefile b/source/mupen64plus-rsp-hle/projects/unix/Makefile
+--- a/source/mupen64plus-rsp-hle/projects/unix/Makefile	2019-02-10 21:25:32.000000000 +0300
+++ b/source/mupen64plus-rsp-hle/projects/unix/Makefile	2021-12-09 14:45:42.243817220 +0300
@@ -102,6 +102,12 @@ ifneq ("$(filter ppc64 powerpc64,$(HOST_
   PIC ?= 1
   $(warning Architecture "$(HOST_CPU)" not officially supported.')
@@ -50,7 +47,7 @@ diff -Pdpru mupen64plus-bundle-src-2.5.9.orig/source/mupen64plus-rsp-hle/project
 ifneq ("$(filter arm%,$(HOST_CPU))","")
   ifeq ("$(filter arm%b,$(HOST_CPU))","")
     CPU := ARM
-@@ -120,8 +126,7 @@ ifneq ("$(filter aarch64,$(HOST_CPU))","
+@@ -133,8 +133,7 @@ ifneq ("$(filter aarch64,$(HOST_CPU))","")
     CPU := AARCH
     ARCH_DETECTED := 64BITS
     PIC ?= 1
@@ -58,65 +55,27 @@ diff -Pdpru mupen64plus-bundle-src-2.5.9.orig/source/mupen64plus-rsp-hle/project
 -    NO_ASM := 1
 +    $(warning Architecture "$(HOST_CPU)" not officially supported.')
 endif
- ifeq ("$(CPU)","NONE")
-   $(error CPU type "$(HOST_CPU)" not supported.  Please file bug report at 'https://github.com/mupen64plus/mupen64plus-core/issues')
-diff -Pdpru mupen64plus-bundle-src-2.5.9.orig/source/mupen64plus-video-glide64mk2/projects/unix/Makefile mupen64plus-bundle-src-2.5.9/source/mupen64plus-video-glide64mk2/projects/unix/Makefile
--- mupen64plus-bundle-src-2.5.9.orig/source/mupen64plus-video-glide64mk2/projects/unix/Makefile	2019-02-10 21:25:35.000000000 +0300
-+++ mupen64plus-bundle-src-2.5.9/source/mupen64plus-video-glide64mk2/projects/unix/Makefile	2021-12-09 15:02:01.619945865 +0300
-@@ -108,6 +108,13 @@ ifneq ("$(filter ppc64 powerpc64,$(HOST_
-   NO_ASM := 1
-   $(warning Architecture "$(HOST_CPU)" not officially supported.')
- endif
-+ifneq ("$(filter ppc64le,$(HOST_CPU))","")
-+  CPU := PPC
-+  ARCH_DETECTED := 64BITS
-+  PIC ?= 1
-+  NO_ASM := 1
-+  $(warning Architecture "$(HOST_CPU)" not officially supported.)
-+endif
- ifneq ("$(filter arm%,$(HOST_CPU))","")
-   ifeq ("$(filter arm%b,$(HOST_CPU))","")
-     CPU := ARM
-@@ -119,14 +126,12 @@ ifneq ("$(filter arm%,$(HOST_CPU))","")
-   endif
- endif
- ifneq ("$(filter aarch64,$(HOST_CPU))","")
-    CPU := AARCH
-    ARCH_DETECTED := 64BITS
-    PIC ?= 1
+ ifneq ("$(filter riscv64,$(HOST_CPU))","")
+     CPU := RISCV64
+diff -Pdpru a/source/mupen64plus-video-glide64mk2/projects/unix/Makefile b/source/mupen64plus-video-glide64mk2/projects/unix/Makefile
+--- a/source/mupen64plus-video-glide64mk2/projects/unix/Makefile	2019-02-10 21:25:35.000000000 +0300
+++ b/source/mupen64plus-video-glide64mk2/projects/unix/Makefile	2021-12-09 15:02:01.619945865 +0300
+@@ -129,9 +129,9 @@ ifneq ("$(filter aarch64,$(HOST_CPU))","")
+     CPU := AARCH
+     ARCH_DETECTED := 64BITS
+     PIC ?= 1
 -    NEW_DYNAREC := 1
-    NO_ASM := 1
-    NO_SSE := 1
-+  CPU := AARCH
-+  ARCH_DETECTED := 64BITS
-+  PIC ?= 1
-+  NO_ASM := 1
-+  $(warning Architecture "$(HOST_CPU)" not officially supported.)
+     NO_ASM := 1
+     NO_SSE := 1
+    $(warning Architecture "$(HOST_CPU)" not officially supported.)
 endif
-
- ifeq ("$(CPU)","NONE")
-   $(error CPU type "$(HOST_CPU)" not supported.  Please file bug report at 'https://github.com/mupen64plus/mupen64plus-core/issues')
- endif
-diff -Pdpru mupen64plus-bundle-src-2.5.9.orig/source/mupen64plus-video-rice/projects/unix/Makefile mupen64plus-bundle-src-2.5.9/source/mupen64plus-video-rice/projects/unix/Makefile
--- mupen64plus-bundle-src-2.5.9.orig/source/mupen64plus-video-rice/projects/unix/Makefile	2019-02-10 21:25:33.000000000 +0300
-+++ mupen64plus-bundle-src-2.5.9/source/mupen64plus-video-rice/projects/unix/Makefile	2021-12-09 15:04:58.388020745 +0300
-@@ -104,6 +104,13 @@ ifneq ("$(filter ppc64 powerpc64,$(HOST_
-   NO_ASM := 1
-   $(warning Architecture "$(HOST_CPU)" not officially supported.')
- endif
-+ifneq ("$(filter ppc64le,$(HOST_CPU))","")
-+  CPU := PPC
-+  ARCH_DETECTED := 64BITS
-+  PIC ?= 1
-+  NO_ASM := 1
-+  $(warning Architecture "$(HOST_CPU)" not officially supported.)
-+endif
- ifneq ("$(filter arm%,$(HOST_CPU))","")
-   ifeq ("$(filter arm%b,$(HOST_CPU))","")
-     CPU := ARM
-@@ -113,6 +120,13 @@ ifneq ("$(filter arm%,$(HOST_CPU))","")
-     $(warning Architecture "$(HOST_CPU)" not officially supported.')
-   endif
+ ifneq ("$(filter riscv64,$(HOST_CPU))","")
+     CPU := RISCV64
+diff -Pdpru a/source/mupen64plus-video-rice/projects/unix/Makefile b/source/mupen64plus-video-rice/projects/unix/Makefile
+--- a/source/mupen64plus-video-rice/projects/unix/Makefile	2019-02-10 21:25:33.000000000 +0300
+++ b/source/mupen64plus-video-rice/projects/unix/Makefile	2021-12-09 15:04:58.388020745 +0300
+     NO_ASM := 1
+     $(warning Architecture "$(HOST_CPU)" not officially supported.)
 endif
 +ifneq ("$(filter aarch64,$(HOST_CPU))","")
 +  CPU := AARCH
--- a/mupen64plus.changes
+++ b/mupen64plus.changes
@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Sun Oct 12 13:19:51 UTC 2025 - Arjen de Korte <suse+build@de-korte.org>
+
+- Boost.System is headers only since 1.69 (stub library removed in 1.89)
+
+-------------------------------------------------------------------
+Tue Sep  2 06:55:56 UTC 2025 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
+
+- Cherry-pick mupen64plus-CVE-2025-9688.patch from upstream to fix
+  integer overflow in write_is_viewer() (bsc#1249035, CVE-2025-9688)
+- Add Mesa-libGL-devel and glu-devel to BuildRequires
+
+-------------------------------------------------------------------
+Sat Mar  1 00:43:02 UTC 2025 - Avindra Goolcharan <avindra@opensuse.org>
+
+- update to version 2.6.0
+  * no change notes provided
+- rebase mupen64plus-binutils-2_29.patch
+- rebase mupen64plus-ppc64le-aarch64.patch
+- rebase mupen64plus-fix-cflags.patch
+- rebase mupen64plus-ppc64le-aarch64.patch
+- drop don-t-put-globals-in-include-files.patch
+- drop mupen64plus-libboost-1.85.patch
+
 -------------------------------------------------------------------
 Thu Jun  6 16:57:26 UTC 2024 - Илья Индиго <ilya@ilya.top>

--- a/mupen64plus.spec
+++ b/mupen64plus.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package mupen64plus
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@


 Name:           mupen64plus
-Version:        2.5.9
+Version:        2.6.0
 Release:        0
 Summary:        Plugin-Based Nintendo 64 Emulator
 License:        GPL-2.0-or-later
@@ -27,14 +27,15 @@ Source1:        %{name}.rpmlintrc
 Patch0:         %{name}-fix-cflags.patch
 Patch1:         %{name}-use-system-font.patch
 Patch2:         %{name}-binutils-2_29.patch
-Patch3:         %{name}-libboost-1.85.patch
-Patch4:         %{name}-ppc64le-aarch64.patch
-Patch5:         don-t-put-globals-in-include-files.patch
+Patch3:         %{name}-ppc64le-aarch64.patch
+Patch4:         %{name}-CVE-2025-9688.patch
+BuildRequires:  Mesa-libGL-devel
 BuildRequires:  binutils-devel
 BuildRequires:  gcc-c++
+BuildRequires:  glu-devel
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  libboost_filesystem-devel
-BuildRequires:  libboost_system-devel
+BuildRequires:  (libboost_system-devel if libboost_filesystem-devel < 1.89)
 BuildRequires:  lirc-devel
 BuildRequires:  nasm
 BuildRequires:  pkgconfig
@@ -42,6 +43,7 @@ BuildRequires:  pkgconfig(freetype2)
 BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(samplerate)
 BuildRequires:  pkgconfig(sdl2)
+BuildRequires:  pkgconfig(vulkan)
 BuildRequires:  pkgconfig(zlib)
 ExcludeArch:    s390x
Author	SHA256	Message	Date
Ana Guerrero	a37e3d5049	Accepting request 1311713 from Emulators - Boost.System is headers only since 1.69 (stub library removed in 1.89) (forwarded request 1310917 from adkorte) OBS-URL: https://build.opensuse.org/request/show/1311713 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mupen64plus?expand=0&rev=6	2025-10-16 15:39:34 +00:00
Ana Guerrero	ff92055aa8	- Boost.System is headers only since 1.69 (stub library removed in 1.89) OBS-URL: https://build.opensuse.org/package/show/Emulators/mupen64plus?expand=0&rev=20	2025-10-16 13:30:22 +00:00
Ana Guerrero	15cda14eed	Accepting request 1302324 from Emulators OBS-URL: https://build.opensuse.org/request/show/1302324 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mupen64plus?expand=0&rev=5	2025-09-02 15:59:11 +00:00
John Paul Adrian Glaubitz	efeac445fb	- Cherry-pick mupen64plus-CVE-2025-9688.patch from upstream to fix integer overflow in write_is_viewer() (bsc#1249035, CVE-2025-9688) - Add Mesa-libGL-devel and glu-devel to BuildRequires OBS-URL: https://build.opensuse.org/package/show/Emulators/mupen64plus?expand=0&rev=18	2025-09-02 07:11:29 +00:00
Ana Guerrero	1592d26c96	Accepting request 1249941 from Emulators - update to version 2.6.0 * no change notes provided - rebase mupen64plus-binutils-2_29.patch - rebase mupen64plus-ppc64le-aarch64.patch - rebase mupen64plus-fix-cflags.patch - rebase mupen64plus-ppc64le-aarch64.patch - drop don-t-put-globals-in-include-files.patch - drop mupen64plus-libboost-1.85.patch OBS-URL: https://build.opensuse.org/request/show/1249941 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mupen64plus?expand=0&rev=4	2025-03-04 17:32:37 +00:00
Илья Индиго	4f54e60905	- update to version 2.6.0 * no change notes provided - rebase mupen64plus-binutils-2_29.patch - rebase mupen64plus-ppc64le-aarch64.patch - rebase mupen64plus-fix-cflags.patch - rebase mupen64plus-ppc64le-aarch64.patch - drop don-t-put-globals-in-include-files.patch - drop mupen64plus-libboost-1.85.patch OBS-URL: https://build.opensuse.org/package/show/Emulators/mupen64plus?expand=0&rev=16	2025-03-03 22:47:01 +00:00