summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorOskar Roesler2020-09-19 18:58:18 +0200
committerGitHub2020-09-19 18:58:18 +0200
commitad39153fc59b9f98960bd4a59d69ad962a7053ce (patch)
tree8f35c5d6969055ca7e9fad6664714ce16db680eb
parenteb319f9dca0c19bebcaceb6102a51119aaf8cb6f (diff)
parent3624271ce0847dba52c3f8a3df0a390f1d6a31b3 (diff)
downloadaur-ad39153fc59b9f98960bd4a59d69ad962a7053ce.tar.gz
Merge pull request #3 from ros-melodic-arch/remove_patch
boost patch seems not to be necessary (anymore?)
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD15
2 files changed, 8 insertions, 17 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3a0df1c94c24..f1a4e5b3b2c8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = ros-melodic-libmavconn
pkgdesc = ROS - MAVLink communication library.
- pkgver = 1.1.0
- pkgrel = 2
+ pkgver = 1.3.0
+ pkgrel = 1
url = https://wiki.ros.org/libmavconn
arch = i686
arch = x86_64
@@ -18,10 +18,8 @@ pkgbase = ros-melodic-libmavconn
depends = ros-melodic-mavlink
depends = boost
depends = console-bridge
- source = ros-melodic-libmavconn-1.1.0.tar.gz::https://github.com/mavlink/mavros/archive/1.1.0.tar.gz
- source = boost-1.70.patch
- sha256sums = 7bed7003e0905a5bbf53a8927068201a90ff08fab23e5483622295c2eea4aa10
- sha256sums = d7a6c462f9328536ffd9b5b59e3a7e483fc5d403d71114bfc03024c364df233d
+ source = ros-melodic-libmavconn-1.3.0.tar.gz::https://github.com/mavlink/mavros/archive/1.3.0.tar.gz
+ sha256sums = 1046802606eadf6d578ef221b685702a985e46e3624b24bfbe2bfaf40182e4dc
pkgname = ros-melodic-libmavconn
diff --git a/PKGBUILD b/PKGBUILD
index 222540889c53..79cfeb261977 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,9 +4,9 @@ pkgdesc="ROS - MAVLink communication library."
url='https://wiki.ros.org/libmavconn'
pkgname='ros-melodic-libmavconn'
-pkgver='1.1.0'
+pkgver='1.3.0'
arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
-pkgrel=2
+pkgrel=1
license=('GPLv3, LGPLv3, BSD')
ros_makedepends=(ros-melodic-mavlink
@@ -22,15 +22,8 @@ depends=(${ros_depends[@]}
console-bridge)
_dir="mavros-${pkgver}/libmavconn"
-source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/mavlink/mavros/archive/${pkgver}.tar.gz"
- "boost-1.70.patch")
-sha256sums=('7bed7003e0905a5bbf53a8927068201a90ff08fab23e5483622295c2eea4aa10'
- 'd7a6c462f9328536ffd9b5b59e3a7e483fc5d403d71114bfc03024c364df233d')
-
-prepare() {
- cd "${srcdir}/${_dir}"
- patch -uN src/tcp.cpp ../../../boost-1.70.patch || return 1
-}
+source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/mavlink/mavros/archive/${pkgver}.tar.gz")
+sha256sums=('1046802606eadf6d578ef221b685702a985e46e3624b24bfbe2bfaf40182e4dc')
build() {
# Use ROS environment variables