diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile index 155d00c30921..da8aca91394a 100644 --- a/games/scummvm/Makefile +++ b/games/scummvm/Makefile @@ -1,100 +1,99 @@ PORTNAME= scummvm -PORTVERSION= 2.5.1 -PORTREVISION= 1 +PORTVERSION= 2.6.0 CATEGORIES= games emulators MASTER_SITES= https://downloads.scummvm.org/frs/${PORTNAME}/${PORTVERSION}/ MAINTAINER= kai@FreeBSD.org COMMENT= Interpreter for several adventure games -LICENSE= GPLv2+ +LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING 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 \ libogg.so:audio/libogg \ libpng.so:graphics/png \ libtheoradec.so:multimedia/libtheora \ libvorbis.so:audio/libvorbis -USES= cpe gl gmake gnome iconv jpeg pkgconfig sdl tar:xz +USES= compiler:c++11-lang cpe gl gmake gnome iconv jpeg pkgconfig sdl tar:xz USE_GL= gl glew HAS_CONFIGURE= yes USE_SDL= sdl2 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= CURL DOCS FLAC GIF FLUIDSYNTH MT32EMU SNDIO TTS XENGINES OPTIONS_DEFAULT= GIF MT32EMU OPTIONS_SUB= yes CURL_DESC= Enable ScummVM cloud storage backend MT32EMU_DESC= MT-32 emulator TTS_DESC= Text-to-Speech support XENGINES_DESC= Experimental/Unstable engine support CURL_LIB_DEPENDS= libcurl.so:ftp/curl CURL_CONFIGURE_ON= --with-libcurl-prefix=${LOCALBASE} CURL_CONFIGURE_OFF= --disable-libcurl FLAC_LIB_DEPENDS= libFLAC.so:audio/flac FLAC_CONFIGURE_ON= --with-flac-prefix=${LOCALBASE} FLAC_CONFIGURE_OFF= --disable-flac 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 SNDIO_CONFIGURE_ON= --with-sndio-prefix=${LOCALBASE} SNDIO_CONFIGURE_OFF= --disable-sndio TTS_LIB_DEPENDS= libspeechd.so:accessibility/speech-dispatcher TTS_CONFIGURE_ON= --enable-tts TTS_CONFIGURE_OFF= --disable-tts XENGINES_CONFIGURE_ON= --enable-all-engines XENGINES_CONFIGURE_OFF= --disable-all-unstable-engines .include .if ${ARCH} == armv6 || ${ARCH} == armv7 CONFIGURE_ENV+= ASFLAGS=-meabi=5 .endif post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/configure post-install: ${INSTALL_DATA} ${WRKSRC}/dists/${PORTNAME}.desktop \ ${STAGEDIR}${DESKTOPDIR} @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} .include diff --git a/games/scummvm/distinfo b/games/scummvm/distinfo index 980a58610a96..78a18e8c564e 100644 --- a/games/scummvm/distinfo +++ b/games/scummvm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1640900445 -SHA256 (scummvm-2.5.1.tar.xz) = 9fd8db38e4456144bf8c34dacdf7f204e75f18e8e448ec01ce08ce826a035f01 -SIZE (scummvm-2.5.1.tar.xz) = 132828412 +TIMESTAMP = 1658061114 +SHA256 (scummvm-2.6.0.tar.xz) = 1c1438e8d0c9d9e15fd129e2e9e2d2227715bd7559f83b2e7208f5d8704ffc17 +SIZE (scummvm-2.6.0.tar.xz) = 141331920 diff --git a/games/scummvm/files/patch-configure b/games/scummvm/files/patch-configure index b7561f7142b8..1db275249480 100644 --- a/games/scummvm/files/patch-configure +++ b/games/scummvm/files/patch-configure @@ -1,25 +1,24 @@ ---- configure.orig 2021-08-28 18:59:28 UTC +--- configure.orig 2022-07-16 20:28:55 UTC +++ configure -@@ -2937,9 +2937,9 @@ EOF - _optimization_level=-O2 +@@ -2939,9 +2939,9 @@ EOF + append_var LDFLAGS "-s USE_ZLIB=1" fi ;; -- freebsd* | openbsd*) +- freebsd*) - append_var LDFLAGS "-L/usr/local/lib" - append_var CXXFLAGS "-I/usr/local/include" -+ dragonfly* | freebsd* | openbsd*) ++ dragonfly* | freebsd*) + append_var LDFLAGS "-L%%LOCALBASE%%/lib" + append_var CXXFLAGS "-I%%LOCALBASE%%/include" ;; gamecube) _optimization_level=-Os -@@ -3975,6 +3975,9 @@ case $_host_os in +@@ -4021,7 +4021,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*) -+ _posix=yes -+ ;; -+ dragonfly*) +- 3ds | android | 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*) ++ 3ds | android | beos* | bsd* | darwin* | dragonfly* | 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*) diff --git a/games/scummvm/pkg-plist b/games/scummvm/pkg-plist index b0225113475b..62a1672546d1 100644 --- a/games/scummvm/pkg-plist +++ b/games/scummvm/pkg-plist @@ -1,116 +1,124 @@ bin/scummvm share/applications/scummvm.desktop %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTING.md %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/COPYING.BSD %%PORTDOCS%%%%DOCSDIR%%/COPYING.FREEFONT +%%PORTDOCS%%%%DOCSDIR%%/COPYING.GLAD %%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 share/icons/hicolor/scalable/apps/scummvm.svg 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 +%%DATADIR%%/gui-icons.dat %%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 +%%XENGINES%%%%DATADIR%%/shaders/playground3d_bitmap.fragment +%%XENGINES%%%%DATADIR%%/shaders/playground3d_bitmap.vertex +%%XENGINES%%%%DATADIR%%/shaders/playground3d_cube.fragment +%%XENGINES%%%%DATADIR%%/shaders/playground3d_cube.vertex +%%XENGINES%%%%DATADIR%%/shaders/playground3d_fade.fragment +%%XENGINES%%%%DATADIR%%/shaders/playground3d_fade.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 %%DATADIR%%/titanic.dat %%DATADIR%%/tony.dat %%DATADIR%%/toon.dat %%DATADIR%%/translations.dat %%DATADIR%%/ultima.dat %%DATADIR%%/wintermute.zip %%DATADIR%%/xeen.ccs