git: 9a8da9fb0136 - main - games/scummvm: Update to 2.5.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Kai Knoblich <kai_at_FreeBSD.org>
Date: Sat, 09 Oct 2021 19:29:36 UTC
The branch main has been updated by kai:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9a8da9fb0136f1af4ade2c71343f8c90c2bfc192

commit 9a8da9fb0136f1af4ade2c71343f8c90c2bfc192
Author:     Kai Knoblich <kai@FreeBSD.org>
AuthorDate: 2021-10-09 19:14:44 +0000
Commit:     Kai Knoblich <kai@FreeBSD.org>
CommitDate: 2021-10-09 19:14:44 +0000

    games/scummvm: Update to 2.5.0
    
    * Version 2.4 was skipped because this is the first release that
      supports 2.5D games (almost 3D), thanks to the merge with ResidualVM.
    
    * Fold the A52, MP3, PNG and VORBIS options because their dependencies
      are now required to provide the full set of stable engines.
    
    * Remove now obsolete patch from 05a45a5e50775.
    
    Changelog:
    
    https://downloads.scummvm.org/frs/scummvm/2.5.0/ReleaseNotes.html
    
    MFH:            No (feature release)
---
 games/scummvm/Makefile                             | 48 ++++++-------
 games/scummvm/distinfo                             |  6 +-
 games/scummvm/files/patch-Makefile.common          | 18 +++++
 .../files/patch-audio_softsynth_fluidsynth.cpp     | 31 ---------
 games/scummvm/files/patch-configure                | 22 +++---
 games/scummvm/pkg-plist                            | 78 +++++++++++++++++++++-
 6 files changed, 130 insertions(+), 73 deletions(-)

diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile
index 0e6921192508..0bbfc75b5a5a 100644
--- a/games/scummvm/Makefile
+++ b/games/scummvm/Makefile
@@ -1,8 +1,7 @@
 #_ Created by: Alex Trull <freebsd.alex@trull.org>
 
 PORTNAME=	scummvm
-PORTVERSION=	2.2.0
-PORTREVISION=	2
+PORTVERSION=	2.5.0
 CATEGORIES=	games emulators
 MASTER_SITES=	https://downloads.scummvm.org/frs/${PORTNAME}/${PORTVERSION}/
 
@@ -12,31 +11,43 @@ COMMENT=	Interpreter for several adventure games
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libfaad.so:audio/faad \
+LIB_DEPENDS=	liba52.so:audio/liba52 \
+		libfaad.so:audio/faad \
 		libfreetype.so:print/freetype2 \
 		libfribidi.so:converters/fribidi \
+		libmad.so:audio/libmad \
 		libmpeg2.so:multimedia/libmpeg2 \
-		libtheoradec.so:multimedia/libtheora
+		libogg.so:audio/libogg \
+		libpng.so:graphics/png \
+		libtheoradec.so:multimedia/libtheora \
+		libvorbis.so:audio/libvorbis
 
-USES=		cpe gmake gnome iconv jpeg pkgconfig sdl tar:xz
+USES=		cpe gl gmake gnome iconv jpeg pkgconfig sdl tar:xz
+USE_GL=		gl glew
 HAS_CONFIGURE=	yes
 USE_SDL=	sdl2
 INSTALLS_ICONS=	yes
 
 CONFIGURE_ARGS=	--disable-alsa \
 		--disable-debug \
+		--disable-fluidlite \
 		--disable-gtk \
 		--disable-nasm \
 		--disable-tremor \
 		--enable-verbose-build \
+		--with-a52-prefix=${LOCALBASE} \
 		--with-jpeg-prefix=${LOCALBASE} \
+		--with-mad-prefix=${LOCALBASE} \
+		--with-ogg-prefix=${LOCALBASE} \
+		--with-png-prefix=${LOCALBASE} \
 		--with-sdl-prefix=${LOCALBASE} \
+		--with-vorbis-prefix=${LOCALBASE} \
 		--with-zlib-prefix=/usr
 
 LDFLAGS+=	-lpthread
 
-OPTIONS_DEFINE=		A52 CURL DOCS FLAC FLUIDSYNTH MP3 MT32EMU PNG SNDIO TTS VORBIS XENGINES
-OPTIONS_DEFAULT=	A52 MP3 MT32EMU PNG VORBIS
+OPTIONS_DEFINE=		CURL DOCS FLAC GIF FLUIDSYNTH MT32EMU SNDIO TTS XENGINES
+OPTIONS_DEFAULT=	GIF MT32EMU
 OPTIONS_SUB=		yes
 
 CURL_DESC=	Enable ScummVM cloud storage backend
