From 43d4575ddd352afcaeb14e37ca50355a77b0468a Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 18 Jun 2025 00:21:41 +0200 Subject: [PATCH] [azure-kinect-sensor-sdk] Update to 1.4.2, cleanup (#46022) --- .../k4adeploy.ps1 | 0 .../azure-kinect-depth-engine/portfile.cmake | 30 + ports/azure-kinect-depth-engine/vcpkg.json | 8 + .../fix-build-imgui.patch | 15 + .../azure-kinect-sensor-sdk/fix-builds.patch | 587 +++--------------- .../fix-dependency-imgui.patch | 35 -- ports/azure-kinect-sensor-sdk/portfile.cmake | 76 +-- ports/azure-kinect-sensor-sdk/vcpkg.json | 17 +- ports/libsoundio/portfile.cmake | 11 +- ports/libsoundio/vcpkg.json | 2 +- scripts/ci.feature.baseline.txt | 5 - versions/a-/azure-kinect-depth-engine.json | 9 + versions/a-/azure-kinect-sensor-sdk.json | 5 + versions/baseline.json | 10 +- versions/l-/libsoundio.json | 5 + 15 files changed, 177 insertions(+), 638 deletions(-) rename ports/{azure-kinect-sensor-sdk => azure-kinect-depth-engine}/k4adeploy.ps1 (100%) create mode 100644 ports/azure-kinect-depth-engine/portfile.cmake create mode 100644 ports/azure-kinect-depth-engine/vcpkg.json delete mode 100644 ports/azure-kinect-sensor-sdk/fix-dependency-imgui.patch create mode 100644 versions/a-/azure-kinect-depth-engine.json diff --git a/ports/azure-kinect-sensor-sdk/k4adeploy.ps1 b/ports/azure-kinect-depth-engine/k4adeploy.ps1 similarity index 100% rename from ports/azure-kinect-sensor-sdk/k4adeploy.ps1 rename to ports/azure-kinect-depth-engine/k4adeploy.ps1 diff --git a/ports/azure-kinect-depth-engine/portfile.cmake b/ports/azure-kinect-depth-engine/portfile.cmake new file mode 100644 index 0000000000..5dbcb73787 --- /dev/null +++ b/ports/azure-kinect-depth-engine/portfile.cmake @@ -0,0 +1,30 @@ +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) # runtime only + +vcpkg_download_distfile(BLOB_ARCHIVE + URLS "https://www.nuget.org/api/v2/package/Microsoft.Azure.Kinect.Sensor/${VERSION}" + FILENAME "microsoft.azure.kinect.sensor.${VERSION}.nupkg.zip" + SHA512 6e9e68f16bb00b3ddfdc963c6b62f9100d12b3407e0cd894052d5dc08ce2214e871f0c0977bff5b5e52af4ee325f775c818e2babacb6e8633b2887a9866c3ea3 +) + +vcpkg_extract_source_archive( + PACKAGE_PATH + ARCHIVE "${BLOB_ARCHIVE}" + NO_REMOVE_ONE_LEVEL +) + +if(VCPKG_TARGET_IS_LINUX) + file(COPY "${PACKAGE_PATH}/linux/lib/native/${VCPKG_TARGET_ARCHITECTURE}/release/libdepthengine.so.2.0" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + if(NOT VCPKG_BUILD_TYPE) + file(COPY "${PACKAGE_PATH}/linux/lib/native/${VCPKG_TARGET_ARCHITECTURE}/release/libdepthengine.so.2.0" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + endif() +elseif(VCPKG_TARGET_IS_WINDOWS) + string(REPLACE "x64" "amd64" ARCHITECTURE "${VCPKG_TARGET_ARCHITECTURE}") + file(COPY "${PACKAGE_PATH}/lib/native/${ARCHITECTURE}/release/depthengine_2_0.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/azure-kinect-sensor-sdk") + file(COPY "${CMAKE_CURRENT_LIST_DIR}/k4adeploy.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/azure-kinect-sensor-sdk") + if(NOT VCPKG_BUILD_TYPE) + file(COPY "${PACKAGE_PATH}/lib/native/${ARCHITECTURE}/release/depthengine_2_0.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools/azure-kinect-sensor-sdk") + file(COPY "${CMAKE_CURRENT_LIST_DIR}/k4adeploy.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools/azure-kinect-sensor-sdk") + endif() +endif() + +vcpkg_install_copyright(FILE_LIST "${PACKAGE_PATH}/LICENSE.txt") diff --git a/ports/azure-kinect-depth-engine/vcpkg.json b/ports/azure-kinect-depth-engine/vcpkg.json new file mode 100644 index 0000000000..710eb23805 --- /dev/null +++ b/ports/azure-kinect-depth-engine/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "azure-kinect-depth-engine", + "version": "1.4.2", + "description": "The depth engine converts raw sensor data into a normalized depth map. It contains closed-source proprietary code.", + "homepage": "https://github.com/microsoft/Azure-Kinect-Sensor-SDK/blob/develop/docs/depthengine.md", + "license": null, + "supports": "(linux & (x64 | arm64)) | (windows & (x64 | x86))" +} diff --git a/ports/azure-kinect-sensor-sdk/fix-build-imgui.patch b/ports/azure-kinect-sensor-sdk/fix-build-imgui.patch index 7d3b1c3d79..cca3eaf5ae 100644 --- a/ports/azure-kinect-sensor-sdk/fix-build-imgui.patch +++ b/ports/azure-kinect-sensor-sdk/fix-build-imgui.patch @@ -55,3 +55,18 @@ index 8fe5687..6d1e95a 100644 } if (ImGui::TreeNode("External Sync")) { +diff --git a/tools/k4aviewer/k4aviewerimage.cpp b/tools/k4aviewer/k4aviewerimage.cpp +index 68899f1..ad23490 100644 +--- a/tools/k4aviewer/k4aviewerimage.cpp ++++ b/tools/k4aviewer/k4aviewerimage.cpp +@@ -134,7 +134,9 @@ GLenum K4AViewerImage::Create(std::shared_ptr *out, + + K4AViewerImage::operator ImTextureID() const + { +- return reinterpret_cast(static_cast(m_texture.Id())); ++ // m_texture.Id() : GLUint, 32 bit unsigned ++ // ImTextureID : ImU64, 64 bit unsigned ++ return m_texture.Id(); + } + + K4AViewerImage::operator GLuint() const diff --git a/ports/azure-kinect-sensor-sdk/fix-builds.patch b/ports/azure-kinect-sensor-sdk/fix-builds.patch index aa839ca225..a904cbbc06 100644 --- a/ports/azure-kinect-sensor-sdk/fix-builds.patch +++ b/ports/azure-kinect-sensor-sdk/fix-builds.patch @@ -11,50 +11,68 @@ index 4f002b5..dd9b1df 100644 # Set the project version include(K4AProjectVersion) -@@ -100,6 +98,42 @@ if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL - set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) +@@ -101,7 +99,59 @@ if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL endif() + # Find all dependencies +-add_subdirectory(extern) +find_package(azure_c_shared_utility CONFIG REQUIRED) -+find_package(glfw3 CONFIG REQUIRED) ++add_library(azure::aziotsharedutil ALIAS aziotsharedutil) ++ +find_package(cJSON CONFIG REQUIRED) -+find_package(GTest CONFIG REQUIRED) -+find_package(imgui CONFIG REQUIRED) ++add_library(cJSON::cJSON ALIAS cjson) ++ +find_package(EBML CONFIG REQUIRED) -+find_path(TURBOJPEG_INCLUDE_DIR NAMES turbojpeg.h PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include" NO_DEFAULT_PATH REQUIRED) -+find_library(TURBOJPEG_LIBRARY_RELEASE NAMES turbojpeg PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH REQUIRED) -+add_library(libjpeg-turbo::libjpeg-turbo UNKNOWN IMPORTED) -+set_property(TARGET libjpeg-turbo::libjpeg-turbo PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${TURBOJPEG_INCLUDE_DIR}) -+set_property(TARGET libjpeg-turbo::libjpeg-turbo PROPERTY IMPORTED_LOCATION_RELEASE ${TURBOJPEG_LIBRARY_RELEASE}) -+find_library(TURBOJPEG_LIBRARY_DEBUG NAMES turbojpeg PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH) -+if(TURBOJPEG_LIBRARY_DEBUG) -+ set_property(TARGET libjpeg-turbo::libjpeg-turbo PROPERTY IMPORTED_LOCATION_DEBUG ${TURBOJPEG_LIBRARY_DEBUG}) -+endif() -+find_package(Matroska CONFIG REQUIRED) -+add_definitions(-DMATROSKA_VERSION=2) -+find_package(libsoundio CONFIG REQUIRED) -+if (NOT WIN32) -+ find_package(libuvc CONFIG REQUIRED) -+ add_library(libuvc::libuvc ALIAS LibUVC::UVCStatic) -+ find_package(OpenSSL REQUIRED) -+ find_package(ZLIB REQUIRED) -+endif() -+FIND_PACKAGE(PkgConfig REQUIRED) -+pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0) -+find_package(libyuv CONFIG REQUIRED) -+find_package(spdlog CONFIG REQUIRED) -+if (BUILD_TOOLS) -+ find_package(gl3w CONFIG REQUIRED) -+endif() -+# Fix embl error -+if ("MSVC") -+add_compile_options(/wd4828 /wd4251 /wd4275) ++add_library(ebml::ebml ALIAS EBML::ebml) ++ ++find_package(libjpeg-turbo CONFIG REQUIRED) ++if(TARGET libjpeg-turbo::turbojpeg) ++ add_library(libjpeg-turbo::libjpeg-turbo ALIAS libjpeg-turbo::turbojpeg) ++else() ++ add_library(libjpeg-turbo::libjpeg-turbo ALIAS libjpeg-turbo::turbojpeg-static) +endif() + - # Find all dependencies - add_subdirectory(extern) ++find_package(libsoundio CONFIG REQUIRED) ++ ++find_package(PkgConfig REQUIRED) ++pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0) ++add_library(LibUSB::LibUSB ALIAS PkgConfig::libusb) ++ ++if(NOT WIN32) ++ find_package(libuvc CONFIG REQUIRED) ++ if(TARGET LibUVC::UVCShared) ++ add_library(libuvc::libuvc ALIAS LibUVC::UVCShared) ++ else() ++ add_library(libuvc::libuvc ALIAS LibUVC::UVCStatic) ++ endif() ++endif() ++ ++find_package(libyuv CONFIG REQUIRED) ++add_library(libyuv::libyuv ALIAS yuv) ++ ++find_package(Matroska CONFIG REQUIRED) ++add_library(matroska::matroska ALIAS Matroska::matroska) ++add_definitions(-DMATROSKA_VERSION=2) ++ ++find_package(spdlog CONFIG REQUIRED) ++ ++if (BUILD_TOOLS) ++ find_package(gl3w CONFIG REQUIRED) ++ ++ find_package(glfw3 CONFIG REQUIRED) ++ add_library(glfw::glfw ALIAS glfw) ++ ++ find_package(imgui CONFIG REQUIRED) ++endif() ++ ++# Fix embl error ++if (MSVC) ++ add_compile_options(/wd4828 /wd4251 /wd4275) ++endif() -@@ -161,10 +196,16 @@ if ("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC") + # Don't enable testing until after building dependencies + enable_testing() +@@ -161,10 +211,13 @@ if ("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC") endif() endif() @@ -66,87 +84,12 @@ index 4f002b5..dd9b1df 100644 + add_subdirectory(examples) +endif() + add_subdirectory(src) -+if (WITH_TEST) -+ add_subdirectory(tests) -+endif() +if (BUILD_TOOLS) + add_subdirectory(tools) +endif() if (K4A_BUILD_DOCS) find_package(Doxygen 1.8.14 EXACT) -diff --git a/examples/viewer/opengl/CMakeLists.txt b/examples/viewer/opengl/CMakeLists.txt -index 166fe2a..a3db07f 100644 ---- a/examples/viewer/opengl/CMakeLists.txt -+++ b/examples/viewer/opengl/CMakeLists.txt -@@ -14,6 +14,6 @@ add_executable(viewer_opengl - - target_link_libraries(viewer_opengl PRIVATE - k4a::k4a -- glfw::glfw -+ glfw - imgui::imgui - ${OPENGL_LIBRARIES}) -\ No newline at end of file -diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt -index cb4f7b4..3d00084 100644 ---- a/extern/CMakeLists.txt -+++ b/extern/CMakeLists.txt -@@ -1,7 +1,6 @@ - # External dependencies are pulled in via submodules. Lets make sure the user - # has updated all the submodules --if ((NOT K4A_TURNED_ON_GIT_SUBMODULES_RECURSE) OR -- (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/azure_c_shared/src/CMakeLists.txt")) -+if (0) - find_package(Git REQUIRED QUIET) - if (Git_FOUND) - get_git_dir(${K4A_SOURCE_DIR} GIT_DIR) -@@ -57,18 +56,4 @@ endif() - # lower than CMake 3.3 - set(CMAKE_POLICY_DEFAULT_CMP0063 NEW) - --add_subdirectory(azure_c_shared) --add_subdirectory(cjson) --add_subdirectory(glfw) --add_subdirectory(googletest) --add_subdirectory(imgui) --add_subdirectory(libebml) --add_subdirectory(libjpeg-turbo) --add_subdirectory(libmatroska) --add_subdirectory(libsoundio) --add_subdirectory(libyuv) --add_subdirectory(libuvc) --add_subdirectory(spdlog) --if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "WindowsStore") -- add_subdirectory(libusb) --endif() -+ -diff --git a/src/allocator/CMakeLists.txt b/src/allocator/CMakeLists.txt -index 7140274..3bb6747 100644 ---- a/src/allocator/CMakeLists.txt -+++ b/src/allocator/CMakeLists.txt -@@ -11,7 +11,7 @@ target_include_directories(k4a_allocator PUBLIC - - # Dependencies of this library - target_link_libraries(k4a_allocator PUBLIC -- azure::aziotsharedutil -+ aziotsharedutil - k4ainternal::image - k4ainternal::logging) - -diff --git a/src/calibration/CMakeLists.txt b/src/calibration/CMakeLists.txt -index e96b7d0..ed69f41 100644 ---- a/src/calibration/CMakeLists.txt -+++ b/src/calibration/CMakeLists.txt -@@ -11,7 +11,7 @@ target_include_directories(k4a_calibration PUBLIC - - # Dependencies of this library - target_link_libraries(k4a_calibration PUBLIC -- cJSON::cJSON -+ cjson - k4ainternal::logging) - - # Define alias for other targets to link against diff --git a/src/calibration/calibration.c b/src/calibration/calibration.c index bf5f34a..d37c4e6 100644 --- a/src/calibration/calibration.c @@ -160,58 +103,6 @@ index bf5f34a..d37c4e6 100644 #include //cJSON.h need this set correctly. // System dependencies -diff --git a/src/capturesync/CMakeLists.txt b/src/capturesync/CMakeLists.txt -index a434593..bcb19ba 100644 ---- a/src/capturesync/CMakeLists.txt -+++ b/src/capturesync/CMakeLists.txt -@@ -11,7 +11,7 @@ target_include_directories(k4a_capturesync PUBLIC - - # Dependencies of this library - target_link_libraries(k4a_capturesync PUBLIC -- azure::aziotsharedutil -+ aziotsharedutil - k4ainternal::logging) - - # Define alias for other targets to link against -diff --git a/src/dewrapper/CMakeLists.txt b/src/dewrapper/CMakeLists.txt -index 2756e43..f736fd1 100644 ---- a/src/dewrapper/CMakeLists.txt -+++ b/src/dewrapper/CMakeLists.txt -@@ -10,7 +10,7 @@ target_include_directories(k4a_dewrapper PUBLIC - ${K4A_PRIV_INCLUDE_DIR}) - - target_link_libraries(k4a_dewrapper PUBLIC -- azure::aziotsharedutil -+ aziotsharedutil - k4ainternal::allocator - k4ainternal::calibration - k4ainternal::logging -diff --git a/src/image/CMakeLists.txt b/src/image/CMakeLists.txt -index c40999b..82406e2 100644 ---- a/src/image/CMakeLists.txt -+++ b/src/image/CMakeLists.txt -@@ -11,7 +11,7 @@ target_include_directories(k4a_image PUBLIC - - # Dependencies of this library - target_link_libraries(k4a_image PUBLIC -- azure::aziotsharedutil -+ aziotsharedutil - k4ainternal::allocator - k4ainternal::logging) - -diff --git a/src/logging/CMakeLists.txt b/src/logging/CMakeLists.txt -index cbf0e4d..ca81c41 100644 ---- a/src/logging/CMakeLists.txt -+++ b/src/logging/CMakeLists.txt -@@ -11,7 +11,7 @@ target_include_directories(k4a_logging PUBLIC - - # Dependencies of this library - target_link_libraries(k4a_logging PUBLIC -- azure::aziotsharedutil -+ aziotsharedutil - spdlog::spdlog - k4ainternal::rwlock - k4ainternal::global diff --git a/src/logging/logging.cpp b/src/logging/logging.cpp index 05264c5..41185de 100644 --- a/src/logging/logging.cpp @@ -226,88 +117,6 @@ index 05264c5..41185de 100644 #ifdef _MSC_VER #pragma warning(default : 4702) #endif -diff --git a/src/queue/CMakeLists.txt b/src/queue/CMakeLists.txt -index 03d15f4..a42a135 100644 ---- a/src/queue/CMakeLists.txt -+++ b/src/queue/CMakeLists.txt -@@ -10,7 +10,7 @@ target_include_directories(k4a_queue PUBLIC - ${K4A_PRIV_INCLUDE_DIR}) - - target_link_libraries(k4a_queue PUBLIC -- azure::aziotsharedutil -+ aziotsharedutil - k4ainternal::allocator - k4ainternal::logging - ) -diff --git a/src/record/internal/CMakeLists.txt b/src/record/internal/CMakeLists.txt -index 97c6cf3..e9f5b1a 100644 ---- a/src/record/internal/CMakeLists.txt -+++ b/src/record/internal/CMakeLists.txt -@@ -22,16 +22,16 @@ target_include_directories(k4a_playback PUBLIC - target_link_libraries(k4a_record PUBLIC - k4a::k4a - k4ainternal::logging -- ebml::ebml -- matroska::matroska -+ EBML::ebml -+ Matroska::matroska - ) - - target_link_libraries(k4a_playback PUBLIC - k4a::k4a - k4ainternal::logging -- ebml::ebml -- matroska::matroska -- libyuv::libyuv -+ EBML::ebml -+ Matroska::matroska -+ yuv - libjpeg-turbo::libjpeg-turbo - ) - -diff --git a/src/record/sdk/CMakeLists.txt b/src/record/sdk/CMakeLists.txt -index 2e23295..d150e70 100644 ---- a/src/record/sdk/CMakeLists.txt -+++ b/src/record/sdk/CMakeLists.txt -@@ -40,8 +40,8 @@ target_link_libraries(k4arecord PRIVATE - k4ainternal::record - k4ainternal::playback - k4ainternal::logging -- ebml::ebml -- matroska::matroska -+ EBML::ebml -+ Matroska::matroska - ) - - target_link_libraries(k4arecord PUBLIC -diff --git a/src/tewrapper/CMakeLists.txt b/src/tewrapper/CMakeLists.txt -index e4a696e..6ee6696 100644 ---- a/src/tewrapper/CMakeLists.txt -+++ b/src/tewrapper/CMakeLists.txt -@@ -10,7 +10,7 @@ target_include_directories(k4a_tewrapper PUBLIC - ${K4A_PRIV_INCLUDE_DIR}) - - target_link_libraries(k4a_tewrapper PUBLIC -- azure::aziotsharedutil -+ aziotsharedutil - k4ainternal::logging - k4ainternal::deloader) - -diff --git a/src/usbcommand/CMakeLists.txt b/src/usbcommand/CMakeLists.txt -index f75bd55..7130728 100644 ---- a/src/usbcommand/CMakeLists.txt -+++ b/src/usbcommand/CMakeLists.txt -@@ -12,8 +12,8 @@ target_include_directories(k4a_usb_cmd PUBLIC - - # Dependencies of this library - target_link_libraries(k4a_usb_cmd PUBLIC -- azure::aziotsharedutil -- LibUSB::LibUSB -+ aziotsharedutil -+ PkgConfig::libusb - k4ainternal::allocator - k4ainternal::image - k4ainternal::logging) diff --git a/src/usbcommand/usb_cmd_priv.h b/src/usbcommand/usb_cmd_priv.h index 0aa502c..0405b58 100644 --- a/src/usbcommand/usb_cmd_priv.h @@ -321,282 +130,13 @@ index 0aa502c..0405b58 100644 // Ensure we have LIBUSB_API_VERSION defined if not defined by libusb.h #ifndef LIBUSB_API_VERSION -diff --git a/tests/Calibration/CMakeLists.txt b/tests/Calibration/CMakeLists.txt -index ea6a9dd..c107269 100644 ---- a/tests/Calibration/CMakeLists.txt -+++ b/tests/Calibration/CMakeLists.txt -@@ -4,8 +4,8 @@ - add_executable(calibration_ut calibration.cpp) - - target_link_libraries(calibration_ut PRIVATE -- azure::aziotsharedutil -- gtest::gtest -+ aziotsharedutil -+ GTest::gtest - k4ainternal::calibration - k4ainternal::utcommon) - -diff --git a/tests/CaptureSync/CMakeLists.txt b/tests/CaptureSync/CMakeLists.txt -index 0a9a8e2..f7bff42 100644 ---- a/tests/CaptureSync/CMakeLists.txt -+++ b/tests/CaptureSync/CMakeLists.txt -@@ -4,8 +4,8 @@ - add_executable(capturesync_ut capturesync.cpp) - - target_link_libraries(capturesync_ut PRIVATE -- azure::aziotsharedutil -- gtest::gtest -+ aziotsharedutil -+ GTest::gtest - k4ainternal::allocator - k4ainternal::capturesync - k4ainternal::image -diff --git a/tests/ColorTests/FunctionalTest/CMakeLists.txt b/tests/ColorTests/FunctionalTest/CMakeLists.txt -index 1e65ad7..709dfb0 100644 ---- a/tests/ColorTests/FunctionalTest/CMakeLists.txt -+++ b/tests/ColorTests/FunctionalTest/CMakeLists.txt -@@ -6,7 +6,7 @@ add_executable(color_ft color_ft.cpp) - target_link_libraries(color_ft PRIVATE - k4a::k4a - k4ainternal::utcommon -- gtest::gtest -- azure::aziotsharedutil) -+ GTest::gtest -+ aziotsharedutil) - - k4a_add_tests(TARGET color_ft HARDWARE_REQUIRED TEST_TYPE FUNCTIONAL) -diff --git a/tests/DepthTests/FunctionalTest/CMakeLists.txt b/tests/DepthTests/FunctionalTest/CMakeLists.txt -index 469c125..00f15f8 100644 ---- a/tests/DepthTests/FunctionalTest/CMakeLists.txt -+++ b/tests/DepthTests/FunctionalTest/CMakeLists.txt -@@ -6,7 +6,7 @@ add_executable(depth_ft depth_ft.cpp) - target_link_libraries(depth_ft PRIVATE - k4a::k4a - k4ainternal::utcommon -- gtest::gtest -- azure::aziotsharedutil) -+ GTest::gtest -+ aziotsharedutil) - - k4a_add_tests(TARGET depth_ft HARDWARE_REQUIRED TEST_TYPE FUNCTIONAL) -diff --git a/tests/ExternLibraries/azure_c_shared/CMakeLists.txt b/tests/ExternLibraries/azure_c_shared/CMakeLists.txt -index a487cde..44170f4 100644 ---- a/tests/ExternLibraries/azure_c_shared/CMakeLists.txt -+++ b/tests/ExternLibraries/azure_c_shared/CMakeLists.txt -@@ -6,7 +6,7 @@ add_executable(azure_c_shared_test - threading.cpp) - - target_link_libraries(azure_c_shared_test PRIVATE -- azure::aziotsharedutil -- gtest::gtest) -+ aziotsharedutil -+ GTest::gtest) - - k4a_add_tests(TARGET azure_c_shared_test TEST_TYPE UNIT) -diff --git a/tests/IMUTests/FunctionalTest/CMakeLists.txt b/tests/IMUTests/FunctionalTest/CMakeLists.txt -index cc6b3c2..d8762f6 100644 ---- a/tests/IMUTests/FunctionalTest/CMakeLists.txt -+++ b/tests/IMUTests/FunctionalTest/CMakeLists.txt -@@ -6,7 +6,7 @@ add_executable(imu_ft imu_ft.cpp) - target_link_libraries(imu_ft PRIVATE - k4a::k4a - k4ainternal::utcommon -- gtest::gtest -- azure::aziotsharedutil) -+ GTest::gtest -+ aziotsharedutil) - - k4a_add_tests(TARGET imu_ft HARDWARE_REQUIRED TEST_TYPE FUNCTIONAL) -diff --git a/tests/Transformation/CMakeLists.txt b/tests/Transformation/CMakeLists.txt -index 7f11a2f..c4ddaf8 100644 ---- a/tests/Transformation/CMakeLists.txt -+++ b/tests/Transformation/CMakeLists.txt -@@ -4,8 +4,8 @@ - add_executable(transformation_ut transformation.cpp) - - target_link_libraries(transformation_ut PRIVATE -- azure::aziotsharedutil -- gtest::gtest -+ aziotsharedutil -+ GTest::gtest - k4ainternal::image - k4ainternal::transformation - k4ainternal::utcommon -diff --git a/tests/UnitTests/allocator_ut/CMakeLists.txt b/tests/UnitTests/allocator_ut/CMakeLists.txt -index 913a7d8..0b7baeb 100644 ---- a/tests/UnitTests/allocator_ut/CMakeLists.txt -+++ b/tests/UnitTests/allocator_ut/CMakeLists.txt -@@ -4,8 +4,8 @@ - add_executable(allocator_ut allocator.cpp) - - target_link_libraries(allocator_ut PRIVATE -- azure::aziotsharedutil -- gtest::gtest -+ aziotsharedutil -+ GTest::gtest - k4ainternal::allocator - k4ainternal::image - k4ainternal::utcommon) -diff --git a/tests/UnitTests/dynlib_ut/CMakeLists.txt b/tests/UnitTests/dynlib_ut/CMakeLists.txt -index fbecc17..af73be2 100644 ---- a/tests/UnitTests/dynlib_ut/CMakeLists.txt -+++ b/tests/UnitTests/dynlib_ut/CMakeLists.txt -@@ -34,7 +34,7 @@ elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - endif() - - target_link_libraries(dynlib_ut PRIVATE -- gtest::gtest -+ GTest::gtest - k4ainternal::dynlib - k4ainternal::utcommon) - -diff --git a/tests/UnitTests/queue_ut/CMakeLists.txt b/tests/UnitTests/queue_ut/CMakeLists.txt -index cf9b040..ec4a024 100644 ---- a/tests/UnitTests/queue_ut/CMakeLists.txt -+++ b/tests/UnitTests/queue_ut/CMakeLists.txt -@@ -4,8 +4,8 @@ - add_executable(queue_ut queue.cpp) - - target_link_libraries(queue_ut PRIVATE -- azure::aziotsharedutil -- gtest::gtest -+ aziotsharedutil -+ GTest::gtest - k4ainternal::allocator - k4ainternal::image - k4ainternal::queue -diff --git a/tests/UnitTests/utcommon/CMakeLists.txt b/tests/UnitTests/utcommon/CMakeLists.txt -index cca52c6..dfdd13d 100644 ---- a/tests/UnitTests/utcommon/CMakeLists.txt -+++ b/tests/UnitTests/utcommon/CMakeLists.txt -@@ -4,8 +4,8 @@ - add_library(utcommon STATIC utcommon.cpp) - - target_link_libraries(utcommon PUBLIC -- gtest::gtest -- gtest::gmock -+ GTest::gtest -+ GTest::gmock - k4ainternal::logging - ) - -diff --git a/tests/example/CMakeLists.txt b/tests/example/CMakeLists.txt -index 3305a1a..be0b667 100644 ---- a/tests/example/CMakeLists.txt -+++ b/tests/example/CMakeLists.txt -@@ -3,6 +3,6 @@ - - add_executable(k4a_example_test test.cpp) - target_link_libraries(k4a_example_test PRIVATE k4a::k4a) --target_link_libraries(k4a_example_test PRIVATE gtest::gtest) -+target_link_libraries(k4a_example_test PRIVATE GTest::gtest) - - k4a_add_tests(TARGET k4a_example_test HARDWARE_REQUIRED TEST_TYPE FUNCTIONAL) -diff --git a/tests/executables/CMakeLists.txt b/tests/executables/CMakeLists.txt -index 7b03d15..6c070ee 100644 ---- a/tests/executables/CMakeLists.txt -+++ b/tests/executables/CMakeLists.txt -@@ -17,12 +17,12 @@ target_compile_definitions(executables_ft_custom PRIVATE -DUSE_CUSTOM_TEST_CONFI - target_link_libraries(executables_ft PRIVATE - k4a::k4a - k4ainternal::utcommon -- gtest::gtest) -+ GTest::gtest) - - target_link_libraries(executables_ft_custom PRIVATE - k4a::k4a - k4ainternal::utcommon -- gtest::gtest) -+ GTest::gtest) - - k4a_add_tests(TARGET executables_ft HARDWARE_REQUIRED TEST_TYPE FUNCTIONAL) - k4a_add_tests(TARGET executables_ft_custom HARDWARE_REQUIRED TEST_TYPE FUNCTIONAL_CUSTOM) -diff --git a/tests/global/CMakeLists.txt b/tests/global/CMakeLists.txt -index ea0a0e5..d85728d 100644 ---- a/tests/global/CMakeLists.txt -+++ b/tests/global/CMakeLists.txt -@@ -4,8 +4,8 @@ - add_executable(global_ft global.cpp) - - target_link_libraries(global_ft PRIVATE -- azure::aziotsharedutil -- gtest::gtest -+ aziotsharedutil -+ GTest::gtest - k4ainternal::global - k4ainternal::utcommon) - -diff --git a/tests/multidevice/CMakeLists.txt b/tests/multidevice/CMakeLists.txt -index 3fe044b..85f3058 100644 ---- a/tests/multidevice/CMakeLists.txt -+++ b/tests/multidevice/CMakeLists.txt -@@ -4,8 +4,8 @@ - add_executable(multidevice_ft multidevice.cpp) - - target_link_libraries(multidevice_ft PRIVATE -- azure::aziotsharedutil -- gtest::gtest -+ aziotsharedutil -+ GTest::gtest - k4a::k4a - k4ainternal::utcommon) - -diff --git a/tests/projections/cpp/CMakeLists.txt b/tests/projections/cpp/CMakeLists.txt -index 2fdfa2c..09b5303 100644 ---- a/tests/projections/cpp/CMakeLists.txt -+++ b/tests/projections/cpp/CMakeLists.txt -@@ -6,6 +6,6 @@ add_executable(cpp_projection_ft cpp_projection_ft.cpp) - target_link_libraries(cpp_projection_ft PRIVATE - k4a::k4a - k4ainternal::utcommon -- gtest::gtest) -+ GTest::gtest) - - k4a_add_tests(TARGET cpp_projection_ft HARDWARE_REQUIRED TEST_TYPE FUNCTIONAL) -diff --git a/tests/rwlock/CMakeLists.txt b/tests/rwlock/CMakeLists.txt -index 5889435..c6c1f73 100644 ---- a/tests/rwlock/CMakeLists.txt -+++ b/tests/rwlock/CMakeLists.txt -@@ -4,8 +4,8 @@ - add_executable(rwlock_ft rwlock.cpp) - - target_link_libraries(rwlock_ft PRIVATE -- azure::aziotsharedutil -- gtest::gtest -+ aziotsharedutil -+ GTest::gtest - k4ainternal::rwlock - k4ainternal::utcommon) - -diff --git a/tests/throughput/CMakeLists.txt b/tests/throughput/CMakeLists.txt -index c544e1e..9489bf8 100644 ---- a/tests/throughput/CMakeLists.txt -+++ b/tests/throughput/CMakeLists.txt -@@ -6,8 +6,8 @@ add_executable(throughput_perf throughput_perf.cpp) - target_compile_definitions(throughput_perf PRIVATE _CRT_SECURE_NO_WARNINGS) - - target_link_libraries(throughput_perf PRIVATE -- azure::aziotsharedutil -- gtest::gtest -+ aziotsharedutil -+ GTest::gtest - k4a::k4a - k4ainternal::logging - k4ainternal::utcommon) diff --git a/tools/k4aviewer/CMakeLists.txt b/tools/k4aviewer/CMakeLists.txt index 98578c0..244c867 100644 --- a/tools/k4aviewer/CMakeLists.txt +++ b/tools/k4aviewer/CMakeLists.txt -@@ -60,10 +60,11 @@ set(EXTERNAL_LIBRARIES - imgui::imgui - libjpeg-turbo::libjpeg-turbo - libsoundio::libsoundio -- LibUSB::LibUSB -- libyuv::libyuv -- glfw::glfw -+ PkgConfig::libusb -+ yuv -+ glfw +@@ -64,6 +64,7 @@ set(EXTERNAL_LIBRARIES + libyuv::libyuv + glfw::glfw ${OPENGL_LIBRARIES} + unofficial::gl3w::gl3w ) @@ -615,3 +155,16 @@ index 243c800..ef85d45 100644 // Project headers // +diff --git a/tools/k4aviewer/k4asoundio_util.h b/tools/k4aviewer/k4asoundio_util.h +index c9c2718..011a76e 100644 +--- a/tools/k4aviewer/k4asoundio_util.h ++++ b/tools/k4aviewer/k4asoundio_util.h +@@ -16,7 +16,7 @@ + // This disables that behavior. + // + #define NOMINMAX +-#include ++#include + + // Project headers + // diff --git a/ports/azure-kinect-sensor-sdk/fix-dependency-imgui.patch b/ports/azure-kinect-sensor-sdk/fix-dependency-imgui.patch deleted file mode 100644 index 543bfd2bb7..0000000000 --- a/ports/azure-kinect-sensor-sdk/fix-dependency-imgui.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/tools/k4aviewer/CMakeLists.txt b/tools/k4aviewer/CMakeLists.txt -index 6ab38d9..f31f570 100644 ---- a/tools/k4aviewer/CMakeLists.txt -+++ b/tools/k4aviewer/CMakeLists.txt -@@ -54,6 +54,8 @@ include_directories( - ${CMAKE_CURRENT_LIST_DIR} - ) - -+find_package(GLEW REQUIRED) -+ - set(EXTERNAL_LIBRARIES - k4a::k4a - k4a::k4arecord -@@ -65,6 +67,7 @@ set(EXTERNAL_LIBRARIES - glfw - ${OPENGL_LIBRARIES} - unofficial::gl3w::gl3w -+ GLEW::GLEW - ) - - # On Windows, we need to call into setupapi to get USB container ID information -diff --git a/tools/k4aviewer/k4asoundio_util.h b/tools/k4aviewer/k4asoundio_util.h -index c9c2718..011a76e 100644 ---- a/tools/k4aviewer/k4asoundio_util.h -+++ b/tools/k4aviewer/k4asoundio_util.h -@@ -16,7 +16,7 @@ - // This disables that behavior. - // - #define NOMINMAX --#include -+#include - - // Project headers - // - \ No newline at end of file diff --git a/ports/azure-kinect-sensor-sdk/portfile.cmake b/ports/azure-kinect-sensor-sdk/portfile.cmake index f20fe2a747..fc43187388 100644 --- a/ports/azure-kinect-sensor-sdk/portfile.cmake +++ b/ports/azure-kinect-sensor-sdk/portfile.cmake @@ -1,13 +1,13 @@ -set(VERSION 1.4.1) +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/Azure-Kinect-Sensor-SDK REF "v${VERSION}" - SHA512 ef94c072caae43b0a105b192013e09082d267d4064e6676fac981b52e7576a663f59fcb53f0afe66b425ef2cea0cb3aa224ff7be6485c0b5543ff9cdabd82d4d + SHA512 34db933c56fc4c5f38db54a10e0e9cfcfce536d21d1a1c963f33c038d83eb5e90fc28d6360b3c737b54118878e062860c43c2e051f8030b205f640ad1f2d3a94 HEAD_REF master PATCHES fix-builds.patch - fix-dependency-imgui.patch fix-linux.patch fix-calibration-c.patch fix-build-imgui.patch @@ -15,14 +15,14 @@ vcpkg_from_github( ) vcpkg_find_acquire_program(PYTHON3) + vcpkg_find_acquire_program(PKGCONFIG) get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) vcpkg_add_to_path("${PYTHON3_DIR}") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - docs K4A_BUILD_DOCS - tool BUILD_TOOLS + tool BUILD_TOOLS ) # .rc file needs windows.h, so do not use PREFER_NINJA here @@ -30,72 +30,24 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS - "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" - ${FEATURE_OPTIONS} - -DK4A_SOURCE_LINK=OFF - -DK4A_MTE_VERSION=ON - -DBUILD_EXAMPLES=OFF - -DWITH_TEST=OFF - -DIMGUI_EXTERNAL_PATH="${CURRENT_INSTALLED_DIR}/include/bindings" + ${FEATURE_OPTIONS} + -DCMAKE_POLICY_DEFAULT_CMP0072=NEW + -DBUILD_EXAMPLES=OFF + -DK4A_SOURCE_LINK=OFF + -DK4A_MTE_VERSION=ON + "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" ) vcpkg_cmake_install() - -# Avoid deleting debug/lib/cmake when fixing the first cmake -if(NOT VCPKG_BUILD_TYPE) - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/cmake" "${CURRENT_PACKAGES_DIR}/debug/share") -endif() -file(RENAME "${CURRENT_PACKAGES_DIR}/lib/cmake" "${CURRENT_PACKAGES_DIR}/share") - -vcpkg_cmake_config_fixup(PACKAGE_NAME k4a CONFIG_PATH share/k4a) -vcpkg_cmake_config_fixup(PACKAGE_NAME k4arecord CONFIG_PATH share/k4arecord) - vcpkg_copy_pdbs() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/k4a" PACKAGE_NAME "k4a" DO_NOT_DELETE_PARENT_CONFIG_PATH) +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/k4arecord" PACKAGE_NAME "k4arecord") if ("tool" IN_LIST FEATURES) vcpkg_copy_tools(TOOL_NAMES k4arecorder k4aviewer AzureKinectFirmwareTool AUTO_CLEAN) endif() -if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") -endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -# Install Depth Engine -vcpkg_download_distfile(ARCHIVE - URLS "https://www.nuget.org/api/v2/package/Microsoft.Azure.Kinect.Sensor/${VERSION}" - FILENAME "azure-kinect-sensor-sdk_17630a00.zip" - SHA512 17630a00f4e9ff3ef68945b62021f6d0390030b43c120c207afe934075a7a87c5848be1f46f4c35c7ecd5698012452ffcbb67f739e9048857410ec7077e5e8c6 -) - -vcpkg_extract_source_archive( - PACKAGE_PATH - ARCHIVE ${ARCHIVE} - NO_REMOVE_ONE_LEVEL -) - -if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86) - set(ARCHITECTURE "x86") -elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL x64) - set(ARCHITECTURE "amd64") -else () - message(FATAL_ERROR "this architecture is not supported.") -endif () - -if (VCPKG_TARGET_IS_LINUX) - file(COPY "${PACKAGE_PATH}/linux/lib/native/${VCPKG_TARGET_ARCHITECTURE}/release/libdepthengine.so.2.0" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") - if(NOT VCPKG_BUILD_TYPE) - file(COPY "${PACKAGE_PATH}/linux/lib/native/${VCPKG_TARGET_ARCHITECTURE}/release/libdepthengine.so.2.0" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") - endif() -else() - file(COPY "${PACKAGE_PATH}/lib/native/${ARCHITECTURE}/release/depthengine_2_0.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/azure-kinect-sensor-sdk") - file(COPY "${CMAKE_CURRENT_LIST_DIR}/k4adeploy.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/azure-kinect-sensor-sdk") - if(NOT VCPKG_BUILD_TYPE) - file(COPY "${PACKAGE_PATH}/lib/native/${ARCHITECTURE}/release/depthengine_2_0.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools/azure-kinect-sensor-sdk") - file(COPY "${CMAKE_CURRENT_LIST_DIR}/k4adeploy.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools/azure-kinect-sensor-sdk") - endif() -endif() - -# Handle copyright vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/azure-kinect-sensor-sdk/vcpkg.json b/ports/azure-kinect-sensor-sdk/vcpkg.json index 63c4ff4a8d..b8c0d830cb 100644 --- a/ports/azure-kinect-sensor-sdk/vcpkg.json +++ b/ports/azure-kinect-sensor-sdk/vcpkg.json @@ -1,23 +1,21 @@ { "name": "azure-kinect-sensor-sdk", - "version": "1.4.1", - "port-version": 8, + "version": "1.4.2", "description": "Azure Kinect SDK is a cross platform (Linux and Windows) user mode SDK to read data from your Azure Kinect device.", "homepage": "https://github.com/microsoft/Azure-Kinect-Sensor-SDK", - "supports": "linux | windows", + "license": "MIT", + "supports": "(linux | windows) & !(static & staticcrt)", "dependencies": [ "azure-c-shared-utility", + "azure-kinect-depth-engine", "cjson", "ebml", - "glfw3", - "gtest", - "imgui", "libjpeg-turbo", "libsoundio", "libusb", { "name": "libuvc", - "platform": "linux" + "platform": "!windows" }, "libyuv", "matroska", @@ -32,14 +30,11 @@ } ], "features": { - "docs": { - "description": "Build K4A doxygen documentation." - }, "tool": { "description": "Build tools.", "dependencies": [ "gl3w", - "glew", + "glfw3", { "name": "imgui", "features": [ diff --git a/ports/libsoundio/portfile.cmake b/ports/libsoundio/portfile.cmake index 4fd1443c98..c60ad068e6 100644 --- a/ports/libsoundio/portfile.cmake +++ b/ports/libsoundio/portfile.cmake @@ -1,7 +1,8 @@ +string(REGEX REPLACE "^([0-9]+[.][0-9]+[.][0-9]+)[.]" "\\1-" git_tag "${VERSION}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO andrewrk/libsoundio - REF "${VERSION}" + REF "${git_tag}" SHA512 e854f066087f72438c9f014336a611d73b55a7b932747f94464477bd9f7daf9da440bad820d9c8e3d90ae3679af62a051e9645f0e0a2ddaed9726245a81f1e66 HEAD_REF master PATCHES @@ -34,9 +35,11 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup() vcpkg_copy_pdbs() -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/soundio/soundio.h" "defined(SOUNDIO_STATIC_LIBRARY)" "1") endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libsoundio/vcpkg.json b/ports/libsoundio/vcpkg.json index e14865b9e2..6b01c06eb9 100644 --- a/ports/libsoundio/vcpkg.json +++ b/ports/libsoundio/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libsoundio", - "version": "2.0.1-7", + "version": "2.0.1.7", "description": "libsoundio is C library providing cross-platform audio input and output.", "homepage": "http://libsound.io/", "supports": "!uwp & !(arm64 & windows)", diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index ff35ca21b2..aa88bf6dd4 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -646,10 +646,6 @@ azmq:arm64-uwp = cascade azmq:x64-uwp = cascade azure-iot-sdk-c:arm64-uwp = cascade azure-iot-sdk-c:x64-uwp = cascade -azure-kinect-sensor-sdk:arm64-uwp = cascade -azure-kinect-sensor-sdk:arm64-windows = cascade -azure-kinect-sensor-sdk:x64-uwp = cascade -azure-kinect-sensor-sdk[tool](uwp) = cascade azure-messaging-eventhubs-checkpointstore-blob-cpp:x64-uwp = cascade azure-messaging-eventhubs-cpp:arm64-uwp = cascade azure-messaging-eventhubs-cpp:x64-uwp = cascade @@ -2075,7 +2071,6 @@ 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 -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 cgns[core,fortran,hdf5,legacy,lfs,mpi,tests](osx | linux) = combination-fails # ["fortran","hdf5","mpi"]: Could NOT find MPI (missing: MPI_Fortran_FOUND) (found version "3.1") diff --git a/versions/a-/azure-kinect-depth-engine.json b/versions/a-/azure-kinect-depth-engine.json new file mode 100644 index 0000000000..d23d6fa5de --- /dev/null +++ b/versions/a-/azure-kinect-depth-engine.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "433533fdfc037c872e72c0e326ea044fe74a7a19", + "version": "1.4.2", + "port-version": 0 + } + ] +} diff --git a/versions/a-/azure-kinect-sensor-sdk.json b/versions/a-/azure-kinect-sensor-sdk.json index 158356d75e..0c08a7eada 100644 --- a/versions/a-/azure-kinect-sensor-sdk.json +++ b/versions/a-/azure-kinect-sensor-sdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "69ad1c2c7c7630eb4d19abbcaf07ead5445f393b", + "version": "1.4.2", + "port-version": 0 + }, { "git-tree": "f19cdb3144d4296ac862b6e94c9967c056325476", "version": "1.4.1", diff --git a/versions/baseline.json b/versions/baseline.json index 81894df525..849629cf34 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -500,9 +500,13 @@ "baseline": "2025-03-31", "port-version": 0 }, + "azure-kinect-depth-engine": { + "baseline": "1.4.2", + "port-version": 0 + }, "azure-kinect-sensor-sdk": { - "baseline": "1.4.1", - "port-version": 8 + "baseline": "1.4.2", + "port-version": 0 }, "azure-macro-utils-c": { "baseline": "2022-01-21", @@ -5325,7 +5329,7 @@ "port-version": 0 }, "libsoundio": { - "baseline": "2.0.1-7", + "baseline": "2.0.1.7", "port-version": 0 }, "libsoup": { diff --git a/versions/l-/libsoundio.json b/versions/l-/libsoundio.json index c36643455a..b889eba704 100644 --- a/versions/l-/libsoundio.json +++ b/versions/l-/libsoundio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e94f046a1aab7a12ee7751fcb77361b2f4a99f9d", + "version": "2.0.1.7", + "port-version": 0 + }, { "git-tree": "c3ffbde7e17435b86e3b59810611a8993019aa87", "version": "2.0.1-7",