diff options
author | Oskar Roesler | 2019-06-12 22:25:10 +0200 |
---|---|---|
committer | GitHub | 2019-06-12 22:25:10 +0200 |
commit | 63e3f5f9eea034a1b28d04441dd2fdda4793f842 (patch) | |
tree | aca4674e945450f78d567715044ac8d3c7c7721b | |
parent | 0d4eadb96c1459996ae42ac041310a468642b38c (diff) | |
parent | 978d8f27b0333f28fb78f4d88bdb7d1474f5144b (diff) | |
download | aur-63e3f5f9eea034a1b28d04441dd2fdda4793f842.tar.gz |
Merge pull request #2 from acxz/master
Fixed building without boost signals and switched to official ros source
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | CMakeLists-signal.patch | 11 | ||||
-rw-r--r-- | PKGBUILD | 16 |
3 files changed, 27 insertions, 8 deletions
@@ -1,7 +1,7 @@ pkgbase = ros-melodic-laser-filters pkgdesc = ROS - Assorted filters designed to operate on 2D planar laser scanners, which use the sensor_msgs/LaserScan type. pkgver = 1.8.6 - pkgrel = 1 + pkgrel = 2 url = http://ros.org/wiki/laser_filters arch = any license = BSD @@ -25,8 +25,10 @@ pkgbase = ros-melodic-laser-filters depends = ros-melodic-message-filters depends = ros-melodic-sensor-msgs depends = ros-melodic-pluginlib - source = ros-melodic-laser-filters-1.8.6-0.tar.gz::https://github.com/ros-gbp/laser_filters-release/archive/release/melodic/laser_filters/1.8.6-0.tar.gz - sha256sums = 7429472a08b080cae1e101e9e96443b884791926ad59479c553809669347d46e + source = ros-melodic-laser-filters-1.8.6.tar.gz::https://github.com/ros-perception/laser_filters/archive/1.8.6.tar.gz + source = CMakeLists-signal.patch + sha256sums = c9678edee036ddb42a2dea1e71609763b44d6d1618fe384b204f3caa7d77ea3d + sha256sums = bf96a9ab678f7811ba2d99cb07e0eaaa0a7c03f5604878970ba3acda18931a3c pkgname = ros-melodic-laser-filters diff --git a/CMakeLists-signal.patch b/CMakeLists-signal.patch new file mode 100644 index 000000000000..756b2b678263 --- /dev/null +++ b/CMakeLists-signal.patch @@ -0,0 +1,11 @@ +--- CMakeLists.txt.old 2019-06-12 15:05:37.559918718 -0400 ++++ CMakeLists.txt 2019-06-12 15:06:14.116583763 -0400 +@@ -9,7 +9,7 @@ + laser_geometry pluginlib angles) + + find_package(catkin REQUIRED COMPONENTS ${THIS_PACKAGE_ROS_DEPS}) +-find_package(Boost REQUIRED COMPONENTS system signals) ++find_package(Boost REQUIRED COMPONENTS system) + include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}) + + ############################################################################## @@ -5,9 +5,8 @@ url='http://ros.org/wiki/laser_filters' pkgname='ros-melodic-laser-filters' pkgver='1.8.6' -_pkgver_patch=0 arch=('any') -pkgrel=1 +pkgrel=2 license=('BSD') ros_makedepends=( @@ -44,9 +43,16 @@ depends=( ${ros_depends[@]} ) -_dir="laser_filters-release-release-melodic-laser_filters-${pkgver}-${_pkgver_patch}" -source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/laser_filters-release/archive/release/melodic/laser_filters/${pkgver}-${_pkgver_patch}.tar.gz") -sha256sums=('7429472a08b080cae1e101e9e96443b884791926ad59479c553809669347d46e') +_dir="laser_filters-${pkgver}" +source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros-perception/laser_filters/archive/${pkgver}.tar.gz" + CMakeLists-signal.patch) +sha256sums=('c9678edee036ddb42a2dea1e71609763b44d6d1618fe384b204f3caa7d77ea3d' + 'bf96a9ab678f7811ba2d99cb07e0eaaa0a7c03f5604878970ba3acda18931a3c') + +prepare() { + cd "${srcdir}/${_dir}" + patch -uN CMakeLists.txt ../../CMakeLists-signal.patch || return 1 +} build() { # Use ROS environment variables. |