vv: switch to upstream version of fix

[Thomas Klausner (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Mon Jan 20 23:58:42 2025 +0100
Changeset:	2037c9bde22d0ad0c5cf7c6e58bf31c0b591dc0e

Modified Files:
	vv/distinfo
Added Files:
	vv/patches/patch-src_util_Logs.cpp
Removed Files:
	vv/patches/patch-CMakeLists.txt

Log Message:
vv: switch to upstream version of fix

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

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

diffstat:
 vv/distinfo                        |  2 +-
 vv/patches/patch-CMakeLists.txt    | 24 ------------------------
 vv/patches/patch-src_util_Logs.cpp | 30 ++++++++++++++++++++++++++++++
 3 files changed, 31 insertions(+), 25 deletions(-)

diffs:
diff --git a/vv/distinfo b/vv/distinfo
index 5a8e956b01..0283f07b98 100644
--- a/vv/distinfo
+++ b/vv/distinfo
@@ -9,5 +9,5 @@ Size (vv-3.1.tar.gz) = 1839316 bytes
 BLAKE2s (wolfpld-tracy-f583d1c855bcf45d182eb16a57e84afdab7b0e67.tar.gz) = 379d29e811edb705d066f087b18cb0596a8ecd4a9c1f629809415fd14a940935
 SHA512 (wolfpld-tracy-f583d1c855bcf45d182eb16a57e84afdab7b0e67.tar.gz) = 36401c62b39ae7c44f765b7c0e092f795756d947159b3c1e9fc2034735dad7746fadb1265bd06bf2bd4a6d2c318e62811a4438aa4eb43ddb1e5f32871aaf284e
 Size (wolfpld-tracy-f583d1c855bcf45d182eb16a57e84afdab7b0e67.tar.gz) = 5253102 bytes
-SHA1 (patch-CMakeLists.txt) = c2cb6538860c6a561dff91f6be2d8fac0b8429f5
 SHA1 (patch-src_util_Alloca.h) = d3f26e7eba4a645c4fef7a0248a0efaef7ca8cc1
+SHA1 (patch-src_util_Logs.cpp) = 259b29964f2c8e6544e3f5e9bb6117d6c845fe69
diff --git a/vv/patches/patch-CMakeLists.txt b/vv/patches/patch-CMakeLists.txt
deleted file mode 100644
index aaeafbb76d..0000000000
--- a/vv/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-Find backtrace() where it is.
-https://github.com/wolfpld/vv/pull/11/files
-
---- CMakeLists.txt.orig	2025-01-20 13:40:12.912160257 +0000
-+++ CMakeLists.txt
-@@ -58,6 +58,8 @@ pkg_check_modules(TIFF REQUIRED libtiff-
- pkg_check_modules(WEBP REQUIRED libwebpdemux)
- pkg_check_modules(ZLIB REQUIRED zlib)
- 
-+include(FindBacktrace)
-+
- include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_LIST_DIR} ${CMAKE_CURRENT_LIST_DIR}/src)
- add_compile_definitions(DISABLE_CALLSTACK)
- 
-@@ -91,6 +93,7 @@ set(MCOREUTIL_SRC
- add_library(mcoreutil ${MCOREUTIL_SRC})
- target_link_libraries(mcoreutil PRIVATE
-     Tracy::TracyClient
-+    Backtrace::Backtrace
-     ${PNG_LINK_LIBRARIES}
- )
- target_include_directories(mcoreutil PRIVATE
diff --git a/vv/patches/patch-src_util_Logs.cpp b/vv/patches/patch-src_util_Logs.cpp
new file mode 100644
index 0000000000..10573a6096
--- /dev/null
+++ b/vv/patches/patch-src_util_Logs.cpp
@@ -0,0 +1,30 @@
+$NetBSD$
+
+Fix build on NetBSD.
+https://github.com/wolfpld/vv/commit/b13920153b945d8b2531b7892789c438032bf5c6
+
+--- src/util/Logs.cpp.orig	2024-12-23 10:46:59.000000000 +0000
++++ src/util/Logs.cpp
+@@ -101,10 +101,12 @@ void MCoreLogMessage( LogLevel level, co
+     va_start( args, fmt );
+     const auto len = strlen( fileName );
+ 
++#ifndef DISABLE_CALLSTACK
+     // Get callstack outside of lock
+     const bool printCallstack = level >= LogLevel::Error && s_logLevel <= LogLevel::Callstack;
+     CallstackData stack;
+     if( printCallstack ) stack.count = backtrace( stack.addr, 64 );
++#endif
+ 
+     s_logLock.lock();
+     PrintLevel( level );
+@@ -121,7 +123,9 @@ void MCoreLogMessage( LogLevel level, co
+         fprintf( s_logFile, ANSI_RESET "\n" );
+         fflush( s_logFile );
+     }
++#ifndef DISABLE_CALLSTACK
+     if( printCallstack ) PrintCallstack( stack, 1 );
++#endif
+     s_logLock.unlock();
+     va_end( args );
+