Ports: Update ScummVM to 2.6.0

4 files changed, 15 insertions, 63 deletions

diff --git a/Ports/scummvm/patches/0001-Prevent-call-to-glGetIntegerv-without-context.patch b/Ports/scummvm/patches/0001-Prevent-call-to-glGetIntegerv-without-context.patch
index 98d3c747fe..a94d04a944 100644
--- a/Ports/scummvm/patches/0001-Prevent-call-to-glGetIntegerv-without-context.patch
+++ b/Ports/scummvm/patches/0001-Prevent-call-to-glGetIntegerv-without-context.patch
@@ -13,10 +13,10 @@ Since this is for MSAA which we do not yet support, patch it out.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp b/backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp
-index d5c034f..8a4e3ff 100644
+index 0ab78342..be97cdb5 100644
 --- a/backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp
 +++ b/backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp
-@@ -185,7 +185,7 @@ void OpenGLSdlGraphics3dManager::setupScreen() {
+@@ -299,7 +299,7 @@ void OpenGLSdlGraphics3dManager::setupScreen() {
  		// (or not bridged in Emscripten?). This forces a windows reset.
  		currentSamples = -1;
  		#else
diff --git a/Ports/scummvm/patches/0002-Teach-configure-about-serenity.patch b/Ports/scummvm/patches/0002-Teach-configure-about-serenity.patch
index ea026b3162..cd590a4e40 100644
--- a/Ports/scummvm/patches/0002-Teach-configure-about-serenity.patch
+++ b/Ports/scummvm/patches/0002-Teach-configure-about-serenity.patch
@@ -4,29 +4,20 @@ Date: Sun, 9 Jan 2022 23:01:32 +0100
 Subject: [PATCH] Teach configure about serenity
 
 ---
- configure | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
+ configure | 3 +++
+ 1 file changed, 3 insertions(+)
 
 diff --git a/configure b/configure
-index 65e4731..39509f3 100755
+index a9f4b0e2..a061df20 100755
 --- a/configure
 +++ b/configure
-@@ -3998,7 +3998,7 @@ case $_host_os in
- 	amigaos* | cygwin* | dreamcast | ds | gamecube | mingw* | morphos | n64 | ps3 | psp2 | psp | riscos | wii)
- 		_posix=no
- 		;;
--	3ds | android | androidsdl | beos* | bsd* | darwin* | freebsd* | gnu* | gph-linux | haiku* | hpux* | iphone | ios7 | irix*| k*bsd*-gnu* | linux* | maemo | mint* | netbsd* | openbsd* | solaris* | sunos* | switch | uclinux*)
-+	3ds | android | androidsdl | beos* | bsd* | darwin* | freebsd* | gnu* | gph-linux | haiku* | hpux* | iphone | ios7 | irix*| k*bsd*-gnu* | linux* | maemo | mint* | netbsd* | openbsd* | serenity* | solaris* | sunos* | switch | uclinux*)
- 		_posix=yes
- 		;;
- 	os2-emx*)
-@@ -5538,6 +5538,9 @@ EOF
- 		mingw*)
- 			OPENGL_LIBS="-lopengl32"
- 			;;
-+		serenity*)
-+			OPENGL_LIBS="-lgl"
-+			;;
- 		*)
- 			OPENGL_LIBS="-lGL"
- 			;;
+@@ -5543,6 +5543,9 @@ EOF
+ 			mingw*)
+ 				OPENGL_LIBS="-lopengl32"
+ 				;;
++			serenity*)
++				OPENGL_LIBS="-lgl"
++				;;
+ 			*)
+ 				OPENGL_LIBS="-lGL"
+ 				;;
diff --git a/Ports/scummvm/patches/0003-Remove-SDL-timer-lock.patch b/Ports/scummvm/patches/0003-Remove-SDL-timer-lock.patch
deleted file mode 100644
index e0150eabe3..0000000000
--- a/Ports/scummvm/patches/0003-Remove-SDL-timer-lock.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jelle Raaijmakers <jelle@gmta.nl>
-Date: Sun, 9 Jan 2022 23:18:02 +0100
-Subject: [PATCH] Remove SDL timer lock
-
----
- backends/timer/sdl/sdl-timer.cpp | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/backends/timer/sdl/sdl-timer.cpp b/backends/timer/sdl/sdl-timer.cpp
-index f9d79ac..ce1af0e 100644
---- a/backends/timer/sdl/sdl-timer.cpp
-+++ b/backends/timer/sdl/sdl-timer.cpp
-@@ -29,11 +29,7 @@
- 
- #include "common/textconsole.h"
- 
--OSystem::MutexRef timerMutex;
--
- static Uint32 timer_handler(Uint32 interval, void *param) {
--	Common::StackLock lock(timerMutex);
--
- 	((DefaultTimerManager *)param)->handler();
- 	return interval;
- }
-@@ -49,8 +45,6 @@ SdlTimerManager::SdlTimerManager() {
- }
- 
- SdlTimerManager::~SdlTimerManager() {
--	Common::StackLock lock(timerMutex);
--
- 	// Removes the timer callback
- 	SDL_RemoveTimer(_timerID);
- 
diff --git a/Ports/scummvm/patches/ReadMe.md b/Ports/scummvm/patches/ReadMe.md
index f52281615a..43a86ba6d9 100644
--- a/Ports/scummvm/patches/ReadMe.md
+++ b/Ports/scummvm/patches/ReadMe.md
@@ -15,8 +15,3 @@ Since this is for MSAA which we do not yet support, patch it out.
 Teach configure about serenity
 
 
-## `0003-Remove-SDL-timer-lock.patch`
-
-Remove SDL timer lock
-
-