From 4d037891eace186dbd9b35060c670e1bbf37a6c2 Mon Sep 17 00:00:00 2001
From: Arnaud Degroote <arnaud.degroote@isae-supaero.fr>
Date: Tue, 31 Mar 2015 17:22:32 +0200
Subject: [PATCH] [py-mavlink] Upgrade to 1.1.50 version
No really released outside of pip, so grab it from the git reposity.
No real changelog but important changes for python3 have been done.
Switch to setuptools to build it.
---
py-mavlink/Makefile | 35 ++++-------
py-mavlink/PLIST | 139 ++++++++++++++++++++++++++++++++++++++------
py-mavlink/distinfo | 5 +-
3 files changed, 133 insertions(+), 46 deletions(-)
diff --git a/py-mavlink/Makefile b/py-mavlink/Makefile
index 41330977..d1c1d208 100644
--- a/py-mavlink/Makefile
+++ b/py-mavlink/Makefile
@@ -2,38 +2,23 @@
# Created: Arnaud Degroote on Fri, 30 Jan 2015
#
-PKGNAME= ${PKGTAG.python}-mavlink-${VERSION}
-DISTNAME= ${VERSION}
-VERSION= 1.0.11
-CATEGORIES= net
-MASTER_SITES= https://github.com/mavlink/mavlink/archive/
+DISTNAME= pymavlink-${VERSION}
+PKGNAME= ${PKGTAG.python}-mavlink-${VERSION}
+VERSION= 1.1.50
+CATEGORIES= middleware
+
+COMMIT= 54e826fb8037dfa8dcdd2ce0de6d9bf5dd783048
+FETCH_METHOD= git
+MASTER_SITES= https://github.com/mavlink/mavlink.git@${COMMIT}
MASTER_REPOSITORY= https://github.com/mavlink/mavlink.git
MAINTAINER= arnaud.degroote@isae-supaero.fr
COMMENT= MAVLink -- Micro Air Vehicle Message Marshalling Library -- python interface
LICENSE= gnu-lgpl-v3
-WRKSRC= ${WRKDIR}/mavlink-${VERSION}
+WRKSRC= ${WRKDIR}/pymavlink-${VERSION}/pymavlink
+PYDISTUTILSPKG= yes
-# XXX The generated / installed stuff seems to be python3 compatible but the
-# code generator used to generate it used really old library, only working with
-# python2
-DEPEND_ABI.python= python>=2.5<3
-
-CMAKE_ARG_PATH= ..
-CONFIGURE_DIRS= _build
-INSTALLATION_DIRS= ${PYTHON_SITELIB}/pymavlink
-
-pre-configure:
- mkdir -p ${WRKSRC}/${CONFIGURE_DIRS}
-
-_installdir=${PREFIX}/${PYTHON_SITELIB}/pymavlink
-do-install:
- cd ${WRKSRC}/${CONFIGURE_DIRS}/pymavlink/pymavlink && ${PAX} -rwp ma *.py ${_installdir}
-post-install: python-compile-all(${_installdir})
-
-
-include ../../mk/sysdep/cmake.mk
include ../../mk/language/c.mk
include ../../mk/sysdep/python.mk
include ../../mk/robotpkg.mk
diff --git a/py-mavlink/PLIST b/py-mavlink/PLIST
index 0a1f5c81..25395992 100644
--- a/py-mavlink/PLIST
+++ b/py-mavlink/PLIST
@@ -1,24 +1,127 @@
-@comment Fri Jan 30 15:35:46 CET 2015
+@comment Sun Mar 29 18:49:38 CEST 2015
+bin/MPU6KSearch.py
+bin/magfit.py
+bin/magfit_delta.py
+bin/magfit_gps.py
+bin/magfit_motors.py
+bin/mavextract.py
+bin/mavflightmodes.py
+bin/mavflighttime.py
+bin/mavgen.py
+bin/mavgpslock.py
+bin/mavgraph.py
+bin/mavkml.py
+bin/mavlogdump.py
+bin/mavloss.py
+bin/mavmission.py
+bin/mavparmdiff.py
+bin/mavparms.py
+bin/mavplayback.py
+bin/mavsearch.py
+bin/mavsigloss.py
+bin/mavsummarize.py
+bin/mavtogpx.py
+bin/mavtomfile.py
+${PYTHON_SITELIB}/mavnative.so
+${PYTHON_SITELIB}/pymavlink-1.1.51-py${PYTHON_VERSION}.egg-info
+${PYTHON_SITELIB}/pymavlink/DFReader.py
${PYTHON_SITELIB}/pymavlink/__init__.py
+${PYTHON_SITELIB}/pymavlink/dialects/__init__.py
+${PYTHON_SITELIB}/pymavlink/dialects/v09/__init__.py
+${PYTHON_SITELIB}/pymavlink/dialects/v09/ardupilotmega.py
+${PYTHON_SITELIB}/pymavlink/dialects/v09/ardupilotmega.xml
+${PYTHON_SITELIB}/pymavlink/dialects/v09/common.py
+${PYTHON_SITELIB}/pymavlink/dialects/v09/common.xml
+${PYTHON_SITELIB}/pymavlink/dialects/v09/minimal.py
+${PYTHON_SITELIB}/pymavlink/dialects/v09/minimal.xml
+${PYTHON_SITELIB}/pymavlink/dialects/v09/pixhawk.py
+${PYTHON_SITELIB}/pymavlink/dialects/v09/pixhawk.xml
+${PYTHON_SITELIB}/pymavlink/dialects/v09/slugs.py
+${PYTHON_SITELIB}/pymavlink/dialects/v09/slugs.xml
+${PYTHON_SITELIB}/pymavlink/dialects/v09/test.py
+${PYTHON_SITELIB}/pymavlink/dialects/v09/test.xml
+${PYTHON_SITELIB}/pymavlink/dialects/v09/ualberta.py
+${PYTHON_SITELIB}/pymavlink/dialects/v09/ualberta.xml
+${PYTHON_SITELIB}/pymavlink/dialects/v10/ASLUAV.py
+${PYTHON_SITELIB}/pymavlink/dialects/v10/ASLUAV.xml
+${PYTHON_SITELIB}/pymavlink/dialects/v10/__init__.py
+${PYTHON_SITELIB}/pymavlink/dialects/v10/ardupilotmega.py
+${PYTHON_SITELIB}/pymavlink/dialects/v10/ardupilotmega.xml
+${PYTHON_SITELIB}/pymavlink/dialects/v10/autoquad.py
+${PYTHON_SITELIB}/pymavlink/dialects/v10/autoquad.xml
+${PYTHON_SITELIB}/pymavlink/dialects/v10/common.py
+${PYTHON_SITELIB}/pymavlink/dialects/v10/common.xml
+${PYTHON_SITELIB}/pymavlink/dialects/v10/matrixpilot.py
+${PYTHON_SITELIB}/pymavlink/dialects/v10/matrixpilot.xml
+${PYTHON_SITELIB}/pymavlink/dialects/v10/minimal.py
+${PYTHON_SITELIB}/pymavlink/dialects/v10/minimal.xml
+${PYTHON_SITELIB}/pymavlink/dialects/v10/pixhawk.py
+${PYTHON_SITELIB}/pymavlink/dialects/v10/pixhawk.xml
+${PYTHON_SITELIB}/pymavlink/dialects/v10/python_array_test.py
+${PYTHON_SITELIB}/pymavlink/dialects/v10/python_array_test.xml
+${PYTHON_SITELIB}/pymavlink/dialects/v10/slugs.py
+${PYTHON_SITELIB}/pymavlink/dialects/v10/slugs.xml
+${PYTHON_SITELIB}/pymavlink/dialects/v10/test.py
+${PYTHON_SITELIB}/pymavlink/dialects/v10/test.xml
+${PYTHON_SITELIB}/pymavlink/dialects/v10/ualberta.py
+${PYTHON_SITELIB}/pymavlink/dialects/v10/ualberta.xml
${PYTHON_SITELIB}/pymavlink/fgFDM.py
+${PYTHON_SITELIB}/pymavlink/generator/C/include_v0.9/checksum.h
+${PYTHON_SITELIB}/pymavlink/generator/C/include_v0.9/mavlink_helpers.h
+${PYTHON_SITELIB}/pymavlink/generator/C/include_v0.9/mavlink_types.h
+${PYTHON_SITELIB}/pymavlink/generator/C/include_v0.9/protocol.h
+${PYTHON_SITELIB}/pymavlink/generator/C/include_v1.0/checksum.h
+${PYTHON_SITELIB}/pymavlink/generator/C/include_v1.0/mavlink_conversions.h
+${PYTHON_SITELIB}/pymavlink/generator/C/include_v1.0/mavlink_helpers.h
+${PYTHON_SITELIB}/pymavlink/generator/C/include_v1.0/mavlink_types.h
+${PYTHON_SITELIB}/pymavlink/generator/C/include_v1.0/protocol.h
+${PYTHON_SITELIB}/pymavlink/generator/__init__.py
+${PYTHON_SITELIB}/pymavlink/generator/java/lib/Messages/MAVLinkMessage.java
+${PYTHON_SITELIB}/pymavlink/generator/java/lib/Messages/MAVLinkPayload.java
+${PYTHON_SITELIB}/pymavlink/generator/java/lib/Messages/MAVLinkStats.java
+${PYTHON_SITELIB}/pymavlink/generator/java/lib/Parser.java
+${PYTHON_SITELIB}/pymavlink/generator/lib/__init__.py
+${PYTHON_SITELIB}/pymavlink/generator/lib/genxmlif/__init__.py
+${PYTHON_SITELIB}/pymavlink/generator/lib/genxmlif/xmlif4Dom.py
+${PYTHON_SITELIB}/pymavlink/generator/lib/genxmlif/xmlifApi.py
+${PYTHON_SITELIB}/pymavlink/generator/lib/genxmlif/xmlifBase.py
+${PYTHON_SITELIB}/pymavlink/generator/lib/genxmlif/xmlifDom.py
+${PYTHON_SITELIB}/pymavlink/generator/lib/genxmlif/xmlifElementTree.py
+${PYTHON_SITELIB}/pymavlink/generator/lib/genxmlif/xmlifMinidom.py
+${PYTHON_SITELIB}/pymavlink/generator/lib/genxmlif/xmlifODict.py
+${PYTHON_SITELIB}/pymavlink/generator/lib/genxmlif/xmlifUtils.py
+${PYTHON_SITELIB}/pymavlink/generator/lib/genxmlif/xmliftest.py
+${PYTHON_SITELIB}/pymavlink/generator/lib/minixsv/XInclude.xsd
+${PYTHON_SITELIB}/pymavlink/generator/lib/minixsv/XMLSchema-instance.xsd
+${PYTHON_SITELIB}/pymavlink/generator/lib/minixsv/XMLSchema.xsd
+${PYTHON_SITELIB}/pymavlink/generator/lib/minixsv/__init__.py
+${PYTHON_SITELIB}/pymavlink/generator/lib/minixsv/datatypes.xsd
+${PYTHON_SITELIB}/pymavlink/generator/lib/minixsv/minixsvWrapper.py
+${PYTHON_SITELIB}/pymavlink/generator/lib/minixsv/pyxsval.py
+${PYTHON_SITELIB}/pymavlink/generator/lib/minixsv/xml.xsd
+${PYTHON_SITELIB}/pymavlink/generator/lib/minixsv/xsvalBase.py
+${PYTHON_SITELIB}/pymavlink/generator/lib/minixsv/xsvalErrorHandler.py
+${PYTHON_SITELIB}/pymavlink/generator/lib/minixsv/xsvalSchema.py
+${PYTHON_SITELIB}/pymavlink/generator/lib/minixsv/xsvalSimpleTypes.py
+${PYTHON_SITELIB}/pymavlink/generator/lib/minixsv/xsvalUtils.py
+${PYTHON_SITELIB}/pymavlink/generator/lib/minixsv/xsvalXmlIf.py
+${PYTHON_SITELIB}/pymavlink/generator/mavcrc.py
+${PYTHON_SITELIB}/pymavlink/generator/mavgen.py
+${PYTHON_SITELIB}/pymavlink/generator/mavgen_c.py
+${PYTHON_SITELIB}/pymavlink/generator/mavgen_cs.py
+${PYTHON_SITELIB}/pymavlink/generator/mavgen_java.py
+${PYTHON_SITELIB}/pymavlink/generator/mavgen_javascript.py
+${PYTHON_SITELIB}/pymavlink/generator/mavgen_objc.py
+${PYTHON_SITELIB}/pymavlink/generator/mavgen_python.py
+${PYTHON_SITELIB}/pymavlink/generator/mavgen_wlua.py
+${PYTHON_SITELIB}/pymavlink/generator/mavparse.py
+${PYTHON_SITELIB}/pymavlink/generator/mavschema.xsd
+${PYTHON_SITELIB}/pymavlink/generator/mavtemplate.py
+${PYTHON_SITELIB}/pymavlink/generator/mavtestgen.py
${PYTHON_SITELIB}/pymavlink/mavextra.py
-${PYTHON_SITELIB}/pymavlink/mavlinkv09_ardupilotmega.py
-${PYTHON_SITELIB}/pymavlink/mavlinkv09_common.py
-${PYTHON_SITELIB}/pymavlink/mavlinkv09_minimal.py
-${PYTHON_SITELIB}/pymavlink/mavlinkv09_pixhawk.py
-${PYTHON_SITELIB}/pymavlink/mavlinkv09_slugs.py
-${PYTHON_SITELIB}/pymavlink/mavlinkv09_test.py
-${PYTHON_SITELIB}/pymavlink/mavlinkv09_ualberta.py
-${PYTHON_SITELIB}/pymavlink/mavlinkv10_ardupilotmega.py
-${PYTHON_SITELIB}/pymavlink/mavlinkv10_common.py
-${PYTHON_SITELIB}/pymavlink/mavlinkv10_matrixpilot.py
-${PYTHON_SITELIB}/pymavlink/mavlinkv10_minimal.py
-${PYTHON_SITELIB}/pymavlink/mavlinkv10_pixhawk.py
-${PYTHON_SITELIB}/pymavlink/mavlinkv10_sensesoar.py
-${PYTHON_SITELIB}/pymavlink/mavlinkv10_slugs.py
-${PYTHON_SITELIB}/pymavlink/mavlinkv10_test.py
-${PYTHON_SITELIB}/pymavlink/mavlinkv10_ualberta.py
+${PYTHON_SITELIB}/pymavlink/mavnative/mavlink_defaults.h
${PYTHON_SITELIB}/pymavlink/mavparm.py
${PYTHON_SITELIB}/pymavlink/mavutil.py
${PYTHON_SITELIB}/pymavlink/mavwp.py
-${PYTHON_SITELIB}/pymavlink/scanwin32.py
+${PYTHON_SITELIB}/pymavlink/quaternion.py
+${PYTHON_SITELIB}/pymavlink/rotmat.py
diff --git a/py-mavlink/distinfo b/py-mavlink/distinfo
index 69b89404..a2488992 100644
--- a/py-mavlink/distinfo
+++ b/py-mavlink/distinfo
@@ -1,3 +1,2 @@
-SHA1 (1.0.11.tar.gz) = e6cbf1499cb6bea9cb67a566216aec68bd149b2d
-RMD160 (1.0.11.tar.gz) = 20aedd017e6d70fcd4d8a980dddadc7ad4902c55
-Size (1.0.11.tar.gz) = 374075 bytes
+SHA1 (pymavlink-1.1.50.tar.gz) = 26d7a192b0ff11ab6a1f3415f3f64d9d53618a00
+RMD160 (pymavlink-1.1.50.tar.gz) = a3529cfcea1023dd85a9c32661cfb561362bc87d
--
GitLab