From 5e5e02ffbddfa43eb133eb8c93c7dfdb568ab8c1 Mon Sep 17 00:00:00 2001 From: M374LX 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 -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 -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 " 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