diff options
author | Gonçalo Camelo Neves Pereira | 2018-09-08 14:54:05 +0200 |
---|---|---|
committer | Gonçalo Camelo Neves Pereira | 2018-09-08 14:54:05 +0200 |
commit | 38eb9ad6b1fb9cf949ce313068f68e7cd647a197 (patch) | |
tree | 904bedb0a28bd67eaf55d3ec235abb910abb6e07 | |
parent | b117874182c897f9b4c0517298cb66596675f7f2 (diff) | |
download | aur-38eb9ad6b1fb9cf949ce313068f68e7cd647a197.tar.gz |
Update!
-rw-r--r-- | .SRCINFO | 28 | ||||
-rw-r--r-- | PKGBUILD | 121 |
2 files changed, 82 insertions, 67 deletions
@@ -7,26 +7,26 @@ pkgbase = ros-melodic-laser-filters license = BSD makedepends = cmake makedepends = ros-build-tools + makedepends = ros-melodic-sensor-msgs + makedepends = ros-melodic-message-filters + makedepends = ros-melodic-filters makedepends = ros-melodic-tf - makedepends = ros-melodic-rostest - makedepends = ros-melodic-angles - makedepends = ros-melodic-roscpp + makedepends = ros-melodic-pluginlib makedepends = ros-melodic-laser-geometry makedepends = ros-melodic-catkin - makedepends = ros-melodic-pluginlib - makedepends = ros-melodic-filters - makedepends = ros-melodic-message-filters - makedepends = ros-melodic-sensor-msgs + makedepends = ros-melodic-angles + makedepends = ros-melodic-rostest + makedepends = ros-melodic-roscpp + depends = ros-melodic-sensor-msgs + depends = ros-melodic-message-filters + depends = ros-melodic-filters depends = ros-melodic-tf + depends = ros-melodic-pluginlib + depends = ros-melodic-laser-geometry depends = ros-melodic-angles depends = ros-melodic-roscpp - depends = ros-melodic-laser-geometry - depends = ros-melodic-pluginlib - depends = ros-melodic-filters - depends = ros-melodic-message-filters - depends = ros-melodic-sensor-msgs - 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::git+https://github.com/ros-gbp/laser_filters-release.git + sha256sums = SKIP pkgname = ros-melodic-laser-filters @@ -1,5 +1,5 @@ -# Script generated with import_catkin_packages.py -# For more information: https://github.com/bchretien/arch-ros-stacks +# Script generated with import_catkin_packages.py. +# For more information: https://github.com/bchretien/arch-ros-stacks. pkgdesc="ROS - Assorted filters designed to operate on 2D planar laser scanners, which use the sensor_msgs/LaserScan type." url='http://ros.org/wiki/laser_filters' @@ -10,66 +10,81 @@ arch=('any') pkgrel=1 license=('BSD') -ros_makedepends=(ros-melodic-tf - ros-melodic-rostest - ros-melodic-angles - ros-melodic-roscpp - ros-melodic-laser-geometry - ros-melodic-catkin - ros-melodic-pluginlib - ros-melodic-filters - ros-melodic-message-filters - ros-melodic-sensor-msgs) -makedepends=('cmake' 'ros-build-tools' - ${ros_makedepends[@]}) +ros_makedepends=( + ros-melodic-sensor-msgs + ros-melodic-message-filters + ros-melodic-filters + ros-melodic-tf + ros-melodic-pluginlib + ros-melodic-laser-geometry + ros-melodic-catkin + ros-melodic-angles + ros-melodic-rostest + ros-melodic-roscpp +) -ros_depends=(ros-melodic-tf - ros-melodic-angles - ros-melodic-roscpp - ros-melodic-laser-geometry - ros-melodic-pluginlib - ros-melodic-filters - ros-melodic-message-filters - ros-melodic-sensor-msgs) -depends=(${ros_depends[@]}) +makedepends=( + 'cmake' + 'ros-build-tools' + ${ros_makedepends[@]} +) -# Git version (e.g. for debugging) -# _tag=release/melodic/laser_filters/${pkgver}-${_pkgver_patch} -# _dir=${pkgname} -# source=("${_dir}"::"git+https://github.com/ros-gbp/laser_filters-release.git"#tag=${_tag}) -# sha256sums=('SKIP') +ros_depends=( + ros-melodic-sensor-msgs + ros-melodic-message-filters + ros-melodic-filters + ros-melodic-tf + ros-melodic-pluginlib + ros-melodic-laser-geometry + ros-melodic-angles + ros-melodic-roscpp +) -# Tarball version (faster download) -_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') +depends=( + ${ros_depends[@]} +) + +_dir=${pkgname} +source=("${_dir}"::"git+https://github.com/ros-gbp/laser_filters-release.git") +sha256sums=('SKIP') + +prepare() { + cd ${srcdir}/${_dir} + git checkout upstream + _pkgname=$(echo ${pkgname} | sed 's/ros-lunar-//' | sed 's/-/_/g') + + if [ -d ${_pkgname} ]; then + git subtree split -P ${_pkgname} --branch ${_pkgname} + git checkout ${_pkgname} + fi +} build() { - # Use ROS environment variables - source /usr/share/ros-build-tools/clear-ros-env.sh - [ -f /opt/ros/melodic/setup.bash ] && source /opt/ros/melodic/setup.bash + # Use ROS environment variables. + source /usr/share/ros-build-tools/clear-ros-env.sh + [ -f /opt/ros/melodic/setup.bash ] && source /opt/ros/melodic/setup.bash - # Create build directory - [ -d ${srcdir}/build ] || mkdir ${srcdir}/build - cd ${srcdir}/build + # Create the build directory. + [ -d ${srcdir}/build ] || mkdir ${srcdir}/build + cd ${srcdir}/build - # Fix Python2/Python3 conflicts - /usr/share/ros-build-tools/fix-python-scripts.sh -v 2 ${srcdir}/${_dir} + # Fix Python2/Python3 conflicts. + /usr/share/ros-build-tools/fix-python-scripts.sh -v 3 ${srcdir}/${_dir} - # Build project - cmake ${srcdir}/${_dir} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCATKIN_BUILD_BINARY_PACKAGE=ON \ - -DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \ - -DPYTHON_EXECUTABLE=/usr/bin/python2 \ - -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \ - -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \ - -DPYTHON_BASENAME=-python2.7 \ - -DSETUPTOOLS_DEB_LAYOUT=OFF - make + # Build the project. + cmake ${srcdir}/${_dir} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCATKIN_BUILD_BINARY_PACKAGE=ON \ + -DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \ + -DPYTHON_EXECUTABLE=/usr/bin/python3 \ + -DPYTHON_INCLUDE_DIR=/usr/include/python3.7m \ + -DPYTHON_LIBRARY=/usr/lib/libpython3.7m.so \ + -DPYTHON_BASENAME=.cpython-37m \ + -DSETUPTOOLS_DEB_LAYOUT=OFF + make } package() { - cd "${srcdir}/build" - make DESTDIR="${pkgdir}/" install + cd "${srcdir}/build" + make DESTDIR="${pkgdir}/" install } |