[kfr] Update to 4.2.1 (#19978)

* [kfr] Update to 4.2.1

* [kfr] Update version file

* [kfr] Tab -> Space

* [kfr] Overwrite version

* [kfr] Overwrite version

4 files changed, 33 insertions, 19 deletions

diff --git a/ports/kfr/portfile.cmake b/ports/kfr/portfile.cmake
index 2cd702e2f..ca8f4a0fd 100644
--- a/ports/kfr/portfile.cmake
+++ b/ports/kfr/portfile.cmake
@@ -1,23 +1,25 @@
 vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "Linux")

 

+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

+

 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO kfrlib/kfr

-    REF 1f9706197abfcd4b4ec19ded3ce37b70ebd9a223

-    SHA512 901c6984a46a7abcc28adf9397759156a9e8d173e028c236ab423568ed20b3a3efe207be9660c961539c73a2767afaedcd76133304f542d3299353942cf13f5e

+    REF 9fc73247f43b303617329294ae264613df4dce71 # 4.2.1

+    SHA512 c7dd4b1a0be436460973fb8a48bc6f2264a0f7d8d034ce88ccfd8328135f1492eab155023103a1461c2058eb6c79a6019b62d023dc5bc390ab4d2b43eac9c2d4

     HEAD_REF master

 )

 

 vcpkg_check_features(

     OUT_FEATURE_OPTIONS FEATURE_OPTIONS

-    capi ENABLE_CAPI_BUILD

-    dft ENABLE_DFT

-    dft-np ENABLE_DFT_NP

+    FEATURES

+        capi ENABLE_CAPI_BUILD

+        dft ENABLE_DFT

+        dft-np ENABLE_DFT_NP

 )

 

-vcpkg_configure_cmake(

-    SOURCE_PATH ${SOURCE_PATH}

-    PREFER_NINJA

+vcpkg_cmake_configure(

+    SOURCE_PATH "${SOURCE_PATH}"

     OPTIONS

         -DENABLE_TESTS=OFF

         -DENABLE_ASMTEST=OFF

@@ -27,8 +29,8 @@ vcpkg_configure_cmake(
         ${FEATURE_OPTIONS}

 )

 

-vcpkg_install_cmake()

+vcpkg_cmake_install()

 

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

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

 

-file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

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

diff --git a/ports/kfr/vcpkg.json b/ports/kfr/vcpkg.json
index 25d8c74bd..ecf2ac02d 100644
--- a/ports/kfr/vcpkg.json
+++ b/ports/kfr/vcpkg.json
@@ -1,16 +1,23 @@
 {
   "name": "kfr",
-  "version-string": "2020-06-15",
-  "port-version": 1,
-  "description": "Fast, modern C++ DSP framework",
+  "version-semver": "4.2.1",
+  "description": "Fast, modern C++ DSP framework.",
   "homepage": "https://www.kfr.dev/",
+  "license": "GPL-2.0",
   "supports": "!(arm | linux)",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ],
   "features": {
     "capi": {
-      "description": "Enable C API build",
+      "description": "Enable C API build.",
       "dependencies": [
         {
           "name": "kfr",
+          "default-features": false,
           "features": [
             "dft"
           ]
@@ -18,10 +25,10 @@
       ]
     },
     "dft": {
-      "description": "Enable DFT and related algorithms"
+      "description": "Enable DFT and related algorithms."
     },
     "dft-np": {
-      "description": "Enable Non-power of 2 DFT"
+      "description": "Enable non-power of 2 DFT."
     }
   }
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index 4e7378ce5..cb6c26d86 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3057,8 +3057,8 @@
       "port-version": 2
     },
     "kfr": {
-      "baseline": "2020-06-15",
-      "port-version": 1
+      "baseline": "4.2.1",
+      "port-version": 0
     },
     "kinectsdk1": {
       "baseline": "1.8",
diff --git a/versions/k-/kfr.json b/versions/k-/kfr.json
index e1f4ef71c..00a6e7aa4 100644
--- a/versions/k-/kfr.json
+++ b/versions/k-/kfr.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "3c67a5df3f480154a5f3472c58952566b55b688c",
+      "version-semver": "4.2.1",
+      "port-version": 0
+    },
+    {
       "git-tree": "57db6ba7195ff44caabe75ab302cdc10629fb5f2",
       "version-string": "2020-06-15",
       "port-version": 1