0ad: more progress.

[nikita <nikita%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	nikita <nikita%NetBSD.org@localhost>
Pushed By:	nikita
Date:		Thu May 4 01:09:51 2023 +0200
Changeset:	5b80d54b931ebfd8204963250a36503166b9b5b3

Modified Files:
	0ad/Makefile
	0ad/distinfo
Added Files:
	0ad/patches/patch-source_maths_tests_test__Bound.h
	0ad/patches/patch-source_scriptinterface_tests_test__ScriptConversions.h

Log Message:
0ad: more progress.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5b80d54b931ebfd8204963250a36503166b9b5b3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 0ad/Makefile                                           |  8 +++++---
 0ad/distinfo                                           |  2 ++
 0ad/patches/patch-source_maths_tests_test__Bound.h     | 18 ++++++++++++++++++
 ...rce_scriptinterface_tests_test__ScriptConversions.h | 11 +++++++++++
 4 files changed, 36 insertions(+), 3 deletions(-)

diffs:
diff --git a/0ad/Makefile b/0ad/Makefile
index b51dc138a5..f1b120206f 100644
--- a/0ad/Makefile
+++ b/0ad/Makefile
@@ -15,6 +15,9 @@ GCC_REQD+=	7
 USE_LANGUAGES=	c c++
 
 USE_TOOLS+=	gmake perl bash pkg-config
+TOOL_DEPENDS+=	python${PYTHON_VERSION_DEFAULT}-[0-9]*:../../lang/python${PYTHON_VERSION_DEFAULT}
+
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 DEPENDS+=	0ad-data-${PKGVERSION}:../../wip/0ad-data
 DEPENDS+=	premake5-[0-9]*:../../devel/premake5
@@ -55,11 +58,9 @@ do-configure:
 		--without-pch \
 		--disable-atlas
 
-# ${_MAKE_JOBS_N}
-
 do-build:
 	${RUN} cd ${WRKSRC} && \
-		${GMAKE} config=release verbose=1 -j 1 \
+		${GMAKE} config=release verbose=1 -j ${_MAKE_JOBS_N} \
 		-C build/workspaces/gcc
 
 .include "../../audio/libvorbis/buildlink3.mk"
@@ -74,6 +75,7 @@ do-build:
 .include "../../graphics/nvidia-texture-tools/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../lang/mozjs78/buildlink3.mk"
+.include "../../lang/python/tool.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
 .include "../../net/enet/buildlink3.mk"
 .include "../../net/miniupnpc/buildlink3.mk"
diff --git a/0ad/distinfo b/0ad/distinfo
index 9f86936763..7cc49c4647 100644
--- a/0ad/distinfo
+++ b/0ad/distinfo
@@ -16,7 +16,9 @@ SHA1 (patch-libraries_source_fcollada_src_FCollada_FUtils_Platforms.h) = 6887cca
 SHA1 (patch-libraries_source_spidermonkey_build.sh) = 34225c82659cc236bff076301dd52adca9888f92
 SHA1 (patch-source_lib_allocators_page__aligned.cpp) = c25054afd543a1a90530964a63b2b692b1687765
 SHA1 (patch-source_lib_secure__crt.cpp) = 1eaa9eb892d75e6a2533dc031675615138550e51
+SHA1 (patch-source_maths_tests_test__Bound.h) = 8d6b79199d86dabdddf3dca68eed2d252ef9a649
 SHA1 (patch-source_network_StunClient.cpp) = 6267d44c3d0345d3e47c19746f105657ba984876
 SHA1 (patch-source_scriptinterface_ScriptTypes.h) = f2351c637ba7ed7a36b4399b6e89a0d8281c9ad4
+SHA1 (patch-source_scriptinterface_tests_test__ScriptConversions.h) = 4531fd80325fe98c5d3d21d8e0f2c36a6f7890a3
 SHA1 (patch-source_third__party_mikktspace_weldmesh.cpp) = 35df7dd5d5d2aa784ef03599a47cc69982ebe332
 SHA1 (patch-source_third__party_tinygettext_include_tinygettext_iconv.hpp) = 9778a9729202a95a5b5ec3f66419d31aa9b423b9
diff --git a/0ad/patches/patch-source_maths_tests_test__Bound.h b/0ad/patches/patch-source_maths_tests_test__Bound.h
new file mode 100644
index 0000000000..f047139095
--- /dev/null
+++ b/0ad/patches/patch-source_maths_tests_test__Bound.h
@@ -0,0 +1,18 @@
+$NetBSD$
+
+
+--- source/maths/tests/test_Bound.h.orig	2023-05-04 00:38:25.197319481 +0200
++++ source/maths/tests/test_Bound.h	2023-05-04 00:43:35.449226082 +0200
+@@ -203,9 +203,9 @@
+ 		CBoundingBoxOriented result;
+ 		flatAabb.Transform(transform, result);
+ 
+-		TS_ASSERT(!isnan(result.m_Basis[0].X) && !isnan(result.m_Basis[0].Y) && !isnan(result.m_Basis[0].Z));
+-		TS_ASSERT(!isnan(result.m_Basis[1].X) && !isnan(result.m_Basis[1].Y) && !isnan(result.m_Basis[1].Z));
+-		TS_ASSERT(!isnan(result.m_Basis[2].X) && !isnan(result.m_Basis[2].Y) && !isnan(result.m_Basis[2].Z));
++		TS_ASSERT(!std::isnan(result.m_Basis[0].X) && !std::isnan(result.m_Basis[0].Y) && !std::isnan(result.m_Basis[0].Z));
++		TS_ASSERT(!std::isnan(result.m_Basis[1].X) && !std::isnan(result.m_Basis[1].Y) && !std::isnan(result.m_Basis[1].Z));
++		TS_ASSERT(!std::isnan(result.m_Basis[2].X) && !std::isnan(result.m_Basis[2].Y) && !std::isnan(result.m_Basis[2].Z));
+ 	}
+ 
+ 	void test_point_visibility()
diff --git a/0ad/patches/patch-source_scriptinterface_tests_test__ScriptConversions.h b/0ad/patches/patch-source_scriptinterface_tests_test__ScriptConversions.h
new file mode 100644
index 0000000000..88863ae70a
--- /dev/null
+++ b/0ad/patches/patch-source_scriptinterface_tests_test__ScriptConversions.h
@@ -0,0 +1,11 @@
+--- source/scriptinterface/tests/test_ScriptConversions.h.orig	2023-05-04 01:07:22.308333403 +0200
++++ source/scriptinterface/tests/test_ScriptConversions.h	2023-05-04 01:07:53.059298729 +0200
+@@ -208,7 +208,7 @@
+ 		JS::RootedValue testNANVal(rq.cx);
+ 		Script::ToJSVal(rq, &testNANVal, NAN);
+ 		TS_ASSERT(Script::FromJSVal(rq, testNANVal, f));
+-		TS_ASSERT(isnan(f));
++		TS_ASSERT(std::isnan(f));
+ 	}
+ 
+ 	// NOTE: fixed and vector conversions are defined in simulation2/scripting/EngineScriptConversions.cpp