git: 04c014ce74a0 - main - games/scummvm: Update to 2.6.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Kai Knoblich <kai_at_FreeBSD.org>
Date: Mon, 01 Aug 2022 19:43:56 UTC
The branch main has been updated by kai:

URL: https://cgit.FreeBSD.org/ports/commit/?id=04c014ce74a042f4c2fd298a73e0ab0427e37913

commit 04c014ce74a042f4c2fd298a73e0ab0427e37913
Author:     Kai Knoblich <kai@FreeBSD.org>
AuthorDate: 2022-08-01 19:12:59 +0000
Commit:     Kai Knoblich <kai@FreeBSD.org>
CommitDate: 2022-08-01 19:12:59 +0000

    games/scummvm: Update to 2.6.0
    
    * Upstream has changed the license, set LICENSE accordingly.
    
    * In order to compile the whole code, a compiler which can at least
      C++11 is now required.
    
    Changelog:
    
    https://downloads.scummvm.org/frs/scummvm/2.6.0/ReleaseNotes.html
    
    MFH:            No (feature release)
---
 games/scummvm/Makefile              |  7 +++----
 games/scummvm/distinfo              |  6 +++---
 games/scummvm/files/patch-configure | 19 +++++++++----------
 games/scummvm/pkg-plist             |  8 ++++++++
 4 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile
index 155d00c30921..da8aca91394a 100644
--- a/games/scummvm/Makefile
+++ b/games/scummvm/Makefile
@@ -1,13 +1,12 @@
 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 \
@@ -21,7 +20,7 @@ LIB_DEPENDS=	liba52.so:audio/liba52 \
 		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
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
@@ -5,6 +5,7 @@ share/applications/scummvm.desktop
 %%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
@@ -26,6 +27,7 @@ share/pixmaps/scummvm.xpm
 %%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
@@ -72,6 +74,12 @@ share/pixmaps/scummvm.xpm
 %%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