Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[kfr] Update to 6.0.3 and disable cross-compiling detection #41436

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

[kfr] Update to 6.0.3 and disable cross-compiling detection #41436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions ports/kfr/0100-disable-detect-cross-compiling.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you explain what this change does? (I'm not saying I think there's anything wrong with it, I'm just not sure how to evaluate its correctness, so I'm trying to understand the problem you're fixing)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This block will detect target architecture and generate header file for native-compiling. Although it will not fail the compilation, it might introduce additional features depends on compiler instead of determinate features.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.. additional features that depend on compiler on exact build machine CPU ?!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry I didn't look at the source code carefully.

The main intention here is to prevent using different source code when cross-compiling.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The main intention here is to prevent using different source code when cross-compiling.

That doesn't appear to be what this code does?

Can we get upstream to comment here? It isn't clear that the resulting port does what its users expect it to do....

+if (0)
message(STATUS "Detecting ${KFR_ARCH} architecture")
try_run(
RUN_RESULT COMPILE_RESULT "${CMAKE_CURRENT_BINARY_DIR}/tmpdir"
14 changes: 11 additions & 3 deletions ports/kfr/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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"
)
6 changes: 3 additions & 3 deletions ports/kfr/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see anywhere where this says or later, can you point to where you see that?

I think GPL-2.0-only OR GPL-3.0-only would work...

"supports": "!(arm64 & windows) & !xbox",
"dependencies": [
{
"name": "vcpkg-cmake",
Expand Down
2 changes: 0 additions & 2 deletions scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4097,7 +4097,7 @@
"port-version": 0
},
"kfr": {
"baseline": "6.0.2",
"baseline": "6.0.3",
"port-version": 0
},
"kinectsdk1": {
Expand Down
5 changes: 5 additions & 0 deletions versions/k-/kfr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4db862755bb04ee2f657e1299c252a3dea9ab946",
"version-semver": "6.0.3",
"port-version": 0
},
{
"git-tree": "d2a0f77d81e8be067f6fc0e97d768ed7cbcbb90a",
"version-semver": "6.0.2",
Expand Down