From nobody Wed Jan 11 18:15:24 2023 X-Original-To: dev-commits-ports-all@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 4NsbSr5WC5z2qmNt; Wed, 11 Jan 2023 18:15:24 +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 4NsbSr4tDZz3BrV; Wed, 11 Jan 2023 18:15:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673460924; 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=YH9zjNibxPDo/acaiJQxE46gZC10CmHHS6a4+dN0IAU=; b=myuiPd/T2RS7JvnCZK0zhMWTR5o/hbMbtG0D1X0bCq8PixNvEWFX0XWbFgN9deSUmmIadH HLOTZJpJYGSpA3z9p4HV46WVC9ZQ8kllVVGUr4nDuTihHksy2P48qjUnfDwyUjUH8YU36R 10MMmcarDQH2lLdFHqRaZMwxlWGgE05mevBegQAkJVNzhtj/NVJq+GbETbRHTQVIFSbuXf seczTJo0R7YzLTgMiz+zM56eIU7kBVCLRJoYRX1hNKqa6owOaQ4TG4j1Ouh7kL973/oMRK 80iUbR/VfemDR9G4v2uIZ4KS/amxDmsyiE04nv5O6mCbFE0QCh3zqju9xcoYJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673460924; 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=YH9zjNibxPDo/acaiJQxE46gZC10CmHHS6a4+dN0IAU=; b=KYxpSxGlQ1PFYG8boIAk1s2CZMa+LLPbhLwVl78C305hdkmMvn6b39QeViR6XbXvg67/+h sGJkFAnHA5rqivPbDofnUOR4NyDKTQE+tlHzipHoH2KzHGkj1KuMFHJusMUGrs7OarPKnR OxdyEjv6EheoHfBe6jl6SdIT1uHWQoXLOJLoTfIeBaeUNg4jx6+rFiZoTK/024CcIKyb0C rOybzG7odGpMjcflhKvkd+1/Gjl74BN9/hazFZFr0lKyHIc3p1lIc6bF9EFUzKsnPpJf5q Q5wdqhPnZy2vZWyCUXjhlvFiB+v5BUA/9Ai26RQOqxRlGKw61oS9pzUaKlz6zw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673460924; a=rsa-sha256; cv=none; b=J4F0lVYtJ1FWqQWMYllZOWjAop6AAnWtMXY96NASV3D7+A1QJDgEXEfda8+mfgIuI6ES9H 4lAjVEK8A0nmEYox45zEGKwpKFlcpbrQla1CZPCbUujS+zzOBzKeyiwUzVjXAs+bKiVM1a SQxWNUaM9Ollqd08Zy5XJT2XgpQemND3HquR+sM2hdibuBek+fq9TKjV3HbUedZu/pCdZH JHsH/CAfCdRGc9n9lOqqrYQWuHkuZmnHhrKO06vStdNekBCvAthA3YLDE66nCqGiwmiB0+ 44l0BJq0fINdqh5lQdIyrwNaGvraggiEi+9zv+fElge57NI9zesQWriD9EN/+A== 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 4NsbSr3wRdzxnY; Wed, 11 Jan 2023 18:15:24 +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 30BIFO8c048360; Wed, 11 Jan 2023 18:15:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30BIFOHo048359; Wed, 11 Jan 2023 18:15:24 GMT (envelope-from git) Date: Wed, 11 Jan 2023 18:15:24 GMT Message-Id: <202301111815.30BIFOHo048359@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Danilo Egea Gondolfo Subject: git: a9d2cfdb2455 - main - games/solarus: Update to 1.6.5 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danilo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a9d2cfdb2455b8bd0f548819c39e5b6d0392f333 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danilo: URL: https://cgit.FreeBSD.org/ports/commit/?id=a9d2cfdb2455b8bd0f548819c39e5b6d0392f333 commit a9d2cfdb2455b8bd0f548819c39e5b6d0392f333 Author: Danilo Egea Gondolfo AuthorDate: 2023-01-10 22:14:52 +0000 Commit: Danilo Egea Gondolfo CommitDate: 2023-01-11 18:15:19 +0000 games/solarus: Update to 1.6.5 - Update WWW - Move luajit dependency to USES --- games/solarus/Makefile | 9 +++--- games/solarus/distinfo | 6 ++-- games/solarus/files/patch-src_audio_ItDecoder.cpp | 11 ++++++++ games/solarus/pkg-plist | 34 +++++++++++++++-------- 4 files changed, 40 insertions(+), 20 deletions(-) diff --git a/games/solarus/Makefile b/games/solarus/Makefile index dce714f5762b..d359ebcfc7e4 100644 --- a/games/solarus/Makefile +++ b/games/solarus/Makefile @@ -1,12 +1,11 @@ PORTNAME= solarus -PORTVERSION= 1.6.4 +PORTVERSION= 1.6.5 DISTVERSIONPREFIX= v -PORTREVISION= 3 CATEGORIES= games MAINTAINER= danilo@FreeBSD.org COMMENT= Zelda-like 2D game engine -WWW= http://wiki.solarus-games.org/doku.php +WWW= https://www.solarus-games.org LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/license.txt @@ -22,7 +21,7 @@ USES= cmake:noninja compiler:c++11-lib gl openal qmake qt:5 sdl xorg USE_GITLAB= yes GL_ACCOUNT= solarus-games -GL_COMMIT= f43727b232b3ed13d98440a845e2a29e470e4f0d +GL_COMMIT= 21a378a7858460809ffef1c96a07a493d709730c MAKE_ARGS+= DESTDIR=${STAGEDIR} USE_QT= buildtools:build core gui linguisttools:build widgets @@ -39,7 +38,7 @@ OPTIONS_DEFAULT_powerpc64le= LUAJIT LUAJIT_CMAKE_BOOL= SOLARUS_USE_LUAJIT LUAJIT_DESC= Use LuaJIT instead of standard Lua -LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit +LUAJIT_USES= luajit LUAJIT_USES_OFF= lua:51 CMAKE_ARGS+= -DSOLARUS_MANUAL_INSTALL_DESTINATION:STRING="man" diff --git a/games/solarus/distinfo b/games/solarus/distinfo index bda0653060f3..364cf51690ee 100644 --- a/games/solarus/distinfo +++ b/games/solarus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1617891375 -SHA256 (solarus-games-solarus-f43727b232b3ed13d98440a845e2a29e470e4f0d_GL0.tar.gz) = 93ab9e67c8cc3be7b159dae42dd14ca5aec0e2675485c217e6540f8b45f2e8d3 -SIZE (solarus-games-solarus-f43727b232b3ed13d98440a845e2a29e470e4f0d_GL0.tar.gz) = 14995282 +TIMESTAMP = 1673301511 +SHA256 (solarus-games-solarus-21a378a7858460809ffef1c96a07a493d709730c_GL0.tar.gz) = 28f3b63454a7de6d8fb154dfa1e2e203afeb34db006661329e273137f8fe3dce +SIZE (solarus-games-solarus-21a378a7858460809ffef1c96a07a493d709730c_GL0.tar.gz) = 15015311 diff --git a/games/solarus/files/patch-src_audio_ItDecoder.cpp b/games/solarus/files/patch-src_audio_ItDecoder.cpp new file mode 100644 index 000000000000..15daabcdc6bb --- /dev/null +++ b/games/solarus/files/patch-src_audio_ItDecoder.cpp @@ -0,0 +1,11 @@ +--- src/audio/ItDecoder.cpp.orig 2023-01-09 22:24:56 UTC ++++ src/audio/ItDecoder.cpp +@@ -17,7 +17,7 @@ + #include "solarus/audio/ItDecoder.h" + #include "solarus/core/Debug.h" + #include // These two headers are with the libmodplug ones. +-#include ++#include + + namespace Solarus { + diff --git a/games/solarus/pkg-plist b/games/solarus/pkg-plist index 267e0db3fc83..296b89c24a0c 100644 --- a/games/solarus/pkg-plist +++ b/games/solarus/pkg-plist @@ -254,21 +254,31 @@ include/solarus/third_party/snes_spc/dsp.h include/solarus/third_party/snes_spc/spc.h lib/libsolarus-gui.so lib/libsolarus-gui.so.1 -lib/libsolarus-gui.so.1.6.4 +lib/libsolarus-gui.so.1.6.5 lib/libsolarus.so lib/libsolarus.so.1 -lib/libsolarus.so.1.6.4 +lib/libsolarus.so.1.6.5 man/man6/solarus-launcher.6.gz man/man6/solarus-run.6.gz -share/appdata/solarus-launcher.appdata.xml -share/applications/solarus-launcher.desktop -share/icons/hicolor/16x16/apps/solarus-launcher.png -share/icons/hicolor/20x20/apps/solarus-launcher.png -share/icons/hicolor/24x24/apps/solarus-launcher.png -share/icons/hicolor/32x32/apps/solarus-launcher.png -share/icons/hicolor/48x48/apps/solarus-launcher.png -share/icons/hicolor/scalable/apps/solarus-launcher.svg -share/icons/hicolor/symbolic/apps/solarus-launcher-symbolic.svg -share/pixmaps/solarus-launcher.png +share/applications/org.solarus_games.solarus.Launcher.desktop +share/icons/hicolor/16x16/apps/org.solarus_games.solarus.Launcher.png +share/icons/hicolor/16x16/apps/org.solarus_games.solarus.Runner.png +share/icons/hicolor/20x20/apps/org.solarus_games.solarus.Launcher.png +share/icons/hicolor/20x20/apps/org.solarus_games.solarus.Runner.png +share/icons/hicolor/24x24/apps/org.solarus_games.solarus.Launcher.png +share/icons/hicolor/24x24/apps/org.solarus_games.solarus.Runner.png +share/icons/hicolor/32x32/apps/org.solarus_games.solarus.Launcher.png +share/icons/hicolor/32x32/apps/org.solarus_games.solarus.Runner.png +share/icons/hicolor/40x40/apps/org.solarus_games.solarus.Launcher.png +share/icons/hicolor/40x40/apps/org.solarus_games.solarus.Runner.png +share/icons/hicolor/48x48/apps/org.solarus_games.solarus.Launcher.png +share/icons/hicolor/48x48/apps/org.solarus_games.solarus.Runner.png +share/icons/hicolor/scalable/apps/org.solarus_games.solarus.Launcher.svg +share/icons/hicolor/scalable/apps/org.solarus_games.solarus.Runner.svg +share/icons/hicolor/symbolic/apps/org.solarus_games.solarus.Launcher-symbolic.svg +share/icons/hicolor/symbolic/apps/org.solarus_games.solarus.Runner-symbolic.svg +share/metainfo/org.solarus_games.solarus.appdata.xml +share/pixmaps/org.solarus_games.solarus.Launcher.png +share/pixmaps/org.solarus_games.solarus.Runner.png %%DATADIR%%-gui/translations/solarus_es.qm %%DATADIR%%-gui/translations/solarus_fr.qm