scummvm: updated to 2.5.0

2.5.0 "Twenty years ago today..." (2021-10-09)

 New games:
 - Added support for Grim Fandango.
 - Added support for The Longest Journey.
 - Added support for Myst 3: Exile.
 - Added support for Little Big Adventure.
 - Added support for Red Comrades 1: Save the Galaxy.
 - Added support for Red Comrades 2: For the Great Justice.
 - Added support for Transylvania.
 - Added support for Crimson Crown.
 - Added support for OO-Topos.
 - Added support for Glulx interactive fiction games.
 - Added support for Lure of the Temptress Konami release.
 - Added support for Private Eye.
 - Added support for Spanish Blue Force.
 - Added support for Spanish Ringworld.
 - Added support for Spanish Amazon: Guardians of Eden.
 - Added support for AGS Games versions 2.5+.
 - Added support for Nightlong: Union City Conspiracy.
 - Added support for The Journeyman Project 2: Buried in Time.
 - Added support for Crusader: No Remorse.
 - Added support for L-ZONE.
 - Added support for Spaceship Warlock.

 New ports:
 - The Nintendo DS port got a major rewrite.

 General:
 - Switched ScummVM GUI output to UTF-32.
 - Updated the Roland MT-32 emulation code to the Munt project's mt32emu 2.5.1.
 - Updated Dropbox Cloud Storage to use the new Dropbox OAuth workflow.
 - Major extension to the number of supported graphics scalers.
 - Display path to scummvm configuration file in GUI -> Options -> Paths.
 - Added new optional dependency, giflib >= 5.0.0. Used by some version of LBA.
 - Added HiDPI support to the ScummVM GUI.
 - Added command line option --window-size for specifying ScummVM window size,
   applicable only to the OpenGL renderer.
 - Fixed switching to the default graphics mode. This was sometimes not applied
   until restarting ScummVM or starting a game.
 - ScummVM GUI has been fully translated into Korean and Japanese.
 - Added GUI option for enabling and disabling the Discord RPC integration.

 ADL:
 - Added support for Mystery House French translation.
 - Added support for several game variants.

 AGI:
 - Added support for Russian versions. Input now works.

 AGOS:
 - Added support for the Japanese PC-98 version of Elvira 1.

 CGE:
 - Added option to use Text To Speech for Soltys.

 CGE2:
 - Added option to use Text To Speech for Sfinx.

 Cine:
 - Added detection for Future Wars CD version with French translation patch.
 - Added detection for Italian Amiga Operation Stealth.
 - Fixed crash before entering secret base.
 - Fixed space missing in verb line.
 - Fixed vertically overflowing message boxes.

 Dreamweb:
 - Rendering fixes for Russian fan translation.

 Glk:
 - Fixed savegame issues with several subengines.
 - Fixed memory overrun in Level9 game detector.
 - Added detections for 2020 IF Comp games.
 - Enabled Glulx sub-engine.

 Gob:
 - Added support for Bargon Attack Russian translation.
 - Added support for Woodruff Russian translation.

 Griffon:
 - Fixed Return to Launcher from The Griffon Legend.
 - Added option to use Text To Speech in The Griffon Legend

 Grim:
 - Added support for Brazillian Portuguese Grim Fandango.

 Kyra:
 - Added support for the Japanese Sega-CD version of Eye of the Beholder.
 - Added support for the Hebrew fan translation of Legend of Kyrandia.
 - Added support for the Hebrew fan translation of Legend of Kyrandia 2.
 - Added support for the Simplified Chinese version of Legend of Kyrandia 3.
 - Added support for the playable demo of Lands of Lore.

 Lure:
 - Fixed fire animation in first room when loading saves.
 - Fixed AdLib support.
 - Fixed MT-32 support.

 Pegasus:
 - Added support for DVD/GOG.com release.

 Queen:
 - Added support for German Amiga floppy release.

 SAGA:
 - Added support for ITE GOG Mac CD v1.1.
 - Added support for ITE PC-98 Japanese.

 SCI:
 - Added RGB rendering mode (16/32bpp) for SCI0 - SCI1.1 games, which addresses palette
   issues in screen transitions and avoids mode changes when playing Mac QuickTime videos.
 - Added custom palette mods for SQ3 and LSL2 from the FreeSCI project. When enabled, the mods improve the visuals
   in these two games.
 - Added support for Macintosh version of Gabriel Knight 1.
 - Added support for CD-Audio version of Mixed-Up Mother Goose.
 - Added support for Korean fan translations from the scummkor project: Castle of Dr. Brain,
   EcoQuest 1, Gabriel Knight 1, King's Quest 1, 5, and 6, Laura Bow 2, and Space Quest 4.
 - Added support for Space Quest 4 Update 1.3 by New Rising Sun.
 - Added support for French LSL1VGA.
 - Added support for Hebrew QFG1VGA.
 - Added support for Hebrew GK1.
 - Added support for Russian Longbow.
 - Added support for Russian LSL6.
 - Added support for alternate Russian LSL7.
 - Added support for alternate Polish LSL7 including files packaged with InstallShield.
 - Added support for alternate Russian SQ5.
 - Added support for alternate Russian Torin's Passage.
 - Added support for fan game Soulshade Asylum.
 - SCI1.1 views are now scaled accurately.
 - Fixed sounds not stopping or restarting correctly.
 - Fixed sound issues when restoring SCI0 games.
 - Fixed corruption when "Prefer digital sound effects" was disabled in SCI1 games.
 - Space Quest 4 CD sound effects now match the selected platform.
 - Added option to enable Windows cursors in CD versions of King's Quest 5 and Space Quest 4.
 - Fixed "Girl In The Tower" song not playing at the end of King's Quest 6 CD.
 - Fixed King's Quest 5 Amiga beach error that prevented completing the game.
 - Fixed over 30 script bugs in GK1, HOYLE4, KQ1DEMO, KQ5, KQ6, KQ7, LB1,
   LSL3, PEPPER, PQ3, QFG3, SQ1, SQ4, and SQ6.
 - Unlocked JANE easter egg in Gabriel Knight 1.

 SCUMM:
 - Fixed Chinese, Japanese and Korean text display for The Dig and for The Curse of Monkey Island. These fixes
   also include some improvements to the common text display (mainly the formatting of wrapped texts).
 - Fixed display of Chinese, Japanese and Korean pause and restart dialogs.
 - Added support for numerous Korean translations from scummkor project.
 - Added support for Russobit-M versions of Pajama2 and SpyOzone.
 - Fixed speech playback in Akella version of COMI.
 - Added support for Discord and Humble Bundle versions of Indiana Jones and the Fate of Atlantis.
 - Added smooth scrolling for FM-TOWNS versions of games.
 - Added optional trimming to 200 pixels for some FM-TOWNS games, so aspect-ratio correction is possible.
 - Fixed audio distortion in Loom for PC-Engine.
 - Added support for the high resolution font and cursor in the 16-color Macintosh version of Loom.
 - Added support for Japanese Mac version of The Dig.
 - Added partial support for the high resolution fonts and cursor in the
   16-color Macintosh version of Indiana Jones and the Last Crusade.
 - Fixed missing instruments in the m68k Mac versions of Monkey Island 2
   and Indiana Jones and the Fate of Atlantis.
 - Added "Macintosh b/w" render mode for the 16-color Macintosh versions of
   Loom and Indiana Jones and the Last Crusade.
 - Enabled difficulty selection in the version of Monkey Island 2 that was
   included on the LucasArts Mac CD Game Pack II compilation. (It had been
   disabled along with the copy protection.)
 - Repaired clumsy crack in Maniac Mansion (enhanced)'s keypad script.
   This means that the GOG and Steam versions will no longer accept incorrect
   numbers, e.g. for Edna's phone number. (Why are they selling a cracked
   version anyway?!)
 - Added support for Low quality music in Macintosh version of Loom.
 - Improved Digital iMUSE accuracy for Full Throttle and The Curse of Monkey Island. These improvements also fix
   several audio related bugs for both games.
 - Fixed a very old regression in the walk code for Full Throttle which softlocked the game.
 - Improved the accuracy of the walk code for The Dig and The Curse of Monkey Island.
 - Fixed a bug in The Curse of Monkey Island which prevented, during the cannon minigame in Part 1, the destruction
   of one of the three destroyable turrets in the fort.
 - Added animated cigar smoke to the close-up of captain Smirk in the CD
   version of Monkey Island 1. It was present in earlier versions.
 - Restored some missing Lemonhead lines in the English, Italian, German and Spanish CD
   versions as well as the English Macintosh, FM-Towns and Sega CD versions
   of Monkey Island 1.
 - Made the clock tower in Monkey Island 1 behave the same in the CD version
   as in earlier versions, i.e. after examining it you have to leave the
   room and come back again for its description to change.

 Tinsel:
 - Enabled the Return to Launcher feature.

 Titanic:
 - Fixed crashes when asking bots what I should do.

 TsAGE:
 - Added support for uninstalled floppy version.

 Stark:
 - Added support for Hungarian translation.

 Supernova:
 - Added Italian translation for part 1.

 Sword25:
 - Made the extracted version working.
 - Fixed crash when selecting Croatian language.

 Ultima:
 - Ultima 4: Added several debugger commands.
 - Ultima 4: Allow Enter key to exit ZStats display.
 - Ultima 8: Fixed several animation bugs for events and objects.
 - Ultima 8: Restored original text for the Spell of Resurrection book.

 Xeen:
 - Fixed occasional border corruption during fights.
 - Improvements to cutscenes to better match the original games.
 - Fixes for character selection, deselection, and dismissing to better match original.
 - Added support for Russian version.

 AmigaOS port:
 - Added native system file browser feature.
 - Re-activated nuked OPL Adlib driver.

 Big-endian ports:
 - Fixed crashes or rendering issues with the Blazing Dragons, Duckman and
   Full Pipe games.

 iOS port:
 - Fixed using arrow keys on physical keyboard in iOS 15.
 - Fixed rotating the device while ScummVM is inactive.
 - Added support for upside down portrait orientation.

 macOS port:
 - Added support for Dark Mode.
 - Use OpenGL renderer by default, providing better support for HiDPI displays.

 MorphOS port:
 - Added native system file browser feature.
 - Added Cloud feature.
 - Re-activate nuked OPL Adlib driver.
 - Added CAMD MIDI driver support.

