View | Details | Raw Unified | Return to bug 213873 | Differences between
and this patch

Collapse All | Expand All

(-)pioneer/Makefile (-13 / +17 lines)
Lines 36-42 Link Here
36
36
37
USE_GITHUB=	yes
37
USE_GITHUB=	yes
38
GH_ACCOUNT=	pioneerspacesim
38
GH_ACCOUNT=	pioneerspacesim
39
GH_TAGNAME=	20160610
39
GH_TAGNAME=	20161028
40
40
41
USES=		autoreconf gmake pkgconfig
41
USES=		autoreconf gmake pkgconfig
42
USE_GL=		gl
42
USE_GL=		gl
Lines 58-73 Link Here
58
		"Game;Simulation;" false
58
		"Game;Simulation;" false
59
59
60
SUB_FILES=	pkg-message
60
SUB_FILES=	pkg-message
61
SUB_LIST=	QUICKSTART_PATH="${QUICKSTART_PATH}"
62
61
63
OPTIONS_DEFINE=		DOCS MODELCOMPILER PROFILER
62
OPTIONS_DEFINE=		DOCS MODELCOMPILER NOGPUJOBS PROFILER
64
OPTIONS_DEFAULT=	MODELCOMPILER
63
OPTIONS_DEFAULT=	MODELCOMPILER
64
DOCS_SUB_LIST=	QUICKSTART_PATH="${DOCSDIR}"
65
DOCS_SUB_LIST_OFF=	\
66
		QUICKSTART_PATH="https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${GH_TAGNAME}"
65
MODELCOMPILER_DESC=	Build/install modelcompiler tool
67
MODELCOMPILER_DESC=	Build/install modelcompiler tool
66
MODELCOMPILER_PLIST_FILES=	bin/${PORTNAME}-modelcompiler
68
MODELCOMPILER_PLIST_FILES=	bin/${PORTNAME}-modelcompiler
69
NOGPUJOBS_DESC=		Disable EnableGPUJobs for config.ini by default
67
PROFILER_DESC=		Build with internal profiler
70
PROFILER_DESC=		Build with internal profiler
68
PROFILER_CONFIGURE_ON=	--enable-profiler
71
PROFILER_CONFIGURE_ON=	--enable-profiler
69
72
70
.include <bsd.port.options.mk>
73
.include <bsd.port.pre.mk>
71
74
72
.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000054
75
.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000054
73
USE_GCC=	yes
76
USE_GCC=	yes
Lines 76-104 Link Here
76
CPPFLAGS+=	-I${LOCALBASE}/include
79
CPPFLAGS+=	-I${LOCALBASE}/include
77
.endif
80
.endif
78
81
79
.if ${PORT_OPTIONS:MDOCS}
80
QUICKSTART_PATH=	${DOCSDIR}
81
.else
82
QUICKSTART_PATH=	\
83
	https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${GH_TAGNAME}
84
.endif
85
86
post-patch: .SILENT
82
post-patch: .SILENT
87
	${REINPLACE_CMD} -e '/^OPTIMISE=/d' \
83
	${REINPLACE_CMD} -e '/^OPTIMISE=/d' \
88
		${WRKSRC}/configure.ac
84
		${WRKSRC}/configure.ac
89
	${REINPLACE_CMD} -e 's/std:://g' \
85
	${REINPLACE_CMD} -e 's/std:://g' \
90
		${WRKSRC}/src/Orbit.cpp
86
		${WRKSRC}/src/Orbit.cpp
91
	${REINPLACE_CMD} -e 's/std::to_string/to_string/g' \
87
	${REINPLACE_CMD} -e 's/std::to_string/to_string/g' \
88
		${WRKSRC}/src/graphics/opengl/GenGasGiantColourMaterial.cpp \
92
		${WRKSRC}/src/graphics/opengl/RendererGL.cpp
89
		${WRKSRC}/src/graphics/opengl/RendererGL.cpp
93
90
94
post-patch-MODELCOMPILER-off: .SILENT
91
post-patch-MODELCOMPILER-off: .SILENT
95
	${REINPLACE_CMD} -e 's/pioneer modelcompiler/pioneer/' \
92
	${REINPLACE_CMD} -e 's/pioneer modelcompiler/pioneer/' \
96
		${WRKSRC}/src/Makefile.am
93
		${WRKSRC}/src/Makefile.am
97
94
95
post-patch-NOGPUJOBS-on: .SILENT
96
# Revert 41272a856d9072404efbfdb10f0e3c9e4f96bb4d commit, in case of
97
# GL_OUT_OF_MEMORY OpenGL error, when turning to gas giant planet
98
	${REINPLACE_CMD} -e '/EnableGPUJobs/s|1|0|' \
99
		 ${WRKSRC}/src/GameConfig.cpp
100
98
post-patch-PROFILER-off: .SILENT
101
post-patch-PROFILER-off: .SILENT
99
	${REINPLACE_CMD} -e '/^SUBDIRS/s/ profiler//' \
102
	${REINPLACE_CMD} -e '/^SUBDIRS/s/ profiler//' \
100
		${WRKSRC}/contrib/Makefile.am
103
		${WRKSRC}/contrib/Makefile.am
101
	${REINPLACE_CMD} -i '.p.bak' -e '/libjson.a/s| \\|| ; /libprofiler.a/d' \
104
	${REINPLACE_CMD} -i '.p.bak' -e \
105
		'/libprofiler.a/d; $$!N; /libprofiler.a$$/s| \\||; P; D' \
102
		${WRKSRC}/src/Makefile.am
106
		${WRKSRC}/src/Makefile.am
103
	${REINPLACE_CMD} -i '.p.bak' -e '/contrib\/profiler/d' \
107
	${REINPLACE_CMD} -i '.p.bak' -e '/contrib\/profiler/d' \
104
		${WRKSRC}/configure.ac
108
		${WRKSRC}/configure.ac
Lines 114-117 Link Here
114
	${MV} ${STAGEDIR}${PREFIX}/bin/modelcompiler \
118
	${MV} ${STAGEDIR}${PREFIX}/bin/modelcompiler \
115
		${STAGEDIR}${PREFIX}/bin/${PORTNAME}-modelcompiler
119
		${STAGEDIR}${PREFIX}/bin/${PORTNAME}-modelcompiler
116
120
117
.include <bsd.port.mk>
121
.include <bsd.port.post.mk>
(-)pioneer/distinfo (-2 / +3 lines)
Lines 1-2 Link Here
1
SHA256 (pioneerspacesim-pioneer-0.0.20160610-20160610_GH0.tar.gz) = 3e658c2747242d2e134ece0ffe910088cb1ecc6e6fcb1b88a3bd75646bafa1c4
1
TIMESTAMP = 1477647657
2
SIZE (pioneerspacesim-pioneer-0.0.20160610-20160610_GH0.tar.gz) = 194457994
2
SHA256 (pioneerspacesim-pioneer-0.0.20161028-20161028_GH0.tar.gz) = d8ceefc7ec22ecdbaf2408a13c80d0368675feebff558457bef2ffc7258f4b77
3
SIZE (pioneerspacesim-pioneer-0.0.20161028-20161028_GH0.tar.gz) = 194439211

Return to bug 213873