git: a9d2cfdb2455 - main - games/solarus: Update to 1.6.5
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 11 Jan 2023 18:15:24 UTC
The branch main has been updated by danilo:
URL: https://cgit.FreeBSD.org/ports/commit/?id=a9d2cfdb2455b8bd0f548819c39e5b6d0392f333
commit a9d2cfdb2455b8bd0f548819c39e5b6d0392f333
Author: Danilo Egea Gondolfo <danilo@FreeBSD.org>
AuthorDate: 2023-01-10 22:14:52 +0000
Commit: Danilo Egea Gondolfo <danilo@FreeBSD.org>
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 <stdafx.h> // These two headers are with the libmodplug ones.
+-#include <sndfile.h>
++#include <libmodplug/sndfile.h>
+
+ 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