Windows port:
 - Use OpenGL renderer by default, providing better support for HiDPI displays.

5 files changed, 85 insertions, 42 deletions

diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile
index a9f820b4b97..6e961dc9423 100644
--- a/games/scummvm/Makefile
+++ b/games/scummvm/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.95 2021/09/29 19:00:40 adam Exp $
+# $NetBSD: Makefile,v 1.96 2021/10/11 08:27:04 adam Exp $
 
-DISTNAME=	scummvm-2.2.0
-PKGREVISION=	4
+DISTNAME=	scummvm-2.5.0
 CATEGORIES=	games
 MASTER_SITES=	https://www.scummvm.org/frs/scummvm/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tar.xz
@@ -32,9 +31,11 @@ BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.2.1
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../converters/fribidi/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
+.include "../../graphics/glew/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
 .include "../../multimedia/libmpeg2/buildlink3.mk"
 .include "../../multimedia/libtheora/buildlink3.mk"
 .include "../../net/SDL2_net/buildlink3.mk"
diff --git a/games/scummvm/PLIST b/games/scummvm/PLIST
index 7000ae352d4..c1778369863 100644
--- a/games/scummvm/PLIST
+++ b/games/scummvm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2020/09/29 08:44:25 adam Exp $
+@comment $NetBSD: PLIST,v 1.20 2021/10/11 08:27:04 adam Exp $
 bin/scummvm
 man/man6/scummvm.6
 share/applications/scummvm.desktop
