From 521999fbfc836e8f894e44af3af09d2bc811c70d Mon Sep 17 00:00:00 2001 From: Michael Schollerer Date: Fri, 25 Apr 2025 09:41:42 +0200 Subject: [PATCH 01/13] add fftw3 patch for neon as seen in this source repository local PR https://github.com/FFTW/fftw3/pull/275 that will never be merged --- ports/fftw3/neon.patch | 73 ++++++++++++++++++++++++++++++++++++++ ports/fftw3/portfile.cmake | 4 ++- ports/fftw3/vcpkg.json | 4 +++ 3 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 ports/fftw3/neon.patch diff --git a/ports/fftw3/neon.patch b/ports/fftw3/neon.patch new file mode 100644 index 00000000000000..0d53000273b4a7 --- /dev/null +++ b/ports/fftw3/neon.patch @@ -0,0 +1,73 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index db20caa7..48e724f3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -25,6 +25,7 @@ option (ENABLE_SSE "Compile with SSE instruction set support" OFF) + option (ENABLE_SSE2 "Compile with SSE2 instruction set support" OFF) + option (ENABLE_AVX "Compile with AVX instruction set support" OFF) + option (ENABLE_AVX2 "Compile with AVX2 instruction set support" OFF) ++option (ENABLE_NEON "Compile with NEON instruction set support" OFF) + + option (DISABLE_FORTRAN "Disable Fortran wrapper routines" OFF) + +@@ -203,9 +204,20 @@ if (ENABLE_AVX2) + endforeach () + endif () + ++if (ENABLE_NEON) ++ if (ENABLE_LONG_DOUBLE) ++ message (FATAL_ERROR "NEON only works in single or double precision, please disable long double support") ++ endif () ++ if (ENABLE_QUAD_PRECISION) ++ message (FATAL_ERROR "NEON only works in single or double precision, please disable quad precision support") ++ endif () ++ set (HAVE_NEON TRUE) ++endif () ++ + if (HAVE_SSE2 OR HAVE_AVX) + set (HAVE_SIMD TRUE) + endif () ++ + file(GLOB fftw_api_SOURCE api/*.c api/*.h) + file(GLOB fftw_dft_SOURCE dft/*.c dft/*.h) + file(GLOB fftw_dft_scalar_SOURCE dft/scalar/*.c dft/scalar/*.h) +@@ -215,6 +227,7 @@ file(GLOB fftw_dft_simd_SOURCE dft/simd/*.c dft/simd + file(GLOB fftw_dft_simd_sse2_SOURCE dft/simd/sse2/*.c dft/simd/sse2/*.h) + file(GLOB fftw_dft_simd_avx_SOURCE dft/simd/avx/*.c dft/simd/avx/*.h) + file(GLOB fftw_dft_simd_avx2_SOURCE dft/simd/avx2/*.c dft/simd/avx2/*.h dft/simd/avx2-128/*.c dft/simd/avx2-128/*.h) ++file(GLOB fftw_dft_simd_neon_SOURCE dft/simd/neon/*.c dft/simd/neon/*.h) + file(GLOB fftw_kernel_SOURCE kernel/*.c kernel/*.h) + file(GLOB fftw_rdft_SOURCE rdft/*.c rdft/*.h) + file(GLOB fftw_rdft_scalar_SOURCE rdft/scalar/*.c rdft/scalar/*.h) +@@ -230,6 +243,7 @@ file(GLOB fftw_rdft_simd_SOURCE rdft/simd/*.c rdft/sim + file(GLOB fftw_rdft_simd_sse2_SOURCE rdft/simd/sse2/*.c rdft/simd/sse2/*.h) + file(GLOB fftw_rdft_simd_avx_SOURCE rdft/simd/avx/*.c rdft/simd/avx/*.h) + file(GLOB fftw_rdft_simd_avx2_SOURCE rdft/simd/avx2/*.c rdft/simd/avx2/*.h rdft/simd/avx2-128/*.c rdft/simd/avx2-128/*.h) ++file(GLOB fftw_rdft_simd_neon_SOURCE rdft/simd/neon/*.c rdft/simd/neon/*.h) + + file(GLOB fftw_reodft_SOURCE reodft/*.c reodft/*.h) + file(GLOB fftw_simd_support_SOURCE simd-support/*.c simd-support/*.h) +@@ -283,6 +297,10 @@ if (HAVE_AVX2) + list (APPEND SOURCEFILES ${fftw_dft_simd_avx2_SOURCE} ${fftw_rdft_simd_avx2_SOURCE}) + endif () + ++if (HAVE_NEON) ++ list (APPEND SOURCEFILES ${fftw_dft_simd_neon_SOURCE} ${fftw_rdft_simd_neon_SOURCE}) ++endif () ++ + set (FFTW_VERSION 3.3.10) + + set (PREC_SUFFIX) + diff --git a/cmake.config.h.in b/cmake.config.h.in +index 1f4c5055..8c61b38f 100644 +--- a/cmake.config.h.in ++++ b/cmake.config.h.in +@@ -211,7 +211,7 @@ + /* #undef HAVE_MPI */ + + /* Define to enable ARM NEON optimizations. */ +-/* #undef HAVE_NEON */ ++#cmakedefine HAVE_NEON 1 + + /* Define if OpenMP is enabled */ + #cmakedefine HAVE_OPENMP diff --git a/ports/fftw3/portfile.cmake b/ports/fftw3/portfile.cmake index 4eaea9136a0af3..d82f448b4daaa3 100644 --- a/ports/fftw3/portfile.cmake +++ b/ports/fftw3/portfile.cmake @@ -14,6 +14,7 @@ vcpkg_extract_source_archive( fix-openmp.patch install-subtargets.patch fix-wrong-version.patch # https://github.com/FFTW/fftw3/commit/0842f00ae6b6e1f3aade155bc0edd17a7313fa6a + neon.patch # add neon ) vcpkg_check_features( @@ -27,12 +28,13 @@ vcpkg_check_features( avx ENABLE_AVX sse2 ENABLE_SSE2 sse ENABLE_SSE + neon ENABLE_NEON # add neon ) set(package_names fftw3 fftw3f fftw3l) set(fftw3_options "") set(fftw3f_options -DENABLE_FLOAT=ON) -set(fftw3l_options -DENABLE_LONG_DOUBLE=ON -DENABLE_AVX2=OFF -DENABLE_AVX=OFF -DENABLE_SSE2=OFF) +set(fftw3l_options -DENABLE_LONG_DOUBLE=ON -DENABLE_AVX2=OFF -DENABLE_AVX=OFF -DENABLE_SSE2=OFF -DENABLE_NEON=OFF) foreach(package_name IN LISTS package_names) message(STATUS "${package_name}...") diff --git a/ports/fftw3/vcpkg.json b/ports/fftw3/vcpkg.json index deb93c90a6d0f0..0b5d586a5ffa4d 100644 --- a/ports/fftw3/vcpkg.json +++ b/ports/fftw3/vcpkg.json @@ -35,6 +35,10 @@ "description": "Builds part of the library with sse2, sse", "supports": "!arm" }, + "neon": { + "description": "Builds part of the library with neon", + "supports": "arm" + }, "threads": { "description": "Enable threads in fftw3" } From a5d1830bd777ad2d8fe8a4df53dfe80a2fff792c Mon Sep 17 00:00:00 2001 From: Michael Schollerer Date: Fri, 25 Apr 2025 10:01:58 +0200 Subject: [PATCH 02/13] update vcpkg with changed fftw3 port --- ports/fftw3/vcpkg.json | 10 +++++----- versions/baseline.json | 2 +- versions/f-/fftw3.json | 5 +++++ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/fftw3/vcpkg.json b/ports/fftw3/vcpkg.json index 0b5d586a5ffa4d..aa3407598eddb3 100644 --- a/ports/fftw3/vcpkg.json +++ b/ports/fftw3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "fftw3", "version": "3.3.10", - "port-version": 9, + "port-version": 10, "description": "FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) in one or more dimensions, of arbitrary input size, and of both real and complex data (as well as of even/odd data, i.e. the discrete cosine/sine transforms or DCT/DST).", "homepage": "https://www.fftw.org/", "license": "GPL-2.0-or-later", @@ -24,6 +24,10 @@ "description": "Builds part of the library with avx2, fma, avx, sse2, sse", "supports": "!arm" }, + "neon": { + "description": "Builds part of the library with neon", + "supports": "arm" + }, "openmp": { "description": "Builds openmp enabled lib" }, @@ -35,10 +39,6 @@ "description": "Builds part of the library with sse2, sse", "supports": "!arm" }, - "neon": { - "description": "Builds part of the library with neon", - "supports": "arm" - }, "threads": { "description": "Enable threads in fftw3" } diff --git a/versions/baseline.json b/versions/baseline.json index 510bbb2d9c89de..f0f983062d93cd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2802,7 +2802,7 @@ }, "fftw3": { "baseline": "3.3.10", - "port-version": 9 + "port-version": 10 }, "fftwpp": { "baseline": "2019-12-19", diff --git a/versions/f-/fftw3.json b/versions/f-/fftw3.json index 2e6592463e66fa..56cd7658bd42ff 100644 --- a/versions/f-/fftw3.json +++ b/versions/f-/fftw3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1c70d9ebe4747740267447c048ca40da3f11e101", + "version": "3.3.10", + "port-version": 10 + }, { "git-tree": "d64246f2b42f53756787bd4f886488846a789030", "version": "3.3.10", From 789b33a208718a1b15c6ff2889d8ca1777c05d2d Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Mon, 28 Apr 2025 12:42:57 -0700 Subject: [PATCH 03/13] windows-static openmp actually works! --- scripts/ci.feature.baseline.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index d647c4f11daca9..31cc3a89db8dc2 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -833,6 +833,8 @@ ffmpeg[dav1d]:x86-windows = cascade ffmpeg[ilbc]:arm64-uwp = cascade ffmpeg[qsv](!linux & !windows & !(x64 & android)) = cascade ffmpeg[tensorflow](windows) = cascade +fftw3[openmp](osx) = feature-fails # waits for https://github.com/microsoft/vcpkg/pull/30833 +fftw3[openmp](windows & !static) = feature-fails # Linker missing symbols. See https://github.com/microsoft/vcpkg/issues/33322 fizz:arm64-uwp = cascade fizz:arm64-windows = cascade fizz:x64-uwp = cascade @@ -2188,8 +2190,6 @@ dv-processing[tools](osx) = feature-fails # Broke with compiler version. See htt embree3[core,avx,avx2,avx512,default-features,sse2,sse42](osx) = combination-fails # CMake Error at CMakeLists.txt:447 (MESSAGE): Using Embree as static library is not supported with AppleClang >= 9.0 when multiple ISAs are selected. Please either build a shared library or enable only one ISA. ffmpeg[all,all-gpl](x64 & android) = feature-fails ffmpeg[nvcodec,ffplay,opengl](android) = feature-fails -fftw3[openmp](osx) = feature-fails # waits for https://github.com/microsoft/vcpkg/pull/30833 -fftw3[openmp](windows) = feature-fails # Linker missing symbols. See https://github.com/microsoft/vcpkg/issues/33322 flashlight-cpu = fail # CMake Error: INSTALL(EXPORT) given unknown export "flashlightTargets". See https://github.com/microsoft/vcpkg/issues/32098 flashlight-sequence[openmp](osx) = feature-fails # No openmp on osx freerdp[server](osx) = skip # Uses api removed with macOS 15. Don't get fixed. See https://github.com/FreeRDP/FreeRDP/issues/10558 From c37d26045bc9cc70ab464cfa35aca69168549b39 Mon Sep 17 00:00:00 2001 From: Michael Schollerer Date: Thu, 8 May 2025 15:28:35 +0200 Subject: [PATCH 04/13] add distinction for arm64 and arm32, clean up --- ports/fftw3/portfile.cmake | 10 +++++++--- ports/fftw3/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/f-/fftw3.json | 5 +++++ 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ports/fftw3/portfile.cmake b/ports/fftw3/portfile.cmake index d82f448b4daaa3..0233402d55fe5f 100644 --- a/ports/fftw3/portfile.cmake +++ b/ports/fftw3/portfile.cmake @@ -14,7 +14,7 @@ vcpkg_extract_source_archive( fix-openmp.patch install-subtargets.patch fix-wrong-version.patch # https://github.com/FFTW/fftw3/commit/0842f00ae6b6e1f3aade155bc0edd17a7313fa6a - neon.patch # add neon + neon.patch # https://github.com/FFTW/fftw3/pull/275/commits/262f5cfe23af54930b119bd3653bc25bf2d881da ) vcpkg_check_features( @@ -28,11 +28,15 @@ vcpkg_check_features( avx ENABLE_AVX sse2 ENABLE_SSE2 sse ENABLE_SSE - neon ENABLE_NEON # add neon + neon ENABLE_NEON ) set(package_names fftw3 fftw3f fftw3l) -set(fftw3_options "") +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm32") + set(fftw3_options "-DENABLE_NEON=OFF") # neon for double precision is not supported on arm32 +else() + set(fftw3_options "") +endif() set(fftw3f_options -DENABLE_FLOAT=ON) set(fftw3l_options -DENABLE_LONG_DOUBLE=ON -DENABLE_AVX2=OFF -DENABLE_AVX=OFF -DENABLE_SSE2=OFF -DENABLE_NEON=OFF) diff --git a/ports/fftw3/vcpkg.json b/ports/fftw3/vcpkg.json index aa3407598eddb3..0c24d37d9b5a08 100644 --- a/ports/fftw3/vcpkg.json +++ b/ports/fftw3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "fftw3", "version": "3.3.10", - "port-version": 10, + "port-version": 11, "description": "FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) in one or more dimensions, of arbitrary input size, and of both real and complex data (as well as of even/odd data, i.e. the discrete cosine/sine transforms or DCT/DST).", "homepage": "https://www.fftw.org/", "license": "GPL-2.0-or-later", @@ -26,7 +26,7 @@ }, "neon": { "description": "Builds part of the library with neon", - "supports": "arm" + "supports": "linux & arm" }, "openmp": { "description": "Builds openmp enabled lib" diff --git a/versions/baseline.json b/versions/baseline.json index f0f983062d93cd..19cfd3e68d7a39 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2802,7 +2802,7 @@ }, "fftw3": { "baseline": "3.3.10", - "port-version": 10 + "port-version": 11 }, "fftwpp": { "baseline": "2019-12-19", diff --git a/versions/f-/fftw3.json b/versions/f-/fftw3.json index 56cd7658bd42ff..37dc18f457cfd4 100644 --- a/versions/f-/fftw3.json +++ b/versions/f-/fftw3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "078b3debb36667a59dd5c2a5b27bf8442b80cbac", + "version": "3.3.10", + "port-version": 11 + }, { "git-tree": "1c70d9ebe4747740267447c048ca40da3f11e101", "version": "3.3.10", From 4235d0fdf998108e9667dc41391805b5f7b658bf Mon Sep 17 00:00:00 2001 From: Michael Schollerer Date: Thu, 8 May 2025 15:35:35 +0200 Subject: [PATCH 05/13] add android --- ports/fftw3/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/f-/fftw3.json | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/fftw3/vcpkg.json b/ports/fftw3/vcpkg.json index 0c24d37d9b5a08..766a6dc8d9bbc1 100644 --- a/ports/fftw3/vcpkg.json +++ b/ports/fftw3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "fftw3", "version": "3.3.10", - "port-version": 11, + "port-version": 12, "description": "FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) in one or more dimensions, of arbitrary input size, and of both real and complex data (as well as of even/odd data, i.e. the discrete cosine/sine transforms or DCT/DST).", "homepage": "https://www.fftw.org/", "license": "GPL-2.0-or-later", @@ -26,7 +26,7 @@ }, "neon": { "description": "Builds part of the library with neon", - "supports": "linux & arm" + "supports": "(linux | android) & arm" }, "openmp": { "description": "Builds openmp enabled lib" diff --git a/versions/baseline.json b/versions/baseline.json index 19cfd3e68d7a39..1ba9dbc96893f4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2802,7 +2802,7 @@ }, "fftw3": { "baseline": "3.3.10", - "port-version": 11 + "port-version": 12 }, "fftwpp": { "baseline": "2019-12-19", diff --git a/versions/f-/fftw3.json b/versions/f-/fftw3.json index 37dc18f457cfd4..2047a008968405 100644 --- a/versions/f-/fftw3.json +++ b/versions/f-/fftw3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c958adcdb7decc28e54909583cad487d44c6a088", + "version": "3.3.10", + "port-version": 12 + }, { "git-tree": "078b3debb36667a59dd5c2a5b27bf8442b80cbac", "version": "3.3.10", From 118d9516c5fe63a78fef70725072f6ba1e0cacd9 Mon Sep 17 00:00:00 2001 From: mschollerer Date: Thu, 8 May 2025 21:27:59 +0200 Subject: [PATCH 06/13] Update ports/fftw3/vcpkg.json as suggested in review Co-authored-by: Kai Pastor --- ports/fftw3/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/fftw3/vcpkg.json b/ports/fftw3/vcpkg.json index 766a6dc8d9bbc1..5be2465d73a39d 100644 --- a/ports/fftw3/vcpkg.json +++ b/ports/fftw3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "fftw3", "version": "3.3.10", - "port-version": 12, + "port-version": 10, "description": "FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) in one or more dimensions, of arbitrary input size, and of both real and complex data (as well as of even/odd data, i.e. the discrete cosine/sine transforms or DCT/DST).", "homepage": "https://www.fftw.org/", "license": "GPL-2.0-or-later", From d5776cb28656c96bb186269e9699dc693339aa3a Mon Sep 17 00:00:00 2001 From: mschollerer Date: Thu, 8 May 2025 21:28:19 +0200 Subject: [PATCH 07/13] Update versions/f-/fftw3.json as suggested in review Co-authored-by: Kai Pastor --- versions/f-/fftw3.json | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/versions/f-/fftw3.json b/versions/f-/fftw3.json index 2047a008968405..56cd7658bd42ff 100644 --- a/versions/f-/fftw3.json +++ b/versions/f-/fftw3.json @@ -1,15 +1,5 @@ { "versions": [ - { - "git-tree": "c958adcdb7decc28e54909583cad487d44c6a088", - "version": "3.3.10", - "port-version": 12 - }, - { - "git-tree": "078b3debb36667a59dd5c2a5b27bf8442b80cbac", - "version": "3.3.10", - "port-version": 11 - }, { "git-tree": "1c70d9ebe4747740267447c048ca40da3f11e101", "version": "3.3.10", From a6b76ada3b6f40c12cba1e9f12f042b2774f192d Mon Sep 17 00:00:00 2001 From: mschollerer Date: Thu, 8 May 2025 21:28:34 +0200 Subject: [PATCH 08/13] Update ports/fftw3/portfile.cmake as suggested in review Co-authored-by: Kai Pastor --- ports/fftw3/portfile.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/fftw3/portfile.cmake b/ports/fftw3/portfile.cmake index 0233402d55fe5f..540177aae2bd2a 100644 --- a/ports/fftw3/portfile.cmake +++ b/ports/fftw3/portfile.cmake @@ -28,7 +28,6 @@ vcpkg_check_features( avx ENABLE_AVX sse2 ENABLE_SSE2 sse ENABLE_SSE - neon ENABLE_NEON ) set(package_names fftw3 fftw3f fftw3l) From fdd003a29314272a80878bdde2ffb7b100727c53 Mon Sep 17 00:00:00 2001 From: mschollerer Date: Thu, 8 May 2025 21:28:47 +0200 Subject: [PATCH 09/13] Update ports/fftw3/portfile.cmake as suggested in review Co-authored-by: Kai Pastor --- ports/fftw3/portfile.cmake | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ports/fftw3/portfile.cmake b/ports/fftw3/portfile.cmake index 540177aae2bd2a..a27d8f4de832f1 100644 --- a/ports/fftw3/portfile.cmake +++ b/ports/fftw3/portfile.cmake @@ -31,11 +31,7 @@ vcpkg_check_features( ) set(package_names fftw3 fftw3f fftw3l) -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm32") - set(fftw3_options "-DENABLE_NEON=OFF") # neon for double precision is not supported on arm32 -else() - set(fftw3_options "") -endif() +set(fftw3_options "") set(fftw3f_options -DENABLE_FLOAT=ON) set(fftw3l_options -DENABLE_LONG_DOUBLE=ON -DENABLE_AVX2=OFF -DENABLE_AVX=OFF -DENABLE_SSE2=OFF -DENABLE_NEON=OFF) From 200d3e203ab5734ad7fd2fabbb3d70fb12946c6b Mon Sep 17 00:00:00 2001 From: mschollerer Date: Thu, 8 May 2025 21:28:57 +0200 Subject: [PATCH 10/13] Update ports/fftw3/portfile.cmake as suggested in review Co-authored-by: Kai Pastor --- ports/fftw3/portfile.cmake | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/fftw3/portfile.cmake b/ports/fftw3/portfile.cmake index a27d8f4de832f1..25ae46bd69d79a 100644 --- a/ports/fftw3/portfile.cmake +++ b/ports/fftw3/portfile.cmake @@ -33,7 +33,14 @@ vcpkg_check_features( set(package_names fftw3 fftw3f fftw3l) set(fftw3_options "") set(fftw3f_options -DENABLE_FLOAT=ON) -set(fftw3l_options -DENABLE_LONG_DOUBLE=ON -DENABLE_AVX2=OFF -DENABLE_AVX=OFF -DENABLE_SSE2=OFF -DENABLE_NEON=OFF) +set(fftw3l_options -DENABLE_LONG_DOUBLE=ON -DENABLE_AVX2=OFF -DENABLE_AVX=OFF -DENABLE_SSE2=OFF) + +if("neon" IN_LIST FEATURES) + list(APPEND fftw3l_options -DENABLE_NEON=ON) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + list(APPEND fftw3_options -DENABLE_NEON=ON) + endif() +endif() foreach(package_name IN LISTS package_names) message(STATUS "${package_name}...") From ea5eaf981084a2ac6e66d1faa3e50cbbc6ba2306 Mon Sep 17 00:00:00 2001 From: Michael Schollerer Date: Thu, 8 May 2025 21:32:54 +0200 Subject: [PATCH 11/13] fftw3f can always be built with neon, fftw3l can never be --- ports/fftw3/portfile.cmake | 2 +- versions/baseline.json | 2 +- versions/f-/fftw3.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/fftw3/portfile.cmake b/ports/fftw3/portfile.cmake index 25ae46bd69d79a..e689ed35919188 100644 --- a/ports/fftw3/portfile.cmake +++ b/ports/fftw3/portfile.cmake @@ -36,7 +36,7 @@ set(fftw3f_options -DENABLE_FLOAT=ON) set(fftw3l_options -DENABLE_LONG_DOUBLE=ON -DENABLE_AVX2=OFF -DENABLE_AVX=OFF -DENABLE_SSE2=OFF) if("neon" IN_LIST FEATURES) - list(APPEND fftw3l_options -DENABLE_NEON=ON) + list(APPEND fftw3f_options -DENABLE_NEON=ON) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") list(APPEND fftw3_options -DENABLE_NEON=ON) endif() diff --git a/versions/baseline.json b/versions/baseline.json index 1ba9dbc96893f4..f0f983062d93cd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2802,7 +2802,7 @@ }, "fftw3": { "baseline": "3.3.10", - "port-version": 12 + "port-version": 10 }, "fftwpp": { "baseline": "2019-12-19", diff --git a/versions/f-/fftw3.json b/versions/f-/fftw3.json index 56cd7658bd42ff..1593b6b452eb30 100644 --- a/versions/f-/fftw3.json +++ b/versions/f-/fftw3.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "1c70d9ebe4747740267447c048ca40da3f11e101", + "git-tree": "98a1c4076fefe0c03872693b7305204b2db65f2c", "version": "3.3.10", "port-version": 10 }, From dd2535eff69ed0aa8965e3504fc6d27dfd1351ff Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Thu, 8 May 2025 17:49:30 -0700 Subject: [PATCH 12/13] Un-reorder in ci.feature.baseline.txt. --- scripts/ci.feature.baseline.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index 1562508b1e88a8..b591b72ecbc548 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -841,8 +841,6 @@ ffmpeg[dav1d]:x86-windows = cascade ffmpeg[ilbc]:arm64-uwp = cascade ffmpeg[qsv](!linux & !windows & !(x64 & android)) = cascade ffmpeg[tensorflow](windows) = cascade -fftw3[openmp](osx) = feature-fails # waits for https://github.com/microsoft/vcpkg/pull/30833 -fftw3[openmp](windows & !static) = feature-fails # Linker missing symbols. See https://github.com/microsoft/vcpkg/issues/33322 fizz:arm64-windows = cascade fizz:arm64-windows-static-md = cascade fizz:x86-windows = cascade @@ -2205,6 +2203,8 @@ dv-processing[tools](osx) = feature-fails # Broke with compiler version. See htt embree3[core,avx,avx2,avx512,default-features,sse2,sse42](osx) = combination-fails # CMake Error at CMakeLists.txt:447 (MESSAGE): Using Embree as static library is not supported with AppleClang >= 9.0 when multiple ISAs are selected. Please either build a shared library or enable only one ISA. ffmpeg[all,all-gpl](x64 & android) = feature-fails ffmpeg[nvcodec,ffplay,opengl](android) = feature-fails +fftw3[openmp](osx) = feature-fails # waits for https://github.com/microsoft/vcpkg/pull/30833 +fftw3[openmp](windows & !static) = feature-fails # Linker missing symbols. See https://github.com/microsoft/vcpkg/issues/33322 flashlight-cpu = fail # CMake Error: INSTALL(EXPORT) given unknown export "flashlightTargets". See https://github.com/microsoft/vcpkg/issues/32098 flashlight-sequence[openmp](osx) = feature-fails # No openmp on osx freerdp[server](osx) = skip # Uses api removed with macOS 15. Don't get fixed. See https://github.com/FreeRDP/FreeRDP/issues/10558 @@ -2291,7 +2291,7 @@ sqlpp11[core,mariadb,mysql] = options # can not select mariadb and mysql at the sqlpp11-connector-mysql[core,mariadb,mysql] = options # can not select mariadb and mysql at the same time symengine[tcmalloc](windows) = feature-fails # tcmalloc not found. See https://github.com/microsoft/vcpkg/issues/33576 tgui[sdl2] = options # At least one of the backend features must be selected: sdl2 sfml -vlfeat[openmp](osx) = feature-fails # No openmp on osx +vlfeat[openmp](osx) = feature-fails # No openmp on osxa vlpp[tools](linux) = feature-fails # See https://github.com/microsoft/vcpkg/issues/32143 (error: inconsistent begin/end types in range-based ‘for’ statement) vlpp[tools](osx) = feature-fails # error: use of undeclared identifier 'PATH_MAX' vtk[all](!windows) = feature-fails # Wait for fix: https://github.com/microsoft/vcpkg/pull/29260 From b19a2e8e71c515958fa21107ed806f0fb75cf844 Mon Sep 17 00:00:00 2001 From: Michael Schollerer Date: Fri, 9 May 2025 13:57:35 +0200 Subject: [PATCH 13/13] fix typo --- scripts/ci.feature.baseline.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index b591b72ecbc548..774603ae9ce451 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -2291,7 +2291,7 @@ sqlpp11[core,mariadb,mysql] = options # can not select mariadb and mysql at the sqlpp11-connector-mysql[core,mariadb,mysql] = options # can not select mariadb and mysql at the same time symengine[tcmalloc](windows) = feature-fails # tcmalloc not found. See https://github.com/microsoft/vcpkg/issues/33576 tgui[sdl2] = options # At least one of the backend features must be selected: sdl2 sfml -vlfeat[openmp](osx) = feature-fails # No openmp on osxa +vlfeat[openmp](osx) = feature-fails # No openmp on osx vlpp[tools](linux) = feature-fails # See https://github.com/microsoft/vcpkg/issues/32143 (error: inconsistent begin/end types in range-based ‘for’ statement) vlpp[tools](osx) = feature-fails # error: use of undeclared identifier 'PATH_MAX' vtk[all](!windows) = feature-fails # Wait for fix: https://github.com/microsoft/vcpkg/pull/29260