From nobody Mon Aug 01 19:43:56 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4LxT8D4zmLz4Xl2J; Mon, 1 Aug 2022 19:43:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LxT8D4Txpz3tN4; Mon, 1 Aug 2022 19:43:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659383036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ky+0ec7xdJRQhywQH7IclWkRfVfq2v+P2YQo8kCsoEg=; b=wxrbTGwDYM3frRi0k7cdZh4NUcCRtfU2IMXNiQnEypPK4m9IDQmXH/F5AMG4EZoUwonYI9 sRxfjLwVIKxWZMQ6ciYfDDYAo4GzGg7TnGXgTYwBwNh0BA0/St6fFyo02wjhlTMRxuWTDZ w4lofnAVCU4auKEqfZGbPP9nb2KYyuk/YiNqsD9swidN2Bndy9dsOD0tzNkuBTMV04yd0c 7weSZiBIXDkFJMDNzpTh7A6+BxPIlAygBq/3z1x/6/UECQka4PfWjna4eqEYPwQNUPIZny FBp+xW8XNOCtZswQspGXbweK2lHSypA0xFjKiBuBc/j9Ep93ke+STWXZhgqgig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4LxT8D3XTvzldZ; Mon, 1 Aug 2022 19:43:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 271JhuLx071630; Mon, 1 Aug 2022 19:43:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 271Jhu40071629; Mon, 1 Aug 2022 19:43:56 GMT (envelope-from git) Date: Mon, 1 Aug 2022 19:43:56 GMT Message-Id: <202208011943.271Jhu40071629@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kai Knoblich Subject: git: 04c014ce74a0 - main - games/scummvm: Update to 2.6.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kai X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 04c014ce74a042f4c2fd298a73e0ab0427e37913 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659383036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ky+0ec7xdJRQhywQH7IclWkRfVfq2v+P2YQo8kCsoEg=; b=M5FPDfSjnvcEYEWTqUOKmkQk25UqrB8Z/sEBOl/mUuP2G2xQmB9GkQLHoez1WpH9qzvopN JGFq25MZ72SGC7OxNTbDaf4VmU4hRwnRUZM0xU/7OFmRb7nOxzaugC61wew9uhLVXU5Kjm DJtwpgRSy3iXPT10wC0na3LjY4B0zlQnzgeG8cd/g7yTgH8Xt5VwygAThsmntcE1/9KRri 1p7wg9rBRLzjkXuc3yugcBj4poN94yhMhFJjEtGvA/mlbWUcsb4hurXUkDpz2fYZoFg8S3 lFzMiCqjuTdK+bTSmnLurncrWmAYRGQTX4MvoGzP9wiMnZiwwz2IQuqC9JpoYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659383036; a=rsa-sha256; cv=none; b=RkFFWyFtQk8kRruJEC5qljPTiwQz+a38XPVfdw/JYjDa6Kufyz5O73ptq2syWSY8ZdXgrY vZKUlKzkNX3NnIR0xn+ffBSG458B5gxO66jHAIQN7CuZrOBeVxaNUPk5fclSoB1HOVeVtk 6/bCVfwe5kflXYrgteomrX8Img5efOj1pC0LRSJ8hhubahA0CeKHboFFeurXumzUEPjzUq ukexJu6sLlP18Od76SLsK4EbJzhCmj5L+VPIgVKybwzgSwT32meBJtXaCp20+VWhAeNJwv 9w7rPjuZ2IvF2ODswptA5FrmD5rM79Ie8URxSZIuzo3FCd6K3ILAVnT1JVdWoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kai: URL: https://cgit.FreeBSD.org/ports/commit/?id=04c014ce74a042f4c2fd298a73e0ab0427e37913 commit 04c014ce74a042f4c2fd298a73e0ab0427e37913 Author: Kai Knoblich AuthorDate: 2022-08-01 19:12:59 +0000 Commit: Kai Knoblich 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