@@ -7,8 +7,12 @@ share/doc/scummvm/CONTRIBUTING.md
 share/doc/scummvm/COPYING
 share/doc/scummvm/COPYING.BSD
 share/doc/scummvm/COPYING.FREEFONT
+share/doc/scummvm/COPYING.ISC
 share/doc/scummvm/COPYING.LGPL
+share/doc/scummvm/COPYING.LUA
+share/doc/scummvm/COPYING.MIT
 share/doc/scummvm/COPYING.OFL
+share/doc/scummvm/COPYING.TINYGL
 share/doc/scummvm/COPYRIGHT
 share/doc/scummvm/NEWS.md
 share/doc/scummvm/README.md
@@ -16,19 +20,87 @@ share/icons/hicolor/scalable/apps/scummvm.svg
 share/metainfo/scummvm.appdata.xml
 share/pixmaps/scummvm.xpm
 share/scummvm/access.dat
+share/scummvm/achievements.dat
 share/scummvm/cryomni3d.dat
 share/scummvm/drascula.dat
+share/scummvm/encoding.dat
 share/scummvm/fonts.dat
+share/scummvm/grim-patch.lab
 share/scummvm/hugo.dat
 share/scummvm/kyra.dat
 share/scummvm/lure.dat
+share/scummvm/macgui.dat
 share/scummvm/mort.dat
