From owner-svn-ports-all@freebsd.org Tue Oct 15 15:53:00 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 403BE14B7B1; Tue, 15 Oct 2019 15:53:00 +0000 (UTC) (envelope-from swills@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46t0M00xgSz4PZw; Tue, 15 Oct 2019 15:53:00 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0430B20EA3; Tue, 15 Oct 2019 15:53:00 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x9FFqxq7060730; Tue, 15 Oct 2019 15:52:59 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9FFqx7h060726; Tue, 15 Oct 2019 15:52:59 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201910151552.x9FFqx7h060726@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Tue, 15 Oct 2019 15:52:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r514541 - in head/games/pioneer: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/games/pioneer: . files X-SVN-Commit-Revision: 514541 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Oct 2019 15:53:00 -0000 Author: swills Date: Tue Oct 15 15:52:58 2019 New Revision: 514541 URL: https://svnweb.freebsd.org/changeset/ports/514541 Log: games/pioneer: Update to 20191009 PR: 241197 Submitted by: lightside (maintainer) Added: head/games/pioneer/files/patch-src_scenegraph_Serializer.h (contents, props changed) head/games/pioneer/pkg-plist (contents, props changed) Deleted: head/games/pioneer/files/buildopts.h Modified: head/games/pioneer/Makefile (contents, props changed) head/games/pioneer/distinfo (contents, props changed) Modified: head/games/pioneer/Makefile ============================================================================== --- head/games/pioneer/Makefile Tue Oct 15 15:45:23 2019 (r514540) +++ head/games/pioneer/Makefile Tue Oct 15 15:52:58 2019 (r514541) @@ -3,19 +3,20 @@ PORTNAME= pioneer DISTVERSION= 0.0.${GH_TAGNAME} -PORTREVISION= 1 CATEGORIES= games MAINTAINER= lightside@gmx.com COMMENT= Space adventure game set in the Milky Way galaxy -LICENSE= APACHE20 GPLv3 MIT ZLIB CC-BY-SA-3.0 DejaVu IUP SIL -LICENSE_COMB= multi +LICENSE= APACHE20 BSD2CLAUSE CC-BY-SA-3.0 DejaVu GLEW GPLv3 IUP \ + MIT SIL ZLIB +LICENSE_COMB= multi LICENSE_NAME_DejaVu= Bitstream Vera and Arev fonts license LICENSE_NAME_GLEW= The OpenGL Extension Wrangler Library license LICENSE_NAME_IUP= Galaxy colour image use policy LICENSE_NAME_SIL= SIL open font license version 1.1 LICENSE_FILE_APACHE20= ${WRKSRC}/licenses/Apache-2.0.txt +LICENSE_FILE_BSD2CLAUSE= ${WRKSRC}/licenses/LZ4.txt LICENSE_FILE_CC-BY-SA-3.0= ${WRKSRC}/licenses/CC-BY-SA-3.0.txt LICENSE_FILE_DejaVu= ${WRKSRC}/licenses/DejaVu-license.txt LICENSE_FILE_GLEW= ${WRKSRC}/licenses/GLEW.txt @@ -31,67 +32,51 @@ BROKEN_powerpc= fails to build: contrib/profiler/Prof 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' -BUILD_DEPENDS= ${LOCALBASE}/include/GL/glu.h:graphics/libGLU -LIB_DEPENDS= libsigc-2.0.so:devel/libsigc++20 \ +LIB_DEPENDS= libassimp.so:multimedia/assimp \ libfreetype.so:print/freetype2 \ - libvorbisfile.so:audio/libvorbis \ - libpng.so:graphics/png \ - libassimp.so:multimedia/assimp + libsigc-2.0.so:devel/libsigc++20 \ + libvorbisfile.so:audio/libvorbis -USES= autoreconf compiler:c++11-lib gl gmake pkgconfig +USES= cmake compiler:c++11-lib gl gnome pkgconfig USE_GITHUB= yes GH_ACCOUNT= pioneerspacesim -GH_TAGNAME= 20190203 -USE_GL= gl +GH_TAGNAME= 20191009 +USE_GL= gl glu USE_SDL= image2 sdl2 -GNU_CONFIGURE= yes -CONFIGURE_ENV= PIONEER_DATA_DIR="${DATADIR}/data" -CONFIGURE_ARGS= --with-version="${GH_TAGNAME}" -EXTRACT_AFTER_ARGS= --no-same-owner --no-same-permissions --exclude .gitignore +CMAKE_ARGS= -DPIONEER_DATA_DIR:PATH="${DATADIR}/data" +EXTRACT_AFTER_ARGS= --no-same-owner --no-same-permissions --exclude \ + .gitignore +INSTALLS_ICONS= yes PORTDATA= data -PORTDOCS= AUTHORS.txt Changelog.txt Modelviewer.txt Quickstart.txt README.md +PORTDOCS= AUTHORS.txt Changelog.txt Modelviewer.txt Quickstart.txt \ + README.md -PLIST_FILES= bin/${PORTNAME} \ - share/pixmaps/${PORTNAME}.png - -DESKTOP_ENTRIES="Pioneer" "${COMMENT}" \ - "${PORTNAME}" "${PORTNAME}" \ - "Game;Simulation;" false - SUB_FILES= pkg-message -OPTIONS_DEFINE= DOCS EXTRA_WARNINGS EXTERNAL_GLEW EXTERNAL_LUA \ - MODELCOMPILER NOGPUJOBS PROFILER -OPTIONS_DEFAULT= EXTERNAL_GLEW EXTERNAL_LUA MODELCOMPILER +OPTIONS_DEFINE= DOCS EXTERNAL_GLEW EXTERNAL_LUA NOGPUJOBS PROFILER +OPTIONS_DEFAULT= EXTERNAL_GLEW EXTERNAL_LUA EXTERNAL_GLEW_DESC= Use external libglew from graphics/glew EXTERNAL_LUA_DESC= Use external liblua from lang/lua52 -EXTRA_WARNINGS_DESC= Enable extra compiler warnings -MODELCOMPILER_DESC= Build/install modelcompiler tool NOGPUJOBS_DESC= Disable EnableGPUJobs for config.ini by default PROFILER_DESC= Build with internal profiler -DOCS_SUB_LIST= QUICKSTART_PATH="${DOCSDIR}" -DOCS_SUB_LIST_OFF= QUICKSTART_PATH="https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${GH_TAGNAME}" -EXTERNAL_GLEW_CONFIGURE_WITH= external-libglew -EXTERNAL_GLEW_VARS_OFF= LICENSE+=GLEW -EXTERNAL_GLEW_USE= GL=glew,glu -EXTERNAL_LUA_CONFIGURE_WITH= external-liblua -EXTERNAL_LUA_USES= lua:52 -EXTRA_WARNINGS_CONFIGURE_WITH= extra-warnings -MODELCOMPILER_PLIST_FILES= bin/${PORTNAME}-modelcompiler -PROFILER_CONFIGURE_ON= --enable-profiler +DOCS_SUB_LIST= QUICKSTART_PATH="${DOCSDIR}" +DOCS_SUB_LIST_OFF= QUICKSTART_PATH="https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${GH_TAGNAME}" +EXTERNAL_GLEW_CMAKE_BOOL= USE_SYSTEM_LIBGLEW +EXTERNAL_GLEW_VARS_OFF= LICENSE+=GLEW +EXTERNAL_GLEW_USE= GL=glew +EXTERNAL_LUA_CMAKE_BOOL= USE_SYSTEM_LIBLUA +EXTERNAL_LUA_USES= lua:52 +PROFILER_CMAKE_BOOL= PROFILER_ENABLED post-patch: .SILENT - ${REINPLACE_CMD} -e '/^OPTIMISE=/d ; s|lua5\.2|lua-5.2|' \ - ${WRKSRC}/configure.ac + ${REINPLACE_CMD} -e '/^include(FindGit/d ; \ + /TIMESTAMP PROJECT_VERSION/s|.*|set(PROJECT_VERSION "${GH_TAGNAME}")|' \ + ${WRKSRC}/CMakeLists.txt -post-patch-MODELCOMPILER-off: .SILENT - ${REINPLACE_CMD} -e 's/pioneer modelcompiler/pioneer/' \ - ${WRKSRC}/src/Makefile.am - post-patch-NOGPUJOBS-on: .SILENT # Revert 41272a856d9072404efbfdb10f0e3c9e4f96bb4d commit, in case of # GL_OUT_OF_MEMORY OpenGL error, when turning to gas giant planet @@ -99,26 +84,17 @@ post-patch-NOGPUJOBS-on: .SILENT ${WRKSRC}/src/GameConfig.cpp post-patch-PROFILER-off: .SILENT - ${REINPLACE_CMD} -e '/^SUBDIRS/s/ profiler//' \ - ${WRKSRC}/contrib/Makefile.am - ${REINPLACE_CMD} -i '.p.bak' -e \ - '/libprofiler.a/d; $$!N; /libprofiler.a$$/s| \\||; P; D' \ - ${WRKSRC}/src/Makefile.am - ${REINPLACE_CMD} -i '.p.bak' -e '/contrib\/profiler/d' \ - ${WRKSRC}/configure.ac + ${REINPLACE_CMD} -i '.profiler' -e '/contrib\/profiler/d ; /profiler$$/d ; \ + /target_link_libraries(savegamedump/s| profiler||' \ + ${WRKSRC}/CMakeLists.txt -post-configure: - ${CP} ${FILESDIR}/buildopts.h ${WRKSRC}/src - post-install: - ${INSTALL_DATA} ${WRKSRC}/application-icon/pngs/pioneer-256x256.png \ - ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png +.for f in modelcompiler savegamedump + ${MV} ${STAGEDIR}${PREFIX}/bin/${f} \ + ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-${f} +.endfor post-install-DOCS-on: (cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}) - -post-install-MODELCOMPILER-on: - ${MV} ${STAGEDIR}${PREFIX}/bin/modelcompiler \ - ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-modelcompiler .include Modified: head/games/pioneer/distinfo ============================================================================== --- head/games/pioneer/distinfo Tue Oct 15 15:45:23 2019 (r514540) +++ head/games/pioneer/distinfo Tue Oct 15 15:52:58 2019 (r514541) @@ -1,3 +1,3 @@ -TIMESTAMP = 1549191376 -SHA256 (pioneerspacesim-pioneer-0.0.20190203-20190203_GH0.tar.gz) = e526f1659ae321f45b997c0245acecbf9c4cf2122b025ab8db1090f1b9804f5e -SIZE (pioneerspacesim-pioneer-0.0.20190203-20190203_GH0.tar.gz) = 360574063 +TIMESTAMP = 1570621744 +SHA256 (pioneerspacesim-pioneer-0.0.20191009-20191009_GH0.tar.gz) = 54ffa99b5dad6334e75f21deab6e9afa48164d5ea474753c6ccda1a742c22cd6 +SIZE (pioneerspacesim-pioneer-0.0.20191009-20191009_GH0.tar.gz) = 360730481 Added: head/games/pioneer/files/patch-src_scenegraph_Serializer.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/pioneer/files/patch-src_scenegraph_Serializer.h Tue Oct 15 15:52:58 2019 (r514541) @@ -0,0 +1,24 @@ +# pioneerLib.dir/src/CollMesh.cpp does not compile on i686 arch +# https://github.com/pioneerspacesim/pioneer/issues/4691#issuecomment-540114463 + +--- src/scenegraph/Serializer.h.orig 2019-10-09 11:49:04 UTC ++++ src/scenegraph/Serializer.h +@@ -23,14 +23,14 @@ + // where possible, prefer serializing state information via JSON instead. + namespace Serializer { + static_assert((sizeof(Uint32) == 4 && alignof(Uint32) == 4), "Int32 is sized differently on this platform and will not serialize properly."); +- static_assert((sizeof(Uint64) == 8 && alignof(Uint64) == 8), "Int64 is sized differently on this platform and will not serialize properly."); ++ static_assert((sizeof(Uint64) == 8 && alignof(Uint64) <= 8), "Int64 is sized differently on this platform and will not serialize properly."); + static_assert((sizeof(Color) == 4 && alignof(Color) == 1), "Color is padded differently on this platform and will not serialize properly."); + static_assert((sizeof(vector2f) == 8 && alignof(vector2f) == 4), "Vector2f is padded differently on this platform and will not serialize properly."); +- static_assert((sizeof(vector2d) == 16 && alignof(vector2d) == 8), "Vector2d is padded differently on this platform and will not serialize properly."); ++ static_assert((sizeof(vector2d) == 16 && alignof(vector2d) <= 8), "Vector2d is padded differently on this platform and will not serialize properly."); + static_assert((sizeof(vector3f) == 12 && alignof(vector3f) == 4), "Vector3f is padded differently on this platform and will not serialize properly."); +- static_assert((sizeof(vector3d) == 24 && alignof(vector3d) == 8), "Vector3d is padded differently on this platform and will not serialize properly."); ++ static_assert((sizeof(vector3d) == 24 && alignof(vector3d) <= 8), "Vector3d is padded differently on this platform and will not serialize properly."); + static_assert((sizeof(Quaternionf) == 16 && alignof(Quaternionf) == 4), "Quaternionf is padded differently on this platform and will not serialize properly."); +- static_assert((sizeof(Aabb) == 56 && alignof(Aabb) == 8), "Aabb is padded differently on this platform and will not serialize properly."); ++ static_assert((sizeof(Aabb) == 56 && alignof(Aabb) <= 8), "Aabb is padded differently on this platform and will not serialize properly."); + + class Writer { + public: Added: head/games/pioneer/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/pioneer/pkg-plist Tue Oct 15 15:52:58 2019 (r514541) @@ -0,0 +1,17 @@ +bin/pioneer +bin/pioneer-modelcompiler +bin/pioneer-savegamedump +share/appdata/net.pioneerspacesim.Pioneer.appdata.xml +share/applications/net.pioneerspacesim.Pioneer.desktop +share/icons/hicolor/128x128/apps/net.pioneerspacesim.Pioneer.png +share/icons/hicolor/16x16/apps/net.pioneerspacesim.Pioneer.png +share/icons/hicolor/22x22/apps/net.pioneerspacesim.Pioneer.png +share/icons/hicolor/24x24/apps/net.pioneerspacesim.Pioneer.png +share/icons/hicolor/256x256/apps/net.pioneerspacesim.Pioneer.png +share/icons/hicolor/32x32/apps/net.pioneerspacesim.Pioneer.png +share/icons/hicolor/40x40/apps/net.pioneerspacesim.Pioneer.png +share/icons/hicolor/48x48/apps/net.pioneerspacesim.Pioneer.png +share/icons/hicolor/64x64/apps/net.pioneerspacesim.Pioneer.png +@dir %%DATADIR%%/data/music/core/docked +@dir %%DATADIR%%/data/music/core/near-planet +@dir %%DATADIR%%/data/music/core/undocked