Skip to content

Commit f06bb0b

Browse files
authored
Merge pull request #161 from lvjonok/feat/feb-rebuild
Full Rebuild (Sync) of February 2026: bump ros2-distro-mutex to 0.14.0 and build_number to 15
2 parents bcdd314 + 57c7e21 commit f06bb0b

7 files changed

Lines changed: 941 additions & 768 deletions

patch/dependencies.yaml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ intra_process_demo:
3535
# Depends on opencv with gui support, see https://github.com/ros2/demos/blob/8f361a1ece2daae54016959f3ea9ab2e7692ddbb/intra_process_demo/include/image_pipeline/image_view_node.hpp#L58
3636
add_run: ["libopencv * *qt6*"]
3737
rviz_ogre_vendor:
38-
add_host: ["zlib", "freeimage", "freetype", "assimp", "zziplib", "pugixml", "${{ 'libglu' if linux }}"]
39-
add_build: ["vcstool"]
38+
add_host: ["zlib", "freeimage", "freetype", "assimp", "zziplib", "pugixml", "${{ 'libglu' if linux }}", "setuptools <81"]
39+
add_build: ["vcstool", "setuptools <81"]
4040
add_run: ["assimp"]
4141
pcl_conversions:
4242
add_host: ["${{ 'libgl-devel' if linux }}", "${{ 'libopengl-devel' if linux }}", "libboost-devel"]
@@ -171,9 +171,11 @@ velodyne_pointcloud:
171171
add_host: ["libboost-devel"]
172172
# TODO unvendor?!
173173
uncrustify_vendor:
174-
add_build: ["vcstool"]
174+
add_build: ["vcstool", "setuptools <81"]
175+
add_host: ["setuptools <81"]
175176
mimick_vendor:
176-
add_build: ["vcstool"]
177+
add_build: ["vcstool", "setuptools <81"]
178+
add_host: ["setuptools <81"]
177179
gz_cmake_vendor:
178180
# https://github.com/gazebo-release/gz_cmake_vendor/blob/jazzy/CMakeLists.txt#L6 for select the right major version
179181
# (this is true for all gz-* vendor packages) or https://github.com/gazebo-tooling/gazebodistro/blob/master/collection-harmonic.yaml
@@ -260,3 +262,7 @@ livox_ros_driver2:
260262
add_host: ["livox-sdk2"]
261263
moveit2_tutorials:
262264
add_host: ["${{ 'libgl-devel' if linux }}", "${{ 'libopengl-devel' if linux }}"]
265+
openvdb_vendor:
266+
add_host: ["openvdb"]
267+
spatio_temporal_voxel_layer:
268+
add_host: ["${{ 'libgl-devel' if linux }}", "${{ 'libopengl-devel' if linux }}"]

