From 6404a356f0cd5cae3d6ef21e7471108ded7f1a1a Mon Sep 17 00:00:00 2001 From: jimwang118 Date: Thu, 17 Aug 2023 06:05:51 +0000 Subject: [PATCH 1/2] fix imgui delete function --- .../fix-build-imgui.patch | 44 +++++++++++++++++++ ports/azure-kinect-sensor-sdk/portfile.cmake | 2 +- ports/azure-kinect-sensor-sdk/vcpkg.json | 2 +- 3 files changed, 46 insertions(+), 2 deletions(-) diff --git a/ports/azure-kinect-sensor-sdk/fix-build-imgui.patch b/ports/azure-kinect-sensor-sdk/fix-build-imgui.patch index eb94390e635547..a41f56082b9730 100644 --- a/ports/azure-kinect-sensor-sdk/fix-build-imgui.patch +++ b/ports/azure-kinect-sensor-sdk/fix-build-imgui.patch @@ -11,3 +11,47 @@ index 4289f71..407e912 100644 } ImGui::EndChild(); +diff --git a/tools/k4aviewer/k4adevicedockcontrol.cpp b/tools/k4aviewer/k4adevicedockcontrol.cpp +index 8fe5687..6d1e95a 100644 +--- a/tools/k4aviewer/k4adevicedockcontrol.cpp ++++ b/tools/k4aviewer/k4adevicedockcontrol.cpp +@@ -333,7 +333,7 @@ K4ADockControlStatus K4ADeviceDockControl::Show() + + if (m_firstRun || depthEnabledStateChanged) + { +- ImGui::SetNextTreeNodeOpen(m_config.EnableDepthCamera); ++ ImGui::SetNextItemOpen(m_config.EnableDepthCamera); + } + + ImGui::Indent(); +@@ -376,7 +376,7 @@ K4ADockControlStatus K4ADeviceDockControl::Show() + + if (m_firstRun || colorEnableStateChanged) + { +- ImGui::SetNextTreeNodeOpen(m_config.EnableColorCamera); ++ ImGui::SetNextItemOpen(m_config.EnableColorCamera); + } + + ImGui::Indent(); +@@ -710,7 +710,7 @@ K4ADockControlStatus K4ADeviceDockControl::Show() + + if (m_firstRun && (m_syncInConnected || m_syncOutConnected)) + { +- ImGui::SetNextTreeNodeOpen(true); ++ ImGui::SetNextItemOpen(true); + } + if (ImGui::TreeNode("External Sync")) + { +diff --git a/tools/k4aviewer/k4asourceselectiondockcontrol.cpp b/tools/k4aviewer/k4asourceselectiondockcontrol.cpp +index 812608b..31e961d 100644 +--- a/tools/k4aviewer/k4asourceselectiondockcontrol.cpp ++++ b/tools/k4aviewer/k4asourceselectiondockcontrol.cpp +@@ -34,7 +34,7 @@ K4ASourceSelectionDockControl::K4ASourceSelectionDockControl() + + K4ADockControlStatus K4ASourceSelectionDockControl::Show() + { +- ImGui::SetNextTreeNodeOpen(true, ImGuiCond_FirstUseEver); ++ ImGui::SetNextItemOpen(true, ImGuiCond_FirstUseEver); + if (ImGui::TreeNode("Open Device")) + { + ImGuiExtensions::K4AComboBox("Device S/N", diff --git a/ports/azure-kinect-sensor-sdk/portfile.cmake b/ports/azure-kinect-sensor-sdk/portfile.cmake index 0bbc78a5220e12..8ddc8fbb8e7e2c 100644 --- a/ports/azure-kinect-sensor-sdk/portfile.cmake +++ b/ports/azure-kinect-sensor-sdk/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_from_github( fix-dependency-imgui.patch fix-linux.patch fix-calibration-c.patch - fix-build-imgui.patch + fix-build-imgui.patch #https://github.com/microsoft/Azure-Kinect-Sensor-SDK/pull/1945 ) vcpkg_find_acquire_program(PYTHON3) diff --git a/ports/azure-kinect-sensor-sdk/vcpkg.json b/ports/azure-kinect-sensor-sdk/vcpkg.json index 9726bd8cdb0e33..5bff0fea5f505c 100644 --- a/ports/azure-kinect-sensor-sdk/vcpkg.json +++ b/ports/azure-kinect-sensor-sdk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "azure-kinect-sensor-sdk", "version": "1.4.1", - "port-version": 5, + "port-version": 6, "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", From 94403caff152dd833200eefc1f9e7ecf2c29aa59 Mon Sep 17 00:00:00 2001 From: jimwang118 Date: Thu, 17 Aug 2023 06:06:19 +0000 Subject: [PATCH 2/2] update version --- versions/a-/azure-kinect-sensor-sdk.json | 5 +++++ versions/baseline.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/a-/azure-kinect-sensor-sdk.json b/versions/a-/azure-kinect-sensor-sdk.json index 8df675151fc028..0ba58aeaadef81 100644 --- a/versions/a-/azure-kinect-sensor-sdk.json +++ b/versions/a-/azure-kinect-sensor-sdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c18d1979e92816401a8f8c529fc69f6fdca27d63", + "version": "1.4.1", + "port-version": 6 + }, { "git-tree": "e2a1e6a1a145f9436731cbcc9019f807325298c1", "version": "1.4.1", diff --git a/versions/baseline.json b/versions/baseline.json index a79b946fca4f2a..d5eb63090b5824 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -426,7 +426,7 @@ }, "azure-kinect-sensor-sdk": { "baseline": "1.4.1", - "port-version": 5 + "port-version": 6 }, "azure-macro-utils-c": { "baseline": "2022-01-21",