@@ -44,29 +55,10 @@ MT32EMU_DESC=	MT-32 emulator
 TTS_DESC=	Text-to-Speech support
 XENGINES_DESC=	Experimental/Unstable engine support
 
-A52_LIB_DEPENDS=	liba52.so:audio/liba52
-A52_CONFIGURE_ON=	--with-a52-prefix=${LOCALBASE}
-A52_CONFIGURE_OFF=	--disable-a52
-
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_ON=	--with-libcurl-prefix=${LOCALBASE}
 CURL_CONFIGURE_OFF=	--disable-libcurl
 
-VORBIS_LIB_DEPENDS=	libogg.so:audio/libogg \
-			libvorbis.so:audio/libvorbis
-VORBIS_CONFIGURE_ON=	--with-ogg-prefix=${LOCALBASE} \
-			--with-vorbis-prefix=${LOCALBASE}
-VORBIS_CONFIGURE_OFF=	--disable-vorbis \
-			--disable-ogg
-
-MP3_LIB_DEPENDS=	libmad.so:audio/libmad
-MP3_CONFIGURE_ON=	--with-mad-prefix=${LOCALBASE}
-MP3_CONFIGURE_OFF=	--disable-mad
-
-PNG_LIB_DEPENDS=	libpng.so:graphics/png
-PNG_CONFIGURE_ON=	--with-png-prefix=${LOCALBASE}
-PNG_CONFIGURE_OFF=	--disable-png
-
 FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
 FLAC_CONFIGURE_ON=	--with-flac-prefix=${LOCALBASE}
 FLAC_CONFIGURE_OFF=	--disable-flac
@@ -75,6 +67,10 @@ FLUIDSYNTH_LIB_DEPENDS=		libfluidsynth.so:audio/fluidsynth
 FLUIDSYNTH_CONFIGURE_ON=	--with-fluidsynth-prefix=${LOCALBASE}
 FLUIDSYNTH_CONFIGURE_OFF=	--disable-fluidsynth
 
+GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
+GIF_CONFIGURE_ON=	--with-gif-prefix=${LOCALBASE}
+GIF_CONFIGURE_OFF=	--disable-gif
+
 MT32EMU_CONFIGURE_OFF=	--disable-mt32emu
 
 SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
diff --git a/games/scummvm/distinfo b/games/scummvm/distinfo
index 5525522357bd..3099d7059df6 100644
--- a/games/scummvm/distinfo
+++ b/games/scummvm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1608146920
-SHA256 (scummvm-2.2.0.tar.xz) = 1469657e593bd8acbcfac0b839b086f640ebf120633e93f116cab652b5b27387
-SIZE (scummvm-2.2.0.tar.xz) = 63652348
+TIMESTAMP = 1633268742
+SHA256 (scummvm-2.5.0.tar.xz) = b47ee4b195828d2c358e38a4088eda49886dc37a04f1cc17b981345a59e0d623
+SIZE (scummvm-2.5.0.tar.xz) = 130095472
diff --git a/games/scummvm/files/patch-Makefile.common b/games/scummvm/files/patch-Makefile.common
new file mode 100644
index 000000000000..cd3757d655d3
--- /dev/null
+++ b/games/scummvm/files/patch-Makefile.common
@@ -0,0 +1,18 @@
+Avoid fetching the manual via "curl" during build
+
+--- Makefile.common.orig	2021-10-01 11:27:56 UTC
++++ Makefile.common
+@@ -132,13 +132,7 @@ $(EXECUTABLE).dwp: $(EXECUTABLE)
+ endif
+ 
+ # Grab the ScummVM Manual from Read the Docs
+-ifdef USE_CURL
+-DIST_FILES_MANUAL := ScummVM\ Manual\ $(MANUALVERSION).pdf
+ manual:
+-	$(QUIET_CURL)$(CURL) -s https://docs.scummvm.org/_/downloads/en/$(MANUALVERSION)/pdf/ --output $(DIST_FILES_MANUAL)
+-else
+-manual:
+-endif
+ 
+ distclean: clean clean-devtools
+ 	$(RM) config.h config.mk config.log configure.stamp engines/engines.mk engines/detection_table.h engines/plugins_table.h "ScummVM Manual"*.pdf
diff --git a/games/scummvm/files/patch-audio_softsynth_fluidsynth.cpp b/games/scummvm/files/patch-audio_softsynth_fluidsynth.cpp
deleted file mode 100644
index e538d47910b4..000000000000
--- a/games/scummvm/files/patch-audio_softsynth_fluidsynth.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-Fix build with FluidSynth >= 2.2.0
-
-Obtained from:
-
-https://github.com/NetBSD/pkgsrc/commit/25b35d66ba06339121f9ed19cc0a307a7b61dfc9
-
---- audio/softsynth/fluidsynth.cpp.orig	2020-09-13 21:05:37 UTC
-+++ audio/softsynth/fluidsynth.cpp
-@@ -144,11 +144,11 @@ static void *SoundFontMemLoader_open(const char *filen
- 	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 *handle) {
- 	return FLUID_OK;
- }
- 
--static long SoundFontMemLoader_tell(void *handle) {
-+static long long SoundFontMemLoader_tell(void *handle) {
- 	return ((Common::SeekableReadStream *) handle)->pos();
- }
- #endif
diff --git a/games/scummvm/files/patch-configure b/games/scummvm/files/patch-configure
index 68453aa63ad5..b7561f7142b8 100644
--- a/games/scummvm/files/patch-configure
+++ b/games/scummvm/files/patch-configure
@@ -1,9 +1,9 @@
---- configure.orig	2020-09-13 21:05:37 UTC
+--- configure.orig	2021-08-28 18:59:28 UTC
 +++ configure
-@@ -2947,9 +2947,9 @@ EOF
- 		append_var LIBS "-specs=ds_arm9.specs"
- 		append_var LIBS "-lnds9"
- 		;;
+@@ -2937,9 +2937,9 @@ EOF
+ 			_optimization_level=-O2
+ 		fi
+ 	;;
 -	freebsd* | openbsd*)
 -		append_var LDFLAGS "-L/usr/local/lib"
 -		append_var CXXFLAGS "-I/usr/local/include"
