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

This commit is contained in:
WangWeiLin-MV 2024-10-08 18:17:21 +08:00
parent b2a47d316d
commit 791cce463c
6 changed files with 33 additions and 9 deletions

View File

@ -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"

View File

@ -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"
)

View File

@ -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": "!(arm64 & windows) & !xbox",
"dependencies": [
{
"name": "vcpkg-cmake",

View File

@ -498,8 +498,6 @@ 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
# needs android-24
kubazip:arm-neon-android=fail
lcm:x64-windows-static=fail

View File

@ -4097,7 +4097,7 @@
"port-version": 0
},
"kfr": {
"baseline": "6.0.2",
"baseline": "6.0.3",
"port-version": 0
},
"kinectsdk1": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4db862755bb04ee2f657e1299c252a3dea9ab946",
"version-semver": "6.0.3",
"port-version": 0
},
{
"git-tree": "d2a0f77d81e8be067f6fc0e97d768ed7cbcbb90a",
"version-semver": "6.0.2",