From ca0f810f4f2c3f18eeb20ad92f3f7fa658037ae5 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Sat, 25 Jun 2022 06:00:50 +0800 Subject: [PATCH] [pffft] fix supports (#25403) * fix supports * fix invalid command * update patch --- ports/pffft/fix-invalid-command.patch | 17 +++++++++++++++++ ports/pffft/portfile.cmake | 2 ++ ports/pffft/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/p-/pffft.json | 5 +++++ 5 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 ports/pffft/fix-invalid-command.patch diff --git a/ports/pffft/fix-invalid-command.patch b/ports/pffft/fix-invalid-command.patch new file mode 100644 index 00000000000..ddb69883e0e --- /dev/null +++ b/ports/pffft/fix-invalid-command.patch @@ -0,0 +1,17 @@ +diff --git a/pffft.c b/pffft.c +index d12f572..7cc0546 100644 +--- a/pffft.c ++++ b/pffft.c +@@ -173,7 +173,11 @@ typedef float32x4_t v4sf; + # define VALIGNED(ptr) ((((long long)(ptr)) & 0x3) == 0) + #else + # if !defined(PFFFT_SIMD_DISABLE) +-# warning "building with simd disabled !\n"; ++# ifdef COMPILER_MSVC ++# pragma message ("building with simd disabled !\n"); ++# else ++# warning "building with simd disabled !\n"; ++# endif + # define PFFFT_SIMD_DISABLE // fallback to scalar code + # endif + #endif diff --git a/ports/pffft/portfile.cmake b/ports/pffft/portfile.cmake index 32d4f833f2c..434f47ce9a2 100644 --- a/ports/pffft/portfile.cmake +++ b/ports/pffft/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_bitbucket( REF ed78751d751e51bbd94c41d24f748b400f272d69 SHA512 44f65c7f7e5b71f549dca2e03d58b1fd64e698858f79e4c2833a9ae3dff8a835cf9d5e14be2341c6370f800012cb69b05b9226d6918b12e67f7f7e81ed8e9ad4 HEAD_REF master + PATCHES + fix-invalid-command.patch ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") diff --git a/ports/pffft/vcpkg.json b/ports/pffft/vcpkg.json index 5ea7a3bd204..f06a359e1e6 100644 --- a/ports/pffft/vcpkg.json +++ b/ports/pffft/vcpkg.json @@ -1,9 +1,10 @@ { "name": "pffft", "version-date": "2021-10-09", + "port-version": 1, "description": "PFFFT, a pretty fast Fourier Transform.", "homepage": "https://bitbucket.org/jpommier/pffft/", - "supports": "static", + "license": null, "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 6a7585b1e92..15569c2796a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5426,7 +5426,7 @@ }, "pffft": { "baseline": "2021-10-09", - "port-version": 0 + "port-version": 1 }, "pfring": { "baseline": "2019-10-17", diff --git a/versions/p-/pffft.json b/versions/p-/pffft.json index 9defc013443..90b53b67189 100644 --- a/versions/p-/pffft.json +++ b/versions/p-/pffft.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "525bc1ec4fd9aa77feeaba44fc6f0cf717716ae1", + "version-date": "2021-10-09", + "port-version": 1 + }, { "git-tree": "c425b1091069b34450a9b7e524f1cad202e4e709", "version-date": "2021-10-09",