@@ -13,13 +13,13 @@
  		;;
  	gamecube)
  		_optimization_level=-Os
-@@ -3920,6 +3920,9 @@ case $_host_os in
- 	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*)
- 		_posix=yes
+@@ -3975,6 +3975,9 @@ case $_host_os in
+ 		_posix=no
  		;;
-+	dragonfly*)
+ 	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*)
 +		_posix=yes
 +		;;
- 	os2-emx*)
- 		_posix=yes	# FIXME: Really???
++	dragonfly*)
+ 		_posix=yes
  		;;
+ 	os2-emx*)
diff --git a/games/scummvm/pkg-plist b/games/scummvm/pkg-plist
index b64a3ebb8dbd..b0225113475b 100644
--- a/games/scummvm/pkg-plist
+++ b/games/scummvm/pkg-plist
@@ -5,8 +5,12 @@ share/applications/scummvm.desktop
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/COPYING.BSD
 %%PORTDOCS%%%%DOCSDIR%%/COPYING.FREEFONT
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.ISC
 %%PORTDOCS%%%%DOCSDIR%%/COPYING.LGPL
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.LUA
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.MIT
 %%PORTDOCS%%%%DOCSDIR%%/COPYING.OFL
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.TINYGL
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
 %%PORTDOCS%%%%DOCSDIR%%/NEWS.md
 %%PORTDOCS%%%%DOCSDIR%%/README.md
@@ -15,28 +19,98 @@ share/man/man6/scummvm.6.gz
 share/metainfo/scummvm.appdata.xml
 share/pixmaps/scummvm.xpm
 %%DATADIR%%/access.dat
+%%DATADIR%%/achievements.dat
 %%XENGINES%%%%DATADIR%%/cryo.dat
 %%DATADIR%%/cryomni3d.dat
 %%DATADIR%%/drascula.dat
+%%DATADIR%%/encoding.dat
 %%DATADIR%%/fonts.dat
+%%DATADIR%%/grim-patch.lab
+%%XENGINES%%%%DATADIR%%/hadesch_translations.dat
 %%DATADIR%%/hugo.dat
 %%DATADIR%%/kyra.dat
 %%DATADIR%%/lure.dat
+%%DATADIR%%/macgui.dat
 %%XENGINES%%%%DATADIR%%/macventure.dat
+%%XENGINES%%%%DATADIR%%/monkey4-patch.m4b
 %%DATADIR%%/mort.dat
+%%DATADIR%%/myst3.dat
 %%DATADIR%%/neverhood.dat
 %%DATADIR%%/pred.dic
 %%DATADIR%%/queen.tbl
+%%DATADIR%%/residualvm.zip
 %%DATADIR%%/scummclassic.zip
 %%DATADIR%%/scummmodern.zip
 %%DATADIR%%/scummremastered.zip
