summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Ports/AvailablePorts.md2
-rwxr-xr-xPorts/scummvm/package.sh5
-rw-r--r--Ports/scummvm/patches/0001-Prevent-call-to-glGetIntegerv-without-context.patch4
-rw-r--r--Ports/scummvm/patches/0002-Teach-configure-about-serenity.patch35
-rw-r--r--Ports/scummvm/patches/0003-Remove-SDL-timer-lock.patch34
-rw-r--r--Ports/scummvm/patches/ReadMe.md5
6 files changed, 18 insertions, 67 deletions
diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md
index 9b01d1d88f..967edea3fc 100644
--- a/Ports/AvailablePorts.md
+++ b/Ports/AvailablePorts.md
@@ -208,7 +208,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n
| [`rsync`](rsync/) | rsync | 3.1.3 | https://rsync.samba.org/ |
| [`ruby`](ruby/) | Ruby | 3.0.4 | https://www.ruby-lang.org/ |
| [`sam`](sam/) | Software Automatic Mouth (SAM) | c86ea39 | https://github.com/vidarh/SAM |
-| [`scummvm`](scummvm/) | ScummVM | 2.5.1 | https://www.scummvm.org/ |
+| [`scummvm`](scummvm/) | ScummVM | 2.6.0 | https://www.scummvm.org/ |
| [`sdl12-compat`](sdl12-compat/) | SDL2 compatibility layer for SDL 1.2 games | 1.2.52 | https://github.com/libsdl-org/sdl12-compat/ |
| [`SDL2`](SDL2/) | Simple DirectMedia Layer (SDL2) | 2.0.22 | https://github.com/libsdl-org/SDL |
| [`SDL2-GNUBoy`](SDL2-GNUBoy/) | SDL2 GNUBoy | 1.2.1 | https://github.com/AlexOberhofer/SDL2-GNUBoy |
diff --git a/Ports/scummvm/package.sh b/Ports/scummvm/package.sh
index fe2856015a..440c40bac9 100755
--- a/Ports/scummvm/package.sh
+++ b/Ports/scummvm/package.sh
@@ -1,12 +1,11 @@
#!/usr/bin/env -S bash ../.port_include.sh
port=scummvm
useconfigure="true"
-version="2.5.1"
-files="https://downloads.scummvm.org/frs/scummvm/${version}/scummvm-${version}.tar.xz scummvm-${version}.tar.xz 9fd8db38e4456144bf8c34dacdf7f204e75f18e8e448ec01ce08ce826a035f01"
+version="2.6.0"
+files="https://downloads.scummvm.org/frs/scummvm/${version}/scummvm-${version}.tar.xz scummvm-${version}.tar.xz 1c1438e8d0c9d9e15fd129e2e9e2d2227715bd7559f83b2e7208f5d8704ffc17"
auth_type=sha256
depends=("freetype" "libiconv" "libjpeg" "libmad" "libmpeg2" "libpng" "libtheora" "SDL2")
configopts=(
- "--enable-c++11"
"--enable-engine=monkey4"
"--enable-optimizations"
"--with-sdl-prefix=${SERENITY_INSTALL_ROOT}/usr/local"
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
-
-
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 02:28:04 +0000