[PR PATCH] mupen64plus: update to 2.6.0

[PR PATCH] mupen64plus: update to 2.6.0

[M374LX]

[-- Attachment #1: Type: text/plain, Size: 1134 bytes --]

There is a new pull request by M374LX against master on the void-packages repository

https://github.com/M374LX/void-packages mupen64plus-v2.6.0
https://github.com/void-linux/void-packages/pull/53109

mupen64plus: update to 2.6.0
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64)

#### Notes
- As the Boost libraries are no longer required, they have been removed from the dependencies.
- Two of the patches have been removed because the new version incorporates the respective changes.

#### Pending checks
- For some reason, the launcher (mupen64plus-ui-console) still displays 2.5.9 as the version number, although the core library (mupen64plus-core) displays 2.6.0, as expected.
- The "ui-console-pic" patch might need to be updated.

A patch file from https://github.com/void-linux/void-packages/pull/53109.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mupen64plus-v2.6.0-53109.patch --]
[-- Type: text/x-diff, Size: 5083 bytes --]

From 5e5e02ffbddfa43eb133eb8c93c7dfdb568ab8c1 Mon Sep 17 00:00:00 2001
From: M374LX <wilsalx@gmail.com>
Date: Sun, 17 Nov 2024 16:04:31 -0300
Subject: [PATCH] mupen64plus: update to 2.6.0

---
 ...ault-configuration-for-Logitech-F310.patch | 38 -------------------
 ...argument-in-call-to-SDL_CreateRGBSur.patch | 34 -----------------
 srcpkgs/mupen64plus/template                  |  6 +--
 3 files changed, 3 insertions(+), 75 deletions(-)
 delete mode 100644 srcpkgs/mupen64plus/patches/0001-Fix-default-configuration-for-Logitech-F310.patch
 delete mode 100644 srcpkgs/mupen64plus/patches/0001-Fix-wrong-pitch-argument-in-call-to-SDL_CreateRGBSur.patch

diff --git a/srcpkgs/mupen64plus/patches/0001-Fix-default-configuration-for-Logitech-F310.patch b/srcpkgs/mupen64plus/patches/0001-Fix-default-configuration-for-Logitech-F310.patch
deleted file mode 100644
index 433539e1648d55..00000000000000
--- a/srcpkgs/mupen64plus/patches/0001-Fix-default-configuration-for-Logitech-F310.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 5e2cedb10b77766db1a2f2a51167e91245d27de0 Mon Sep 17 00:00:00 2001
-From: Dexter Gaon-Shatford <dexter@gaonshatford.ca>
-Date: Sat, 22 Oct 2022 10:56:36 -0400
-Subject: [PATCH] Fix default configuration for Logitech F310
-
-The default configuration for the Logitech F310 gamepad is incorrect in
-the 2.5.9 release. This patch applies the (correct) configuration from
-the project upstream.
----
- data/InputAutoCfg.ini | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/data/InputAutoCfg.ini b/data/InputAutoCfg.ini
-index 4db5576..368a761 100644
---- a/source/mupen64plus-input-sdl/data/InputAutoCfg.ini
-+++ b/source/mupen64plus-input-sdl/data/InputAutoCfg.ini
-@@ -597,15 +597,15 @@ DPad L = hat(0 Left)
- DPad D = hat(0 Down)
- DPad U = hat(0 Up)
- Start = button(7)
--Z Trig = button(5)
-+Z Trig = axis(5+)
- B Button = button(2)
- A Button = button(0)
- C Button R = axis(3+)
- C Button L = axis(3-)
- C Button D = axis(4+)
- C Button U = axis(4-)
--R Trig = axis(5-)
--L Trig = axis(2-)
-+R Trig = button(5)
-+L Trig = button(4)
- Mempak switch = button(1)
- Rumblepak switch = button(3)
- X Axis = axis(0-,0+)
--- 
-2.38.1
-
diff --git a/srcpkgs/mupen64plus/patches/0001-Fix-wrong-pitch-argument-in-call-to-SDL_CreateRGBSur.patch b/srcpkgs/mupen64plus/patches/0001-Fix-wrong-pitch-argument-in-call-to-SDL_CreateRGBSur.patch
deleted file mode 100644
index 2e37d55c404d82..00000000000000
--- a/srcpkgs/mupen64plus/patches/0001-Fix-wrong-pitch-argument-in-call-to-SDL_CreateRGBSur.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 9d016ace855b88916746837b1a424cf9e5960c3b Mon Sep 17 00:00:00 2001
-From: Dexter Gaon-Shatford <dexter@gaonshatford.ca>
-Date: Thu, 20 Oct 2022 20:06:16 -0400
-Subject: [PATCH] Fix wrong pitch argument in call to SDL_CreateRGBSurfaceFrom.
-
-This patch makes the change in
-https://github.com/mupen64plus/mupen64plus-core/pull/970 compatible with
-the source distribution of mupen64plus v2.5.9.
-
-This patch should be removed when the next version of mupen64plus is
-released since it will already contain the changes from the PR mentioned
-above.
----
- src/api/vidext_sdl2_compat.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/source/mupen64plus-core/src/api/vidext_sdl2_compat.h b/source/mupen64plus-core/src/api/vidext_sdl2_compat.h
-index 06d778dd..7cbd5963 100644
---- a/source/mupen64plus-core/src/api/vidext_sdl2_compat.h
-+++ b/source/mupen64plus-core/src/api/vidext_sdl2_compat.h
-@@ -474,8 +474,9 @@ SDL_SetVideoMode(int width, int height, int bpp, Uint32 flags)
-         if (SDL_GL_MakeCurrent(SDL_VideoWindow, SDL_VideoContext) < 0) {
-             return NULL;
-         }
-+        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;
-         }
--- 
-2.38.1
-
diff --git a/srcpkgs/mupen64plus/template b/srcpkgs/mupen64plus/template
index b91898f321c42a..83a51c3dde2117 100644
--- a/srcpkgs/mupen64plus/template
+++ b/srcpkgs/mupen64plus/template
@@ -1,17 +1,17 @@
 # Template file for 'mupen64plus'
 pkgname=mupen64plus
