Skip to content

Refresh patches that no longer apply to the current sources #67

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

Merged
Tobias-Fischer merged 1 commit into from
Oct 10, 2026
Merged

Refresh patches that no longer apply to the current sources #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 0 additions & 13 deletions distros/humble/patch/ros2-autoware-downsample-filters.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,3 @@
diff --git a/src/voxel_grid_downsample_filter/faster_voxel_grid_downsample_filter.cpp b/src/voxel_grid_downsample_filter/faster_voxel_grid_downsample_filter.cpp
index 2e418c0..428b6bc 100644
--- a/src/voxel_grid_downsample_filter/faster_voxel_grid_downsample_filter.cpp
+++ b/src/voxel_grid_downsample_filter/faster_voxel_grid_downsample_filter.cpp
@@ -165,7 +165,7 @@ FasterVoxelGridDownsampleFilter::calc_centroids_each_voxel(
for (size_t global_offset = 0; global_offset + input->point_step <= input->data.size();
global_offset += input->point_step) {
Eigen::Vector4f point = get_point_from_global_offset(input, global_offset);
- if (std::isfinite(point[0]) && std::isfinite(point[1]), std::isfinite(point[2])) {
+ if (std::isfinite(point[0]) && std::isfinite(point[1]) && std::isfinite(point[2])) {
// Calculate the voxel index to which the point belongs
int ijk0 = static_cast<int>(std::floor(point[0] * inverse_voxel_size_[0]) - min_voxel[0]);
int ijk1 = static_cast<int>(std::floor(point[1] * inverse_voxel_size_[1]) - min_voxel[1]);
diff --git a/src/voxel_grid_downsample_filter/voxel_grid_downsample_filter_node.cpp b/src/voxel_grid_downsample_filter/voxel_grid_downsample_filter_node.cpp
index 241239d..4b02608 100644
--- a/src/voxel_grid_downsample_filter/voxel_grid_downsample_filter_node.cpp
Expand Down
66 changes: 0 additions & 66 deletions distros/humble/patch/ros2-moveit-ros-perception.osx.patch
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion distros/humble/patch/ros2-rclpy.osx.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ index a9966c0..30cb145 100644
endfunction()

# Split from main extension and converted to pybind11
-pybind11_add_module(_rclpy_pybind11 SHARED
-pybind11_add_module(_rclpy_pybind11
+pybind11_add_module(_rclpy_pybind11 MODULE NO_EXTRAS
src/rclpy/_rclpy_logging.cpp
src/rclpy/_rclpy_pybind11.cpp
Expand Down
39 changes: 14 additions & 25 deletions distros/rolling/patch/ros2-plotjuggler.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,5 @@
diff --git a/plotjuggler_plugins/ParserROS/ros_parser.cpp b/plotjuggler_plugins/ParserROS/ros_parser.cpp
index 1ee03a8b..cd711f28 100644
--- a/plotjuggler_plugins/ParserROS/ros_parser.cpp
+++ b/plotjuggler_plugins/ParserROS/ros_parser.cpp
@@ -113,7 +113,8 @@ bool ParserROS::parseMessage(const PJ::MessageRef serialized_msg, double& timest
return true;
}

- _parser.deserialize(serialized_msg, &_flat_msg, _deserializer.get());
+ _parser.deserialize(Span<const uint8_t>(serialized_msg.data(), serialized_msg.size()),
+ &_flat_msg, _deserializer.get());

if (_has_header && this->useEmbeddedTimestamp())
{
diff --git a/plotjuggler_plugins/ParserROS/rosx_introspection/CMakeLists.txt b/plotjuggler_plugins/ParserROS/rosx_introspection/CMakeLists.txt
index 1111111..2222222 100644
--- a/plotjuggler_plugins/ParserROS/rosx_introspection/CMakeLists.txt
+++ b/plotjuggler_plugins/ParserROS/rosx_introspection/CMakeLists.txt
@@ -26,4 +26,4 @@ target_include_directories(rosx_introspection PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>)

-target_compile_features(rosx_introspection PUBLIC cxx_std_17)
+target_compile_features(rosx_introspection PUBLIC cxx_std_20)
diff --git a/plotjuggler_app/mainwindow.cpp b/plotjuggler_app/mainwindow.cpp
index c84d9066..b493dd0d 100644
index c84d906..b493dd0 100644
--- a/plotjuggler_app/mainwindow.cpp
+++ b/plotjuggler_app/mainwindow.cpp
@@ -68,8 +68,8 @@
Expand All @@ -48,3 +24,16 @@ index c84d9066..b493dd0d 100644
_plugin_manager.loadPluginsFromFolder(ros2_path);
#endif
}
diff --git a/plotjuggler_plugins/ParserROS/rosx_introspection/CMakeLists.txt b/plotjuggler_plugins/ParserROS/rosx_introspection/CMakeLists.txt
index c85f032..c643d97 100644
--- a/plotjuggler_plugins/ParserROS/rosx_introspection/CMakeLists.txt
+++ b/plotjuggler_plugins/ParserROS/rosx_introspection/CMakeLists.txt
@@ -28,7 +28,7 @@ target_include_directories(rosx_introspection PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>)

-target_compile_features(rosx_introspection PUBLIC cxx_std_17)
+target_compile_features(rosx_introspection PUBLIC cxx_std_20)

# peglib.h (used by idl_parser.cpp) checks __cplusplus >= 201703L, but MSVC
# keeps __cplusplus at 199711L for ABI back-compat unless /Zc:__cplusplus
Loading