Attachment #208294 for bug #241197





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 BSD2CLAUSE MIT ZLIB CC-BY-SA-3.0 DejaVu IUP SIL
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

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 \
		libfreetype.so:print/freetype2 \
		libvorbisfile.so:audio/libvorbis \
		libpng.so:graphics/png \
		libassimp.so:multimedia/assimp

USES=		cmake compiler:c++11-lib gl gnome pkgconfig
USE_GITHUB=	yes
GH_ACCOUNT=	pioneerspacesim
GH_TAGNAME=	20191009
USE_GL=		gl glu
USE_SDL=	image2 sdl2

CMAKE_ARGS=	-DPIONEER_DATA_DIR:PATH="${DATADIR}/data"
CONFIGURE_ENV=	PIONEER_DATA_DIR="${DATADIR}/data"
CONFIGURE_ARGS=	--with-version="${GH_TAGNAME}"
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

PLIST_FILES=	bin/${PORTNAME} \
		share/pixmaps/${PORTNAME}.png

DESKTOP_ENTRIES="Pioneer" "${COMMENT}" \
		"${PORTNAME}" "${PORTNAME}" \
		"Game;Simulation;" false

SUB_FILES=	pkg-message

OPTIONS_DEFINE=		DOCS EXTERNAL_GLEW EXTERNAL_LUA NOGPUJOBS PROFILER
OPTIONS_DEFAULT=	EXTERNAL_GLEW EXTERNAL_LUA
OPTIONS_DEFAULT=	EXTERNAL_GLEW EXTERNAL_LUA MODELCOMPILER

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_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
MODELCOMPILER_PLIST_FILES=	bin/${PORTNAME}-modelcompiler
PROFILER_CONFIGURE_ON=	--enable-profiler

