From 7ce15ca82cddfbf23a30447d37992c5683789354 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Wed, 29 Sep 2021 23:26:29 +0800 Subject: [PATCH] [fftw3] Update the hash (#20420) --- ports/fftw3/fftw3_arch_fix.patch | 15 +++++++-------- ports/fftw3/portfile.cmake | 2 +- ports/fftw3/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/f-/fftw3.json | 5 +++++ 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/ports/fftw3/fftw3_arch_fix.patch b/ports/fftw3/fftw3_arch_fix.patch index 0f1a7e5ae6..53fd7c0e73 100644 --- a/ports/fftw3/fftw3_arch_fix.patch +++ b/ports/fftw3/fftw3_arch_fix.patch @@ -1,17 +1,16 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 95bd537a..245acc8f 100644 ---- a/CMakeLists.txt +index 49be67d..ef69fa6 100644 +--- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -66,6 +66,8 @@ +@@ -66,6 +66,7 @@ check_prototype_definition (cosl "long double cosl( long double arg )" "0" math. check_prototype_definition (sinl "long double sinl( long double arg )" "0" math.h HAVE_DECL_SINL) check_prototype_definition (memalign "void *memalign(size_t alignment, size_t size)" "0" malloc.h HAVE_DECL_MEMALIGN) check_prototype_definition (posix_memalign "int posix_memalign(void **memptr, size_t alignment, size_t size)" "0" stdlib.h HAVE_DECL_POSIX_MEMALIGN) +check_prototype_definition (_aligned_malloc "void* __cdecl _aligned_malloc(size_t _Size, size_t _Alignment)" "0" malloc.h HAVE_DECL_ALIGNED_MALLOC) -+ include (CheckSymbolExists) check_symbol_exists (clock_gettime time.h HAVE_CLOCK_GETTIME) -@@ -75,6 +77,7 @@ +@@ -75,6 +76,7 @@ check_symbol_exists (drand48 stdlib.h HAVE_DRAND48) check_symbol_exists (srand48 stdlib.h HAVE_SRAND48) check_symbol_exists (memalign malloc.h HAVE_MEMALIGN) check_symbol_exists (posix_memalign stdlib.h HAVE_POSIX_MEMALIGN) @@ -19,7 +18,7 @@ index 95bd537a..245acc8f 100644 check_symbol_exists (mach_absolute_time mach/mach_time.h HAVE_MACH_ABSOLUTE_TIME) check_symbol_exists (alloca alloca.h HAVE_ALLOCA) if (NOT HAVE_ALLOCA) -@@ -131,6 +131,7 @@ endif () +@@ -131,6 +133,7 @@ endif () include (CheckCCompilerFlag) @@ -27,7 +26,7 @@ index 95bd537a..245acc8f 100644 if (ENABLE_SSE) foreach (FLAG "-msse" "/arch:SSE") unset (HAVE_SSE CACHE) -@@ -176,8 +177,9 @@ if (ENABLE_AVX2) +@@ -180,8 +183,9 @@ if (ENABLE_AVX2) endif () # AVX2 codelets require FMA support as well @@ -36,5 +35,5 @@ index 95bd537a..245acc8f 100644 - foreach (FLAG "-mfma" "/arch:FMA") + foreach (FLAG "-mfma" "/arch:AVX2") unset (HAVE_FMA CACHE) + unset (HAVE_FMA) check_c_compiler_flag (${FLAG} HAVE_FMA) - if (HAVE_FMA) diff --git a/ports/fftw3/portfile.cmake b/ports/fftw3/portfile.cmake index b580d42e1a..3493d7cdac 100644 --- a/ports/fftw3/portfile.cmake +++ b/ports/fftw3/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_download_distfile(ARCHIVE URLS "http://www.fftw.org/fftw-3.3.10.tar.gz" FILENAME "fftw-3.3.10.tar.gz" - SHA512 52ebc2a33063a41fd478f6ea2acbf3b511867f736591d273dd57f9dfca5d3e0b0c73157921b3a36f1a7cfd741a8a6bde0fd80de578040ae730ea168b5ba466cf + SHA512 2d34b5ccac7b08740dbdacc6ebe451d8a34cf9d9bfec85a5e776e87adf94abfd803c222412d8e10fbaa4ed46f504aa87180396af1b108666cde4314a55610b40 ) vcpkg_extract_source_archive_ex( diff --git a/ports/fftw3/vcpkg.json b/ports/fftw3/vcpkg.json index 9ce87120f9..08b641c4a5 100644 --- a/ports/fftw3/vcpkg.json +++ b/ports/fftw3/vcpkg.json @@ -1,6 +1,7 @@ { "name": "fftw3", "version": "3.3.10", + "port-version": 1, "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/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 1198546568..669d17b5a8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2110,7 +2110,7 @@ }, "fftw3": { "baseline": "3.3.10", - "port-version": 0 + "port-version": 1 }, "fftwpp": { "baseline": "2019-12-19", diff --git a/versions/f-/fftw3.json b/versions/f-/fftw3.json index 71bbb8f85f..6a5b99192b 100644 --- a/versions/f-/fftw3.json +++ b/versions/f-/fftw3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ecf3602083e88dce78331f58590466c22664c584", + "version": "3.3.10", + "port-version": 1 + }, { "git-tree": "174084fa9cf349e48d219eb948c585df3f093f6e", "version": "3.3.10",