diff --git a/ports/realsense2/add-include-chrono.patch b/ports/realsense2/add-include-chrono.patch deleted file mode 100644 index 62bfc5f761..0000000000 --- a/ports/realsense2/add-include-chrono.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/platform/uvc-device.h b/src/platform/uvc-device.h -index 48bd19e..b626799 100644 ---- a/src/platform/uvc-device.h -+++ b/src/platform/uvc-device.h -@@ -15,6 +15,7 @@ - #include - #include - #include -+#include - #include - #include // find - diff --git a/ports/realsense2/add-stdexcept.diff b/ports/realsense2/add-stdexcept.diff index 01a0bbd9b0..63af1c8704 100644 --- a/ports/realsense2/add-stdexcept.diff +++ b/ports/realsense2/add-stdexcept.diff @@ -22,3 +22,16 @@ index d22b142..68c62d5 100644 namespace librealsense { + +diff --git a/third-party/rsutils/src/control-c-handler.cpp b/third-party/rsutils/src/control-c-handler.cpp +index 7d73013ce..ff534155c 100644 +--- a/third-party/rsutils/src/control-c-handler.cpp ++++ b/third-party/rsutils/src/control-c-handler.cpp +@@ -6,6 +6,7 @@ + + #include + #include ++#include + + + namespace rsutils { diff --git a/ports/realsense2/portfile.cmake b/ports/realsense2/portfile.cmake index c88c5ec5f8..043899d25e 100644 --- a/ports/realsense2/portfile.cmake +++ b/ports/realsense2/portfile.cmake @@ -1,20 +1,12 @@ -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 @@ -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}" ) diff --git a/ports/realsense2/vcpkg.json b/ports/realsense2/vcpkg.json index e527c8ffa8..eda33674f9 100644 --- a/ports/realsense2/vcpkg.json +++ b/ports/realsense2/vcpkg.json @@ -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", diff --git a/versions/baseline.json b/versions/baseline.json index c28ac26c0f..b5212b0034 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8453,8 +8453,8 @@ "port-version": 0 }, "realsense2": { - "baseline": "2.56.3", - "port-version": 1 + "baseline": "2.56.5", + "port-version": 0 }, "rebind": { "baseline": "5.3.1", diff --git a/versions/r-/realsense2.json b/versions/r-/realsense2.json index 89d8512cb6..bd5c7571fc 100644 --- a/versions/r-/realsense2.json +++ b/versions/r-/realsense2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7ac60fd0850994d747081839db61a8add2f66e45", + "version": "2.56.5", + "port-version": 0 + }, { "git-tree": "aa980b8483d170b67075925135782123f561dd8a", "version": "2.56.3",