Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions ports/realsense2/add-include-chrono.patch

This file was deleted.

75 changes: 0 additions & 75 deletions ports/realsense2/build.diff

This file was deleted.

21 changes: 21 additions & 0 deletions ports/realsense2/fix-rsutils-includes.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
--- a/third-party/rsutils/src/control-c-handler.cpp
+++ b/third-party/rsutils/src/control-c-handler.cpp
@@ -1,4 +1,5 @@
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2 original lines, 3 lines after the change.

Suggested change
@@ -1,4 +1,5 @@
@@ -1,2 +1,3 @@

#include <atomic>
+#include <stdexcept>

--- a/third-party/rsutils/src/special-folder.cpp
+++ b/third-party/rsutils/src/special-folder.cpp
@@ -1,6 +1,7 @@
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

4 original lines, 5 lines after the change.

Suggested change
@@ -1,6 +1,7 @@
@@ -1,4 +1,5 @@

#include <string>
#include <vector>
#include <sstream>
+#include <stdexcept>

--- a/third-party/rsutils/src/network-adapter-watcher.cpp
+++ b/third-party/rsutils/src/network-adapter-watcher.cpp
@@ -1,6 +1,8 @@
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
@@ -1,6 +1,8 @@
@@ -1,2 +1,4 @@

#include <chrono>
#include <regex>
+#include <thread>
+#include <cstring>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No line break at end of the file. Bad editor, e.g. VS Code.

Suggested change
+#include <cstring>
+#include <cstring>

14 changes: 3 additions & 11 deletions ports/realsense2/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,27 +1,19 @@
vcpkg_download_distfile(lz4_patch
URLS https://github.com/IntelRealSense/librealsense/commit/20748445a8e24bee148d8b6f67f3a6c3f259cced.diff?full_index=1
SHA512 90d754e7da6931b607429035c2fa14aa1137e28fa88d04f5e90220f57fc808fd256b516840922d0938d6b0f3f30b937ddc3568865c9a21fa1a2d8a51788e6f9a
FILENAME IntelRealSense-librealsense-lz4.diff
)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO IntelRealSense/librealsense
REF "v${VERSION}"
SHA512 5b5998560ab6a7d81a23b1d84194f4cf3e123af1d46711127d838dc37c3eb1414f232bf0e1a444c68212fabcd79c3e4e1c47ff87b878266558e0027bd522447f
SHA512 e38350be3eba6fec97096abfff652a36d0e37ba95baf1b40841cc180e2d650c9abfa53d99e1c0a7767fa0c91ac4d9780702b51078f9c1564848121c1048749f4
HEAD_REF master
PATCHES
add-include-chrono.patch # https://github.com/IntelRealSense/librealsense/pull/13537
android-config.diff
build.diff
"${lz4_patch}"
devendor-lz4.diff # https://github.com/IntelRealSense/librealsense/pull/13803#issuecomment-3072432118
devendor-nlohmann-json.diff
devendor-stb.diff
fix_openni2.patch
libusb.diff
using-firmware.diff
add-stdexcept.diff # https://github.com/IntelRealSense/librealsense/pull/14299
fix-rsutils-includes.patch
)
file(GLOB extern "${SOURCE_PATH}/CMake/extern_*.cmake")
file(REMOVE_RECURSE
Expand All @@ -38,7 +30,7 @@ string(REGEX MATCH "D4XX_RECOMMENDED_FIRMWARE_VERSION \"([0-9]+.[0-9]+.[0-9]+.[0
set(firmware_filename "D4XX_FW_Image-${CMAKE_MATCH_1}.bin")
vcpkg_download_distfile(firmware_distfile
URLS "https://librealsense.intel.com/Releases/RS4xx/FW/${firmware_filename}"
SHA512 c465cedba2a8df713fb7900bb60a448b15e53ac013175cf7c152909bc9f2324cf46efd1323954633d7c011e33a27f9426eb1347ad48d92839a68c7e4fa680f94
SHA512 1098738B754D14BCF529541986E0C39C9EFD481CAE3954F5F01233B12859E289BFA62B97C06CE644B7CE704ED8CAB066F1BD91CBE2287CC6CC20A671213CDCFF
FILENAME "IntelRealSense-${firmware_filename}"
)

Expand Down
3 changes: 1 addition & 2 deletions ports/realsense2/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "realsense2",
"version": "2.56.3",
"port-version": 1,
"version": "2.56.5",
"description": "Intel® RealSense™ SDK 2.0 is a cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300).",
"homepage": "https://github.com/IntelRealSense/librealsense",
"license": "Apache-2.0",
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -8473,8 +8473,8 @@
"port-version": 0
},
"realsense2": {
"baseline": "2.56.3",
"port-version": 1
"baseline": "2.56.5",
"port-version": 0
},
"rebind": {
"baseline": "5.2.2",
Expand Down
5 changes: 5 additions & 0 deletions versions/r-/realsense2.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "237e09a4704f29a88164112ab45c8cdd5ee50a26",
"version": "2.56.5",
"port-version": 0
},
{
"git-tree": "aa980b8483d170b67075925135782123f561dd8a",
"version": "2.56.3",
Expand Down
Loading