-version=2.5.9
+version=2.6.0
 revision=7
 archs="x86_64* i686*"
 hostmakedepends="pkg-config which nasm"
-makedepends="boost-devel SDL2-devel speexdsp-devel freetype-devel glu-devel libpng-devel libsamplerate-devel"
+makedepends="SDL2-devel speexdsp-devel freetype-devel glu-devel libpng-devel libsamplerate-devel"
 depends="desktop-file-utils"
 short_desc="Nintendo64 Emulator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://www.mupen64plus.org"
 distfiles="https://github.com/mupen64plus/mupen64plus-core/releases/download/${version}/${pkgname}-bundle-src-${version}.tar.gz"
-checksum=d5243ddc00388ee2e538b3826a78a719dec2bd5da54ac6f3344fed861fb141a8
+checksum=297e17180cd76a7b8ea809d1a1be2c98ed5c7352dc716965a80deb598b21e131
 nopie=yes
 nocross=yes
 

Re: [PR PATCH] [Updated] mupen64plus: update to 2.6.0

[M374LX]

[-- Attachment #1: Type: text/plain, Size: 1341 bytes --]

There is an updated pull request by M374LX against master on the void-packages repository

https://github.com/M374LX/void-packages mupen64plus-v2.6.0
https://github.com/void-linux/void-packages/pull/53109

mupen64plus: update to 2.6.0
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64)

#### Notes
- As the Boost libraries are no longer required, they have been removed from the dependencies.
- Two of the patches have been removed because the new version incorporates the respective changes.

#### Pending checks
- For some reason, the launcher (mupen64plus-ui-console) still displays 2.5.9 as the version number, although the core library (mupen64plus-core) displays 2.6.0, as expected.
- The "ui-console-pic" patch might need to be updated.
- It looks like the ARM architecture is now supported, as seen in https://github.com/mupen64plus/mupen64plus-video-glide64mk2/blob/eb6484ee309f2aa4dfeff44c4fdd3755c97f812d/projects/unix/Makefile#L111.

A patch file from https://github.com/void-linux/void-packages/pull/53109.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mupen64plus-v2.6.0-53109.patch --]
[-- Type: text/x-diff, Size: 5815 bytes --]

From 5e5e02ffbddfa43eb133eb8c93c7dfdb568ab8c1 Mon Sep 17 00:00:00 2001
From: M374LX <wilsalx@gmail.com>
Date: Sun, 17 Nov 2024 16:04:31 -0300
Subject: [PATCH 1/2] mupen64plus: update to 2.6.0

