From 0142e1fa26fbb3a8fa1f4a70341e33b774ba4297 Mon Sep 17 00:00:00 2001
From: Arnaud Degroote <arnaud.degroote@isae-supaero.fr>
Date: Tue, 29 Sep 2015 14:40:35 +0200
Subject: [PATCH] [wip/mavlink] Update to version of today
Changes since last revision:
- not documented, but includes a lot of new messages
Package changes:
- the patch fixing the call to mavgen has been merged upstream, so
remove it
- add a new patch to force the non installation of pymavlink
---
mavlink/Makefile | 4 +--
mavlink/PLIST | 31 +++++++++++++++++++-
mavlink/distinfo | 6 ++--
mavlink/patches/patch-cmake | 22 --------------
mavlink/patches/patch-dont-install-pymavlink | 14 +++++++++
5 files changed, 49 insertions(+), 28 deletions(-)
delete mode 100644 mavlink/patches/patch-cmake
create mode 100644 mavlink/patches/patch-dont-install-pymavlink
diff --git a/mavlink/Makefile b/mavlink/Makefile
index e301af84..49a2681d 100644
--- a/mavlink/Makefile
+++ b/mavlink/Makefile
@@ -3,10 +3,10 @@
#
DISTNAME= mavlink-${VERSION}
-VERSION= 20150326
+VERSION= 20150929
CATEGORIES= middleware
-COMMIT= 7a7ce3362706dd0164377d6182ce73f22f4d41ef
+COMMIT= 9fff38f4561b7a6ff32ee71d41e67cf956e541bd
FETCH_METHOD= git
MASTER_SITES= https://github.com/mavlink/mavlink.git@${COMMIT}
MASTER_REPOSITORY= https://github.com/mavlink/mavlink.git
diff --git a/mavlink/PLIST b/mavlink/PLIST
index f9571629..3f54ab9a 100644
--- a/mavlink/PLIST
+++ b/mavlink/PLIST
@@ -1,4 +1,4 @@
-@comment Thu Mar 26 09:13:56 CET 2015
+@comment Tue Sep 29 14:39:50 CEST 2015
include/mavlink/config.h
include/mavlink/v0.9/ardupilotmega/ardupilotmega.h
include/mavlink/v0.9/ardupilotmega/mavlink.h
@@ -174,22 +174,40 @@ include/mavlink/v1.0/ardupilotmega/mavlink_msg_data64.h
include/mavlink/v1.0/ardupilotmega/mavlink_msg_data96.h
include/mavlink/v1.0/ardupilotmega/mavlink_msg_digicam_configure.h
include/mavlink/v1.0/ardupilotmega/mavlink_msg_digicam_control.h
+include/mavlink/v1.0/ardupilotmega/mavlink_msg_ekf_status_report.h
include/mavlink/v1.0/ardupilotmega/mavlink_msg_fence_fetch_point.h
include/mavlink/v1.0/ardupilotmega/mavlink_msg_fence_point.h
include/mavlink/v1.0/ardupilotmega/mavlink_msg_fence_status.h
+include/mavlink/v1.0/ardupilotmega/mavlink_msg_gimbal_axis_calibration_progress.h
include/mavlink/v1.0/ardupilotmega/mavlink_msg_gimbal_control.h
+include/mavlink/v1.0/ardupilotmega/mavlink_msg_gimbal_erase_firmware_and_config.h
+include/mavlink/v1.0/ardupilotmega/mavlink_msg_gimbal_factory_parameters_loaded.h
+include/mavlink/v1.0/ardupilotmega/mavlink_msg_gimbal_home_offset_calibration_result.h
+include/mavlink/v1.0/ardupilotmega/mavlink_msg_gimbal_perform_factory_tests.h
include/mavlink/v1.0/ardupilotmega/mavlink_msg_gimbal_report.h
+include/mavlink/v1.0/ardupilotmega/mavlink_msg_gimbal_report_factory_tests_progress.h
+include/mavlink/v1.0/ardupilotmega/mavlink_msg_gimbal_reset.h
+include/mavlink/v1.0/ardupilotmega/mavlink_msg_gimbal_set_factory_parameters.h
+include/mavlink/v1.0/ardupilotmega/mavlink_msg_gimbal_set_home_offsets.h
+include/mavlink/v1.0/ardupilotmega/mavlink_msg_gopro_command.h
+include/mavlink/v1.0/ardupilotmega/mavlink_msg_gopro_power_off.h
+include/mavlink/v1.0/ardupilotmega/mavlink_msg_gopro_power_on.h
+include/mavlink/v1.0/ardupilotmega/mavlink_msg_gopro_response.h
include/mavlink/v1.0/ardupilotmega/mavlink_msg_hwstatus.h
include/mavlink/v1.0/ardupilotmega/mavlink_msg_led_control.h
include/mavlink/v1.0/ardupilotmega/mavlink_msg_limits_status.h
+include/mavlink/v1.0/ardupilotmega/mavlink_msg_mag_cal_progress.h
+include/mavlink/v1.0/ardupilotmega/mavlink_msg_mag_cal_report.h
include/mavlink/v1.0/ardupilotmega/mavlink_msg_meminfo.h
include/mavlink/v1.0/ardupilotmega/mavlink_msg_mount_configure.h
include/mavlink/v1.0/ardupilotmega/mavlink_msg_mount_control.h
include/mavlink/v1.0/ardupilotmega/mavlink_msg_mount_status.h
+include/mavlink/v1.0/ardupilotmega/mavlink_msg_pid_tuning.h
include/mavlink/v1.0/ardupilotmega/mavlink_msg_radio.h
include/mavlink/v1.0/ardupilotmega/mavlink_msg_rally_fetch_point.h
include/mavlink/v1.0/ardupilotmega/mavlink_msg_rally_point.h
include/mavlink/v1.0/ardupilotmega/mavlink_msg_rangefinder.h
+include/mavlink/v1.0/ardupilotmega/mavlink_msg_rpm.h
include/mavlink/v1.0/ardupilotmega/mavlink_msg_sensor_offsets.h
include/mavlink/v1.0/ardupilotmega/mavlink_msg_set_mag_offsets.h
include/mavlink/v1.0/ardupilotmega/mavlink_msg_simstate.h
@@ -206,6 +224,7 @@ include/mavlink/v1.0/checksum.h
include/mavlink/v1.0/common/common.h
include/mavlink/v1.0/common/mavlink.h
include/mavlink/v1.0/common/mavlink_msg_actuator_control_target.h
+include/mavlink/v1.0/common/mavlink_msg_altitude.h
include/mavlink/v1.0/common/mavlink_msg_att_pos_mocap.h
include/mavlink/v1.0/common/mavlink_msg_attitude.h
include/mavlink/v1.0/common/mavlink_msg_attitude_quaternion.h
@@ -214,11 +233,13 @@ include/mavlink/v1.0/common/mavlink_msg_attitude_target.h
include/mavlink/v1.0/common/mavlink_msg_auth_key.h
include/mavlink/v1.0/common/mavlink_msg_autopilot_version.h
include/mavlink/v1.0/common/mavlink_msg_battery_status.h
+include/mavlink/v1.0/common/mavlink_msg_camera_trigger.h
include/mavlink/v1.0/common/mavlink_msg_change_operator_control.h
include/mavlink/v1.0/common/mavlink_msg_change_operator_control_ack.h
include/mavlink/v1.0/common/mavlink_msg_command_ack.h
include/mavlink/v1.0/common/mavlink_msg_command_int.h
include/mavlink/v1.0/common/mavlink_msg_command_long.h
+include/mavlink/v1.0/common/mavlink_msg_control_system_state.h
include/mavlink/v1.0/common/mavlink_msg_data_stream.h
include/mavlink/v1.0/common/mavlink_msg_data_transmission_handshake.h
include/mavlink/v1.0/common/mavlink_msg_debug.h
@@ -245,6 +266,8 @@ include/mavlink/v1.0/common/mavlink_msg_hil_rc_inputs_raw.h
include/mavlink/v1.0/common/mavlink_msg_hil_sensor.h
include/mavlink/v1.0/common/mavlink_msg_hil_state.h
include/mavlink/v1.0/common/mavlink_msg_hil_state_quaternion.h
+include/mavlink/v1.0/common/mavlink_msg_home_position.h
+include/mavlink/v1.0/common/mavlink_msg_landing_target.h
include/mavlink/v1.0/common/mavlink_msg_local_position_ned.h
include/mavlink/v1.0/common/mavlink_msg_local_position_ned_cov.h
include/mavlink/v1.0/common/mavlink_msg_local_position_ned_system_global_offset.h
@@ -257,6 +280,7 @@ include/mavlink/v1.0/common/mavlink_msg_log_request_list.h
include/mavlink/v1.0/common/mavlink_msg_manual_control.h
include/mavlink/v1.0/common/mavlink_msg_manual_setpoint.h
include/mavlink/v1.0/common/mavlink_msg_memory_vect.h
+include/mavlink/v1.0/common/mavlink_msg_message_interval.h
include/mavlink/v1.0/common/mavlink_msg_mission_ack.h
include/mavlink/v1.0/common/mavlink_msg_mission_clear_all.h
include/mavlink/v1.0/common/mavlink_msg_mission_count.h
@@ -291,6 +315,7 @@ include/mavlink/v1.0/common/mavlink_msg_rc_channels_override.h
include/mavlink/v1.0/common/mavlink_msg_rc_channels_raw.h
include/mavlink/v1.0/common/mavlink_msg_rc_channels_scaled.h
include/mavlink/v1.0/common/mavlink_msg_request_data_stream.h
+include/mavlink/v1.0/common/mavlink_msg_resource_request.h
include/mavlink/v1.0/common/mavlink_msg_safety_allowed_area.h
include/mavlink/v1.0/common/mavlink_msg_safety_set_allowed_area.h
include/mavlink/v1.0/common/mavlink_msg_scaled_imu.h
@@ -298,11 +323,13 @@ include/mavlink/v1.0/common/mavlink_msg_scaled_imu2.h
include/mavlink/v1.0/common/mavlink_msg_scaled_imu3.h
include/mavlink/v1.0/common/mavlink_msg_scaled_pressure.h
include/mavlink/v1.0/common/mavlink_msg_scaled_pressure2.h
+include/mavlink/v1.0/common/mavlink_msg_scaled_pressure3.h
include/mavlink/v1.0/common/mavlink_msg_serial_control.h
include/mavlink/v1.0/common/mavlink_msg_servo_output_raw.h
include/mavlink/v1.0/common/mavlink_msg_set_actuator_control_target.h
include/mavlink/v1.0/common/mavlink_msg_set_attitude_target.h
include/mavlink/v1.0/common/mavlink_msg_set_gps_global_origin.h
+include/mavlink/v1.0/common/mavlink_msg_set_home_position.h
include/mavlink/v1.0/common/mavlink_msg_set_mode.h
include/mavlink/v1.0/common/mavlink_msg_set_position_target_global_int.h
include/mavlink/v1.0/common/mavlink_msg_set_position_target_local_ned.h
@@ -317,9 +344,11 @@ include/mavlink/v1.0/common/mavlink_msg_terrain_request.h
include/mavlink/v1.0/common/mavlink_msg_timesync.h
include/mavlink/v1.0/common/mavlink_msg_v2_extension.h
include/mavlink/v1.0/common/mavlink_msg_vfr_hud.h
+include/mavlink/v1.0/common/mavlink_msg_vibration.h
include/mavlink/v1.0/common/mavlink_msg_vicon_position_estimate.h
include/mavlink/v1.0/common/mavlink_msg_vision_position_estimate.h
include/mavlink/v1.0/common/mavlink_msg_vision_speed_estimate.h
+include/mavlink/v1.0/common/mavlink_msg_vtol_state.h
include/mavlink/v1.0/common/testsuite.h
include/mavlink/v1.0/common/version.h
include/mavlink/v1.0/matrixpilot/matrixpilot.h
diff --git a/mavlink/distinfo b/mavlink/distinfo
index b4276826..79639e89 100644
--- a/mavlink/distinfo
+++ b/mavlink/distinfo
@@ -1,3 +1,3 @@
-SHA1 (mavlink-20150326.tar.gz) = 173e60d59e5d3c1b788d0f879e56fa97472a244e
-RMD160 (mavlink-20150326.tar.gz) = 60008b61234467791e0ad0c153a745777894ba1e
-SHA1 (patch-cmake) = 99e7836e33990af23eda3957d45a398f67b67a67
+SHA1 (mavlink-20150929.tar.gz) = b2f15e15c6b9f597974beeddc5a13bef019102b1
+RMD160 (mavlink-20150929.tar.gz) = 9dc09cc87ecf37ec6f8ce108358e6891008c014f
+SHA1 (patch-dont-install-pymavlink) = 6c13ab0095bbd18d76861b5cf3a2c7b5d497b742
diff --git a/mavlink/patches/patch-cmake b/mavlink/patches/patch-cmake
deleted file mode 100644
index feab03d6..00000000
--- a/mavlink/patches/patch-cmake
+++ /dev/null
@@ -1,22 +0,0 @@
-Reported on https://github.com/mavlink/mavlink/pull/359
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9672634..ab3c11e 100644
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -127,14 +127,13 @@ macro(generateMavlink version definitions)
- COMMAND PYTHONPATH=$ENV{PYTHONPATH}:${CMAKE_CURRENT_SOURCE_DIR} ${PYTHON_EXECUTABLE} ${mavgen} --lang=C --wire-protocol=${version}
- --output=include/v${version} ${definitionAbsPath}
- COMMAND touch ${targetName}-stamp
-- DEPENDS ${definitionAbsPath} ${mavgen}
- )
- add_custom_target(${targetName} ALL DEPENDS ${targetName}-stamp)
- endforeach()
- endmacro()
-
- # build
--set(mavgen ${CMAKE_SOURCE_DIR}/pymavlink/generator/mavgen.py)
-+set(mavgen -m pymavlink.tools.mavgen)
- set(v0.9Definitions
- ardupilotmega.xml
- common.xml
diff --git a/mavlink/patches/patch-dont-install-pymavlink b/mavlink/patches/patch-dont-install-pymavlink
new file mode 100644
index 00000000..2429c73a
--- /dev/null
+++ b/mavlink/patches/patch-dont-install-pymavlink
@@ -0,0 +1,14 @@
+--- CMakeLists.txt.orig 2015-09-29 14:36:39.174556893 +0200
++++ CMakeLists.txt 2015-09-29 14:36:48.654557150 +0200
+@@ -170,11 +170,6 @@
+ install(DIRECTORY ${CMAKE_BINARY_DIR}/include/ DESTINATION include/${PROJECT_NAME} COMPONENT Dev FILES_MATCHING PATTERN "*.h*")
+ install(DIRECTORY ${CMAKE_BINARY_DIR}/src/ DESTINATION share/${PROJECT_NAME} COMPONENT Dev FILES_MATCHING PATTERN "*.c*")
+ install(DIRECTORY ${CMAKE_SOURCE_DIR}/share/${PROJECT_NAME} DESTINATION share COMPONENT Dev FILES_MATCHING PATTERN "*.c*")
+-if (UNIX)
+- install(DIRECTORY ${CMAKE_SOURCE_DIR}/pymavlink DESTINATION ${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages COMPONENT Dev)
+-else ()
+- install(DIRECTORY ${CMAKE_SOURCE_DIR}/pymavlink DESTINATION "share/pyshared" COMPONENT Dev)
+-endif ()
+
+ configure_file(pc.in ${PROJECT_NAME}.pc)
+ install(FILES
--
GitLab