From ecc16e4558b4467ca1502a892e8372aff747e729 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Tue, 24 Sep 2019 19:26:02 +0800 Subject: [PATCH 1/5] [kfr] Add new port --- ports/kfr/CONTROL | 4 ++++ ports/kfr/portfile.cmake | 29 +++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 ports/kfr/CONTROL create mode 100644 ports/kfr/portfile.cmake diff --git a/ports/kfr/CONTROL b/ports/kfr/CONTROL new file mode 100644 index 00000000000000..43259d6eb2026b --- /dev/null +++ b/ports/kfr/CONTROL @@ -0,0 +1,4 @@ +Source: kfr +Version: 2019-09-24 +Description: Fast, modern C++ DSP framework +Homepage: https://www.kfr.dev/ diff --git a/ports/kfr/portfile.cmake b/ports/kfr/portfile.cmake new file mode 100644 index 00000000000000..f52a19a1b9d85d --- /dev/null +++ b/ports/kfr/portfile.cmake @@ -0,0 +1,29 @@ +include(vcpkg_common_functions) + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO kfrlib/kfr + REF 11d9a1568b6157ebe6b4b44e121be8c9d3e587bf + SHA512 09120b38bcd5e49ca83a14516ab678d0cb866cf08ca5dd33cc6701ac7db7cd73cd7a3f445b30085b4e1718d98a53497e4e9b27772224051f623ac3006fe409bf + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DENABLE_TESTS=OFF + -DENABLE_ASMTEST=OFF + -DREGENERATE_TESTS=OFF + -DKFR_EXTENDED_TESTS=OFF + -DSKIP_TESTS=ON +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) From d0e0e3b3e23b108bf41408c079d0b32b9e0439a2 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Mon, 15 Jun 2020 14:21:21 +0800 Subject: [PATCH 2/5] [kfr] Modernize and update to lastest --- ports/kfr/CONTROL | 2 +- ports/kfr/portfile.cmake | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/ports/kfr/CONTROL b/ports/kfr/CONTROL index 43259d6eb2026b..5720e88fe1797d 100644 --- a/ports/kfr/CONTROL +++ b/ports/kfr/CONTROL @@ -1,4 +1,4 @@ Source: kfr -Version: 2019-09-24 +Version: 2020-06-15 Description: Fast, modern C++ DSP framework Homepage: https://www.kfr.dev/ diff --git a/ports/kfr/portfile.cmake b/ports/kfr/portfile.cmake index f52a19a1b9d85d..5ab950720741db 100644 --- a/ports/kfr/portfile.cmake +++ b/ports/kfr/portfile.cmake @@ -1,12 +1,10 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO kfrlib/kfr - REF 11d9a1568b6157ebe6b4b44e121be8c9d3e587bf - SHA512 09120b38bcd5e49ca83a14516ab678d0cb866cf08ca5dd33cc6701ac7db7cd73cd7a3f445b30085b4e1718d98a53497e4e9b27772224051f623ac3006fe409bf + REF 1f9706197abfcd4b4ec19ded3ce37b70ebd9a223 + SHA512 901c6984a46a7abcc28adf9397759156a9e8d173e028c236ab423568ed20b3a3efe207be9660c961539c73a2767afaedcd76133304f542d3299353942cf13f5e HEAD_REF master ) @@ -25,5 +23,4 @@ vcpkg_install_cmake() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -# Handle copyright -configure_file(${SOURCE_PATH}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From 33ed32299e7cc5e265c275edfcbbefade1266016 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Mon, 15 Jun 2020 17:10:23 +0800 Subject: [PATCH 3/5] [kfr] Add features --- ports/kfr/CONTROL | 10 ++++++++++ ports/kfr/portfile.cmake | 10 +++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/ports/kfr/CONTROL b/ports/kfr/CONTROL index 5720e88fe1797d..626cc93d2dfa02 100644 --- a/ports/kfr/CONTROL +++ b/ports/kfr/CONTROL @@ -2,3 +2,13 @@ Source: kfr Version: 2020-06-15 Description: Fast, modern C++ DSP framework Homepage: https://www.kfr.dev/ + +Feature: capi +Description: Enable C API build +Build-Depends: kfr[dft] + +Feature: dft +Description: Enable DFT and related algorithms + +Feature: dft-np +Description: Enable Non-power of 2 DFT diff --git a/ports/kfr/portfile.cmake b/ports/kfr/portfile.cmake index 5ab950720741db..7b6336cb2bc8d6 100644 --- a/ports/kfr/portfile.cmake +++ b/ports/kfr/portfile.cmake @@ -1,4 +1,4 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +#vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -8,6 +8,13 @@ vcpkg_from_github( HEAD_REF master ) +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + capi ENABLE_CAPI_BUILD + dft ENABLE_DFT + dft-np ENABLE_DFT_NP +) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -17,6 +24,7 @@ vcpkg_configure_cmake( -DREGENERATE_TESTS=OFF -DKFR_EXTENDED_TESTS=OFF -DSKIP_TESTS=ON + ${FEATURE_OPTIONS} ) vcpkg_install_cmake() From 67f2d71a6679112a32459809b656c49c16b8b105 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Tue, 16 Jun 2020 09:35:27 +0800 Subject: [PATCH 4/5] [kfr] Fail fast on arm-uwp, arm64-windows --- ports/kfr/CONTROL | 1 + ports/kfr/portfile.cmake | 2 +- scripts/ci.baseline.txt | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ports/kfr/CONTROL b/ports/kfr/CONTROL index 626cc93d2dfa02..71c38e099bf7d5 100644 --- a/ports/kfr/CONTROL +++ b/ports/kfr/CONTROL @@ -2,6 +2,7 @@ Source: kfr Version: 2020-06-15 Description: Fast, modern C++ DSP framework Homepage: https://www.kfr.dev/ +Supports: !arm Feature: capi Description: Enable C API build diff --git a/ports/kfr/portfile.cmake b/ports/kfr/portfile.cmake index 7b6336cb2bc8d6..cc7d59e8ddbb74 100644 --- a/ports/kfr/portfile.cmake +++ b/ports/kfr/portfile.cmake @@ -1,4 +1,4 @@ -#vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +vcpkg_fail_port_install(ON_ARCH "arm") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index edc4e9b48c81fb..a053089f54670e 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -669,6 +669,8 @@ jinja2cpplight:arm-uwp=fail jinja2cpplight:x64-uwp=fail keystone:arm-uwp=fail keystone:x64-uwp=fail +kfr:arm64-windows=fail +kfr:arm-uwp=fail kinectsdk1:arm64-windows=fail kinectsdk1:arm-uwp=fail kinectsdk1:x64-linux=fail From 07b175a669779400a74ac33fc09d40bf3e535d0e Mon Sep 17 00:00:00 2001 From: myd7349 Date: Mon, 6 Jul 2020 23:08:42 +0800 Subject: [PATCH 5/5] [kfr] Fail fast on linux --- ports/kfr/CONTROL | 2 +- ports/kfr/portfile.cmake | 2 +- scripts/ci.baseline.txt | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ports/kfr/CONTROL b/ports/kfr/CONTROL index 71c38e099bf7d5..985ba86bf82575 100644 --- a/ports/kfr/CONTROL +++ b/ports/kfr/CONTROL @@ -2,7 +2,7 @@ Source: kfr Version: 2020-06-15 Description: Fast, modern C++ DSP framework Homepage: https://www.kfr.dev/ -Supports: !arm +Supports: !(arm|linux) Feature: capi Description: Enable C API build diff --git a/ports/kfr/portfile.cmake b/ports/kfr/portfile.cmake index cc7d59e8ddbb74..2cd702e2f90ae2 100644 --- a/ports/kfr/portfile.cmake +++ b/ports/kfr/portfile.cmake @@ -1,4 +1,4 @@ -vcpkg_fail_port_install(ON_ARCH "arm") +vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "Linux") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 4270aa12ac9ac8..703db024b2fb8b 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -643,7 +643,8 @@ jinja2cpplight:x64-uwp=fail keystone:arm-uwp=fail keystone:x64-uwp=fail kfr:arm64-windows=fail -kfr:arm-uwp=fail +kfr:arm-uwp=fail +kfr:x64-linux=fail kinectsdk1:arm64-windows=fail kinectsdk1:arm-uwp=fail kinectsdk1:x64-linux=fail