---
 ...ault-configuration-for-Logitech-F310.patch | 38 -------------------
 ...argument-in-call-to-SDL_CreateRGBSur.patch | 34 -----------------
 srcpkgs/mupen64plus/template                  |  6 +--
 3 files changed, 3 insertions(+), 75 deletions(-)
 delete mode 100644 srcpkgs/mupen64plus/patches/0001-Fix-default-configuration-for-Logitech-F310.patch
 delete mode 100644 srcpkgs/mupen64plus/patches/0001-Fix-wrong-pitch-argument-in-call-to-SDL_CreateRGBSur.patch

diff --git a/srcpkgs/mupen64plus/patches/0001-Fix-default-configuration-for-Logitech-F310.patch b/srcpkgs/mupen64plus/patches/0001-Fix-default-configuration-for-Logitech-F310.patch
deleted file mode 100644
index 433539e1648d55..00000000000000
--- a/srcpkgs/mupen64plus/patches/0001-Fix-default-configuration-for-Logitech-F310.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 5e2cedb10b77766db1a2f2a51167e91245d27de0 Mon Sep 17 00:00:00 2001
-From: Dexter Gaon-Shatford <dexter@gaonshatford.ca>
-Date: Sat, 22 Oct 2022 10:56:36 -0400
-Subject: [PATCH] Fix default configuration for Logitech F310
-
-The default configuration for the Logitech F310 gamepad is incorrect in
-the 2.5.9 release. This patch applies the (correct) configuration from
-the project upstream.
----
- data/InputAutoCfg.ini | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/data/InputAutoCfg.ini b/data/InputAutoCfg.ini
-index 4db5576..368a761 100644
---- a/source/mupen64plus-input-sdl/data/InputAutoCfg.ini
-+++ b/source/mupen64plus-input-sdl/data/InputAutoCfg.ini
-@@ -597,15 +597,15 @@ DPad L = hat(0 Left)
- DPad D = hat(0 Down)
- DPad U = hat(0 Up)
- Start = button(7)
--Z Trig = button(5)
-+Z Trig = axis(5+)
- B Button = button(2)
- A Button = button(0)
- C Button R = axis(3+)
- C Button L = axis(3-)
- C Button D = axis(4+)
- C Button U = axis(4-)
--R Trig = axis(5-)
--L Trig = axis(2-)
-+R Trig = button(5)
-+L Trig = button(4)
- Mempak switch = button(1)
- Rumblepak switch = button(3)
- X Axis = axis(0-,0+)
--- 
-2.38.1
-
diff --git a/srcpkgs/mupen64plus/patches/0001-Fix-wrong-pitch-argument-in-call-to-SDL_CreateRGBSur.patch b/srcpkgs/mupen64plus/patches/0001-Fix-wrong-pitch-argument-in-call-to-SDL_CreateRGBSur.patch
deleted file mode 100644
index 2e37d55c404d82..00000000000000
--- a/srcpkgs/mupen64plus/patches/0001-Fix-wrong-pitch-argument-in-call-to-SDL_CreateRGBSur.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 9d016ace855b88916746837b1a424cf9e5960c3b Mon Sep 17 00:00:00 2001
-From: Dexter Gaon-Shatford <dexter@gaonshatford.ca>
-Date: Thu, 20 Oct 2022 20:06:16 -0400
-Subject: [PATCH] Fix wrong pitch argument in call to SDL_CreateRGBSurfaceFrom.
-
-This patch makes the change in
-https://github.com/mupen64plus/mupen64plus-core/pull/970 compatible with
-the source distribution of mupen64plus v2.5.9.
-
-This patch should be removed when the next version of mupen64plus is
-released since it will already contain the changes from the PR mentioned
-above.
----
- src/api/vidext_sdl2_compat.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/source/mupen64plus-core/src/api/vidext_sdl2_compat.h b/source/mupen64plus-core/src/api/vidext_sdl2_compat.h
-index 06d778dd..7cbd5963 100644
---- a/source/mupen64plus-core/src/api/vidext_sdl2_compat.h
-+++ b/source/mupen64plus-core/src/api/vidext_sdl2_compat.h
-@@ -474,8 +474,9 @@ SDL_SetVideoMode(int width, int height, int bpp, Uint32 flags)
-         if (SDL_GL_MakeCurrent(SDL_VideoWindow, SDL_VideoContext) < 0) {
-             return NULL;
-         }
-+        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;
-         }
--- 
-2.38.1
-
diff --git a/srcpkgs/mupen64plus/template b/srcpkgs/mupen64plus/template
index b91898f321c42a..83a51c3dde2117 100644
--- a/srcpkgs/mupen64plus/template
+++ b/srcpkgs/mupen64plus/template
@@ -1,17 +1,17 @@
 # Template file for 'mupen64plus'
 pkgname=mupen64plus
