diff --git a/ports/highway/2695.patch b/ports/highway/2695.patch deleted file mode 100644 index 7c7e0ac957..0000000000 --- a/ports/highway/2695.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 21635e43996f0b4365584f69b0014655f548853a Mon Sep 17 00:00:00 2001 -From: John Platts -Date: Sun, 31 Aug 2025 22:08:43 -0500 -Subject: [PATCH] Fix for AVX10_2 target with Android NDK r29-beta3 - ---- - hwy/ops/x86_128-inl.h | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/hwy/ops/x86_128-inl.h b/hwy/ops/x86_128-inl.h -index bcd08d590d..3a2820102e 100644 ---- a/hwy/ops/x86_128-inl.h -+++ b/hwy/ops/x86_128-inl.h -@@ -71,8 +71,9 @@ namespace detail { - #endif - - #undef HWY_X86_HAVE_AVX10_2_OPS --#if HWY_TARGET_IS_AVX10_2 && \ -- (HWY_COMPILER_GCC_ACTUAL >= 1501 || HWY_COMPILER3_CLANG >= 200103) -+#if HWY_TARGET_IS_AVX10_2 && \ -+ (HWY_COMPILER_GCC_ACTUAL >= 1501 || \ -+ (HWY_COMPILER3_CLANG >= 200103 && HWY_COMPILER_CLANG != 2100)) - #define HWY_X86_HAVE_AVX10_2_OPS 1 - #else - #define HWY_X86_HAVE_AVX10_2_OPS 0 diff --git a/ports/highway/portfile.cmake b/ports/highway/portfile.cmake index 544201aa2b..1d093f3337 100644 --- a/ports/highway/portfile.cmake +++ b/ports/highway/portfile.cmake @@ -2,10 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/highway REF "${VERSION}" - SHA512 8b9f4fdc4fa60b6817417959853f5b55bf86aec9d35fc6664dda15179cc55e0a9940f3a46011a84b95263ba342dc47ca1cb93b04481ff4b63d724cce1815d7c6 + SHA512 819422857d6a74e3a936c402698e078db5b7b88fb43767e62429ec7bd954fe93b017e75029a4df4a1a97ef3a2486107eef5247da751eb487640dea409f3f2fa2 HEAD_REF master - PATCHES - 2695.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/highway/vcpkg.json b/ports/highway/vcpkg.json index 1a1df7faf6..cde0b2cc4b 100644 --- a/ports/highway/vcpkg.json +++ b/ports/highway/vcpkg.json @@ -1,7 +1,6 @@ { "name": "highway", - "version": "1.3.0", - "port-version": 1, + "version": "1.4.0", "description": "Performance-portable, length-agnostic SIMD with runtime dispatch", "homepage": "https://github.com/google/highway", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 6a470552c4..8013625c2e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3813,8 +3813,8 @@ "port-version": 0 }, "highway": { - "baseline": "1.3.0", - "port-version": 1 + "baseline": "1.4.0", + "port-version": 0 }, "hikogui": { "baseline": "0.8.1", diff --git a/versions/h-/highway.json b/versions/h-/highway.json index 2d78e84bb4..ca0fed3c04 100644 --- a/versions/h-/highway.json +++ b/versions/h-/highway.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4a44183703a0d4f07d01e3731d7bb50ab11d4f6c", + "version": "1.4.0", + "port-version": 0 + }, { "git-tree": "0bf9c7166ab8a4e4727c51977ec1a9c7563ffcfe", "version": "1.3.0",