Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 10 Dec 2024 09:06:52 GMT
From:      Robert Clausecker <fuz@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 5d7c4f57aa8e - main - games/openage: update to 0.6.0
Message-ID:  <202412100906.4BA96qRQ001421@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by fuz:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5d7c4f57aa8e0aa33b7319af2f3e19c91485e349

commit 5d7c4f57aa8e0aa33b7319af2f3e19c91485e349
Author:     Martin Filla <freebsd@sysctl.cz>
AuthorDate: 2024-12-08 12:37:16 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2024-12-10 09:02:57 +0000

    games/openage: update to 0.6.0
    
    Changelog: https://github.com/SFTtech/openage/releases/tag/v0.6.0
    
    PR:             283198
---
 games/openage/Makefile                             |  9 ++++-
 games/openage/distinfo                             |  6 +--
 .../patch-libopenage_pathfinding_pathfinder.cpp    | 11 ++++++
 games/openage/files/patch-openage_default__dirs.py |  4 +-
 games/openage/pkg-plist                            | 45 +++++++++++++++++++++-
 5 files changed, 66 insertions(+), 9 deletions(-)

diff --git a/games/openage/Makefile b/games/openage/Makefile
index b7fb6a541ec8..edd3b6e3a029 100644
--- a/games/openage/Makefile
+++ b/games/openage/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	openage
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.5.3
+DISTVERSION=	0.6.0
 CATEGORIES=	games
 
 MAINTAINER=	freebsd@sysctl.cz
@@ -10,6 +10,11 @@ WWW=		https://openage.sft.mx/
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/legal/GPLv3
 
+BROKEN_armv7=	error: non-constant-expression cannot be narrowed from type \
+			'long long' to 'unsigned int' in initializer list
+BROKEN_i386=	error: non-constant-expression cannot be narrowed from type \
+			'long long' to 'unsigned int' in initializer list
+
 BUILD_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PY_PILLOW} \
@@ -33,7 +38,7 @@ RUN_DEPENDS=	${PYNUMPY} \
 		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR}
 
-USES=		cmake compiler:c++17-lang eigen:3 gl ncurses:base python qt:6 sdl shebangfix
+USES=		cmake compiler:c++17-lang eigen:3 gl ncurses:port python qt:6 sdl shebangfix
 SHEBANG_FILES=	configure run.py.in buildsystem/cythonize.py
 USE_GITHUB=	yes
 GH_ACCOUNT=	SFTtech