-version=2.5.9
+version=2.6.0
 revision=7
 archs="x86_64* i686*"
 hostmakedepends="pkg-config which nasm"
-makedepends="boost-devel SDL2-devel speexdsp-devel freetype-devel glu-devel libpng-devel libsamplerate-devel"
+makedepends="SDL2-devel speexdsp-devel freetype-devel glu-devel libpng-devel libsamplerate-devel"
 depends="desktop-file-utils"
 short_desc="Nintendo64 Emulator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://www.mupen64plus.org"
 distfiles="https://github.com/mupen64plus/mupen64plus-core/releases/download/${version}/${pkgname}-bundle-src-${version}.tar.gz"
-checksum=d5243ddc00388ee2e538b3826a78a719dec2bd5da54ac6f3344fed861fb141a8
+checksum=297e17180cd76a7b8ea809d1a1be2c98ed5c7352dc716965a80deb598b21e131
 nopie=yes
 nocross=yes
 

From 9812f9f88b5a3abe45a318058ccae1b05723fb1c Mon Sep 17 00:00:00 2001
From: M374LX <wilsalx@gmail.com>
Date: Sun, 17 Nov 2024 16:37:37 -0300
Subject: [PATCH 2/2] Fix revision

---
 srcpkgs/mupen64plus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mupen64plus/template b/srcpkgs/mupen64plus/template
index 83a51c3dde2117..2cb1147f335746 100644
--- a/srcpkgs/mupen64plus/template
+++ b/srcpkgs/mupen64plus/template
@@ -1,7 +1,7 @@
 # Template file for 'mupen64plus'
 pkgname=mupen64plus
 version=2.6.0
-revision=7
+revision=1
 archs="x86_64* i686*"
 hostmakedepends="pkg-config which nasm"
 makedepends="SDL2-devel speexdsp-devel freetype-devel glu-devel libpng-devel libsamplerate-devel"

Re: [PR PATCH] [Updated] mupen64plus: update to 2.6.0

[M374LX]

[-- Attachment #1: Type: text/plain, Size: 1341 bytes --]

There is an updated pull request by M374LX against master on the void-packages repository

https://github.com/M374LX/void-packages mupen64plus-v2.6.0
https://github.com/void-linux/void-packages/pull/53109

mupen64plus: update to 2.6.0
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64)

#### Notes
- As the Boost libraries are no longer required, they have been removed from the dependencies.
- Two of the patches have been removed because the new version incorporates the respective changes.

#### Pending checks
- For some reason, the launcher (mupen64plus-ui-console) still displays 2.5.9 as the version number, although the core library (mupen64plus-core) displays 2.6.0, as expected.
- The "ui-console-pic" patch might need to be updated.
- It looks like the ARM architecture is now supported, as seen in https://github.com/mupen64plus/mupen64plus-video-glide64mk2/blob/eb6484ee309f2aa4dfeff44c4fdd3755c97f812d/projects/unix/Makefile#L111.

A patch file from https://github.com/void-linux/void-packages/pull/53109.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mupen64plus-v2.6.0-53109.patch --]
[-- Type: text/x-diff, Size: 6869 bytes --]

From 5e5e02ffbddfa43eb133eb8c93c7dfdb568ab8c1 Mon Sep 17 00:00:00 2001
From: M374LX <wilsalx@gmail.com>
Date: Sun, 17 Nov 2024 16:04:31 -0300
Subject: [PATCH 1/3] mupen64plus: update to 2.6.0

---
 ...ault-configuration-for-Logitech-F310.patch | 38 -------------------
 ...argument-in-call-to-SDL_CreateRGBSur.patch | 34 -----------------
 srcpkgs/mupen64plus/template                  |  6 +--
 3 files changed, 3 insertions(+), 75 deletions(-)
 delete mode 100644 srcpkgs/mupen64plus/patches/0001-Fix-default-configuration-for-Logitech-F310.patch
 delete mode 100644 srcpkgs/mupen64plus/patches/0001-Fix-wrong-pitch-argument-in-call-to-SDL_CreateRGBSur.patch

