diff options
| author | Lily <47812810+LilyWangL@users.noreply.github.com> | 2020-10-13 00:42:52 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-12 09:42:52 -0700 |
| commit | d6b5fbfef10e9476cdb8d1a90503f4f6504e63d9 (patch) | |
| tree | 4b4c91b701776b44d998e80ea98d43056920ccad | |
| parent | 37c412ae073056d6295c0aeaecc1b625f77c612f (diff) | |
| download | vcpkg-d6b5fbfef10e9476cdb8d1a90503f4f6504e63d9.tar.gz vcpkg-d6b5fbfef10e9476cdb8d1a90503f4f6504e63d9.zip | |
[azure-kinect-sensor-sdk] Fix azure-kinect-sensor-sdk[tool] build error (#13737)
| -rw-r--r-- | ports/azure-kinect-sensor-sdk/CONTROL | 5 | ||||
| -rw-r--r-- | ports/azure-kinect-sensor-sdk/fix-dependency-imgui.patch | 40 |
2 files changed, 18 insertions, 27 deletions
diff --git a/ports/azure-kinect-sensor-sdk/CONTROL b/ports/azure-kinect-sensor-sdk/CONTROL index f0e78a1a2..81b05d3ac 100644 --- a/ports/azure-kinect-sensor-sdk/CONTROL +++ b/ports/azure-kinect-sensor-sdk/CONTROL @@ -1,5 +1,6 @@ Source: azure-kinect-sensor-sdk -Version: 1.4.0-alpha.0-5 +Version: 1.4.0-alpha.0 +Port-Version: 6 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 @@ -9,4 +10,4 @@ Description: Build K4A doxygen documentation. Feature: tool Description: Build tools. -Build-Depends: gl3w, glew, imgui[bindings]
\ No newline at end of file +Build-Depends: gl3w, glew, imgui[glfw-binding,opengl3-glew-binding]
\ No newline at end of file diff --git a/ports/azure-kinect-sensor-sdk/fix-dependency-imgui.patch b/ports/azure-kinect-sensor-sdk/fix-dependency-imgui.patch index f997e71b5..543bfd2bb 100644 --- a/ports/azure-kinect-sensor-sdk/fix-dependency-imgui.patch +++ b/ports/azure-kinect-sensor-sdk/fix-dependency-imgui.patch @@ -1,17 +1,8 @@ diff --git a/tools/k4aviewer/CMakeLists.txt b/tools/k4aviewer/CMakeLists.txt -index 6ab38d9..e0c5bad 100644 +index 6ab38d9..f31f570 100644 --- a/tools/k4aviewer/CMakeLists.txt +++ b/tools/k4aviewer/CMakeLists.txt -@@ -35,6 +35,8 @@ set(SOURCE_FILES - k4awindowset.cpp - perfcounter.cpp - ${CMAKE_CURRENT_BINARY_DIR}/version.rc -+ ${IMGUI_EXTERNAL_PATH}/imgui_impl_glfw.cpp -+ ${IMGUI_EXTERNAL_PATH}/imgui_impl_opengl3.cpp - ) - - # Include ${CMAKE_CURRENT_BINARY_DIR}/version.rc in the target's sources -@@ -54,6 +56,8 @@ include_directories( +@@ -54,6 +54,8 @@ include_directories( ${CMAKE_CURRENT_LIST_DIR} ) @@ -20,7 +11,7 @@ index 6ab38d9..e0c5bad 100644 set(EXTERNAL_LIBRARIES k4a::k4a k4a::k4arecord -@@ -65,6 +69,7 @@ set(EXTERNAL_LIBRARIES +@@ -65,6 +67,7 @@ set(EXTERNAL_LIBRARIES glfw ${OPENGL_LIBRARIES} unofficial::gl3w::gl3w @@ -28,18 +19,17 @@ index 6ab38d9..e0c5bad 100644 ) # On Windows, we need to call into setupapi to get USB container ID information -diff --git a/tools/k4aviewer/k4aimgui_all.h b/tools/k4aviewer/k4aimgui_all.h -index e40ccfb..756fb09 100644 ---- a/tools/k4aviewer/k4aimgui_all.h -+++ b/tools/k4aviewer/k4aimgui_all.h -@@ -34,8 +34,8 @@ - #include <GL/gl3w.h> - #include <GLFW/glfw3.h> - #include <imgui.h> --#include <imgui_impl_glfw.h> --#include <imgui_impl_opengl3.h> -+#include <bindings/imgui_impl_glfw.h> -+#include <bindings/imgui_impl_opengl3.h> +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 <soundio.h> ++#include <soundio/soundio.h> - // For disabling buttons, which has not yet been promoted to the public API + // Project headers // +
\ No newline at end of file |