Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[RealSense] Update to 2.54.1 #32389

Merged
merged 11 commits into from
Jul 11, 2023
Merged

[RealSense] Update to 2.54.1 #32389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6fa6347
version partly updated
Tamir91 Jun 19, 2023
237cf32
SHA added
Tamir91 Jun 22, 2023
b4a81ba
git-tree apdated
Tamir91 Jun 22, 2023
7fc6f2d
fix_config_osx patch removed
Tamir91 Jun 27, 2023
0a0fc06
Scope fixed
Tamir91 Jul 4, 2023
32deefd
Revert "Scope fixed"
Tamir91 Jul 5, 2023
a889891
brackets fixed
Tamir91 Jul 5, 2023
20455f8
[realsense2] new port
Tamir91 Jul 6, 2023
9c99f17
git-tree updated
Tamir91 Jul 6, 2023
a15d8ae
fixing error with fw.res
Tamir91 Jul 10, 2023
784b009
SHA port updated
Tamir91 Jul 10, 2023
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/fix_config_osx.patch
View file
Open in desktop

This file was deleted.

9 changes: 5 additions & 4 deletions ports/realsense2/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO IntelRealSense/librealsense
REF v2.53.1
SHA512 ea975cf919f483dc6669bd3fbce6c301df2ffadbe592972fdec8051de373374a5243565cb87b592f21f017c5ca319634617bacb0c49557136fda3620c59f2101
REF v2.54.1
SHA512 9b7146a5f6a4152d95286f679e0f5314ab0b040f67a030e42dfe01ad995af486d3d158d1ac7ef0bbe783a90e067d32e4bb4ba1a524fe75a89be6c7fe9c3a30ed
HEAD_REF master
PATCHES
fix_openni2.patch
fix_config_osx.patch
)

file(COPY "${SOURCE_PATH}/src/win7/drivers/IntelRealSense_D400_series_win7.inf" DESTINATION "${SOURCE_PATH}")
string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_CRT_LINKAGE)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
tm2 BUILD_WITH_TM2
tools BUILD_TOOLS
)

Expand Down Expand Up @@ -50,6 +48,9 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/realsense2)
if(VCPKG_TARGET_IS_WINDOWS)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/realsense2/realsense2Targets.cmake" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" "\${_IMPORT_PREFIX}")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/realsense2/realsense2Targets.cmake" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" "\${_IMPORT_PREFIX}")

file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/common/fw")
file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/common/fw/fw.res" DESTINATION "${CURRENT_PACKAGES_DIR}/common/fw")
endif()
vcpkg_copy_pdbs()

Expand Down
5 changes: 1 addition & 4 deletions ports/realsense2/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "realsense2",
"version": "2.53.1",
"version": "2.54.1",
"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 All @@ -25,9 +25,6 @@
"openni2"
]
},
"tm2": {
"description": "Build Intel® RealSense™ T265 device"
},
Comment on lines -28 to -30
Copy link
Contributor

@autoantwort autoantwort Aug 8, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

It seems that rtabmap still depends on this:

vcpkg/ports/rtabmap/vcpkg.json

Lines 117 to 128 in ad46340

"realsense2": {
"description": "Build RTAB-Map with RealSense2 camera driver",
"dependencies": [
{
"name": "realsense2",
"default-features": false,
"features": [
"tm2"
]
}
]
},

"tools": {
"description": "Build Intel® RealSense™ tools"
}
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7077,7 +7077,7 @@
"port-version": 4
},
"realsense2": {
"baseline": "2.53.1",
"baseline": "2.54.1",
"port-version": 0
},
"recast": {
Expand Down
5 changes: 5 additions & 0 deletions versions/r-/realsense2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ba09c586ba854502c24f6abf1b3307e964c8ae16",
"version": "2.54.1",
"port-version": 0
},
{
"git-tree": "90cd2f16e28c916f46da66fea9e6de742a26b0c2",
"version": "2.53.1",
Expand Down