post-patch: .SILENT
	${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

		 ${WRKSRC}/src/GameConfig.cpp

post-patch-PROFILER-off: .SILENT
	${REINPLACE_CMD} -i '.profiler' -e '/contrib\/profiler/d ; /profiler$$/d ; \
		/target_link_libraries(savegamedump/s| profiler||' \
		${WRKSRC}/CMakeLists.txt
		'/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

post-configure:
	${CP} ${FILESDIR}/buildopts.h ${WRKSRC}/src

post-install:
.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 <bsd.port.mk>

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1549191376	1	TIMESTAMP = 1570621744
2	SHA256 (pioneerspacesim-pioneer-0.0.20190203-20190203_GH0.tar.gz) = e526f1659ae321f45b997c0245acecbf9c4cf2122b025ab8db1090f1b9804f5e	2	SHA256 (pioneerspacesim-pioneer-0.0.20191009-20191009_GH0.tar.gz) = 54ffa99b5dad6334e75f21deab6e9afa48164d5ea474753c6ccda1a742c22cd6
3	SIZE (pioneerspacesim-pioneer-0.0.20190203-20190203_GH0.tar.gz) = 360574063	3	SIZE (pioneerspacesim-pioneer-0.0.20191009-20191009_GH0.tar.gz) = 360730481

Lines 1-7 Link Here

(-)files/buildopts.h (-7 lines)
1	#ifndef BUILDOPTS_H
2	#define BUILDOPTS_H
3
4	#define WITH_OBJECTVIEWER 1
5	#define WITH_DEVKEYS 1
6
7	#endif




# 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:




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

Return to bug 241197

Lines 3-15 Link Here

(-)Makefile (-50 / +23 lines)
3		3
4	PORTNAME= pioneer	4	PORTNAME= pioneer
5	DISTVERSION= 0.0.${GH_TAGNAME}	5	DISTVERSION= 0.0.${GH_TAGNAME}
6	PORTREVISION= 1
7	CATEGORIES= games	6	CATEGORIES= games
8		7
9	MAINTAINER= lightside@gmx.com	8	MAINTAINER= lightside@gmx.com
10	COMMENT= Space adventure game set in the Milky Way galaxy	9	COMMENT= Space adventure game set in the Milky Way galaxy
11		10
12	LICENSE= APACHE20 GPLv3 MIT ZLIB CC-BY-SA-3.0 DejaVu IUP SIL	11	LICENSE= APACHE20 GPLv3 BSD2CLAUSE MIT ZLIB CC-BY-SA-3.0 DejaVu IUP SIL
13	LICENSE_COMB= multi	12	LICENSE_COMB= multi
14	LICENSE_NAME_DejaVu= Bitstream Vera and Arev fonts license	13	LICENSE_NAME_DejaVu= Bitstream Vera and Arev fonts license
15	LICENSE_NAME_GLEW= The OpenGL Extension Wrangler Library license	14	LICENSE_NAME_GLEW= The OpenGL Extension Wrangler Library license
Lines 16-21 Link Here
16	LICENSE_NAME_IUP= Galaxy colour image use policy	15	LICENSE_NAME_IUP= Galaxy colour image use policy
17	LICENSE_NAME_SIL= SIL open font license version 1.1	16	LICENSE_NAME_SIL= SIL open font license version 1.1
18	LICENSE_FILE_APACHE20= ${WRKSRC}/licenses/Apache-2.0.txt	17	LICENSE_FILE_APACHE20= ${WRKSRC}/licenses/Apache-2.0.txt
		18	LICENSE_FILE_BSD2CLAUSE= ${WRKSRC}/licenses/LZ4.txt
19	LICENSE_FILE_CC-BY-SA-3.0= ${WRKSRC}/licenses/CC-BY-SA-3.0.txt	19	LICENSE_FILE_CC-BY-SA-3.0= ${WRKSRC}/licenses/CC-BY-SA-3.0.txt
20	LICENSE_FILE_DejaVu= ${WRKSRC}/licenses/DejaVu-license.txt	20	LICENSE_FILE_DejaVu= ${WRKSRC}/licenses/DejaVu-license.txt
21	LICENSE_FILE_GLEW= ${WRKSRC}/licenses/GLEW.txt	21	LICENSE_FILE_GLEW= ${WRKSRC}/licenses/GLEW.txt
Lines 31-97 Link Here
31	BROKEN_powerpc64= fails to build: contrib/profiler/Profiler.h:158:51: inconsistent operand constraints in an 'asm'	31	BROKEN_powerpc64= fails to build: contrib/profiler/Profiler.h:158:51: inconsistent operand constraints in an 'asm'
32	BROKEN_powerpcspe= fails to build: contrib/profiler/Profiler.h:158:51: inconsistent operand constraints in an 'asm'	32	BROKEN_powerpcspe= fails to build: contrib/profiler/Profiler.h:158:51: inconsistent operand constraints in an 'asm'
33		33
34	BUILD_DEPENDS= ${LOCALBASE}/include/GL/glu.h:graphics/libGLU
35	LIB_DEPENDS= libsigc-2.0.so:devel/libsigc++20 \	34	LIB_DEPENDS= libsigc-2.0.so:devel/libsigc++20 \
36	libfreetype.so:print/freetype2 \	35	libfreetype.so:print/freetype2 \
37	libvorbisfile.so:audio/libvorbis \	36	libvorbisfile.so:audio/libvorbis \
38	libpng.so:graphics/png \
39	libassimp.so:multimedia/assimp	37	libassimp.so:multimedia/assimp
40		38
41	USES= autoreconf compiler:c++11-lib gl gmake pkgconfig	39	USES= cmake compiler:c++11-lib gl gnome pkgconfig
42	USE_GITHUB= yes	40	USE_GITHUB= yes
43	GH_ACCOUNT= pioneerspacesim	41	GH_ACCOUNT= pioneerspacesim
44	GH_TAGNAME= 20190203	42	GH_TAGNAME= 20191009
45	USE_GL= gl	43	USE_GL= gl glu
46	USE_SDL= image2 sdl2	44	USE_SDL= image2 sdl2
47		45
48	GNU_CONFIGURE= yes	46	CMAKE_ARGS= -DPIONEER_DATA_DIR:PATH="${DATADIR}/data"
49	CONFIGURE_ENV= PIONEER_DATA_DIR="${DATADIR}/data"
50	CONFIGURE_ARGS= --with-version="${GH_TAGNAME}"
51	EXTRACT_AFTER_ARGS= --no-same-owner --no-same-permissions --exclude .gitignore	47	EXTRACT_AFTER_ARGS= --no-same-owner --no-same-permissions --exclude .gitignore
		48	INSTALLS_ICONS= yes
52		49
53	PORTDATA= data	50	PORTDATA= data
54	PORTDOCS= AUTHORS.txt Changelog.txt Modelviewer.txt Quickstart.txt README.md	51	PORTDOCS= AUTHORS.txt Changelog.txt Modelviewer.txt Quickstart.txt README.md
55		52
56	PLIST_FILES= bin/${PORTNAME} \
57	share/pixmaps/${PORTNAME}.png
58
59	DESKTOP_ENTRIES="Pioneer" "${COMMENT}" \
60	"${PORTNAME}" "${PORTNAME}" \
61	"Game;Simulation;" false
62
63	SUB_FILES= pkg-message	53	SUB_FILES= pkg-message
64		54
65	OPTIONS_DEFINE= DOCS EXTRA_WARNINGS EXTERNAL_GLEW EXTERNAL_LUA \	55	OPTIONS_DEFINE= DOCS EXTERNAL_GLEW EXTERNAL_LUA NOGPUJOBS PROFILER
66	MODELCOMPILER NOGPUJOBS PROFILER	56	OPTIONS_DEFAULT= EXTERNAL_GLEW EXTERNAL_LUA
67	OPTIONS_DEFAULT= EXTERNAL_GLEW EXTERNAL_LUA MODELCOMPILER
68		57
69	EXTERNAL_GLEW_DESC= Use external libglew from graphics/glew	58	EXTERNAL_GLEW_DESC= Use external libglew from graphics/glew
70	EXTERNAL_LUA_DESC= Use external liblua from lang/lua52	59	EXTERNAL_LUA_DESC= Use external liblua from lang/lua52
71	EXTRA_WARNINGS_DESC= Enable extra compiler warnings
72	MODELCOMPILER_DESC= Build/install modelcompiler tool
73	NOGPUJOBS_DESC= Disable EnableGPUJobs for config.ini by default	60	NOGPUJOBS_DESC= Disable EnableGPUJobs for config.ini by default
74	PROFILER_DESC= Build with internal profiler	61	PROFILER_DESC= Build with internal profiler
75		62
76	DOCS_SUB_LIST= QUICKSTART_PATH="${DOCSDIR}"	63	DOCS_SUB_LIST= QUICKSTART_PATH="${DOCSDIR}"
77	DOCS_SUB_LIST_OFF= QUICKSTART_PATH="https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${GH_TAGNAME}"	64	DOCS_SUB_LIST_OFF= QUICKSTART_PATH="https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${GH_TAGNAME}"
78	EXTERNAL_GLEW_CONFIGURE_WITH= external-libglew	65	EXTERNAL_GLEW_CMAKE_BOOL= USE_SYSTEM_LIBGLEW
79	EXTERNAL_GLEW_VARS_OFF= LICENSE+=GLEW	66	EXTERNAL_GLEW_VARS_OFF= LICENSE+=GLEW
80	EXTERNAL_GLEW_USE= GL=glew,glu	67	EXTERNAL_GLEW_USE= GL=glew
81	EXTERNAL_LUA_CONFIGURE_WITH= external-liblua	68	EXTERNAL_LUA_CMAKE_BOOL= USE_SYSTEM_LIBLUA
82	EXTERNAL_LUA_USES= lua:52	69	EXTERNAL_LUA_USES= lua:52
83	EXTRA_WARNINGS_CONFIGURE_WITH= extra-warnings	70	PROFILER_CMAKE_BOOL= PROFILER_ENABLED
84	MODELCOMPILER_PLIST_FILES= bin/${PORTNAME}-modelcompiler
85	PROFILER_CONFIGURE_ON= --enable-profiler
86		71
87	post-patch: .SILENT	72	post-patch: .SILENT
88	${REINPLACE_CMD} -e '/^OPTIMISE=/d ; s\|lua5\.2\|lua-5.2\|' \	73	${REINPLACE_CMD} -e '/^include(FindGit/d ; \
89	${WRKSRC}/configure.ac	74	/TIMESTAMP PROJECT_VERSION/s\|.*\|set(PROJECT_VERSION "${GH_TAGNAME}")\|' \
		75	${WRKSRC}/CMakeLists.txt
90		76
91	post-patch-MODELCOMPILER-off: .SILENT
92	${REINPLACE_CMD} -e 's/pioneer modelcompiler/pioneer/' \
93	${WRKSRC}/src/Makefile.am
94
95	post-patch-NOGPUJOBS-on: .SILENT	77	post-patch-NOGPUJOBS-on: .SILENT
96	# Revert 41272a856d9072404efbfdb10f0e3c9e4f96bb4d commit, in case of	78	# Revert 41272a856d9072404efbfdb10f0e3c9e4f96bb4d commit, in case of
97	# GL_OUT_OF_MEMORY OpenGL error, when turning to gas giant planet	79	# GL_OUT_OF_MEMORY OpenGL error, when turning to gas giant planet
Lines 99-124 Link Here
99	${WRKSRC}/src/GameConfig.cpp	81	${WRKSRC}/src/GameConfig.cpp
100		82
101	post-patch-PROFILER-off: .SILENT	83	post-patch-PROFILER-off: .SILENT
102	${REINPLACE_CMD} -e '/^SUBDIRS/s/ profiler//' \	84	${REINPLACE_CMD} -i '.profiler' -e '/contrib\/profiler/d ; /profiler$$/d ; \
103	${WRKSRC}/contrib/Makefile.am	85	/target_link_libraries(savegamedump/s\| profiler\|\|' \
104	${REINPLACE_CMD} -i '.p.bak' -e \	86	${WRKSRC}/CMakeLists.txt
105	'/libprofiler.a/d; $$!N; /libprofiler.a$$/s\| \\\|\|; P; D' \
106	${WRKSRC}/src/Makefile.am
107	${REINPLACE_CMD} -i '.p.bak' -e '/contrib\/profiler/d' \
108	${WRKSRC}/configure.ac
109		87
110	post-configure:
111	${CP} ${FILESDIR}/buildopts.h ${WRKSRC}/src
112
113	post-install:	88	post-install:
114	${INSTALL_DATA} ${WRKSRC}/application-icon/pngs/pioneer-256x256.png \	89	.for f in modelcompiler savegamedump
115	${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png	90	${MV} ${STAGEDIR}${PREFIX}/bin/${f} \
		91	${STAGEDIR}${PREFIX}/bin/${PORTNAME}-${f}
		92	.endfor
116		93
117	post-install-DOCS-on:	94	post-install-DOCS-on:
118	(cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR})	95	(cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
119		96
120	post-install-MODELCOMPILER-on:
121	${MV} ${STAGEDIR}${PREFIX}/bin/modelcompiler \
122	${STAGEDIR}${PREFIX}/bin/${PORTNAME}-modelcompiler
123
124	.include <bsd.port.mk>	97	.include <bsd.port.mk>

Line 0 Link Here

(-)files/patch-src_scenegraph_Serializer.h (+24 lines)
	1	# pioneerLib.dir/src/CollMesh.cpp does not compile on i686 arch
	2	# https://github.com/pioneerspacesim/pioneer/issues/4691#issuecomment-540114463
	3
	4	--- src/scenegraph/Serializer.h.orig 2019-10-09 11:49:04 UTC
	5	+++ src/scenegraph/Serializer.h
	6	@@ -23,14 +23,14 @@
	7	// where possible, prefer serializing state information via JSON instead.
	8	namespace Serializer {
	9	static_assert((sizeof(Uint32) == 4 && alignof(Uint32) == 4), "Int32 is sized differently on this platform and will not serialize properly.");
	10	- static_assert((sizeof(Uint64) == 8 && alignof(Uint64) == 8), "Int64 is sized differently on this platform and will not serialize properly.");
	11	+ static_assert((sizeof(Uint64) == 8 && alignof(Uint64) <= 8), "Int64 is sized differently on this platform and will not serialize properly.");
	12	static_assert((sizeof(Color) == 4 && alignof(Color) == 1), "Color is padded differently on this platform and will not serialize properly.");
	13	static_assert((sizeof(vector2f) == 8 && alignof(vector2f) == 4), "Vector2f is padded differently on this platform and will not serialize properly.");
	14	- static_assert((sizeof(vector2d) == 16 && alignof(vector2d) == 8), "Vector2d is padded differently on this platform and will not serialize properly.");
	15	+ static_assert((sizeof(vector2d) == 16 && alignof(vector2d) <= 8), "Vector2d is padded differently on this platform and will not serialize properly.");
	16	static_assert((sizeof(vector3f) == 12 && alignof(vector3f) == 4), "Vector3f is padded differently on this platform and will not serialize properly.");
	17	- static_assert((sizeof(vector3d) == 24 && alignof(vector3d) == 8), "Vector3d is padded differently on this platform and will not serialize properly.");
	18	+ static_assert((sizeof(vector3d) == 24 && alignof(vector3d) <= 8), "Vector3d is padded differently on this platform and will not serialize properly.");
	19	static_assert((sizeof(Quaternionf) == 16 && alignof(Quaternionf) == 4), "Quaternionf is padded differently on this platform and will not serialize properly.");
	20	- static_assert((sizeof(Aabb) == 56 && alignof(Aabb) == 8), "Aabb is padded differently on this platform and will not serialize properly.");
	21	+ static_assert((sizeof(Aabb) == 56 && alignof(Aabb) <= 8), "Aabb is padded differently on this platform and will not serialize properly.");
	22
	23	class Writer {
	24	public:

Line 0 Link Here

(-)pkg-plist (+17 lines)
	1	bin/pioneer
	2	bin/pioneer-modelcompiler
	3	bin/pioneer-savegamedump
	4	share/appdata/net.pioneerspacesim.Pioneer.appdata.xml
	5	share/applications/net.pioneerspacesim.Pioneer.desktop
	6	share/icons/hicolor/128x128/apps/net.pioneerspacesim.Pioneer.png
	7	share/icons/hicolor/16x16/apps/net.pioneerspacesim.Pioneer.png
	8	share/icons/hicolor/22x22/apps/net.pioneerspacesim.Pioneer.png
	9	share/icons/hicolor/24x24/apps/net.pioneerspacesim.Pioneer.png
	10	share/icons/hicolor/256x256/apps/net.pioneerspacesim.Pioneer.png
	11	share/icons/hicolor/32x32/apps/net.pioneerspacesim.Pioneer.png
	12	share/icons/hicolor/40x40/apps/net.pioneerspacesim.Pioneer.png
	13	share/icons/hicolor/48x48/apps/net.pioneerspacesim.Pioneer.png
	14	share/icons/hicolor/64x64/apps/net.pioneerspacesim.Pioneer.png
	15	@dir %%DATADIR%%/data/music/core/docked
	16	@dir %%DATADIR%%/data/music/core/near-planet
	17	@dir %%DATADIR%%/data/music/core/undocked