[fftw3/libwebsockets/uwebsockets] Update to latest release (#20051)

3 files changed, 58 insertions, 48 deletions

diff --git a/ports/fftw3/CONTROL b/ports/fftw3/CONTROL
deleted file mode 100644
index 95c693631..000000000
--- a/ports/fftw3/CONTROL
+++ /dev/null
@@ -1,22 +0,0 @@
-Source: fftw3

-Version: 3.3.8-7

-Homepage: https://www.fftw.org/

-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).

-

-Feature: openmp

-Description: Builds openmp enabled lib

-

-Feature: sse

-Description: Builds part of the library with sse

-

-Feature: sse2

-Description: Builds part of the library with sse2, sse

-

-Feature: avx

-Description: Builds part of the library with avx, sse2, sse

-

-Feature: avx2

-Description: Builds part of the library with avx2, fma, avx, sse2, sse

-

-Feature: threads

-Description: Enable threads in fftw3

diff --git a/ports/fftw3/portfile.cmake b/ports/fftw3/portfile.cmake
index 161cff768..c98024695 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.8.tar.gz"

-    FILENAME "fftw-3.3.8.tar.gz"

-    SHA512 ab918b742a7c7dcb56390a0a0014f517a6dff9a2e4b4591060deeb2c652bf3c6868aa74559a422a276b853289b4b701bdcbd3d4d8c08943acf29167a7be81a38

+    URLS "http://www.fftw.org/fftw-3.3.9.tar.gz"

+    FILENAME "fftw-3.3.9.tar.gz"

+    SHA512 52ebc2a33063a41fd478f6ea2acbf3b511867f736591d273dd57f9dfca5d3e0b0c73157921b3a36f1a7cfd741a8a6bde0fd80de578040ae730ea168b5ba466cf

 )

 

 vcpkg_extract_source_archive_ex(

@@ -16,13 +16,14 @@ vcpkg_extract_source_archive_ex(
 

 vcpkg_check_features(

     OUT_FEATURE_OPTIONS FEATURE_OPTIONS

-    openmp ENABLE_OPENMP

-    threads ENABLE_THREADS

-    threads WITH_COMBINED_THREADS

-    avx2 ENABLE_AVX2

-    avx ENABLE_AVX

-    sse2 ENABLE_SSE2

-    sse ENABLE_SSE

+    FEATURES

+        openmp ENABLE_OPENMP

+        threads ENABLE_THREADS

+        threads WITH_COMBINED_THREADS

+        avx2 ENABLE_AVX2

+        avx ENABLE_AVX

+        sse2 ENABLE_SSE2

+        sse ENABLE_SSE

 )

 

 set(ENABLE_FLOAT_CMAKE fftw3f)

@@ -31,9 +32,8 @@ set(ENABLE_DEFAULT_PRECISION_CMAKE fftw3)
 

 foreach(PRECISION ENABLE_FLOAT ENABLE_LONG_DOUBLE ENABLE_DEFAULT_PRECISION)

     if(PRECISION STREQUAL "ENABLE_LONG_DOUBLE")

-        vcpkg_configure_cmake(

-        SOURCE_PATH ${SOURCE_PATH}

-        PREFER_NINJA

+        vcpkg_cmake_configure(

+        SOURCE_PATH "${SOURCE_PATH}"

         OPTIONS 

             -D${PRECISION}=ON

             -DENABLE_OPENMP=${ENABLE_OPENMP}

@@ -42,9 +42,8 @@ foreach(PRECISION ENABLE_FLOAT ENABLE_LONG_DOUBLE ENABLE_DEFAULT_PRECISION)
             -DBUILD_TESTS=OFF

         )

     else()

-        vcpkg_configure_cmake(

-        SOURCE_PATH ${SOURCE_PATH}

-        PREFER_NINJA

+        vcpkg_cmake_configure(

+        SOURCE_PATH "${SOURCE_PATH}"

         OPTIONS 

             -D${PRECISION}=ON

             ${FEATURE_OPTIONS}

@@ -52,25 +51,22 @@ foreach(PRECISION ENABLE_FLOAT ENABLE_LONG_DOUBLE ENABLE_DEFAULT_PRECISION)
         )

     endif()

 

-    vcpkg_install_cmake()

+    vcpkg_cmake_install()

 

     vcpkg_copy_pdbs()

 

-    vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share/${${PRECISION}_CMAKE})

+    vcpkg_cmake_config_fixup(PACKAGE_NAME ${${PRECISION}_CMAKE} CONFIG_PATH lib/cmake)

 endforeach()

 

-file(READ ${SOURCE_PATH}/api/fftw3.h _contents)

+file(READ "${SOURCE_PATH}/api/fftw3.h" _contents)

 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")

     string(REPLACE "defined(FFTW_DLL)" "0" _contents "${_contents}")

 else()

     string(REPLACE "defined(FFTW_DLL)" "1" _contents "${_contents}")

 endif()

-file(WRITE ${SOURCE_PATH}/include/fftw3.h "${_contents}")

+file(WRITE "${SOURCE_PATH}/include/fftw3.h" "${_contents}")

 

-# Cleanup

-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)

+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

 

-# Handle copyright

-file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/fftw3)

-file(RENAME ${CURRENT_PACKAGES_DIR}/share/fftw3/COPYING ${CURRENT_PACKAGES_DIR}/share/fftw3/copyright)

+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

diff --git a/ports/fftw3/vcpkg.json b/ports/fftw3/vcpkg.json
new file mode 100644
index 000000000..646e2627e
--- /dev/null
+++ b/ports/fftw3/vcpkg.json
@@ -0,0 +1,36 @@
+{
+  "name": "fftw3",
+  "version-string": "3.3.9",
+  "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": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
+  "features": {
+    "avx": {
+      "description": "Builds part of the library with avx, sse2, sse"
+    },
+    "avx2": {
+      "description": "Builds part of the library with avx2, fma, avx, sse2, sse"
+    },
+    "openmp": {
+      "description": "Builds openmp enabled lib"
+    },
+    "sse": {
+      "description": "Builds part of the library with sse"
+    },
+    "sse2": {
+      "description": "Builds part of the library with sse2, sse"
+    },
+    "threads": {
+      "description": "Enable threads in fftw3"
+    }
+  }
+}