diff --git a/games/openage/distinfo b/games/openage/distinfo
index a4554f148fd5..b195383f1961 100644
--- a/games/openage/distinfo
+++ b/games/openage/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1704113854
-SHA256 (SFTtech-openage-v0.5.3_GH0.tar.gz) = 012f3669ea0689a3d0601bd3f632e4499ef27f8d17eae1f256e11e1b6022a1ae
-SIZE (SFTtech-openage-v0.5.3_GH0.tar.gz) = 2984534
+TIMESTAMP = 1733655906
+SHA256 (SFTtech-openage-v0.6.0_GH0.tar.gz) = 74472c6df4361dbedecadb10608f3fea983c7ca05fa5667f00f8b775e215886f
+SIZE (SFTtech-openage-v0.6.0_GH0.tar.gz) = 4912564
diff --git a/games/openage/files/patch-libopenage_pathfinding_pathfinder.cpp b/games/openage/files/patch-libopenage_pathfinding_pathfinder.cpp
new file mode 100644
index 000000000000..4aa33b44bca2
--- /dev/null
+++ b/games/openage/files/patch-libopenage_pathfinding_pathfinder.cpp
@@ -0,0 +1,11 @@
+--- libopenage/pathfinding/pathfinder.cpp.orig	2024-12-08 11:19:50 UTC
++++ libopenage/pathfinding/pathfinder.cpp
+@@ -470,7 +470,7 @@ PortalNode::PortalNode(const std::shared_ptr<Portal> &
+ 
+ PortalNode::PortalNode(const std::shared_ptr<Portal> &portal) :
+ 	portal{portal},
+-	entry_sector{NULL},
++	entry_sector{0},
+ 	future_cost{std::numeric_limits<int>::max()},
+ 	current_cost{std::numeric_limits<int>::max()},
+ 	heuristic_cost{std::numeric_limits<int>::max()},
diff --git a/games/openage/files/patch-openage_default__dirs.py b/games/openage/files/patch-openage_default__dirs.py
index c4eab7f570c7..90ee4b56a6bc 100644
--- a/games/openage/files/patch-openage_default__dirs.py
+++ b/games/openage/files/patch-openage_default__dirs.py
@@ -1,4 +1,4 @@
---- openage/default_dirs.py.orig	2020-08-15 10:50:07 UTC
+--- openage/default_dirs.py.orig	2024-11-26 15:15:38 UTC
 +++ openage/default_dirs.py
 @@ -33,6 +33,14 @@ LINUX_DIRS = {
      "runtime_dir": ("XDG_RUNTIME_DIR", ("/run/user/$UID")),
@@ -24,4 +24,4 @@
 +    	platform_table = FREEBSD_DIRS
  
      else:
-         raise Exception("unsupported platform: '%s'" % sys.platform)
+         raise RuntimeError(f"unsupported platform: '{sys.platform}'")
diff --git a/games/openage/pkg-plist b/games/openage/pkg-plist
index 057b0cac02e3..71d7b17b5cc4 100644
--- a/games/openage/pkg-plist
+++ b/games/openage/pkg-plist
@@ -303,13 +303,11 @@ lib/libopenage.so.0
 %%PYTHON_SITELIBDIR%%/openage/convert/service/init/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/openage/convert/service/init/__pycache__/api_export_required%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/openage/convert/service/init/__pycache__/changelog%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/openage/convert/service/init/__pycache__/conversion_required%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/openage/convert/service/init/__pycache__/modpack_search%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/openage/convert/service/init/__pycache__/mount_asset_dirs%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/openage/convert/service/init/__pycache__/version_detect%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/openage/convert/service/init/api_export_required.py
 %%PYTHON_SITELIBDIR%%/openage/convert/service/init/changelog.py
-%%PYTHON_SITELIBDIR%%/openage/convert/service/init/conversion_required.py
 %%PYTHON_SITELIBDIR%%/openage/convert/service/init/modpack_search.py
 %%PYTHON_SITELIBDIR%%/openage/convert/service/init/mount_asset_dirs.py
 %%PYTHON_SITELIBDIR%%/openage/convert/service/init/version_detect.py
@@ -498,6 +496,9 @@ lib/libopenage.so.0
 %%PYTHON_SITELIBDIR%%/openage/nyan/__pycache__/nyan_structs%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/openage/nyan/import_tree.py
 %%PYTHON_SITELIBDIR%%/openage/nyan/nyan_structs.py
+%%PYTHON_SITELIBDIR%%/openage/pathfinding/__init__.py
+%%PYTHON_SITELIBDIR%%/openage/pathfinding/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/openage/pathfinding/tests%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/openage/renderer/__init__.py
 %%PYTHON_SITELIBDIR%%/openage/renderer/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/openage/renderer/renderer_cpp%%PYTHON_EXT_SUFFIX%%.so
@@ -523,6 +524,7 @@ lib/libopenage.so.0
 %%PYTHON_SITELIBDIR%%/openage/util/__pycache__/bytequeue%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/openage/util/__pycache__/context%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/openage/util/__pycache__/decorators%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/openage/util/__pycache__/dll%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/openage/util/__pycache__/files%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/openage/util/__pycache__/fsprinting%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/openage/util/__pycache__/hash%%PYTHON_EXT_SUFFIX%%.pyc
@@ -535,9 +537,11 @@ lib/libopenage.so.0
 %%PYTHON_SITELIBDIR%%/openage/util/__pycache__/struct%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/openage/util/__pycache__/system%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/openage/util/__pycache__/threading%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/openage/util/__pycache__/version%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/openage/util/bytequeue.py
 %%PYTHON_SITELIBDIR%%/openage/util/context.py
 %%PYTHON_SITELIBDIR%%/openage/util/decorators.py
+%%PYTHON_SITELIBDIR%%/openage/util/dll.py
 %%PYTHON_SITELIBDIR%%/openage/util/filelike/__init__.py
 %%PYTHON_SITELIBDIR%%/openage/util/filelike/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/openage/util/filelike/__pycache__/abstract%%PYTHON_EXT_SUFFIX%%.pyc
@@ -578,11 +582,13 @@ lib/libopenage.so.0
 %%PYTHON_SITELIBDIR%%/openage/util/struct.py
 %%PYTHON_SITELIBDIR%%/openage/util/system.py
 %%PYTHON_SITELIBDIR%%/openage/util/threading.py
+%%PYTHON_SITELIBDIR%%/openage/util/version.py
 %%PYTHON_SITELIBDIR%%/openage/versions/__init__.py
 %%PYTHON_SITELIBDIR%%/openage/versions/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/openage/versions/versions%%PYTHON_EXT_SUFFIX%%.so
 share/applications/openage.desktop
 %%DATADIR%%/banner.svg
+%%DATADIR%%/qml/.gitignore
 %%DATADIR%%/qml/Actions.qml
 %%DATADIR%%/qml/ActionsGrid.qml
 %%DATADIR%%/qml/BindsHelp.qml
@@ -606,6 +612,8 @@ share/applications/openage.desktop
 %%DATADIR%%/shaders/equalsEpsilon.glsl
 %%DATADIR%%/shaders/final.frag.glsl
 %%DATADIR%%/shaders/final.vert.glsl
+%%DATADIR%%/shaders/hud_drag_select.frag.glsl
+%%DATADIR%%/shaders/hud_drag_select.vert.glsl
 %%DATADIR%%/shaders/identity.vert.glsl
 %%DATADIR%%/shaders/maptexture.frag.glsl
 %%DATADIR%%/shaders/maptexture.vert.glsl
@@ -637,6 +645,35 @@ share/applications/openage.desktop
 %%DATADIR%%/test/shaders/demo_4_obj.vert.glsl
 %%DATADIR%%/test/shaders/demo_5_obj.frag.glsl
 %%DATADIR%%/test/shaders/demo_5_obj.vert.glsl
+%%DATADIR%%/test/shaders/demo_6_2d.frag.glsl
+%%DATADIR%%/test/shaders/demo_6_2d.vert.glsl
+%%DATADIR%%/test/shaders/demo_6_2d_frame.frag.glsl
+%%DATADIR%%/test/shaders/demo_6_2d_frame.vert.glsl
+%%DATADIR%%/test/shaders/demo_6_2d_frustum_frame.vert.glsl
+%%DATADIR%%/test/shaders/demo_6_3d.frag.glsl
+%%DATADIR%%/test/shaders/demo_6_3d.vert.glsl
+%%DATADIR%%/test/shaders/demo_6_display.frag.glsl
+%%DATADIR%%/test/shaders/demo_6_display.vert.glsl
+%%DATADIR%%/test/shaders/pathfinding/demo_0_cost_field.frag.glsl
+%%DATADIR%%/test/shaders/pathfinding/demo_0_cost_field.vert.glsl
+%%DATADIR%%/test/shaders/pathfinding/demo_0_display.frag.glsl
+%%DATADIR%%/test/shaders/pathfinding/demo_0_display.vert.glsl
+%%DATADIR%%/test/shaders/pathfinding/demo_0_flow_field.frag.glsl
+%%DATADIR%%/test/shaders/pathfinding/demo_0_flow_field.vert.glsl
+%%DATADIR%%/test/shaders/pathfinding/demo_0_grid.frag.glsl
+%%DATADIR%%/test/shaders/pathfinding/demo_0_grid.vert.glsl
+%%DATADIR%%/test/shaders/pathfinding/demo_0_integration_field.frag.glsl
+%%DATADIR%%/test/shaders/pathfinding/demo_0_integration_field.vert.glsl
+%%DATADIR%%/test/shaders/pathfinding/demo_0_obj.frag.glsl
+%%DATADIR%%/test/shaders/pathfinding/demo_0_obj.vert.glsl
+%%DATADIR%%/test/shaders/pathfinding/demo_0_vector.frag.glsl
+%%DATADIR%%/test/shaders/pathfinding/demo_0_vector.vert.glsl
+%%DATADIR%%/test/shaders/pathfinding/demo_1_display.frag.glsl
+%%DATADIR%%/test/shaders/pathfinding/demo_1_display.vert.glsl
+%%DATADIR%%/test/shaders/pathfinding/demo_1_grid.frag.glsl
+%%DATADIR%%/test/shaders/pathfinding/demo_1_grid.vert.glsl
+%%DATADIR%%/test/shaders/pathfinding/demo_1_obj.frag.glsl
+%%DATADIR%%/test/shaders/pathfinding/demo_1_obj.vert.glsl
 %%DATADIR%%/test/textures/gaben.png
 %%DATADIR%%/test/textures/missing.png
 %%DATADIR%%/test/textures/test_animation.sprite
@@ -651,9 +688,13 @@ share/applications/openage.desktop
 %%DATADIR%%/test/textures/test_terrain.png
 %%DATADIR%%/test/textures/test_terrain.terrain
 %%DATADIR%%/test/textures/test_terrain.texture
+%%DATADIR%%/test/textures/test_terrain2.png
+%%DATADIR%%/test/textures/test_terrain2.terrain
+%%DATADIR%%/test/textures/test_terrain2.texture
 %%DATADIR%%/test/textures/test_texture.png
 %%DATADIR%%/test/textures/test_texture.texture
 %%DATADIR%%/textures/torn_paper_edge.docx
 %%DATADIR%%/textures/torn_paper_edge.png
 share/pixmaps/openage.svg
 @dir etc/xdg
+



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202412100906.4BA96qRQ001421>