diff --git a/srcpkgs/mupen64plus/patches/0001-Fix-default-configuration-for-Logitech-F310.patch b/srcpkgs/mupen64plus/patches/0001-Fix-default-configuration-for-Logitech-F310.patch
deleted file mode 100644
index 433539e1648d55..00000000000000
--- a/srcpkgs/mupen64plus/patches/0001-Fix-default-configuration-for-Logitech-F310.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 5e2cedb10b77766db1a2f2a51167e91245d27de0 Mon Sep 17 00:00:00 2001
-From: Dexter Gaon-Shatford <dexter@gaonshatford.ca>
-Date: Sat, 22 Oct 2022 10:56:36 -0400
-Subject: [PATCH] Fix default configuration for Logitech F310
-
-The default configuration for the Logitech F310 gamepad is incorrect in
-the 2.5.9 release. This patch applies the (correct) configuration from
-the project upstream.
----
- data/InputAutoCfg.ini | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/data/InputAutoCfg.ini b/data/InputAutoCfg.ini
-index 4db5576..368a761 100644
---- a/source/mupen64plus-input-sdl/data/InputAutoCfg.ini
-+++ b/source/mupen64plus-input-sdl/data/InputAutoCfg.ini
-@@ -597,15 +597,15 @@ DPad L = hat(0 Left)
- DPad D = hat(0 Down)
- DPad U = hat(0 Up)
- Start = button(7)
--Z Trig = button(5)
-+Z Trig = axis(5+)
- B Button = button(2)
- A Button = button(0)
- C Button R = axis(3+)
- C Button L = axis(3-)
- C Button D = axis(4+)
- C Button U = axis(4-)
--R Trig = axis(5-)
--L Trig = axis(2-)
-+R Trig = button(5)
-+L Trig = button(4)
- Mempak switch = button(1)
- Rumblepak switch = button(3)
- X Axis = axis(0-,0+)
--- 
-2.38.1
-
diff --git a/srcpkgs/mupen64plus/patches/0001-Fix-wrong-pitch-argument-in-call-to-SDL_CreateRGBSur.patch b/srcpkgs/mupen64plus/patches/0001-Fix-wrong-pitch-argument-in-call-to-SDL_CreateRGBSur.patch
deleted file mode 100644
index 2e37d55c404d82..00000000000000
--- a/srcpkgs/mupen64plus/patches/0001-Fix-wrong-pitch-argument-in-call-to-SDL_CreateRGBSur.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 9d016ace855b88916746837b1a424cf9e5960c3b Mon Sep 17 00:00:00 2001
-From: Dexter Gaon-Shatford <dexter@gaonshatford.ca>
-Date: Thu, 20 Oct 2022 20:06:16 -0400
-Subject: [PATCH] Fix wrong pitch argument in call to SDL_CreateRGBSurfaceFrom.
-
-This patch makes the change in
-https://github.com/mupen64plus/mupen64plus-core/pull/970 compatible with
-the source distribution of mupen64plus v2.5.9.
-
-This patch should be removed when the next version of mupen64plus is
-released since it will already contain the changes from the PR mentioned
-above.
----
- src/api/vidext_sdl2_compat.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/source/mupen64plus-core/src/api/vidext_sdl2_compat.h b/source/mupen64plus-core/src/api/vidext_sdl2_compat.h
-index 06d778dd..7cbd5963 100644
---- a/source/mupen64plus-core/src/api/vidext_sdl2_compat.h
-+++ b/source/mupen64plus-core/src/api/vidext_sdl2_compat.h
-@@ -474,8 +474,9 @@ SDL_SetVideoMode(int width, int height, int bpp, Uint32 flags)
-         if (SDL_GL_MakeCurrent(SDL_VideoWindow, SDL_VideoContext) < 0) {
-             return NULL;
-         }
-+        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;
-         }
--- 
-2.38.1
-
diff --git a/srcpkgs/mupen64plus/template b/srcpkgs/mupen64plus/template
index b91898f321c42a..83a51c3dde2117 100644
--- a/srcpkgs/mupen64plus/template
+++ b/srcpkgs/mupen64plus/template
@@ -1,17 +1,17 @@
 # Template file for 'mupen64plus'
 pkgname=mupen64plus
-version=2.5.9
+version=2.6.0
 revision=7
 archs="x86_64* i686*"
 hostmakedepends="pkg-config which nasm"
-makedepends="boost-devel SDL2-devel speexdsp-devel freetype-devel glu-devel libpng-devel libsamplerate-devel"
+makedepends="SDL2-devel speexdsp-devel freetype-devel glu-devel libpng-devel libsamplerate-devel"
 depends="desktop-file-utils"
 short_desc="Nintendo64 Emulator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://www.mupen64plus.org"
 distfiles="https://github.com/mupen64plus/mupen64plus-core/releases/download/${version}/${pkgname}-bundle-src-${version}.tar.gz"
