diff options
| -rw-r--r-- | agni-tf-tools.spec | 8 | ||||
| -rw-r--r-- | fix-rviz-update-signature.patch | 23 |
2 files changed, 5 insertions, 26 deletions
diff --git a/agni-tf-tools.spec b/agni-tf-tools.spec index 4747bbf..8381b59 100644 --- a/agni-tf-tools.spec +++ b/agni-tf-tools.spec @@ -8,7 +8,6 @@ Summary: GUI and rviz plugin to publish static transforms with Euler angl License: BSD URL: https://github.com/ubi-agni/agni_tf_tools Source0: agni-tf-tools-1.0.0-1.tar.gz -Patch0: fix-rviz-update-signature.patch %global debug_package %{nil} %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') @@ -59,7 +58,10 @@ representations. The rviz plugin also allows configuring the transform with an interactive marker. %prep -%autosetup -n agni-tf-tools-1.0.0-1 +%setup -q -n agni-tf-tools-1.0.0-1 +# rviz_common humble 中 Display::update 签名为 float，源码用 chrono::nanoseconds 需修正 +sed -i 's/void update(std::chrono::nanoseconds wall_dt, std::chrono::nanoseconds ros_dt) override;/void update(float wall_dt, float ros_dt) override;/' src/plugin/TransformPublisherDisplay.h +sed -i '/^void TransformPublisherDisplay::update(std::chrono::nanoseconds wall_dt,/{N;s/void TransformPublisherDisplay::update(std::chrono::nanoseconds wall_dt,\n\s*std::chrono::nanoseconds ros_dt)/void TransformPublisherDisplay::update(float wall_dt,\n float ros_dt)/}' src/plugin/TransformPublisherDisplay.cpp %build source /opt/ros/%{ros_distro}/setup.sh 2>/dev/null || true @@ -87,5 +89,5 @@ make install DESTDIR=%{buildroot} /opt/ros/%{ros_distro} %changelog -* Thu Sep 18 2026 ai-importer <ai-importer@openeuler.org> - 1.0.0-1 +* Wed Sep 18 2024 ai-importer <ai-importer@openeuler.org> - 1.0.0-1 - Initial import (ROS batch) diff --git a/fix-rviz-update-signature.patch b/fix-rviz-update-signature.patch deleted file mode 100644 index bdf4b34..0000000 --- a/fix-rviz-update-signature.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/src/plugin/TransformPublisherDisplay.h -+++ b/src/plugin/TransformPublisherDisplay.h -@@ -71,7 +71,7 @@ protected: - void onInitialize() override; - void onEnable() override; - void onDisable() override; -- void update(std::chrono::nanoseconds wall_dt, std::chrono::nanoseconds ros_dt) override; -+ void update(float wall_dt, float ros_dt) override; - - void addFrameControls(visualization_msgs::msg::InteractiveMarker& im, double scale, bool interactive); - void add6DOFControls(visualization_msgs::msg::InteractiveMarker& im); ---- a/src/plugin/TransformPublisherDisplay.cpp -+++ b/src/plugin/TransformPublisherDisplay.cpp -@@ -144,8 +144,8 @@ void TransformPublisherDisplay::onDisable() { - createInteractiveMarker(NONE); - } - --void TransformPublisherDisplay::update(std::chrono::nanoseconds wall_dt, -- std::chrono::nanoseconds ros_dt) { -+void TransformPublisherDisplay::update(float wall_dt, -+ float ros_dt) { - if (!this->isEnabled()) - return; |