+share/scummvm/myst3.dat
 share/scummvm/neverhood.dat
 share/scummvm/pred.dic
 share/scummvm/queen.tbl
+share/scummvm/residualvm.zip
 share/scummvm/scummclassic.zip
 share/scummvm/scummmodern.zip
 share/scummvm/scummremastered.zip
+share/scummvm/shaders/emi_actor.fragment
+share/scummvm/shaders/emi_actor.vertex
+share/scummvm/shaders/emi_actorlights.fragment
+share/scummvm/shaders/emi_actorlights.vertex
+share/scummvm/shaders/emi_background.fragment
+share/scummvm/shaders/emi_background.vertex
+share/scummvm/shaders/emi_dimplane.fragment
+share/scummvm/shaders/emi_dimplane.vertex
+share/scummvm/shaders/emi_sprite.fragment
+share/scummvm/shaders/emi_sprite.vertex
+share/scummvm/shaders/grim_actor.fragment
+share/scummvm/shaders/grim_actor.vertex
+share/scummvm/shaders/grim_actorlights.fragment
+share/scummvm/shaders/grim_actorlights.vertex
+share/scummvm/shaders/grim_background.fragment
+share/scummvm/shaders/grim_background.vertex
+share/scummvm/shaders/grim_dim.fragment
+share/scummvm/shaders/grim_dim.vertex
+share/scummvm/shaders/grim_emerg.fragment
+share/scummvm/shaders/grim_emerg.vertex
+share/scummvm/shaders/grim_primitive.fragment
+share/scummvm/shaders/grim_primitive.vertex
+share/scummvm/shaders/grim_shadowplane.fragment
+share/scummvm/shaders/grim_shadowplane.vertex
+share/scummvm/shaders/grim_smush.fragment
+share/scummvm/shaders/grim_smush.vertex
+share/scummvm/shaders/grim_text.fragment
+share/scummvm/shaders/grim_text.vertex
+share/scummvm/shaders/myst3_box.fragment
+share/scummvm/shaders/myst3_box.vertex
+share/scummvm/shaders/myst3_cube.fragment
+share/scummvm/shaders/myst3_cube.vertex
+share/scummvm/shaders/myst3_text.fragment
+share/scummvm/shaders/myst3_text.vertex
+share/scummvm/shaders/stark_actor.fragment
+share/scummvm/shaders/stark_actor.vertex
+share/scummvm/shaders/stark_fade.fragment
+share/scummvm/shaders/stark_fade.vertex
+share/scummvm/shaders/stark_prop.fragment
+share/scummvm/shaders/stark_prop.vertex
+share/scummvm/shaders/stark_shadow.fragment
+share/scummvm/shaders/stark_shadow.vertex
+share/scummvm/shaders/stark_surface.fragment
+share/scummvm/shaders/stark_surface.vertex
+share/scummvm/shaders/wme_fade.fragment
+share/scummvm/shaders/wme_fade.vertex
+share/scummvm/shaders/wme_flat_shadow_mask.fragment
+share/scummvm/shaders/wme_flat_shadow_mask.vertex
+share/scummvm/shaders/wme_flat_shadow_modelx.fragment
+share/scummvm/shaders/wme_flat_shadow_modelx.vertex
+share/scummvm/shaders/wme_geometry.fragment
+share/scummvm/shaders/wme_geometry.vertex
+share/scummvm/shaders/wme_line.fragment
+share/scummvm/shaders/wme_line.vertex
+share/scummvm/shaders/wme_modelx.fragment
+share/scummvm/shaders/wme_modelx.vertex
+share/scummvm/shaders/wme_shadow_mask.fragment
+share/scummvm/shaders/wme_shadow_mask.vertex
+share/scummvm/shaders/wme_shadow_volume.fragment
+share/scummvm/shaders/wme_shadow_volume.vertex
+share/scummvm/shaders/wme_sprite.fragment
+share/scummvm/shaders/wme_sprite.vertex
 share/scummvm/sky.cpt
 share/scummvm/supernova.dat
 share/scummvm/teenagent.dat