-checksum=d5243ddc00388ee2e538b3826a78a719dec2bd5da54ac6f3344fed861fb141a8
+checksum=297e17180cd76a7b8ea809d1a1be2c98ed5c7352dc716965a80deb598b21e131
 nopie=yes
 nocross=yes
 

From 9812f9f88b5a3abe45a318058ccae1b05723fb1c Mon Sep 17 00:00:00 2001
From: M374LX <wilsalx@gmail.com>
Date: Sun, 17 Nov 2024 16:37:37 -0300
Subject: [PATCH 2/3] Fix revision

---
 srcpkgs/mupen64plus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mupen64plus/template b/srcpkgs/mupen64plus/template
index 83a51c3dde2117..2cb1147f335746 100644
--- a/srcpkgs/mupen64plus/template
+++ b/srcpkgs/mupen64plus/template
@@ -1,7 +1,7 @@
 # Template file for 'mupen64plus'
 pkgname=mupen64plus
 version=2.6.0
-revision=7
+revision=1
 archs="x86_64* i686*"
 hostmakedepends="pkg-config which nasm"
 makedepends="SDL2-devel speexdsp-devel freetype-devel glu-devel libpng-devel libsamplerate-devel"

From 4940ac5a9a7987907a9c6ffeb4cc50393c987a5d Mon Sep 17 00:00:00 2001
From: M374LX <wilsalx@gmail.com>
Date: Sun, 17 Nov 2024 17:02:59 -0300
Subject: [PATCH 3/3] Remove "ui-console-pic.patch"

---
 srcpkgs/mupen64plus/patches/ui-console-pic.patch | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 srcpkgs/mupen64plus/patches/ui-console-pic.patch

diff --git a/srcpkgs/mupen64plus/patches/ui-console-pic.patch b/srcpkgs/mupen64plus/patches/ui-console-pic.patch
deleted file mode 100644
index 62a14850a5021f..00000000000000
--- a/srcpkgs/mupen64plus/patches/ui-console-pic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/source/mupen64plus-ui-console/projects/unix/Makefile b/source/mupen64plus-ui-console/projects/unix/Makefile
-index a4a05e3..199f27f 100755
---- a/source/mupen64plus-ui-console/projects/unix/Makefile
-+++ b/source/mupen64plus-ui-console/projects/unix/Makefile
-@@ -90,6 +90,7 @@ endif
- 
- # set special flags per-system
- ifeq ($(OS), LINUX)
-+  CFLAGS += -fPIC
-   LDLIBS += -ldl
- endif
- ifeq ($(OS), OSX)

Re: mupen64plus: update to 2.6.0

[zlice]

