From 71c7aa72b42a7d34fa3d7e8715ae1ac325aa32f6 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Fri, 12 Mar 2021 04:17:41 +0800 Subject: [PATCH] [Azure-Kinect-Sensor-SDK] update to 1.41 (#16548) * [Azure-Kinect-Sensor-SDK] update to 1.41 * update version * revert patch * update version * revert patch * update version --- ports/azure-kinect-sensor-sdk/CONTROL | 3 +- .../azure-kinect-sensor-sdk/fix-builds.patch | 53 ++++--------------- ports/azure-kinect-sensor-sdk/portfile.cmake | 6 +-- versions/a-/azure-kinect-sensor-sdk.json | 5 ++ versions/baseline.json | 4 +- 5 files changed, 22 insertions(+), 49 deletions(-) diff --git a/ports/azure-kinect-sensor-sdk/CONTROL b/ports/azure-kinect-sensor-sdk/CONTROL index f6bf9ae0ca..710ceb4606 100644 --- a/ports/azure-kinect-sensor-sdk/CONTROL +++ b/ports/azure-kinect-sensor-sdk/CONTROL @@ -1,6 +1,5 @@ Source: azure-kinect-sensor-sdk -Version: 1.4.0-alpha.0 -Port-Version: 6 +Version: 1.4.1 Homepage: https://github.com/microsoft/Azure-Kinect-Sensor-SDK Description: Azure Kinect SDK is a cross platform (Linux and Windows) user mode SDK to read data from your Azure Kinect device. Build-Depends: azure-c-shared-utility, glfw3, gtest, imgui, libusb, spdlog, cjson, ebml, libjpeg-turbo, matroska, libsoundio, libyuv diff --git a/ports/azure-kinect-sensor-sdk/fix-builds.patch b/ports/azure-kinect-sensor-sdk/fix-builds.patch index 52240c68af..5426cca27d 100644 --- a/ports/azure-kinect-sensor-sdk/fix-builds.patch +++ b/ports/azure-kinect-sensor-sdk/fix-builds.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4967b94..e36009e 100644 +index 4f002b5..cef79d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,8 +27,6 @@ option(K4A_BUILD_DOCS "Build K4A doxygen documentation" OFF) @@ -39,7 +39,7 @@ index 4967b94..e36009e 100644 # Find all dependencies add_subdirectory(extern) -@@ -160,10 +179,16 @@ if ("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC") +@@ -161,10 +180,16 @@ if ("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC") endif() endif() @@ -60,38 +60,6 @@ index 4967b94..e36009e 100644 if (K4A_BUILD_DOCS) find_package(Doxygen 1.8.14 EXACT) -diff --git a/examples/green_screen/CMakeLists.txt b/examples/green_screen/CMakeLists.txt -index 423ca68..0c7cc0a 100644 ---- a/examples/green_screen/CMakeLists.txt -+++ b/examples/green_screen/CMakeLists.txt -@@ -7,9 +7,9 @@ target_include_directories( green_screen PRIVATE ${OpenCV_INCLUDE_DIRS} ) - # OpenCV_LIBS, by default, is picking up the debug version of opencv on Windows even in release mode, which was causing a dependency on non-redistributable Visual Studio dlls. - if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") - if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") -- target_link_libraries(green_screen PRIVATE k4a::k4a ${OpenCV_DIR}/Opencv_world320d.lib) -+ target_link_libraries(green_screen PRIVATE k4a::k4a ${OpenCV_LIBS}) - else() -- target_link_libraries(green_screen PRIVATE k4a::k4a ${OpenCV_DIR}/Opencv_world320.lib) -+ target_link_libraries(green_screen PRIVATE k4a::k4a ${OpenCV_LIBS}) - endif() - else() - target_link_libraries(green_screen PRIVATE k4a::k4a ${OpenCV_LIBS}) -diff --git a/examples/opencv_compatibility/CMakeLists.txt b/examples/opencv_compatibility/CMakeLists.txt -index ef72e99..f1faeb7 100644 ---- a/examples/opencv_compatibility/CMakeLists.txt -+++ b/examples/opencv_compatibility/CMakeLists.txt -@@ -7,9 +7,9 @@ target_include_directories( opencv_example PRIVATE ${OpenCV_INCLUDE_DIRS} ) - # OpenCV_LIBS, by default, is picking up the debug version of opencv on Windows even in release mode, which was causing a dependency on non-redistributable Visual Studio dlls. - if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") - if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") -- target_link_libraries(opencv_example PRIVATE k4a::k4a ${OpenCV_DIR}/Opencv_world320d.lib) -+ target_link_libraries(opencv_example PRIVATE k4a::k4a ${OpenCV_LIBS}) - else() -- target_link_libraries(opencv_example PRIVATE k4a::k4a ${OpenCV_DIR}/Opencv_world320.lib) -+ target_link_libraries(opencv_example PRIVATE k4a::k4a ${OpenCV_LIBS}) - endif() - else() - target_link_libraries(opencv_example PRIVATE k4a::k4a ${OpenCV_LIBS}) diff --git a/examples/transformation/CMakeLists.txt b/examples/transformation/CMakeLists.txt index e5b41e6..8f7f7f3 100644 --- a/examples/transformation/CMakeLists.txt @@ -117,7 +85,7 @@ index 166fe2a..a3db07f 100644 ${OPENGL_LIBRARIES}) \ No newline at end of file diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt -index cb4f7b4..c102766 100644 +index cb4f7b4..c3eab98 100644 --- a/extern/CMakeLists.txt +++ b/extern/CMakeLists.txt @@ -1,7 +1,6 @@ @@ -129,7 +97,7 @@ index cb4f7b4..c102766 100644 find_package(Git REQUIRED QUIET) if (Git_FOUND) get_git_dir(${K4A_SOURCE_DIR} GIT_DIR) -@@ -57,18 +56,4 @@ endif() +@@ -57,18 +56,5 @@ endif() # lower than CMake 3.3 set(CMAKE_POLICY_DEFAULT_CMP0063 NEW) @@ -148,6 +116,7 @@ index cb4f7b4..c102766 100644 -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 @@ -175,7 +144,7 @@ index e96b7d0..ed69f41 100644 # Define alias for other targets to link against diff --git a/src/calibration/calibration.c b/src/calibration/calibration.c -index f046ef2..3d23ada 100644 +index bf5f34a..d37c4e6 100644 --- a/src/calibration/calibration.c +++ b/src/calibration/calibration.c @@ -6,7 +6,7 @@ @@ -184,9 +153,9 @@ index f046ef2..3d23ada 100644 #include -#include +#include + #include //cJSON.h need this set correctly. // System dependencies - #include diff --git a/src/capturesync/CMakeLists.txt b/src/capturesync/CMakeLists.txt index a434593..bcb19ba 100644 --- a/src/capturesync/CMakeLists.txt @@ -295,12 +264,12 @@ index 97c6cf3..e9f5b1a 100644 # Define alias for other targets to link against diff --git a/src/record/sdk/CMakeLists.txt b/src/record/sdk/CMakeLists.txt -index 571a297..4be0697 100644 +index 2e23295..d150e70 100644 --- a/src/record/sdk/CMakeLists.txt +++ b/src/record/sdk/CMakeLists.txt -@@ -41,8 +41,8 @@ target_link_libraries(k4arecord PRIVATE +@@ -40,8 +40,8 @@ target_link_libraries(k4arecord PRIVATE + k4ainternal::record k4ainternal::playback - k4a::k4a k4ainternal::logging - ebml::ebml - matroska::matroska @@ -308,7 +277,7 @@ index 571a297..4be0697 100644 + Matroska::matroska ) - # Define alias for k4arecord + 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 diff --git a/ports/azure-kinect-sensor-sdk/portfile.cmake b/ports/azure-kinect-sensor-sdk/portfile.cmake index 5c6a189eea..0ced2d2689 100644 --- a/ports/azure-kinect-sensor-sdk/portfile.cmake +++ b/ports/azure-kinect-sensor-sdk/portfile.cmake @@ -1,9 +1,9 @@ -set(VERSION 1.4.0-alpha.0) +set(VERSION 1.4.1) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/Azure-Kinect-Sensor-SDK REF v${VERSION} - SHA512 bf09ff92dc1b8621a941d838aef9c804bb5635f7984b7f86f01a38441d44935db764b69483d598e1f2c0aafb5c7ec196ef9c722967d92e6d075cb67ce781fea9 + SHA512 ef94c072caae43b0a105b192013e09082d267d4064e6676fac981b52e7576a663f59fcb53f0afe66b425ef2cea0cb3aa224ff7be6485c0b5543ff9cdabd82d4d HEAD_REF master PATCHES fix-builds.patch @@ -65,7 +65,7 @@ endif() vcpkg_download_distfile(ARCHIVE URLS "https://www.nuget.org/api/v2/package/Microsoft.Azure.Kinect.Sensor/${VERSION}" FILENAME "azure-kinect-sensor-sdk.zip" - SHA512 6c15975e7c834672de723b0c474fa4cd58f41c5bee6511dcbdbc22f1a58daa906c4f01a7e941af0e7d09f763ff886015c1f6b1e29b6bdfb333f10857edfec2ca + SHA512 17630a00f4e9ff3ef68945b62021f6d0390030b43c120c207afe934075a7a87c5848be1f46f4c35c7ecd5698012452ffcbb67f739e9048857410ec7077e5e8c6 ) vcpkg_extract_source_archive_ex( diff --git a/versions/a-/azure-kinect-sensor-sdk.json b/versions/a-/azure-kinect-sensor-sdk.json index 9a466c027b..8e0136949b 100644 --- a/versions/a-/azure-kinect-sensor-sdk.json +++ b/versions/a-/azure-kinect-sensor-sdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c1df96d95d7403ee8b37344e4caf39184b410cb5", + "version-string": "1.4.1", + "port-version": 0 + }, { "git-tree": "dfd54f8c9eeba870d560c0a157996357aeda331c", "version-string": "1.4.0-alpha.0", diff --git a/versions/baseline.json b/versions/baseline.json index 50d298a40f..71c0c055b1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -257,8 +257,8 @@ "port-version": 0 }, "azure-kinect-sensor-sdk": { - "baseline": "1.4.0-alpha.0", - "port-version": 6 + "baseline": "1.4.1", + "port-version": 0 }, "azure-macro-utils-c": { "baseline": "2020-06-17",