diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2017-12-27 20:47:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-27 20:47:33 +0200 |
| commit | 841f2d3985bf81547e8de569ae0335484b0c2602 (patch) | |
| tree | eefa8283ec8976c8a2e0978eb484301abd75f57a | |
| parent | 6e05f9cdf5cf4d53153214f4d4b29133b368bc4d (diff) | |
| parent | 75f43baedf90fce8c50f4c486df2d5831459b715 (diff) | |
| download | vcpkg-841f2d3985bf81547e8de569ae0335484b0c2602.tar.gz vcpkg-841f2d3985bf81547e8de569ae0335484b0c2602.zip | |
Merge pull request #2439 from UnaNancyOwen/update_realsense2
Update realsense2 port to librealsense v2.8.3
| -rw-r--r-- | ports/realsense2/CONTROL | 2 | ||||
| -rw-r--r-- | ports/realsense2/crt-linkage-restriction.patch | 12 | ||||
| -rw-r--r-- | ports/realsense2/portfile.cmake | 16 |
3 files changed, 16 insertions, 14 deletions
diff --git a/ports/realsense2/CONTROL b/ports/realsense2/CONTROL index 9153402c7..8a3efdee0 100644 --- a/ports/realsense2/CONTROL +++ b/ports/realsense2/CONTROL @@ -1,3 +1,3 @@ Source: realsense2 -Version: 2.8.2 +Version: 2.8.3 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/crt-linkage-restriction.patch b/ports/realsense2/crt-linkage-restriction.patch index ae4acc834..c36753f2a 100644 --- a/ports/realsense2/crt-linkage-restriction.patch +++ b/ports/realsense2/crt-linkage-restriction.patch @@ -1,8 +1,10 @@ ---- a/CMakeLists.txt 2017-11-07 14:30:02.270145100 +0800 -+++ b/CMakeLists.txt 2017-11-07 14:26:42.306208800 +0800 -@@ -402,16 +402,6 @@ - source_group("Header Files\\Processing Blocks" FILES - src/colorizer.h +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a59e2513..3b08f490 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -420,16 +420,6 @@ if(WIN32) + src/proc/temporal-filter.h + src/proc/syncer-processing-block.h ) - - foreach(flag_var diff --git a/ports/realsense2/portfile.cmake b/ports/realsense2/portfile.cmake index 609b1c660..ea8fff99d 100644 --- a/ports/realsense2/portfile.cmake +++ b/ports/realsense2/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO IntelRealSense/librealsense - REF v2.8.2 - SHA512 a2622ff241e939fad74f6d0224b5f9b505e971935bb8f27dc10159a5853bc5d55870c312c0f43014c8c7ec5a1c824e659ee9ee9a574b2d7c9b8e484c1a4918a1 + REF v2.8.3 + SHA512 9be27109da0247cf6669f01b3f0f945073f7851897da553915716d979c50f6228e771ca5a63955707f618d0db1fc58ba52f78dece6d904b6671dee56ba70d48f HEAD_REF master ) @@ -19,12 +19,12 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} OPTIONS - -DENFORCE_METADATA=on - -DBUILD_EXAMPLES=off - -DBUILD_GRAPHICAL_EXAMPLES=off - -DBUILD_PYTHON_BINDINGS=off - -DBUILD_UNIT_TESTS=off - -DBUILD_WITH_OPENMP=off # keep OpenMP off until librealsense issue #744 is patched + -DENFORCE_METADATA=ON + -DBUILD_EXAMPLES=OFF + -DBUILD_GRAPHICAL_EXAMPLES=OFF + -DBUILD_PYTHON_BINDINGS=OFF + -DBUILD_UNIT_TESTS=OFF + -DBUILD_WITH_OPENMP=OFF # keep OpenMP off until librealsense issue #744 is patched -DBUILD_SHARED_LIBS=${BUILD_SHARED} OPTIONS_DEBUG "-DCMAKE_PDB_OUTPUT_DIRECTORY=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" |