0ad: remove a patch, fix a failure. build with -j 1 for now for debugging.

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

Module Name:	pkgsrc-wip
Committed By:	nikita <nikita%NetBSD.org@localhost>
Pushed By:	nikita
Date:		Wed May 3 23:43:16 2023 +0200
Changeset:	6f0e4cf4217f8b9612389b2175ee525a2d96c2f6

Modified Files:
	0ad/Makefile
	0ad/distinfo
	0ad/patches/patch-source_lib_secure__crt.cpp
Removed Files:
	0ad/patches/patch-libraries_source_nvtt_src_src_nvcore_Debug.cpp
	0ad/patches/patch-source_graphics_TextureConverter.cpp

Log Message:
0ad: remove a patch, fix a failure. build with -j 1 for now for
debugging.

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

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

diffstat:
 0ad/Makefile                                        |  4 +++-
 0ad/distinfo                                        |  4 +---
 ...h-libraries_source_nvtt_src_src_nvcore_Debug.cpp | 15 ---------------
 .../patch-source_graphics_TextureConverter.cpp      | 15 ---------------
 0ad/patches/patch-source_lib_secure__crt.cpp        | 21 ++++++++++++++++++---
 5 files changed, 22 insertions(+), 37 deletions(-)

diffs:
diff --git a/0ad/Makefile b/0ad/Makefile
index a9db609147..b51dc138a5 100644
--- a/0ad/Makefile
+++ b/0ad/Makefile
@@ -55,9 +55,11 @@ do-configure:
 		--without-pch \
 		--disable-atlas
 
+# ${_MAKE_JOBS_N}
+
 do-build:
 	${RUN} cd ${WRKSRC} && \
-		${GMAKE} config=release verbose=1 -j ${_MAKE_JOBS_N} \
+		${GMAKE} config=release verbose=1 -j 1 \
 		-C build/workspaces/gcc
 
 .include "../../audio/libvorbis/buildlink3.mk"
diff --git a/0ad/distinfo b/0ad/distinfo
index 8a5435ac1e..eb906ddd26 100644
--- a/0ad/distinfo
+++ b/0ad/distinfo
@@ -13,11 +13,9 @@ SHA1 (patch-libraries_source_fcollada_src_FCollada_FCDocument_FCDocument.h) = ae
 SHA1 (patch-libraries_source_fcollada_src_FCollada_FUtils_FUCriticalSection.h) = fd181f746bba33ceb917a5de4794296c229213fc
 SHA1 (patch-libraries_source_fcollada_src_FCollada_FUtils_FUStringBuilder.hpp) = f71f1f361601b2ce561c00a811d33bce6735a06d
 SHA1 (patch-libraries_source_fcollada_src_FCollada_FUtils_Platforms.h) = 6887cca8e6ff1765a6b666bd595f8bcb41c2a90f
-SHA1 (patch-libraries_source_nvtt_src_src_nvcore_Debug.cpp) = c52106acf026b4a992753e543070e602ad6a25e4
 SHA1 (patch-libraries_source_spidermonkey_build.sh) = 34225c82659cc236bff076301dd52adca9888f92
-SHA1 (patch-source_graphics_TextureConverter.cpp) = d4e3920cd507468adc37dc92e27e6cbb50b5c5e2
 SHA1 (patch-source_lib_allocators_page__aligned.cpp) = c25054afd543a1a90530964a63b2b692b1687765
-SHA1 (patch-source_lib_secure__crt.cpp) = 1e56aa627c8f2343884968ab4ebd4b4eec73b777
+SHA1 (patch-source_lib_secure__crt.cpp) = 6efefd2cca718ae55f65e078e19fa8f9770efedd
 SHA1 (patch-source_network_StunClient.cpp) = 6267d44c3d0345d3e47c19746f105657ba984876
 SHA1 (patch-source_scriptinterface_ScriptTypes.h) = f2351c637ba7ed7a36b4399b6e89a0d8281c9ad4
 SHA1 (patch-source_third__party_mikktspace_weldmesh.cpp) = 35df7dd5d5d2aa784ef03599a47cc69982ebe332
diff --git a/0ad/patches/patch-libraries_source_nvtt_src_src_nvcore_Debug.cpp b/0ad/patches/patch-libraries_source_nvtt_src_src_nvcore_Debug.cpp
deleted file mode 100644
index f849ee243c..0000000000
--- a/0ad/patches/patch-libraries_source_nvtt_src_src_nvcore_Debug.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-
---- libraries/source/nvtt/src/src/nvcore/Debug.cpp.orig	2021-02-28 23:45:14 UTC
-+++ libraries/source/nvtt/src/src/nvcore/Debug.cpp
-@@ -628,6 +628,9 @@ namespace 
- #  elif NV_CPU_X86
-         ucontext_t * ucp = (ucontext_t *)secret;
-         return (void *)ucp->uc_mcontext.mc_eip;
-+#  elif NV_CPU_PPC
-+        ucontext_t * ucp = (ucontext_t *)secret;
-+        return (void *)ucp->uc_mcontext.mc_srr0;
- #    else
- #      error "Unknown CPU"
- #    endif
diff --git a/0ad/patches/patch-source_graphics_TextureConverter.cpp b/0ad/patches/patch-source_graphics_TextureConverter.cpp
deleted file mode 100644
index 29f4d065de..0000000000
--- a/0ad/patches/patch-source_graphics_TextureConverter.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
---- source/graphics/TextureConverter.cpp.orig	2015-06-07 21:56:52.000000000 +0000
-+++ source/graphics/TextureConverter.cpp
-@@ -45,6 +45,10 @@ struct BufferOutputHandler : public nvtt
- 	{
- 	}
- 
-+	virtual void endImage()
-+	{
-+	}
-+
- 	virtual bool writeData(const void* data, int size)
- 	{
- 		size_t off = buffer.size();
diff --git a/0ad/patches/patch-source_lib_secure__crt.cpp b/0ad/patches/patch-source_lib_secure__crt.cpp
index b59e8975c7..2cb3f14381 100644
--- a/0ad/patches/patch-source_lib_secure__crt.cpp
+++ b/0ad/patches/patch-source_lib_secure__crt.cpp
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- source/lib/secure_crt.cpp.orig	2015-01-24 00:22:12.000000000 +0000
-+++ source/lib/secure_crt.cpp
-@@ -112,7 +112,7 @@ STATUS_ADD_DEFINITIONS(secureCrtStatusDe
+--- source/lib/secure_crt.cpp.orig	2022-08-21 14:45:19.000000000 +0200
++++ source/lib/secure_crt.cpp	2023-05-03 23:36:26.329771228 +0200
+@@ -113,7 +113,7 @@
  // self-test and the t* defines (needed for test).
  #if EMULATE_SECURE_CRT
  
@@ -11,3 +11,18 @@ $NetBSD$
  // return length [in characters] of a string, not including the trailing
  // null character. to protect against access violations, only the
  // first <max_len> characters are examined; if the null character is
+@@ -126,10 +126,13 @@
+ 	WARN_IF_PTR_LEN(max_len);
+ 
+ 	size_t len;
++#if defined(__NetBSD__)
++	len = wcsnlen(str, max_len);
++#else
+ 	for(len = 0; len < max_len; len++)
+ 		if(*str++ == '\0')
+ 			break;
+-
++#endif
+ 	return len;
+ }
+ #endif // !OS_UNIX