patch/ros-jazzy-foxglove-bridge.osx.patch

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index 611816f..597036e 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -185,6 +185,13 @@ target_link_libraries(foxglove_bridge_component
6+
rosx_introspection::rosx_introspection
7+
)
8+
9+
+# The Foxglove SDK bundles Rust crates that call into system frameworks on macOS.
10+
+if(APPLE)
11+
+ find_library(SECURITY_FRAMEWORK Security REQUIRED)
12+
+ find_library(COREFOUNDATION_FRAMEWORK CoreFoundation REQUIRED)
13+
+ target_link_libraries(foxglove_bridge_component ${SECURITY_FRAMEWORK} ${COREFOUNDATION_FRAMEWORK})
14+
+endif()
15+
+
16+
rclcpp_components_register_nodes(foxglove_bridge_component "foxglove_bridge::FoxgloveBridge")
17+
enable_strict_compiler_warnings(foxglove_bridge_component)
18+
119
diff --git a/src/ros2_foxglove_bridge.cpp b/src/ros2_foxglove_bridge.cpp
220
index 978c732..4883047 100644
321
--- a/src/ros2_foxglove_bridge.cpp
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
diff --git a/CMakeLists.txt b/CMakeLists.txt
2-
index a72a85b..9550019 100644
2+
index 611816f..7a16ab2 100644
33
--- a/CMakeLists.txt
44
+++ b/CMakeLists.txt
5-
@@ -70,6 +70,18 @@ else()
5+
@@ -75,6 +75,18 @@ else()
66
elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
77
set(FOXGLOVE_SDK_PLATFORM "x86_64-unknown-linux-gnu")
8-
set(FOXGLOVE_SDK_SHA "574c3ce006d6131d6519b416f25ef37c5b2a0721ef49c894286c79a5a5e0b4fc")
8+
set(FOXGLOVE_SDK_SHA "8e4967ec7446a06b5a04c47b54bcd4cecff2ad8776e002ef3803ed4a7076841d")
99
+ elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
1010
+ set(FOXGLOVE_SDK_PLATFORM "aarch64-apple-darwin")
11-
+ set(FOXGLOVE_SDK_SHA "2ca081fa503211aba4e89fba26f5edf6174e3978620267f95700e1da559922e3")
11+
+ set(FOXGLOVE_SDK_SHA "0799fcb999616fe25d16d7e4b2894adb6f7fa97ce9671bd908d8412505887bec")
1212
+ elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
1313
+ set(FOXGLOVE_SDK_PLATFORM "x86_64-apple-darwin")
14-
+ set(FOXGLOVE_SDK_SHA "c639c62143995bfc79e9cbe9eb9c170269acfa55b733bc2787742a1801d3b7b3")
14+
+ set(FOXGLOVE_SDK_SHA "3e0d7e575e7de9351ae71a0201ede5c00020f2e9d12cc5cd08e2c896033c9fa9")
1515
+ elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64")
1616
+ set(FOXGLOVE_SDK_PLATFORM "aarch64-pc-windows-msvc")
17-
+ set(FOXGLOVE_SDK_SHA "3d1fc78ab0e870ad524cecd53857b9297999fe162548459287c477a307fff832")
17+
+ set(FOXGLOVE_SDK_SHA "9bb816d97a69bf8f5b81559027955bf9277fcd60204cd11495dff352f49cb35e")
1818
+ elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64")
1919
+ set(FOXGLOVE_SDK_PLATFORM "x86_64-pc-windows-msvc")
20-
+ set(FOXGLOVE_SDK_SHA "f45238d567a9d576ba201f5bc407f0240bbb987f3c2e7cebda562269c7c1c310")
20+
+ set(FOXGLOVE_SDK_SHA "219f84aa184eb1224d8ba35bc84412dc253137e65b3d6c5f0ffd80a8b0c2dbd2")
2121
else()
2222
message(FATAL_ERROR "Unsupported platform/architecture combination: ${CMAKE_SYSTEM_PROCESSOR}-${CMAKE_SYSTEM_NAME}")
2323
endif()
Lines changed: 58 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,8 @@
11
diff --git a/CMakeLists.txt b/CMakeLists.txt
2-
index a72a85b..8b69dda 100644
2+
index 611816f..73c9906 100644
33
--- a/CMakeLists.txt
44
+++ b/CMakeLists.txt
5-
@@ -70,6 +70,18 @@ else()
6-
elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
7-
set(FOXGLOVE_SDK_PLATFORM "x86_64-unknown-linux-gnu")
8-
set(FOXGLOVE_SDK_SHA "574c3ce006d6131d6519b416f25ef37c5b2a0721ef49c894286c79a5a5e0b4fc")
9-
+ elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
10-
+ set(FOXGLOVE_SDK_PLATFORM "aarch64-apple-darwin")
11-
+ set(FOXGLOVE_SDK_SHA "015d660ede95ad4d37f84e83e8ebbe81545f1d3c9fea4a24667baf692267f151")
12-
+ elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
13-
+ set(FOXGLOVE_SDK_PLATFORM "x86_64-apple-darwin")
14-
+ set(FOXGLOVE_SDK_SHA "07a1903013639ae872be9fcee8ccf72224a20cc142e642063a226ba2c2b54196")
15-
+ elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64")
16-
+ set(FOXGLOVE_SDK_PLATFORM "aarch64-pc-windows-msvc")
17-
+ set(FOXGLOVE_SDK_SHA "caa797bad483ee2f1013c39a8997a409a45515f15e62ead9011351f12596f57d")
18-
+ elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64")
19-
+ set(FOXGLOVE_SDK_PLATFORM "x86_64-pc-windows-msvc")
20-
+ set(FOXGLOVE_SDK_SHA "906a5658a207dfe929a6b75f39e0064efdb6182d923e695617fcfa10d311f349")
21-
else()
22-
message(FATAL_ERROR "Unsupported platform/architecture combination: ${CMAKE_SYSTEM_PROCESSOR}-${CMAKE_SYSTEM_NAME}")
23-
endif()
24-
@@ -91,7 +103,16 @@ else()
5+
@@ -96,7 +96,16 @@ else()
256
file(GLOB_RECURSE FOXGLOVE_SDK_SOURCES CONFIGURE_DEPENDS "${foxglove_sdk_SOURCE_DIR}/src/*.cpp")
267
target_sources(foxglove_cpp_static PRIVATE ${FOXGLOVE_SDK_SOURCES})
278
set_target_properties(foxglove_cpp_static PROPERTIES POSITION_INDEPENDENT_CODE ON)
@@ -40,10 +21,46 @@ index a72a85b..8b69dda 100644
4021

