diff options
| author | Francisco Facioni <francisco@remyrobotics.com> | 2021-03-29 19:17:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-29 10:17:50 -0700 |
| commit | 5eae23f558cdae22bd894c450dbb43d26e916467 (patch) | |
| tree | 405e3a1f63b26e795a8625fb7d5a089d181731e3 /ports/azure-kinect-sensor-sdk/fix-uvc.patch | |
| parent | 7adc87efe1a4d04d60c271c6d3f63a1505e3bf9d (diff) | |
| download | vcpkg-5eae23f558cdae22bd894c450dbb43d26e916467.tar.gz vcpkg-5eae23f558cdae22bd894c450dbb43d26e916467.zip | |
[azure-kinect-sensor-sdk] not working on Linux (#14750)
* [azure-kinect-sensor-sdk] fix linux build and other issues
- linux: warnings stopping the build
- linux: set correct casing for dependecies
- linux: depthengine
- upgrade to 1.4.1
* Update ports/azure-kinect-sensor-sdk/CONTROL
* Update ports/azure-kinect-sensor-sdk/portfile.cmake
* Force to re-download archive, revert 9cd44db8e32939fa6f5fa4c2166d32d3ce63ff16
* update version record
* Update ports/azure-kinect-sensor-sdk/CONTROL
* Update versions/a-/azure-kinect-sensor-sdk.json
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Diffstat (limited to 'ports/azure-kinect-sensor-sdk/fix-uvc.patch')
| -rw-r--r-- | ports/azure-kinect-sensor-sdk/fix-uvc.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/ports/azure-kinect-sensor-sdk/fix-uvc.patch b/ports/azure-kinect-sensor-sdk/fix-uvc.patch new file mode 100644 index 000000000..d9eaa9c1e --- /dev/null +++ b/ports/azure-kinect-sensor-sdk/fix-uvc.patch @@ -0,0 +1,36 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 672f6e2..555cb8f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -109,19 +109,23 @@ find_library(JPEG_TURBO turbojpeg REQUIRED) + find_package(Matroska CONFIG REQUIRED) + add_definitions(-DMATROSKA_VERSION=2) + find_package(libsoundio CONFIG REQUIRED) +-find_package(libusb CONFIG REQUIRED) +-find_package(libuvc CONFIG REQUIRED) ++if (NOT WIN32) ++ find_package(libusb CONFIG REQUIRED) ++ find_package(libuvc CONFIG REQUIRED) ++ add_library(libuvc::libuvc ALIAS LibUVC::UVCStatic) ++ find_package(OpenSSL REQUIRED) ++ find_package(ZLIB REQUIRED) ++ add_library(libjpeg-turbo::libjpeg-turbo STATIC IMPORTED) ++ set_property(TARGET libjpeg-turbo::libjpeg-turbo PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${JPEG_INCLUDE_DIR}) ++ set_property(TARGET libjpeg-turbo::libjpeg-turbo PROPERTY IMPORTED_LOCATION ${JPEG_LIBRARIES}) ++else() ++ find_library(LibUSB libusb-1.0 REQUIRED) ++endif() + find_package(libyuv CONFIG REQUIRED) + find_package(spdlog CONFIG REQUIRED) +-find_package(OpenSSL REQUIRED) +-find_package(ZLIB REQUIRED) + if (BUILD_TOOLS) + find_package(gl3w CONFIG REQUIRED) + endif() +-add_library(libuvc::libuvc ALIAS LibUVC::UVCStatic) +-add_library(libjpeg-turbo::libjpeg-turbo STATIC IMPORTED) +-set_property(TARGET libjpeg-turbo::libjpeg-turbo PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${JPEG_INCLUDE_DIR}) +-set_property(TARGET libjpeg-turbo::libjpeg-turbo PROPERTY IMPORTED_LOCATION ${JPEG_LIBRARIES}) + # add jpeg-turbo library to jpeg libraries. + set(JPEG_LIBRARIES ${JPEG_LIBRARIES} ${JPEG_TURBO}) + # Fix embl error |