diff options
| author | Cheney Wang <38240633+Cheney-W@users.noreply.github.com> | 2020-05-20 06:15:33 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-19 15:15:33 -0700 |
| commit | cb388456a29e3c1ab434e00adce6e121d3aa86b9 (patch) | |
| tree | 13f9e50797b4f667c1527b1d956ed8c80c76a4ae | |
| parent | 9fa44fc4b7519ce2262aa4d16dd91a496dab8624 (diff) | |
| download | vcpkg-cb388456a29e3c1ab434e00adce6e121d3aa86b9.tar.gz vcpkg-cb388456a29e3c1ab434e00adce6e121d3aa86b9.zip | |
[realsense2] Update to 2.34.0 (#11437)
* [realsense2] Update to 2.34.0
* Modify the value of REF from version to commit id
Co-authored-by: Cheney-Wang <v-xincwa@microsoft.com>
| -rw-r--r-- | ports/realsense2/CONTROL | 2 | ||||
| -rw-r--r-- | ports/realsense2/fix-tools-compile-on-vs2019.patch | 13 | ||||
| -rw-r--r-- | ports/realsense2/portfile.cmake | 5 |
3 files changed, 3 insertions, 17 deletions
diff --git a/ports/realsense2/CONTROL b/ports/realsense2/CONTROL index cef0ee206..7304016c6 100644 --- a/ports/realsense2/CONTROL +++ b/ports/realsense2/CONTROL @@ -1,5 +1,5 @@ Source: realsense2 -Version: 2.33.1-1 +Version: 2.34.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-tools-compile-on-vs2019.patch b/ports/realsense2/fix-tools-compile-on-vs2019.patch deleted file mode 100644 index 4a9543ed0..000000000 --- a/ports/realsense2/fix-tools-compile-on-vs2019.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/common/rs-config.cpp b/common/rs-config.cpp
-index ff3a757..c9efa1a 100644
---- a/common/rs-config.cpp
-+++ b/common/rs-config.cpp
-@@ -97,7 +97,7 @@ config_file::config_file(std::string filename)
- auto j = json::parse(str);
- for (json::iterator it = j.begin(); it != j.end(); ++it)
- {
-- _values[it.key()] = it.value();
-+ _values[it.key()] = it.value().get<std::string>();
- }
- }
- catch(...)
diff --git a/ports/realsense2/portfile.cmake b/ports/realsense2/portfile.cmake index 9694e2fc5..2db0f278a 100644 --- a/ports/realsense2/portfile.cmake +++ b/ports/realsense2/portfile.cmake @@ -1,13 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO IntelRealSense/librealsense - REF 842ee1e1e5c4bb96d63582a7fde061dbc1bebf69#v2.33.1 - SHA512 70f6f9c2f1c5925532b2ff22779579b3610a7f616d66ac92e8e85c6f30df334bf8fb125355a0706bacef0be8370acc62bb7623f3f200326e71fe53e07726fa6a + REF 025fccf76803ee6a6e60de9f18ac6193b7ff8597 #v2.34.0 + SHA512 c502fba6b3dbb34b0ac0094deef9ffce330faf435bbc7612148fd8ba3d5b380f7990604a67236e7da815c8e6988ae58c17fa597571a2462f75c8f5000007cc0a HEAD_REF master PATCHES fix_openni2.patch fix-dependency-glfw3.patch - fix-tools-compile-on-vs2019.patch ) file(COPY ${SOURCE_PATH}/src/win7/drivers/IntelRealSense_D400_series_win7.inf DESTINATION ${SOURCE_PATH}) |