diff options
| author | Jelle Raaijmakers <jelle@gmta.nl> | 2021-10-17 17:07:01 +0200 |
|---|---|---|
| committer | Linus Groh <mail@linusgroh.de> | 2021-10-28 00:23:30 +0200 |
| commit | 59b2bac3a53a5b7605fc85d10b307147f1702635 (patch) | |
| tree | ab26372799228ba9d7e45ebbb3f9311bd3a150d8 | |
| parent | c6247fe414d570df926c8acf46586f8c69ce04e7 (diff) | |
| download | serenity-59b2bac3a53a5b7605fc85d10b307147f1702635.zip | |
Ports: Update ScummVM to 2.5.0
| -rw-r--r-- | Ports/AvailablePorts.md | 2 | ||||
| -rwxr-xr-x | Ports/scummvm/package.sh | 6 | ||||
| -rw-r--r-- | Ports/scummvm/patches/config.sub.patch | 11 | ||||
| -rw-r--r-- | Ports/scummvm/patches/configure.patch | 15 |
4 files changed, 7 insertions, 27 deletions
diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index 539f897a60..d638557de3 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -145,7 +145,7 @@ Please make sure to keep this list up to date when adding and updating ports. :^ | [`rsync`](rsync/) | rsync | 3.1.3 | https://rsync.samba.org/ | | [`ruby`](ruby/) | Ruby | 3.0.2 | https://www.ruby-lang.org/ | | [`sam`](sam/) | Software Automatic Mouth (SAM) | c86ea39 | https://github.com/vidarh/SAM | -| [`scummvm`](scummvm/) | ScummVM | 2.2.0 | https://www.scummvm.org/ | +| [`scummvm`](scummvm/) | ScummVM | 2.5.0 | https://www.scummvm.org/ | | [`SDL_sound`](SDL_sound/) | SDL_sound (Abstract soundfile decoder) | | https://github.com/icculus/SDL_sound | | [`SDL2`](SDL2/) | Simple DirectMedia Layer (SDL2) | | https://github.com/SerenityOS/SDL | | [`SDL2-GNUBoy`](SDL2-GNUBoy/) | SDL2 GNUBoy | 1.2 | https://github.com/AlexOberhofer/SDL2-GNUBoy | diff --git a/Ports/scummvm/package.sh b/Ports/scummvm/package.sh index a1f9c8e3b4..dce2b079eb 100755 --- a/Ports/scummvm/package.sh +++ b/Ports/scummvm/package.sh @@ -1,8 +1,8 @@ #!/usr/bin/env -S bash ../.port_include.sh port=scummvm useconfigure="true" -version="2.2.0" -files="https://downloads.scummvm.org/frs/scummvm/${version}/scummvm-${version}.tar.gz scummvm-${version}.tar.gz 6ec5bd63b73861c10ca9869f27a74989a9ad6013bad30a1ef70de6ec146c2cb5" +version="2.5.0" +files="https://downloads.scummvm.org/frs/scummvm/${version}/scummvm-${version}.tar.xz scummvm-${version}.tar.xz b47ee4b195828d2c358e38a4088eda49886dc37a04f1cc17b981345a59e0d623" auth_type=sha256 depends=("freetype" "libiconv" "libjpeg" "libpng" "libtheora" "SDL2") configopts=( @@ -18,4 +18,4 @@ launcher_command=/usr/local/bin/scummvm icon_file=icons/scummvm.ico export FREETYPE2_CFLAGS="-I${SERENITY_INSTALL_ROOT}/usr/local/include/freetype2" -export FREETYPE2_LIBS="-lfreetype" +export SDL_CFLAGS="-I${SERENITY_INSTALL_ROOT}/usr/local/include/SDL2" diff --git a/Ports/scummvm/patches/config.sub.patch b/Ports/scummvm/patches/config.sub.patch deleted file mode 100644 index 9d8c1d8010..0000000000 --- a/Ports/scummvm/patches/config.sub.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- scummvm-2.2.0/config.sub 2020-09-13 23:05:37.000000000 +0200 -+++ scummvm-2.2.0-patched/config.sub 2021-04-04 01:14:55.423219188 +0200 -@@ -1341,7 +1341,7 @@ - gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ - | *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\ - | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ -- | sym* | kopensolaris* | plan9* \ -+ | sym* | kopensolaris* | plan9* | serenity* \ - | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \ - | aos* | aros* | cloudabi* | sortix* | twizzler* \ - | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \ diff --git a/Ports/scummvm/patches/configure.patch b/Ports/scummvm/patches/configure.patch index f8a5f37b88..20283677bc 100644 --- a/Ports/scummvm/patches/configure.patch +++ b/Ports/scummvm/patches/configure.patch @@ -1,6 +1,6 @@ ---- scummvm-2.2.0/configure 2020-09-13 23:05:37.000000000 +0200 -+++ scummvm-2.2.0-patched/configure 2021-06-07 14:15:33.369406722 +0200 -@@ -3917,7 +3917,7 @@ +--- scummvm-2.5.0/configure 2021-10-01 13:52:42.000000000 +0200 ++++ scummvm-2.5.0-patched/configure 2021-10-17 16:31:01.554772573 +0200 +@@ -3979,7 +3980,7 @@ amigaos* | cygwin* | dreamcast | ds | gamecube | mingw* | morphos | n64 | ps3 | psp2 | psp | riscos | wii) _posix=no ;; @@ -9,12 +9,3 @@ _posix=yes ;; os2-emx*) -@@ -5073,6 +5073,8 @@ - # Check for FreeType2 to be present - # - find_freetype() { -+ _freetype_found="true" -+ return - # Wrapper function which tries to find freetype - # either by calling freetype-config or by using - # pkg-config. |