ardupilot-copter-sitl 4.0.7 (#110)

2 files changed, 19 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 209856d44ada..573c8adb65a4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ardupilot-copter-sitl
 	pkgdesc = Advanced, Fully-Featured, and Reliable Autopilot Software (Copter, SITL)
-	pkgver = 4.0.3
-	pkgrel = 3
+	pkgver = 4.0.7
+	pkgrel = 1
 	url = https://ardupilot.org
 	arch = i686
 	arch = x86_64
@@ -50,13 +50,15 @@ pkgbase = ardupilot-copter-sitl
 	depends = lsb-release
 	depends = python-wxpython
 	provides = ardupilot-sitl
-	source = ardupilot-copter-sitl-4.0.3::https://github.com/ArduPilot/ardupilot/archive/Copter-4.0.3.tar.gz
+	source = ardupilot-copter-sitl-4.0.7::https://github.com/ArduPilot/ardupilot/archive/Copter-4.0.7.tar.gz
+	source = 13921.patch::https://github.com/ArduPilot/ardupilot/pull/13921.patch
 	source = libcanard::https://github.com/ArduPilot/libcanard/archive/99163fc2369e5e5f75f8473f0b950b3418830d3f.tar.gz
-	source = mavlink::https://github.com/ArduPilot/mavlink/archive/d2cc7dbff67f8c318a40e1ef57a99488b4737fab.tar.gz
+	source = mavlink::https://github.com/ArduPilot/mavlink/archive/6e08c0757a1e90c461a8caf1a8d5b724abf3ca57.tar.gz
 	source = uavcan::https://github.com/ArduPilot/uavcan/archive/3ef4b88d96466bbcf886f74d0ae169a4c8c1bdb0.tar.gz
-	sha256sums = 0dde0a2ab951054831e669257468ee3db784317ea515b36f05e3cf08ef3f9021
+	sha256sums = 26defe4a6d73da802ec152ff9ab9ad4e2673a16ff86f053e59e5369b6f67c355
+	sha256sums = 8237044e8dc5ef8e3159a01c765831a3b5a8d7c3fab7941f0ce8d403ebfe403b
 	sha256sums = c09b0342a77ecd9ea99331d54f51edd74b0050bd7575d4abee3a484bdcdee0b1
-	sha256sums = 880d31b95b0d1fafbb7d2dd14eccfcf1668dfcf888d15323c93388d3eda0e756
+	sha256sums = 1d93d928503561f2ccb307245f6789c3437ad469d0efba637e97a90fb49e5aa8
 	sha256sums = f9638099720152f332b33bd26de24bde9c14d8afae24aa19e4e8da485145c84e
 
 pkgname = ardupilot-copter-sitl
diff --git a/PKGBUILD b/PKGBUILD
index 681302235dbc..4b3657d1fe52 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: acxz <akashpatel2008 at yahoo dot com>
 pkgname=ardupilot-copter-sitl
-pkgver=4.0.3
+pkgver=4.0.7
 pkgdesc="Advanced, Fully-Featured, and Reliable Autopilot Software (Copter,
 SITL)"
 url='https://ardupilot.org'
 arch=('i686' 'x86_64')
-pkgrel=3
+pkgrel=1
 license=('GPLv3')
 provides=('ardupilot-sitl')
 makedepends=('waf' 'python-setuptools')
@@ -78,13 +78,15 @@ depends=(
     python-wxpython
 )
 source=("${pkgname}-${pkgver}::https://github.com/ArduPilot/ardupilot/archive/Copter-${pkgver}.tar.gz"
+        "13921.patch"::"https://github.com/ArduPilot/ardupilot/pull/13921.patch"
         "libcanard::https://github.com/ArduPilot/libcanard/archive/99163fc2369e5e5f75f8473f0b950b3418830d3f.tar.gz"
-        "mavlink::https://github.com/ArduPilot/mavlink/archive/d2cc7dbff67f8c318a40e1ef57a99488b4737fab.tar.gz"
+        "mavlink::https://github.com/ArduPilot/mavlink/archive/6e08c0757a1e90c461a8caf1a8d5b724abf3ca57.tar.gz"
         "uavcan::https://github.com/ArduPilot/uavcan/archive/3ef4b88d96466bbcf886f74d0ae169a4c8c1bdb0.tar.gz"
        )
-sha256sums=('0dde0a2ab951054831e669257468ee3db784317ea515b36f05e3cf08ef3f9021'
+sha256sums=('26defe4a6d73da802ec152ff9ab9ad4e2673a16ff86f053e59e5369b6f67c355'
+            '8237044e8dc5ef8e3159a01c765831a3b5a8d7c3fab7941f0ce8d403ebfe403b'
             'c09b0342a77ecd9ea99331d54f51edd74b0050bd7575d4abee3a484bdcdee0b1'
-            '880d31b95b0d1fafbb7d2dd14eccfcf1668dfcf888d15323c93388d3eda0e756'
+            '1d93d928503561f2ccb307245f6789c3437ad469d0efba637e97a90fb49e5aa8'
             'f9638099720152f332b33bd26de24bde9c14d8afae24aa19e4e8da485145c84e'
            )
 
@@ -94,10 +96,13 @@ prepare() {
     cd "$srcdir"
     mv -n libcanard-99163fc2369e5e5f75f8473f0b950b3418830d3f/* \
           "${_pkgname}-${pkgver}/modules/libcanard"
-    mv -n mavlink-d2cc7dbff67f8c318a40e1ef57a99488b4737fab/* \
+    mv -n mavlink-6e08c0757a1e90c461a8caf1a8d5b724abf3ca57/* \
           "${_pkgname}-${pkgver}/modules/mavlink"
     mv -n uavcan-3ef4b88d96466bbcf886f74d0ae169a4c8c1bdb0/* \
           "${_pkgname}-${pkgver}/modules/uavcan"
+          
+    cd "ardupilot-Copter-$pkgver"
+    patch --forward --strip=1 --input="${srcdir}/13921.patch"
 }
 
 build() {