[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>
This commit is contained in:
Cheney Wang 2020-05-20 06:15:33 +08:00 committed by GitHub
parent 9fa44fc4b7
commit cb388456a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 17 deletions

View File

@ -1,5 +1,5 @@
Source: realsense2 Source: realsense2
Version: 2.33.1-1 Version: 2.34.0
Homepage: https://github.com/IntelRealSense/librealsense 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). Description: Intel® RealSense™ SDK 2.0 is a cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300).

View File

@ -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(...)

View File

@ -1,13 +1,12 @@
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO IntelRealSense/librealsense REPO IntelRealSense/librealsense
REF 842ee1e1e5c4bb96d63582a7fde061dbc1bebf69#v2.33.1 REF 025fccf76803ee6a6e60de9f18ac6193b7ff8597 #v2.34.0
SHA512 70f6f9c2f1c5925532b2ff22779579b3610a7f616d66ac92e8e85c6f30df334bf8fb125355a0706bacef0be8370acc62bb7623f3f200326e71fe53e07726fa6a SHA512 c502fba6b3dbb34b0ac0094deef9ffce330faf435bbc7612148fd8ba3d5b380f7990604a67236e7da815c8e6988ae58c17fa597571a2462f75c8f5000007cc0a
HEAD_REF master HEAD_REF master
PATCHES PATCHES
fix_openni2.patch fix_openni2.patch
fix-dependency-glfw3.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}) file(COPY ${SOURCE_PATH}/src/win7/drivers/IntelRealSense_D400_series_win7.inf DESTINATION ${SOURCE_PATH})