summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authormajor major2018-11-05 14:32:06 +0100
committermajor major2018-11-05 14:32:06 +0100
commitb37b257dfd6f08a739bcfcab267a4058f8fde3ca (patch)
tree8cbb51c25616f5ae926bbc1b53c11be561e7e9c8
parentcdcfb3fcb714cd1f08e20290cadf4b2b205cd13a (diff)
downloadaur-b37b257dfd6f08a739bcfcab267a4058f8fde3ca.tar.gz
updated package to ver 1.75 and added patch to fix input of boost::posix::time
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD13
-rw-r--r--boost_posix_time.patch13
3 files changed, 26 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 16a77491e4e5..e152c9283477 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Sat Mar 4 16:11:30 UTC 2017
pkgbase = ros-kinetic-laser-assembler
pkgdesc = ROS - Provides nodes to assemble point clouds from either LaserScan or PointCloud messages.
- pkgver = 1.7.4
- pkgrel = 1
+ pkgver = 1.7.5
+ pkgrel = 2
url = http://ros.org/wiki/laser_assembler
arch = any
license = BSD
@@ -27,8 +25,8 @@ pkgbase = ros-kinetic-laser-assembler
depends = ros-kinetic-filters
depends = ros-kinetic-sensor-msgs
depends = ros-kinetic-laser-geometry
- source = ros-kinetic-laser-assembler-1.7.4-0.tar.gz::https://github.com/ros-gbp/laser_assembler-release/archive/release/kinetic/laser_assembler/1.7.4-0.tar.gz
- sha256sums = b5eabbf6cf82af173cdd42834c62bc9382dfc1ffc77d669da5f3b59735ffd3c3
+ source = ros-kinetic-laser-assembler-1.7.5-0.tar.gz::https://github.com/ros-gbp/laser_assembler-release/archive/release/kinetic/laser_assembler/1.7.5-0.tar.gz
+ sha256sums = 669a7dfa27df01d2de4227c284ce13aa33f25a38f1a5846c3ea73aaf291fe21e
pkgname = ros-kinetic-laser-assembler
diff --git a/PKGBUILD b/PKGBUILD
index 9bd87ae779c2..ad403e9d34ac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,10 +4,10 @@ pkgdesc="ROS - Provides nodes to assemble point clouds from either LaserScan or
url='http://ros.org/wiki/laser_assembler'
pkgname='ros-kinetic-laser-assembler'
-pkgver='1.7.4'
+pkgver='1.7.5'
_pkgver_patch=0
arch=('any')
-pkgrel=1
+pkgrel=2
license=('BSD')
ros_makedepends=(ros-kinetic-message-filters
@@ -40,9 +40,14 @@ depends=(${ros_depends[@]})
# sha256sums=('SKIP')
# Tarball version (faster download)
-_dir="laser_assembler-release-release-kinetic-laser_assembler-${pkgver}-${_pkgver_patch}"
+#_dir="laser_assembler-release-release-kinetic-laser_assembler-${pkgver}-${_pkgver_patch}"
+_dir="laser_assembler-release-release-kinetic-laser_assembler"
source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/laser_assembler-release/archive/release/kinetic/laser_assembler/${pkgver}-${_pkgver_patch}.tar.gz")
-sha256sums=('b5eabbf6cf82af173cdd42834c62bc9382dfc1ffc77d669da5f3b59735ffd3c3')
+sha256sums=('669a7dfa27df01d2de4227c284ce13aa33f25a38f1a5846c3ea73aaf291fe21e')
+prepare() {
+ cd ${_dir}
+ patch -Np1 -i ${srcdir}/boost_posix_time.patch
+}
build() {
# Use ROS environment variables
diff --git a/boost_posix_time.patch b/boost_posix_time.patch
new file mode 100644
index 000000000000..1d2f510cfc1c
--- /dev/null
+++ b/boost_posix_time.patch
@@ -0,0 +1,13 @@
+diff --git a/test/test_assembler.cpp b/test/test_assembler.cpp
+index c08de43..bc760a8 100644
+--- a/test/test_assembler.cpp
++++ b/test/test_assembler.cpp
+@@ -120,7 +120,7 @@ TEST_F(TestAssembler, non_zero_cloud_test)
+
+ while(n_.ok() && !got_cloud_)
+ {
+- cloud_condition_.timed_wait(lock, boost::posix_time::milliseconds(1000.0f));
++ cloud_condition_.timed_wait(lock, boost::posix_time::milliseconds(1000));
+ }
+
+ EXPECT_LT((unsigned int) 0, cloud_.points.size());