git: dee7b4845a42 - main - devel/highway: switch to upstream fix after 73b4f2889e2c

From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Thu, 14 Aug 2025 17:12:17 UTC
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=dee7b4845a4275e86d6ae9b93e502b1900feaca0

commit dee7b4845a4275e86d6ae9b93e502b1900feaca0
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2025-08-14 15:18:53 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2025-08-14 17:10:38 +0000

    devel/highway: switch to upstream fix after 73b4f2889e2c
---
 devel/highway/Makefile                             |  4 ++++
 devel/highway/distinfo                             |  4 ++++
 .../patch-hwy_contrib_thread__pool_thread__pool.h  | 28 ----------------------
 3 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/devel/highway/Makefile b/devel/highway/Makefile
index e456aa0fda0e..1c4e4a04573b 100644
--- a/devel/highway/Makefile
+++ b/devel/highway/Makefile
@@ -2,6 +2,10 @@ PORTNAME=	highway
 DISTVERSION=	1.3.0
 CATEGORIES=	devel
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	232b3ee08919.patch:-p1 # https://github.com/google/highway/pull/2670
+PATCHFILES+=	c00492256d71.patch:-p1 # https://github.com/google/highway/pull/2672
+
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Performance-portable, length-agnostic SIMD with runtime dispatch
 WWW=		https://github.com/google/highway
diff --git a/devel/highway/distinfo b/devel/highway/distinfo
index 5e6bad8a9fd7..9f226020ab9e 100644
--- a/devel/highway/distinfo
+++ b/devel/highway/distinfo
@@ -1,3 +1,7 @@
 TIMESTAMP = 1755156353
 SHA256 (google-highway-1.3.0_GH0.tar.gz) = 07b3c1ba2c1096878a85a31a5b9b3757427af963b1141ca904db2f9f4afe0bc2
 SIZE (google-highway-1.3.0_GH0.tar.gz) = 3634890
+SHA256 (232b3ee08919.patch) = 8ac11449155a27f0062dc4a65dc97ea36675196f806605f188d1a0449451b652
+SIZE (232b3ee08919.patch) = 1119
+SHA256 (c00492256d71.patch) = e5bba54b7698df010fd80146056131b926b834beaca8963e6c4b8716c32f1c89
+SIZE (c00492256d71.patch) = 1575
diff --git a/devel/highway/files/patch-hwy_contrib_thread__pool_thread__pool.h b/devel/highway/files/patch-hwy_contrib_thread__pool_thread__pool.h
deleted file mode 100644
index 4d51d10b28f6..000000000000
--- a/devel/highway/files/patch-hwy_contrib_thread__pool_thread__pool.h
+++ /dev/null
@@ -1,28 +0,0 @@
-https://github.com/google/highway/issues/2669
-
---- hwy/contrib/thread_pool/thread_pool.h.orig	2025-08-14 07:25:53 UTC
-+++ hwy/contrib/thread_pool/thread_pool.h
-@@ -30,11 +30,6 @@
- #include <thread>  // NOLINT
- #include <vector>
- 
--#include "hwy/detect_compiler_arch.h"
--#if HWY_OS_FREEBSD
--#include <pthread_np.h>
--#endif
--
- #include "hwy/aligned_allocator.h"  // HWY_ALIGNMENT
- #include "hwy/auto_tune.h"
- #include "hwy/base.h"
-@@ -60,10 +55,8 @@ static inline void SetThreadName(const char* format, i
-   HWY_ASSERT(0 < chars_written &&
-              chars_written <= static_cast<int>(sizeof(buf) - 1));
- 
--#if HWY_OS_LINUX && (!defined(__ANDROID__) || __ANDROID_API__ >= 19)
-+#if HWY_OS_FREEBSD || HWY_OS_LINUX && (!defined(__ANDROID__) || __ANDROID_API__ >= 19)
-   HWY_ASSERT(0 == pthread_setname_np(pthread_self(), buf));
--#elif HWY_OS_FREEBSD
--  HWY_ASSERT(0 == pthread_set_name_np(pthread_self(), buf));
- #elif HWY_OS_APPLE
-   // Different interface: single argument, current thread only.
-   HWY_ASSERT(0 == pthread_setname_np(buf));