+%%DATADIR%%/shaders/emi_actor.fragment
+%%DATADIR%%/shaders/emi_actor.vertex
+%%DATADIR%%/shaders/emi_actorlights.fragment
+%%DATADIR%%/shaders/emi_actorlights.vertex
+%%DATADIR%%/shaders/emi_background.fragment
+%%DATADIR%%/shaders/emi_background.vertex
+%%DATADIR%%/shaders/emi_dimplane.fragment
+%%DATADIR%%/shaders/emi_dimplane.vertex
+%%DATADIR%%/shaders/emi_sprite.fragment
+%%DATADIR%%/shaders/emi_sprite.vertex
+%%DATADIR%%/shaders/grim_actor.fragment
+%%DATADIR%%/shaders/grim_actor.vertex
+%%DATADIR%%/shaders/grim_actorlights.fragment
+%%DATADIR%%/shaders/grim_actorlights.vertex
+%%DATADIR%%/shaders/grim_background.fragment
+%%DATADIR%%/shaders/grim_background.vertex
+%%DATADIR%%/shaders/grim_dim.fragment
+%%DATADIR%%/shaders/grim_dim.vertex
+%%DATADIR%%/shaders/grim_emerg.fragment
+%%DATADIR%%/shaders/grim_emerg.vertex
+%%DATADIR%%/shaders/grim_primitive.fragment
+%%DATADIR%%/shaders/grim_primitive.vertex
+%%DATADIR%%/shaders/grim_shadowplane.fragment
+%%DATADIR%%/shaders/grim_shadowplane.vertex
+%%DATADIR%%/shaders/grim_smush.fragment
+%%DATADIR%%/shaders/grim_smush.vertex
+%%DATADIR%%/shaders/grim_text.fragment
+%%DATADIR%%/shaders/grim_text.vertex
+%%DATADIR%%/shaders/myst3_box.fragment
+%%DATADIR%%/shaders/myst3_box.vertex
+%%DATADIR%%/shaders/stark_actor.fragment
+%%DATADIR%%/shaders/stark_actor.vertex
+%%DATADIR%%/shaders/stark_fade.fragment
+%%DATADIR%%/shaders/stark_fade.vertex
+%%DATADIR%%/shaders/stark_prop.fragment
+%%DATADIR%%/shaders/stark_prop.vertex
+%%DATADIR%%/shaders/stark_shadow.fragment
+%%DATADIR%%/shaders/stark_shadow.vertex
+%%DATADIR%%/shaders/stark_surface.fragment
+%%DATADIR%%/shaders/stark_surface.vertex
+%%DATADIR%%/shaders/wme_fade.fragment
+%%DATADIR%%/shaders/wme_fade.vertex
+%%DATADIR%%/shaders/wme_flat_shadow_mask.fragment
+%%DATADIR%%/shaders/wme_flat_shadow_mask.vertex
+%%DATADIR%%/shaders/wme_flat_shadow_modelx.fragment
+%%DATADIR%%/shaders/wme_flat_shadow_modelx.vertex
+%%DATADIR%%/shaders/wme_geometry.fragment
+%%DATADIR%%/shaders/wme_geometry.vertex
+%%DATADIR%%/shaders/wme_line.fragment
+%%DATADIR%%/shaders/wme_line.vertex
+%%DATADIR%%/shaders/wme_modelx.fragment
+%%DATADIR%%/shaders/wme_modelx.vertex
+%%DATADIR%%/shaders/wme_shadow_mask.fragment
+%%DATADIR%%/shaders/wme_shadow_mask.vertex
+%%DATADIR%%/shaders/wme_shadow_volume.fragment
+%%DATADIR%%/shaders/wme_shadow_volume.vertex
+%%DATADIR%%/shaders/wme_sprite.fragment
+%%DATADIR%%/shaders/wme_sprite.vertex
+%%DATADIR%%/shaders/myst3_cube.fragment
+%%DATADIR%%/shaders/myst3_cube.vertex
+%%DATADIR%%/shaders/myst3_text.fragment
+%%DATADIR%%/shaders/myst3_text.vertex
 %%DATADIR%%/sky.cpt
 %%DATADIR%%/supernova.dat
 %%DATADIR%%/teenagent.dat
-%%MP3%%%%DATADIR%%/titanic.dat
+%%DATADIR%%/titanic.dat
 %%DATADIR%%/tony.dat
 %%DATADIR%%/toon.dat
 %%DATADIR%%/translations.dat
 %%DATADIR%%/ultima.dat
-%%PNG%%%%DATADIR%%/wintermute.zip
+%%DATADIR%%/wintermute.zip
 %%DATADIR%%/xeen.ccs