[-- Attachment #1: Type: text/plain, Size: 535 bytes --]

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/53109#issuecomment-2501163392

Comment:
commits need squashed

also had this a while back when i started using RMG - https://github.com/void-linux/void-packages/compare/master...zlice:void-packages:mupen-arm

aarch64 glibc seems to build fine for me on top of your 2.6.0

the `archs` can probably just be removed from template?

`source/mupen64plus-core/projects/unix/Makefile` may need something for musl or im doing it wrong?

Re: mupen64plus: update to 2.6.0

[M374LX]

[-- Attachment #1: Type: text/plain, Size: 480 bytes --]

New comment by M374LX on void-packages repository

https://github.com/void-linux/void-packages/pull/53109#issuecomment-2509495956

Comment:
@zlice If you built the musl package from a virtual machine, you might need to increase the amount of RAM. I have just tried a musl build from a virtual machine and it failed at first. The problem turned out to be too little RAM and increasing it was enough for the build to be successful. In my case, the increase was from 512 MB to 2 GB.

Re: [PR PATCH] [Updated] mupen64plus: update to 2.6.0

[M374LX]

[-- Attachment #1: Type: text/plain, Size: 1746 bytes --]

There is an updated pull request by M374LX against master on the void-packages repository

https://github.com/M374LX/void-packages mupen64plus-v2.6.0
https://github.com/void-linux/void-packages/pull/53109

mupen64plus: update to 2.6.0
#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc

#### Notes
- As the Boost libraries are no longer required, they have been removed from the dependencies.
- Two of the patches have been removed because the new version incorporates the respective changes.
- The patch "ui-console-pic.patch" seems no longer necessary. It was created to fix a build failure (58cca87), but I am now able to successfully build the package without the patch.

#### Pending checks
- ~For some reason, the launcher (mupen64plus-ui-console) still displays 2.5.9 as the version number, although the core library (mupen64plus-core) displays 2.6.0, as expected~ (fixed after installing the newly built package with ``xi`` instead of ``xbps-install``).

It looks like the ARM architecture is now supported, as seen in https://github.com/mupen64plus/mupen64plus-video-glide64mk2/blob/eb6484ee309f2aa4dfeff44c4fdd3755c97f812d/projects/unix/Makefile#L111, but I would prefer if someone else could test it because I don't have a working ARM machine with Void. Otherwise, the program runs fine on my machine and the PR seems ready to be merged.

A patch file from https://github.com/void-linux/void-packages/pull/53109.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mupen64plus-v2.6.0-53109.patch --]
[-- Type: text/x-diff, Size: 5910 bytes --]

From fb5882e47639a57cf5198de3ee7a29f4e50af02e Mon Sep 17 00:00:00 2001
From: M374LX <wilsalx@gmail.com>
Date: Sun, 17 Nov 2024 16:04:31 -0300
Subject: [PATCH] mupen64plus: update to 2.6.0.

---
 ...ault-configuration-for-Logitech-F310.patch | 38 -------------------
 ...argument-in-call-to-SDL_CreateRGBSur.patch | 34 -----------------
 .../mupen64plus/patches/ui-console-pic.patch  | 12 ------
 srcpkgs/mupen64plus/template                  |  9 ++---
 4 files changed, 4 insertions(+), 89 deletions(-)
 delete mode 100644 srcpkgs/mupen64plus/patches/0001-Fix-default-configuration-for-Logitech-F310.patch
 delete mode 100644 srcpkgs/mupen64plus/patches/0001-Fix-wrong-pitch-argument-in-call-to-SDL_CreateRGBSur.patch
 delete mode 100644 srcpkgs/mupen64plus/patches/ui-console-pic.patch

diff --git a/srcpkgs/mupen64plus/patches/0001-Fix-default-configuration-for-Logitech-F310.patch b/srcpkgs/mupen64plus/patches/0001-Fix-default-configuration-for-Logitech-F310.patch
deleted file mode 100644
index 433539e1648d55..00000000000000
--- a/srcpkgs/mupen64plus/patches/0001-Fix-default-configuration-for-Logitech-F310.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 5e2cedb10b77766db1a2f2a51167e91245d27de0 Mon Sep 17 00:00:00 2001
-From: Dexter Gaon-Shatford <dexter@gaonshatford.ca>
-Date: Sat, 22 Oct 2022 10:56:36 -0400
-Subject: [PATCH] Fix default configuration for Logitech F310
-
-The default configuration for the Logitech F310 gamepad is incorrect in
-the 2.5.9 release. This patch applies the (correct) configuration from
-the project upstream.
----
- data/InputAutoCfg.ini | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/data/InputAutoCfg.ini b/data/InputAutoCfg.ini
-index 4db5576..368a761 100644
---- a/source/mupen64plus-input-sdl/data/InputAutoCfg.ini
-+++ b/source/mupen64plus-input-sdl/data/InputAutoCfg.ini
-@@ -597,15 +597,15 @@ DPad L = hat(0 Left)
- DPad D = hat(0 Down)
- DPad U = hat(0 Up)
- Start = button(7)
--Z Trig = button(5)
-+Z Trig = axis(5+)
- B Button = button(2)
- A Button = button(0)
- C Button R = axis(3+)
- C Button L = axis(3-)
- C Button D = axis(4+)
- C Button U = axis(4-)
--R Trig = axis(5-)
--L Trig = axis(2-)
-+R Trig = button(5)
-+L Trig = button(4)
- Mempak switch = button(1)
- Rumblepak switch = button(3)
- X Axis = axis(0-,0+)
--- 
-2.38.1
-
diff --git a/srcpkgs/mupen64plus/patches/0001-Fix-wrong-pitch-argument-in-call-to-SDL_CreateRGBSur.patch b/srcpkgs/mupen64plus/patches/0001-Fix-wrong-pitch-argument-in-call-to-SDL_CreateRGBSur.patch
deleted file mode 100644
index 2e37d55c404d82..00000000000000
--- a/srcpkgs/mupen64plus/patches/0001-Fix-wrong-pitch-argument-in-call-to-SDL_CreateRGBSur.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 9d016ace855b88916746837b1a424cf9e5960c3b Mon Sep 17 00:00:00 2001
-From: Dexter Gaon-Shatford <dexter@gaonshatford.ca>
-Date: Thu, 20 Oct 2022 20:06:16 -0400
-Subject: [PATCH] Fix wrong pitch argument in call to SDL_CreateRGBSurfaceFrom.
-
-This patch makes the change in
-https://github.com/mupen64plus/mupen64plus-core/pull/970 compatible with
-the source distribution of mupen64plus v2.5.9.
-
-This patch should be removed when the next version of mupen64plus is
-released since it will already contain the changes from the PR mentioned
-above.
----
- src/api/vidext_sdl2_compat.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/source/mupen64plus-core/src/api/vidext_sdl2_compat.h b/source/mupen64plus-core/src/api/vidext_sdl2_compat.h
-index 06d778dd..7cbd5963 100644
---- a/source/mupen64plus-core/src/api/vidext_sdl2_compat.h
-+++ b/source/mupen64plus-core/src/api/vidext_sdl2_compat.h
-@@ -474,8 +474,9 @@ SDL_SetVideoMode(int width, int height, int bpp, Uint32 flags)
-         if (SDL_GL_MakeCurrent(SDL_VideoWindow, SDL_VideoContext) < 0) {
-             return NULL;
-         }
-+        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;
-         }
--- 
-2.38.1
-
diff --git a/srcpkgs/mupen64plus/patches/ui-console-pic.patch b/srcpkgs/mupen64plus/patches/ui-console-pic.patch
deleted file mode 100644
index 62a14850a5021f..00000000000000
--- a/srcpkgs/mupen64plus/patches/ui-console-pic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/source/mupen64plus-ui-console/projects/unix/Makefile b/source/mupen64plus-ui-console/projects/unix/Makefile
-index a4a05e3..199f27f 100755
---- a/source/mupen64plus-ui-console/projects/unix/Makefile
-+++ b/source/mupen64plus-ui-console/projects/unix/Makefile
-@@ -90,6 +90,7 @@ endif
- 
- # set special flags per-system
- ifeq ($(OS), LINUX)
-+  CFLAGS += -fPIC
-   LDLIBS += -ldl
- endif
- ifeq ($(OS), OSX)
diff --git a/srcpkgs/mupen64plus/template b/srcpkgs/mupen64plus/template
index b91898f321c42a..fecef3e3e86475 100644
--- a/srcpkgs/mupen64plus/template
+++ b/srcpkgs/mupen64plus/template
@@ -1,17 +1,16 @@
 # Template file for 'mupen64plus'
 pkgname=mupen64plus
-version=2.5.9
-revision=7
-archs="x86_64* i686*"
+version=2.6.0
+revision=1
 hostmakedepends="pkg-config which nasm"
-makedepends="boost-devel SDL2-devel speexdsp-devel freetype-devel glu-devel libpng-devel libsamplerate-devel"
+makedepends="SDL2-devel speexdsp-devel freetype-devel glu-devel libpng-devel libsamplerate-devel"
 depends="desktop-file-utils"
 short_desc="Nintendo64 Emulator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://www.mupen64plus.org"
 distfiles="https://github.com/mupen64plus/mupen64plus-core/releases/download/${version}/${pkgname}-bundle-src-${version}.tar.gz"
-checksum=d5243ddc00388ee2e538b3826a78a719dec2bd5da54ac6f3344fed861fb141a8
+checksum=297e17180cd76a7b8ea809d1a1be2c98ed5c7352dc716965a80deb598b21e131
 nopie=yes
 nocross=yes
 

Re: mupen64plus: update to 2.6.0

[M374LX]

[-- Attachment #1: Type: text/plain, Size: 489 bytes --]

New comment by M374LX on void-packages repository

https://github.com/void-linux/void-packages/pull/53109#issuecomment-2509495956

Comment:
@zlice If you tried to build the musl package from a virtual machine, you might need to increase the amount of RAM. I have just tried a musl build from a virtual machine and it failed at first. The problem turned out to be too little RAM and increasing it was enough for the build to be successful. In my case, the increase was from 512 MB to 2 GB.

Re: [PR REVIEW] mupen64plus: update to 2.6.0

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 197 bytes --]

New review comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/53109#discussion_r1909511282

Comment:
Same with `CFLAGS="-fcommon"` some lines down

Re: [PR REVIEW] mupen64plus: update to 2.6.0

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 174 bytes --]

New review comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/53109#discussion_r1909493326

Comment:
`nopie` can be removed