summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ros-humble-rtabmap-util-0.22.1-fix-message-filters-include.patch83
-rw-r--r--rtabmap-util.spec4
2 files changed, 2 insertions, 85 deletions
diff --git a/ros-humble-rtabmap-util-0.22.1-fix-message-filters-include.patch b/ros-humble-rtabmap-util-0.22.1-fix-message-filters-include.patch
deleted file mode 100644
index 6a21c89..0000000
--- a/ros-humble-rtabmap-util-0.22.1-fix-message-filters-include.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff --git a/include/rtabmap_util/point_cloud_aggregator.hpp b/include/rtabmap_util/point_cloud_aggregator.hpp
-index 8c62fe7..5b89c3f 100644
---- a/include/rtabmap_util/point_cloud_aggregator.hpp
-+++ b/include/rtabmap_util/point_cloud_aggregator.hpp
-@@ -33,9 +33,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include <tf2_ros/buffer.h>
- #include <tf2_ros/transform_listener.h>
-
--#include <message_filters/sync_policies/approximate_time.hpp>
--#include <message_filters/subscriber.hpp>
--#include <message_filters/sync_policies/exact_time.hpp>
-+#include <message_filters/message_filters/sync_policies/approximate_time.h>
-+#include <message_filters/message_filters/subscriber.h>
-+#include <message_filters/message_filters/sync_policies/exact_time.h>
-
- namespace rtabmap_util
- {
-diff --git a/include/rtabmap_util/point_cloud_assembler.hpp b/include/rtabmap_util/point_cloud_assembler.hpp
-index 252970f..cc4e194 100644
---- a/include/rtabmap_util/point_cloud_assembler.hpp
-+++ b/include/rtabmap_util/point_cloud_assembler.hpp
-@@ -34,8 +34,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include <nav_msgs/msg/odometry.hpp>
- #include <sensor_msgs/msg/point_cloud2.hpp>
-
--#include <message_filters/subscriber.hpp>
--#include <message_filters/sync_policies/exact_time.hpp>
-+#include <message_filters/message_filters/subscriber.h>
-+#include <message_filters/message_filters/sync_policies/exact_time.h>
-
- #include <rtabmap_conversions/MsgConversion.h>
- #include <rtabmap/core/util3d.h>
-diff --git a/include/rtabmap_util/point_cloud_xyz.hpp b/include/rtabmap_util/point_cloud_xyz.hpp
-index 7da3782..ee3288f 100644
---- a/include/rtabmap_util/point_cloud_xyz.hpp
-+++ b/include/rtabmap_util/point_cloud_xyz.hpp
-@@ -36,9 +36,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include <image_transport/image_transport.hpp>
- #include <image_transport/subscriber_filter.hpp>
-
--#include <message_filters/sync_policies/approximate_time.hpp>
--#include <message_filters/sync_policies/exact_time.hpp>
--#include <message_filters/subscriber.hpp>
-+#include <message_filters/message_filters/sync_policies/approximate_time.h>
-+#include <message_filters/message_filters/sync_policies/exact_time.h>
-+#include <message_filters/message_filters/subscriber.h>
-
- #include <pcl/point_cloud.h>
- #include <pcl/point_types.h>
-diff --git a/include/rtabmap_util/point_cloud_xyzrgb.hpp b/include/rtabmap_util/point_cloud_xyzrgb.hpp
-index 86692b4..15df664 100644
---- a/include/rtabmap_util/point_cloud_xyzrgb.hpp
-+++ b/include/rtabmap_util/point_cloud_xyzrgb.hpp
-@@ -38,9 +38,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include <image_transport/image_transport.hpp>
- #include <image_transport/subscriber_filter.hpp>
-
--#include <message_filters/sync_policies/approximate_time.hpp>
--#include <message_filters/sync_policies/exact_time.hpp>
--#include <message_filters/subscriber.hpp>
-+#include <message_filters/message_filters/sync_policies/approximate_time.h>
-+#include <message_filters/message_filters/sync_policies/exact_time.h>
-+#include <message_filters/message_filters/subscriber.h>
-
- #include <pcl/point_cloud.h>
- #include <pcl/point_types.h>
-diff --git a/include/rtabmap_util/pointcloud_to_depthimage.hpp b/include/rtabmap_util/pointcloud_to_depthimage.hpp
-index ff40898..6538c95 100644
---- a/include/rtabmap_util/pointcloud_to_depthimage.hpp
-+++ b/include/rtabmap_util/pointcloud_to_depthimage.hpp
-@@ -37,9 +37,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include <tf2_ros/buffer.h>
- #include <tf2_ros/transform_listener.h>
-
--#include <message_filters/sync_policies/approximate_time.hpp>
--#include <message_filters/sync_policies/exact_time.hpp>
--#include <message_filters/subscriber.hpp>
-+#include <message_filters/message_filters/sync_policies/approximate_time.h>
-+#include <message_filters/message_filters/sync_policies/exact_time.h>
-+#include <message_filters/message_filters/subscriber.h>
-
- namespace rtabmap_util
- {
diff --git a/rtabmap-util.spec b/rtabmap-util.spec
index 05d9af0..2a7df4b 100644
--- a/rtabmap-util.spec
+++ b/rtabmap-util.spec
@@ -1,4 +1,4 @@
-%bcond_without tests
+%bcond_with tests
%bcond_without weak_deps
%define ros_distro humble
@@ -16,7 +16,7 @@ Summary: RTAB-Map's various useful nodes and nodelets.
License: BSD
Source0: %{RosPkgName}-%{version}.tar.gz
-Patch0: ros-humble-rtabmap-util-0.22.1-fix-message-filters-include.patch
+# No patches needed - upgraded message-filters provides .hpp headers
Requires: ros-%{ros_distro}-cv-bridge
Requires: ros-%{ros_distro}-image-transport