mirror of
https://github.com/SerenityOS/serenity
synced 2024-07-21 18:15:58 +00:00
Ports: Update ScummVM to 2.7.1
The `glGetIntegerv` patch is now removed since a fix was upstreamed.
This commit is contained in:
Jelle Raaijmakers
Andreas Kling
parent
3e2449d1fe
commit
ad859a8d0d
|
|
@ -257,7 +257,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n
|
|||
| [`ruby`](ruby/) | Ruby | 3.2.2 | https://www.ruby-lang.org/ |
|
||||
| [`rvvm`](rvvm/) | RVVM - The RISC-V Virtual Machine | 0.5 | https://github.com/LekKit/RVVM |
|
||||
| [`sam`](sam/) | Software Automatic Mouth (SAM) | c86ea39 | https://github.com/vidarh/SAM |
|
||||
| [`scummvm`](scummvm/) | ScummVM | 2.7.0 | https://www.scummvm.org/ |
|
||||
| [`scummvm`](scummvm/) | ScummVM | 2.7.1 | https://www.scummvm.org/ |
|
||||
| [`sdl12-compat`](sdl12-compat/) | SDL2 compatibility layer for SDL 1.2 games | 1.2.56 | https://github.com/libsdl-org/sdl12-compat/ |
|
||||
| [`SDL2`](SDL2/) | Simple DirectMedia Layer (SDL2) | 2.24.0 | https://github.com/libsdl-org/SDL |
|
||||
| [`SDL2-GNUBoy`](SDL2-GNUBoy/) | SDL2 GNUBoy | 1.2.1 | https://github.com/AlexOberhofer/SDL2-GNUBoy |
|
||||
|
|
|
|||
|
|
@ -1,22 +1,31 @@
|
|||
#!/usr/bin/env -S bash ../.port_include.sh
|
||||
port=scummvm
|
||||
useconfigure="true"
|
||||
version="2.7.0"
|
||||
port='scummvm'
|
||||
useconfigure='true'
|
||||
version='2.7.1'
|
||||
files=(
|
||||
"https://downloads.scummvm.org/frs/scummvm/${version}/scummvm-${version}.tar.xz 444b1ffd61774fe867824e57bb3033c9998ffa8a4ed3a13246b01611d5cf9993"
|
||||
"https://downloads.scummvm.org/frs/scummvm/${version}/scummvm-${version}.tar.xz d6bbf62e33154759a609d59f3034d71652ecdb64ed5c800156718ab1f1d5d063"
|
||||
)
|
||||
depends=(
|
||||
'freetype'
|
||||
'libiconv'
|
||||
'libjpeg'
|
||||
'libmad'
|
||||
'libmpeg2'
|
||||
'libpng'
|
||||
'libtheora'
|
||||
'SDL2'
|
||||
)
|
||||
depends=("freetype" "libiconv" "libjpeg" "libmad" "libmpeg2" "libpng" "libtheora" "SDL2")
|
||||
configopts=(
|
||||
"--enable-engine=monkey4"
|
||||
"--enable-release"
|
||||
'--enable-engine=monkey4'
|
||||
'--enable-release'
|
||||
"--with-sdl-prefix=${SERENITY_INSTALL_ROOT}/usr/local"
|
||||
)
|
||||
launcher_name=ScummVM
|
||||
launcher_category=Games
|
||||
launcher_command=/usr/local/bin/scummvm
|
||||
icon_file=icons/scummvm.ico
|
||||
launcher_name='ScummVM'
|
||||
launcher_category='Games'
|
||||
launcher_command='/usr/local/bin/scummvm'
|
||||
icon_file='icons/scummvm.ico'
|
||||
|
||||
export CPPFLAGS="-fvisibility=hidden"
|
||||
export CPPFLAGS='-fvisibility=hidden'
|
||||
export FREETYPE2_CFLAGS="-I${SERENITY_INSTALL_ROOT}/usr/local/include/freetype2"
|
||||
export OPENGL_CFLAGS="-I${SERENITY_INSTALL_ROOT}/usr/include/LibGL"
|
||||
export SDL_CFLAGS="-I${SERENITY_INSTALL_ROOT}/usr/local/include/SDL2"
|
||||
|
|
|
|||
|
|
@ -1,27 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Jelle Raaijmakers <jelle@gmta.nl>
|
||||
Date: Wed, 12 Jan 2022 13:41:39 +0100
|
||||
Subject: [PATCH] Prevent call to `glGetIntegerv` without context
|
||||
|
||||
This call to `SDL_GL_GetAttribute` happens when switching from the
|
||||
launcher to the game, when no GL context may exist. This caused Grim
|
||||
Fandango to crash almost immediately.
|
||||
|
||||
Since this is for MSAA which we do not yet support, patch it out.
|
||||
---
|
||||
backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp b/backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp
|
||||
index 0ab78342..be97cdb5 100644
|
||||
--- a/backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp
|
||||
+++ b/backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp
|
||||
@@ -299,7 +299,7 @@ void OpenGLSdlGraphics3dManager::setupScreen() {
|
||||
// (or not bridged in Emscripten?). This forces a windows reset.
|
||||
currentSamples = -1;
|
||||
#else
|
||||
- SDL_GL_GetAttribute(SDL_GL_MULTISAMPLESAMPLES, ¤tSamples);
|
||||
+ currentSamples = -1;
|
||||
#endif
|
||||
|
||||
// When rendering to a framebuffer, MSAA is enabled on that framebuffer, not on the screen
|
||||
|
|
@ -8,10 +8,10 @@ Subject: [PATCH] Teach configure about serenity
|
|||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index a9f4b0e2..a061df20 100755
|
||||
index 5c28f7e35038236debbdeb3c396ce65f1189b13d..5bbf819fe31d24ac215d59f730bd64eac69c0bfd 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -5543,6 +5543,9 @@ EOF
|
||||
@@ -5843,6 +5843,9 @@ EOF
|
||||
mingw*)
|
||||
OPENGL_LIBS="-lopengl32"
|
||||
;;
|
||||
|
|
@ -1,16 +1,6 @@
|
|||
# Patches for scummvm on SerenityOS
|
||||
|
||||
## `0001-Prevent-call-to-glGetIntegerv-without-context.patch`
|
||||
|
||||
Prevent call to `glGetIntegerv` without context
|
||||
|
||||
This call to `SDL_GL_GetAttribute` happens when switching from the
|
||||
launcher to the game, when no GL context may exist. This caused Grim
|
||||
Fandango to crash almost immediately.
|
||||
|
||||
Since this is for MSAA which we do not yet support, patch it out.
|
||||
|
||||
## `0002-Teach-configure-about-serenity.patch`
|
||||
## `0001-Teach-configure-about-serenity.patch`
|
||||
|
||||
Teach configure about serenity
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue