diff options
| author | Alvin <52727318+AlvinZhangH@users.noreply.github.com> | 2020-01-11 07:39:20 +0800 |
|---|---|---|
| committer | dan-shaw <51385773+dan-shaw@users.noreply.github.com> | 2020-01-10 15:39:20 -0800 |
| commit | 21f3e7d6988da47ac27b82572d032d04ab27281c (patch) | |
| tree | 095057cd238009aa1bba8dae0753eda3c6789bfe | |
| parent | d400f3d50bd0c79b192134aa50875f7579ad8efc (diff) | |
| download | vcpkg-21f3e7d6988da47ac27b82572d032d04ab27281c.tar.gz vcpkg-21f3e7d6988da47ac27b82572d032d04ab27281c.zip | |
[realsense2] update to 2.30 (#9220)
* [realsense2] update to 2.30
* [realsense2] Delete deprecated functions, change the REF to commit id
| -rw-r--r-- | ports/realsense2/CONTROL | 2 | ||||
| -rw-r--r-- | ports/realsense2/fix-dependency-glfw3.patch | 26 | ||||
| -rw-r--r-- | ports/realsense2/portfile.cmake | 8 |
3 files changed, 17 insertions, 19 deletions
diff --git a/ports/realsense2/CONTROL b/ports/realsense2/CONTROL index a1be471fb..f55d97d0b 100644 --- a/ports/realsense2/CONTROL +++ b/ports/realsense2/CONTROL @@ -1,5 +1,5 @@ Source: realsense2 -Version: 2.22.0-2 +Version: 2.30.0 Homepage: https://github.com/IntelRealSense/librealsense Description: Intel® RealSense™ SDK 2.0 is a cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300). diff --git a/ports/realsense2/fix-dependency-glfw3.patch b/ports/realsense2/fix-dependency-glfw3.patch index 3d6ff52b9..c11a5cdd1 100644 --- a/ports/realsense2/fix-dependency-glfw3.patch +++ b/ports/realsense2/fix-dependency-glfw3.patch @@ -1,13 +1,13 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2da00e0..09f3eba 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -52,7 +52,7 @@ option(BUILD_CV_KINFU_EXAMPLE "Build OpenCV KinectFusion example" OFF)
- add_subdirectory(wrappers)
-
- if (BUILD_EXAMPLES AND BUILD_GLSL_EXTENSIONS)
-- find_package(glfw3 3.3 QUIET)
-+ find_package(glfw3 CONFIG REQUIRED)
- if(NOT TARGET glfw)
- message(STATUS "GLFW 3.3 not found; using internal version")
- set(GLFW_INSTALL ON)
+diff --git a/CMakeLists.txt b/CMakeLists.txt +index 16ced1b..ef1b158 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -69,7 +69,7 @@ include(CMake/install_config.cmake) + add_subdirectory(wrappers) + + if (BUILD_EXAMPLES AND BUILD_GLSL_EXTENSIONS) +- find_package(glfw3 3.3 QUIET) ++ find_package(glfw3 CONFIG REQUIRED) + if(NOT TARGET glfw) + message(STATUS "GLFW 3.3 not found; using internal version") + set(GLFW_INSTALL ON CACHE BOOL "" FORCE) diff --git a/ports/realsense2/portfile.cmake b/ports/realsense2/portfile.cmake index 560a2a52e..92b37a385 100644 --- a/ports/realsense2/portfile.cmake +++ b/ports/realsense2/portfile.cmake @@ -1,11 +1,9 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO IntelRealSense/librealsense - REF v2.22.0 - SHA512 7595780c1955a2d4a91df5b70ab6366c672f389bc3d2dcb9f2e78a2ea1fc875c65f878103df483205e17f62dfd024ee5f7ccb15afc5d18978d3c25aa071652ab - HEAD_REF development + REF 9f99fa9a509555f85bffc15ce27531aaa6db6f7e#v2.30.0 + SHA512 72d9e0b48a6cd0b056b6d039487431d0097e5151930a2dbb072d09a13fccee1f166ca339fe7f0ab4aae1edc5669de5e8336f0b6d87d1c4ea01ec0c5d4032c728 + HEAD_REF master PATCHES fix_openni2.patch fix-dependency-glfw3.patch |