diff --git a/ports/kfr/portfile.cmake b/ports/kfr/portfile.cmake index 108440aed0..25e0dc380f 100644 --- a/ports/kfr/portfile.cmake +++ b/ports/kfr/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO kfrlib/kfr REF "${VERSION}" - SHA512 f494aa700cbfb95da8d55f818cafa976a346ef4880b2f85f7c8af8f731b1b48487f10d4ad44a9b2e8cefd08383035173c0487f22080e6f1375f013c556bdb045 + SHA512 2974f1c9e86447840de0225cd2a08bf72288ec8dd3f7f6fb55613e3d58d3364f0a488bd7babdb792ccb549976021bd4c18c2cbbb8af8ac79645606058259f7a2 HEAD_REF main ) diff --git a/ports/kfr/vcpkg.json b/ports/kfr/vcpkg.json index d2a3365731..2394284abf 100644 --- a/ports/kfr/vcpkg.json +++ b/ports/kfr/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kfr", - "version-semver": "6.0.3", + "version-semver": "6.2.0", "description": "Fast, modern C++ DSP framework.", "homepage": "https://www.kfr.dev/", "license": null, diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1 index 283e4cef3a..ff2d8222b1 100755 --- a/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/scripts/azure-pipelines/test-modified-ports.ps1 @@ -144,7 +144,7 @@ if ($testFeatures) { $ciFeatureBaselineArg = "--ci-feature-baseline=$ciFeatureBaselineFile" $knownFailingAbisFile = Join-Path $ArtifactStagingDirectory 'failing-abi-log.txt' $failingAbiLogArg = "--failing-abi-log=$knownFailingAbisFile" - & $vcpkgExe x-test-features --for-merge-with origin/master $tripletArg $failureLogsArg $ciBaselineArg $failingAbiLogArg @commonArgs @cachingArgs + & $vcpkgExe x-test-features --for-merge-with origin/master $tripletArg $failureLogsArg $ciBaselineArg $failingAbiLogArg $ciFeatureBaselineArg @commonArgs @cachingArgs $lastLastExitCode = $LASTEXITCODE if ($lastLastExitCode -ne 0) { diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index a71f1897b7..52a90a05b5 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -24,7 +24,7 @@ ## combination-fails - The listed combination of features will fail to build. ## skip - The listed features are not tested in the CI system. ## cascade - The listed features are cascading. -## no-separate-feature-test - The listed features are not tested in the "seperate" feature test. +## no-separate-feature-test - The listed features are not tested in the "separate" feature test. ## options - The listed features are mutually exclusive and can not be selected together. ## The first feature in the list is added to every test combination. Use the `core` ## feature as first one to add no feature to every test combination. @@ -44,8 +44,8 @@ ## entt[experimental] = skip # required head build ## realsense2[openni2](!windows) = cascade # cpkg-tool-lessmsi[core] only supports native & windows ## -## # Testing all targets seperatly would be too time consuming: -## halide[target-amdgpu,target-arm,target-d3d12compute,target-hexagon,target-metal,target-mips,target-nvptx,target-opencl,target-powerpc,target-riscv,target-x86] = no-separate-feature-test +## # Testing all targets separately would be too time consuming: +## halide[target-amdgpu,target-arm,target-d3d12compute,target-hexagon,target-metal,target-mips,target-nvptx,target-opencl,target-powerpc,target-riscv,target-x86] = no-separate-feature-test halide = skip llvm = skip @@ -175,7 +175,7 @@ jinja2cpplight:arm-uwp=fail jinja2cpplight:x64-uwp=fail kfr:arm-uwp=fail kfr:arm64-windows=fail -kfr:x64-linux=fail +kfr[capi](windows) = feature-fails # feature emits DLL even when built static lastools:arm-uwp=fail lastools:x64-uwp=fail lcm:x64-windows-static-md=fail @@ -2164,7 +2164,7 @@ ableton-link[hut](linux) = feature-fails # libportaudiocpp0 must be installed in adios2[python](!uwp) = feature-fails # Could NOT find Python (missing: Python_NumPy_INCLUDE_DIRS NumPy) arrayfire[opencl](windows & !uwp) = feature-fails # build errror: See https://github.com/microsoft/vcpkg/issues/33464 ashes[core](windows) = combination-fails # CMake Error: INSTALL(EXPORT) given unknown export "AshesRenderers". One render backend must be selected -atk[introspection](windows & arm) = feature-fails # ERROR: Dependency "gobject-introspection-1.0" not found. See https://github.com/microsoft/vcpkg/issues/33751 +atk[introspection](windows & arm & !static) = feature-fails # ERROR: Dependency "gobject-introspection-1.0" not found. See https://github.com/microsoft/vcpkg/issues/33751 azure-kinect-sensor-sdk[tool](windows & !uwp) = feature-fails # Waits for https://github.com/microsoft/vcpkg/pull/33231 # boost-python[core](!linux) = combination-fails awlib[graphics] = feature-fails # Broken code. See https://github.com/microsoft/vcpkg/issues/39849 @@ -2200,7 +2200,7 @@ grpc[codegen](uwp) = feature-fails # linker errors. See https://github.com/micro gstreamer[chromaprint](osx) = feature-fails # see https://github.com/microsoft/vcpkg/issues/31109 gstreamer[openal](osx) = feature-fails # see https://github.com/microsoft/vcpkg/issues/43419 gstreamer[x11-bad](osx) = feature-fails # no x11 on macOS -harfbuzz[introspection](windows & arm) = feature-fails # ERROR: Dependency "gobject-introspection-1.0" not found. See https://github.com/microsoft/vcpkg/issues/33751 +harfbuzz[introspection](windows & arm & !static) = feature-fails # ERROR: Dependency "gobject-introspection-1.0" not found. See https://github.com/microsoft/vcpkg/issues/33751 hdf5[core,cpp,fortran,map,parallel,szip,threadsafe,tools,utils,zlib](!windows & arm) = combination-fails # some features are mutually exclusive hdf5[fortran](windows) = feature-fails # No fortan compiler highway[contrib](osx) = feature-fails # clang: fatal error: error in backend: Calling convention SVE_VectorCall is unsupported on Darwin. @@ -2209,8 +2209,6 @@ igraph[openmp](osx) = feature-fails # openmp setup needed imgui[core,sdl2-binding](uwp) = options # sdl2-binding fails to build when build together with docking-experimental => exclude from all irrlicht[tools](osx) = feature-fails # X11 installation required ixwebsocket[core,mbedtls,openssl,sectransp,ssl] = options # you can only choose one ssl backend or none -kfr[capi,dft](windows & !uwp) = feature-fails # internal compiler error -kfr(uwp) = fail # CMake Error: try_run() invoked in cross-compiling mode kissfft[openmp](osx) = feature-fails # No openmp on osx ktx[tools](uwp) = feature-fails # build error. See https://github.com/microsoft/vcpkg/issues/33687 lapack-reference[core,cblas,noblas] = options # Cannot built feature 'cblas' together with feature 'noblas'. cblas requires blas. @@ -2294,7 +2292,7 @@ magnum[anyshaderconverter,shadertools,shaderconverter,vk-info] = skip # only ava magnum-plugins[cgltfimporter,glslangshaderconverter,ktximageconverter,ktximporter,openexrimageconverter,openexrimporter,spirvtoolsshaderconverter,stbdxtimageconverter] = skip # only available in head build openjpeg[tools] = skip # fails and is deprecated qtbase[xcb,xcb-xlib,xkb,xkbcommon-x11,xlib,xrender](osx) = skip # no x11 on macOS -s2n = skip # builds to slow +s2n = skip # builds too slow sciter = skip # The sciter port is deprecated by upstream and conflicts with upstream's replacement. shogun = skip # shogun is not compatible with c++17 because it uses dynamic exception specifications but the dependency abseil requires c++17 winpcap = skip # Broken and merked for removal. See https://github.com/microsoft/vcpkg/pull/33215 diff --git a/versions/baseline.json b/versions/baseline.json index d5ff12b3a8..c422aa15f4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4213,7 +4213,7 @@ "port-version": 0 }, "kfr": { - "baseline": "6.0.3", + "baseline": "6.2.0", "port-version": 0 }, "kinectsdk1": { diff --git a/versions/k-/kfr.json b/versions/k-/kfr.json index d30939515d..a516a3f67b 100644 --- a/versions/k-/kfr.json +++ b/versions/k-/kfr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "df03ace99ec5edfd707e5a4d0658ba6187574604", + "version-semver": "6.2.0", + "port-version": 0 + }, { "git-tree": "885ebd87127fbbd5a964e5648b6996410bdc609c", "version-semver": "6.0.3",