diff --git a/games/scummvm/distinfo b/games/scummvm/distinfo
index 487be2f6d51..3ca552f9295 100644
--- a/games/scummvm/distinfo
+++ b/games/scummvm/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.53 2021/10/07 14:07:50 nia Exp $
+$NetBSD: distinfo,v 1.54 2021/10/11 08:27:04 adam Exp $
 
-RMD160 (scummvm-2.2.0.tar.xz) = 3011e4d66fd3b5e28029afbd894a9cd7df9e9ec1
-SHA512 (scummvm-2.2.0.tar.xz) = 001f884b9689386ef5b69ab8f5fa2362e1e4dc5e8273f96dc8dce1963be354a2fad95e724ff33d65008be7591519f0e2bac530ba3c44a449b8b7cac862f4f81e
-Size (scummvm-2.2.0.tar.xz) = 63652348 bytes
-SHA1 (patch-aa) = eedd2949184813d6089ffdf7df348d57625aa29f
-SHA1 (patch-audio_softsynth_fluidsynth.cpp) = 6e4b0da9b7c17ff881ee42af74393bc2c2cade55
+RMD160 (scummvm-2.5.0.tar.xz) = a4fa5b99f483d27e7c132fd5c553aa88030c627e
+SHA512 (scummvm-2.5.0.tar.xz) = 7ea702cf0f993994209fd692e82ab65f9686fb60d65f36624a31bd642067fe7dd35e556666281c68d1592d7dd07333f085c124038f7a45acefae8f30bceff534
+Size (scummvm-2.5.0.tar.xz) = 130095472 bytes
+SHA1 (patch-Makefile) = 20566aad703a3ed4e2b65acdb921d0df3dc7f891
diff --git a/games/scummvm/patches/patch-aa b/games/scummvm/patches/patch-Makefile
index a59b2b02897..292b8b6be26 100644
--- a/games/scummvm/patches/patch-aa
+++ b/games/scummvm/patches/patch-Makefile
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.20 2016/07/21 13:48:49 adam Exp $
+$NetBSD: patch-Makefile,v 1.1 2021/10/11 08:27:04 adam Exp $
 
 Link against OSS.
 
 --- Makefile.orig	2009-02-22 02:06:44.000000000 +0100
 +++ Makefile
-@@ -10,7 +10,7 @@ srcdir      ?= .
+@@ -8,7 +8,7 @@ srcdir      ?= .
  DEFINES     := -DHAVE_CONFIG_H
  LDFLAGS     :=
  INCLUDES    := -I. -I$(srcdir) -I$(srcdir)/engines
diff --git a/games/scummvm/patches/patch-audio_softsynth_fluidsynth.cpp b/games/scummvm/patches/patch-audio_softsynth_fluidsynth.cpp
deleted file mode 100644
index 1830b054237..00000000000
--- a/games/scummvm/patches/patch-audio_softsynth_fluidsynth.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-audio_softsynth_fluidsynth.cpp,v 1.1 2021/04/06 22:04:36 wiz Exp $
-
-Fix build with fluidsynth 2.2.0
-
---- audio/softsynth/fluidsynth.cpp.orig	2020-09-13 21:05:37.000000000 +0000
-+++ audio/softsynth/fluidsynth.cpp
-@@ -144,11 +144,11 @@ static void *SoundFontMemLoader_open(con
- 	return p;
- }
- 
--static int SoundFontMemLoader_read(void *buf, int count, void *handle) {
-+static int SoundFontMemLoader_read(void *buf, long long count, void *handle) {
- 	return ((Common::SeekableReadStream *) handle)->read(buf, count) == (uint32)count ? FLUID_OK : FLUID_FAILED;
- }
- 
--static int SoundFontMemLoader_seek(void *handle, long offset, int origin) {
-+static int SoundFontMemLoader_seek(void *handle, long long offset, int origin) {
- 	return ((Common::SeekableReadStream *) handle)->seek(offset, origin) ? FLUID_OK : FLUID_FAILED;
- }
- 
-@@ -157,7 +157,7 @@ static int SoundFontMemLoader_close(void
- 	return FLUID_OK;
- }
- 
--static long SoundFontMemLoader_tell(void *handle) {
-+static long long SoundFontMemLoader_tell(void *handle) {
- 	return ((Common::SeekableReadStream *) handle)->pos();
- }
- #endif