[kfr] Update to 6.0.3 and disable detect cross-compiling

microsoft · Oct 10, 2024 · bdde581 · bdde581
1 parent c45ac46
commit bdde581
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 9 deletions.
diff --git a/ports/kfr/0100-disable-detect-cross-compiling.patch b/ports/kfr/0100-disable-detect-cross-compiling.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 243d04e..d5bfe96 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -244,7 +244,7 @@ if (NOT X86)
+     endif ()
+ endif ()
+
+-if (KFR_ARCH IN_LIST DETECT_NAMES AND NOT CMAKE_CROSSCOMPILING)
++if (0)
+     message(STATUS "Detecting ${KFR_ARCH} architecture")
+     try_run(
+         RUN_RESULT COMPILE_RESULT "${CMAKE_CURRENT_BINARY_DIR}/tmpdir"
diff --git a/ports/kfr/portfile.cmake b/ports/kfr/portfile.cmake
@@ -4,8 +4,10 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO kfrlib/kfr
     REF "${VERSION}"
-    SHA512 90ae299b1d3b9cc73de665f7c5ace757978b95d1546a4b00383a1a677ecfcd56698ea80e7bf7367e3f169238fff6391ee1f2a3558cfba7cc11c762cc3fbb3292
-    HEAD_REF master
+    SHA512 f494aa700cbfb95da8d55f818cafa976a346ef4880b2f85f7c8af8f731b1b48487f10d4ad44a9b2e8cefd08383035173c0487f22080e6f1375f013c556bdb045
+    HEAD_REF main
+    PATCHES
+        0100-disable-detect-cross-compiling.patch
 )
 
 vcpkg_check_features(
@@ -33,4 +35,10 @@ vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(
+    COMMENT [[
+KFR is distributed under dual GPLv2/v3 and commercial license.
+https://kfrlib.com/purchase
+]]
+    FILE_LIST "${SOURCE_PATH}/LICENSE.txt"
+)
diff --git a/ports/kfr/vcpkg.json b/ports/kfr/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "kfr",
-  "version-semver": "6.0.2",
+  "version-semver": "6.0.3",
   "description": "Fast, modern C++ DSP framework.",
   "homepage": "https://www.kfr.dev/",
-  "license": "GPL-2.0",
-  "supports": "!(arm | linux | xbox)",
+  "license": "GPL-2.0-or-later",
+  "supports": "!xbox",
   "dependencies": [
     {
       "name": "vcpkg-cmake",

diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
@@ -503,8 +503,7 @@ jemalloc:x64-uwp=fail
 jinja2cpplight:arm-neon-android=fail
 jinja2cpplight:arm64-android=fail
 jinja2cpplight:x64-android=fail
-kfr:x64-android=fail
-kfr:x64-uwp=fail
+kfr:arm64-windows=fail  # No `_M_ARM64` detected in https://github.com/kfrlib/kfr/blob/v3.0.8/include/kfr/cident.h#L12
 # needs android-24
 kubazip:arm-neon-android=fail
 lcm:x64-windows-static=fail

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -4093,7 +4093,7 @@
       "port-version": 0
     },
     "kfr": {
-      "baseline": "6.0.2",
+      "baseline": "6.0.3",
       "port-version": 0
     },
     "kinectsdk1": {

diff --git a/versions/k-/kfr.json b/versions/k-/kfr.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e9fc92770c771ba2a9fef1e661d32e59aeca3aca",
+      "version-semver": "6.0.3",
+      "port-version": 0
+    },
     {
       "git-tree": "d2a0f77d81e8be067f6fc0e97d768ed7cbcbb90a",
       "version-semver": "6.0.2",