Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 9 Feb 2022 18:44:03 GMT
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: f2ff247a098a - main - =?utf-8?Q?games/pioneer: update 20210723 =E2=86=92 20220203?=
Message-ID:  <202202091844.219Ii3Wu026549@gitrepo.freebsd.org>

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

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

commit f2ff247a098a3bf18738937011b51ce6538b0065
Author:     Dmitry Marakasov <amdmi3@FreeBSD.org>
AuthorDate: 2022-02-08 14:40:09 +0000
Commit:     Dmitry Marakasov <amdmi3@FreeBSD.org>
CommitDate: 2022-02-09 18:40:33 +0000

    games/pioneer: update 20210723 → 20220203
---
 games/pioneer/Makefile             | 23 ++++-------------------
 games/pioneer/distinfo             |  6 +++---
 games/pioneer/files/pkg-message.in |  3 +++
 3 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/games/pioneer/Makefile b/games/pioneer/Makefile
index 49f1da899fef..42ea3ee6135b 100644
--- a/games/pioneer/Makefile
+++ b/games/pioneer/Makefile
@@ -1,8 +1,7 @@
 # Created by: lightside <lightside@gmx.com>
 
 PORTNAME=	pioneer
-DISTVERSION=	20210723
-PORTREVISION=	1
+DISTVERSION=	20220203
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
@@ -25,10 +24,8 @@ LICENSE_PERMS_DejaVu=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_IUP=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_SIL=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BROKEN_powerpc=		fails to build: contrib/profiler/Profiler.h:158:51: inconsistent operand constraints in an 'asm'
-BROKEN_powerpc64=	fails to build: contrib/profiler/Profiler.h:158:51: inconsistent operand constraints in an 'asm'
-BROKEN_powerpcspe=	fails to build: contrib/profiler/Profiler.h:158:51: inconsistent operand constraints in an 'asm'
-BROKEN_riscv64=		fails to build: contrib/profiler/Profiler.h:158:28: inconsistent operand constraints in an 'asm'
+# XXX: if you have similar error, try adding failing arch to USE_CHRONO condition in contrib/profiler/Profiler.h
+BROKEN_xxx=		fails to build: contrib/profiler/Profiler.h:158:51: inconsistent operand constraints in an 'asm'
 
 LIB_DEPENDS=	libassimp.so:multimedia/assimp \
 		libfreetype.so:print/freetype2 \
@@ -50,7 +47,7 @@ PORTDOCS=	AUTHORS.txt Changelog.txt Modelviewer.txt Quickstart.txt \
 
 SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=		DOCS NOGPUJOBS PROFILER
+OPTIONS_DEFINE=		DOCS PROFILER
 
 NOGPUJOBS_DESC=		Disable EnableGPUJobs for config.ini by default
 PROFILER_DESC=		Build with internal profiler
@@ -64,18 +61,6 @@ post-patch:
 		/TIMESTAMP PROJECT_VERSION/s|.*|set(PROJECT_VERSION "${GH_TAGNAME}")|' \
 		${WRKSRC}/CMakeLists.txt
 
-post-patch-NOGPUJOBS-on:
-# Revert 41272a856d9072404efbfdb10f0e3c9e4f96bb4d commit, in case of
-# GL_OUT_OF_MEMORY OpenGL error, when turning to gas giant planet
-	@${REINPLACE_CMD} -e '/EnableGPUJobs/s|1|0|' \
-		 ${WRKSRC}/src/GameConfig.cpp
-
-post-patch-PROFILER-off:
-	@${REINPLACE_CMD} -i '.profiler' -e '/contrib\/profiler/d ; /profiler$$/d ; \
-		/target_link_libraries(savegamedump/s| profiler||' \
-		${WRKSRC}/CMakeLists.txt \
-		${WRKSRC}/src/core/CMakeLists.txt
-
 post-install:
 .for f in modelcompiler savegamedump
 	${MV} ${STAGEDIR}${PREFIX}/bin/${f} \
diff --git a/games/pioneer/distinfo b/games/pioneer/distinfo
index 2a9e1e38f856..1e6fe981fee5 100644
--- a/games/pioneer/distinfo
+++ b/games/pioneer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1634828737
-SHA256 (pioneerspacesim-pioneer-20210723_GH0.tar.gz) = 5f5d794d3095079e629980a6a3285d83b95b97e6c9b6058c73531cd06f8d082d
-SIZE (pioneerspacesim-pioneer-20210723_GH0.tar.gz) = 413969783
+TIMESTAMP = 1644231168
+SHA256 (pioneerspacesim-pioneer-20220203_GH0.tar.gz) = 415b55bab7f011f7244348428e13006fa67a926b9be71f2c4ad24e92cfeb051c
+SIZE (pioneerspacesim-pioneer-20220203_GH0.tar.gz) = 427362275
diff --git a/games/pioneer/files/pkg-message.in b/games/pioneer/files/pkg-message.in
index 070c1be6b290..542ee4091ed2 100644
--- a/games/pioneer/files/pkg-message.in
+++ b/games/pioneer/files/pkg-message.in
@@ -8,6 +8,9 @@ different versions of Pioneer. The universe might not be the same in the next
 version of Pioneer. Anything can change. The game is not finished.
 
 Take a look at %%QUICKSTART_PATH%%/Quickstart.txt for more info.
+
+If you encounter GL_OUT_OF_MEMORY error, try setting EnableGPUJobs to 0 in
+your ~/.pioneer/config.ini
 EOM
 }
 ]



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