automatic import of ros-humble-mavros-extras

3 files changed, 29 insertions, 2 deletions

diff --git a/hil-gps-id-yaw-compat.patch b/hil-gps-id-yaw-compat.patch
new file mode 100644
index 0000000..dc49eec
--- /dev/null
+++ b/hil-gps-id-yaw-compat.patch
@@ -0,0 +1,17 @@
+--- a/mavros_extras/src/plugins/hil.cpp	2026-10-12 10:25:09.627053991 +0000
++++ b/mavros_extras/src/plugins/hil.cpp	2026-10-12 10:25:09.636054018 +0000
+@@ -240,8 +240,12 @@
+     gps.vd = req->vd;
+     gps.cog = req->cog;
+     gps.satellites_visible = req->satellites_visible;
+-    gps.id = req->id;
+-    gps.yaw = req->yaw;
++    // id and yaw fields were added to HilGPS.msg in mavros 2.16.0;
++    // the ROS SIG repo ships mavros_msgs 2.14.0 which lacks these fields.
++    // Leave gps.id/gps.yaw at default (0) - HIL_GPS still sent, just
++    // without optional id/yaw from the ROS message.
++    // gps.id = req->id;
++    // gps.yaw = req->yaw;
+     // [[[end]]] (sum: 7jKMh3Vikx)
+ 
+     uas->send_message(gps);
diff --git a/ros-humble-mavros-extras.spec b/ros-humble-mavros-extras.spec
index e9fa2c7..ccad114 100644
--- a/ros-humble-mavros-extras.spec
+++ b/ros-humble-mavros-extras.spec
@@ -4,13 +4,16 @@
 
 Name:       ros-%{ros_distro}-%{RosPkgName}
 Version:    2.16.0
-Release:    3%{?dist}
+Release:    4%{?dist}
 Summary:    Extra nodes and plugins for MAVROS
 
 License:    GPLv3 and LGPLv3 and BSD
 URL:        https://github.com/mavlink/mavros
 Source0:    https://github.com/mavlink/mavros/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
+# Patch: mavros_msgs 2.14.0 (ROS SIG repo) lacks HilGPS.id/yaw fields added in 2.16.0
+Patch0:     hil-gps-id-yaw-compat.patch
+
 # debug subpackage not meaningful (/opt prefix, nonstandard strip paths)
 %global debug_package %{nil}
 # /opt python bytecode compilation writes standard sitelib paths — strip brp-python-bytecompile
@@ -145,6 +148,13 @@ cd mavros_extras/.obj
 /opt/ros/%{ros_distro}
 
 %changelog
+* Mon Oct 12 2026 AI Importer <ai-importer@openeuler.org> - 2.16.0-4
+- Add Patch0 (hil-gps-id-yaw-compat.patch): comment out gps.id/gps.yaw
+  assignments in hil.cpp that reference HilGPS fields added in mavros 2.16.0.
+  The ROS SIG repo ships mavros_msgs 2.14.0 which lacks these fields, causing
+  "has no member named 'id'/'yaw'" compile errors at hil.cpp:243-244.
+  The MAVLink HIL_GPS message still has id/yaw (defaults to 0).
+
 * Mon Oct 12 2026 AI Importer <ai-importer@openeuler.org> - 2.16.0-3
 - Escape %%cmake token in a %%build comment: rpm expands %%macros even
   inside comments, so the openEuler %%cmake macro's multi-line body (which
diff --git a/sources b/sources
index adf14aa..14ebb66 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-19fe31661b7c566b2264f0f4d3f3e8ce  ros-humble-mavros-extras-2.16.0.tar.gz
+529dbde82cd5a7d6bc48030e744513c5  ros-humble-mavros-extras-2.16.0.tar.gz