4122
find_program(GIT_SCM git DOC "Git version control")
4223
diff --git a/src/message_definition_cache.cpp b/src/message_definition_cache.cpp
43-
index f338db9..d766894 100644
24+
index 5ed9d12..83d1490 100644
4425
--- a/src/message_definition_cache.cpp
4526
+++ b/src/message_definition_cache.cpp
46-
@@ -225,16 +225,16 @@ const MessageSpec& MessageDefinitionCache::load_message_spec(
27+
@@ -217,34 +217,52 @@ const MessageSpec& MessageDefinitionCache::load_message_spec(
28+
// Get the package share directory, or throw a PackageNotFoundError
29+
// TODO: FLE-167: Remove warning once ament_index_cpp is updated and synced across all current
30+
// ROS2 distributions.
31+
+#if defined(__GNUC__) || defined(__clang__)
32+
#pragma GCC diagnostic push
33+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
34+
+#elif defined(_MSC_VER)
35+
+#pragma warning(push)
36+
+#pragma warning(disable : 4996)
37+
+#endif
38+
const std::string share_dir = ament_index_cpp::get_package_share_directory(package);
39+
+#if defined(__GNUC__) || defined(__clang__)
40+
#pragma GCC diagnostic pop
41+
+#elif defined(_MSC_VER)
42+
+#pragma warning(pop)
43+
+#endif
44+
45+
// Get the rosidl_interfaces index contents for this package
46+
// TODO: FLE-167: Remove warning once ament_index_cpp is updated and synced across all current
47+
// ROS2 distributions.
48+
+#if defined(__GNUC__) || defined(__clang__)
49+
#pragma GCC diagnostic push
50+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
51+
+#elif defined(_MSC_VER)
52+
+#pragma warning(push)
53+
+#pragma warning(disable : 4996)
54+
+#endif
55+
std::string index_contents;
56+
if (!ament_index_cpp::get_resource("rosidl_interfaces", package, index_contents)) {
57+
throw DefinitionNotFoundError(definition_identifier.package_resource_name);
58+
}
59+
+#if defined(__GNUC__) || defined(__clang__)
60+
#pragma GCC diagnostic pop
61+
+#elif defined(_MSC_VER)
62+
+#pragma warning(pop)
63+
+#endif
4764

4865
// Find the first line that ends with the filename we're looking for
4966
const auto lines = split_string(index_contents);
@@ -63,23 +80,29 @@ index f338db9..d766894 100644
6380
std::ifstream file{full_path};
6481
if (!file.good()) {
6582
throw DefinitionNotFoundError(definition_identifier.package_resource_name);
66-
@@ -376,8 +376,8 @@ std::pair<MessageDefinitionFormat, const std::string&> MessageDefinitionCache::g
67-
result = delimiter(root_definition_identifier) + append_recursive(root_definition_identifier);
68-
}
69-
70-
- auto [it, _] = full_text_cache_.emplace(root_package_resource_name, result);
71-
- return {format, it->second};
72-
+ auto [cache_it, _] = full_text_cache_.emplace(root_package_resource_name, result);
73-
+ return {format, cache_it->second};
74-
}
75-
76-
} // namespace foxglove_bridge
7783
diff --git a/src/ros2_foxglove_bridge.cpp b/src/ros2_foxglove_bridge.cpp
78-
index 978c732..83dce52 100644
84+
index 299ae62..4e03aef 100644
7985
--- a/src/ros2_foxglove_bridge.cpp
8086
+++ b/src/ros2_foxglove_bridge.cpp
8187
@@ -1,3 +1,4 @@
8288
+#define _CRT_SECURE_NO_WARNINGS
8389
#include <filesystem>
8490
#include <fstream>
8591
#include <unordered_set>
92+
@@ -201,7 +202,7 @@ FoxgloveBridge::FoxgloveBridge(const rclcpp::NodeOptions& options)
93+
_clientCountPublisher = this->create_publisher<std_msgs::msg::UInt32>(
94+
CLIENT_COUNT_TOPIC, rclcpp::QoS{rclcpp::KeepLast(1)}.transient_local());
95+
auto init_msg = std_msgs::msg::UInt32();
96+
- init_msg.data = _server->clientCount();
97+
+ init_msg.data = static_cast<decltype(init_msg.data)>(_server->clientCount());
98+
_clientCountPublisher->publish(
99+
init_msg); // Initialize transient local topic to current connection count
100+
}
101+
@@ -1109,6 +1110,6 @@ void FoxgloveBridge::publishClientCount() {
102+
}
103+
const auto currentCount = _server->clientCount();
104+
auto msg = std_msgs::msg::UInt32{};
105+
- msg.data = currentCount;
106+
+ msg.data = static_cast<decltype(msg.data)>(currentCount);
107+
_clientCountPublisher->publish(msg);
108+
}

pkg_additional_info.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,5 +153,3 @@ lanelet2_python:
153153
additional_cmake_args: "-DCMAKE_CXX_STANDARD=17 -DCMAKE_CXX_STANDARD_REQUIRED=ON -DCMAKE_CXX_EXTENSIONS=OFF"
154154
robot_state_publisher:
155155
additional_cmake_args: "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON"
156-
ur_calibration:
157-
build_number: 15

0 commit comments

Comments
 (0)