diff options
author | Gonçalo Camelo Neves Pereira | 2018-09-08 15:04:28 +0200 |
---|---|---|
committer | Gonçalo Camelo Neves Pereira | 2018-09-08 15:04:28 +0200 |
commit | 0d5f9c0115bd1774f9cf14ffbd08708016a86b1a (patch) | |
tree | ca6765c61bb91e5f2652b377cd3bd31ec2a518a5 | |
parent | 9a6cb5a26354b02d9081cb92a245feb660936729 (diff) | |
download | aur-0d5f9c0115bd1774f9cf14ffbd08708016a86b1a.tar.gz |
Update!
-rw-r--r-- | .SRCINFO | 14 | ||||
-rw-r--r-- | PKGBUILD | 109 |
2 files changed, 69 insertions, 54 deletions
@@ -7,20 +7,20 @@ pkgbase = ros-melodic-tf-conversions license = BSD makedepends = cmake makedepends = ros-build-tools - makedepends = ros-melodic-catkin + makedepends = ros-melodic-kdl-conversions makedepends = ros-melodic-tf - makedepends = ros-melodic-orocos-kdl + makedepends = ros-melodic-catkin makedepends = ros-melodic-geometry-msgs - makedepends = ros-melodic-kdl-conversions + makedepends = ros-melodic-orocos-kdl makedepends = eigen3 depends = ros-melodic-python-orocos-kdl + depends = ros-melodic-kdl-conversions depends = ros-melodic-tf - depends = ros-melodic-orocos-kdl depends = ros-melodic-geometry-msgs - depends = ros-melodic-kdl-conversions + depends = ros-melodic-orocos-kdl depends = eigen3 - source = ros-melodic-tf-conversions-1.12.0-0.tar.gz::https://github.com/ros-gbp/geometry-release/archive/release/melodic/tf_conversions/1.12.0-0.tar.gz - sha256sums = eec87e068f5106c1835fb093d5995ca8c6972e3a5e127038d94c68701ad2029e + source = ros-melodic-tf-conversions::git+https://github.com/ros-gbp/geometry-release.git + sha256sums = SKIP pkgname = ros-melodic-tf-conversions @@ -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 - This package contains a set of conversion functions to convert common tf datatypes (point, vector, pose, etc) into semantically identical datatypes used by other libraries." url='http://www.ros.org/wiki/tf_conversions' @@ -10,60 +10,75 @@ arch=('any') pkgrel=1 license=('BSD') -ros_makedepends=(ros-melodic-catkin - ros-melodic-tf - ros-melodic-orocos-kdl - ros-melodic-geometry-msgs - ros-melodic-kdl-conversions) -makedepends=('cmake' 'ros-build-tools' - ${ros_makedepends[@]} - eigen3) +ros_makedepends=( + ros-melodic-kdl-conversions + ros-melodic-tf + ros-melodic-catkin + ros-melodic-geometry-msgs + ros-melodic-orocos-kdl +) -ros_depends=(ros-melodic-python-orocos-kdl - ros-melodic-tf - ros-melodic-orocos-kdl - ros-melodic-geometry-msgs - ros-melodic-kdl-conversions) -depends=(${ros_depends[@]} - eigen3) +makedepends=( + 'cmake' + 'ros-build-tools' + ${ros_makedepends[@]} + eigen3 +) -# Git version (e.g. for debugging) -# _tag=release/melodic/tf_conversions/${pkgver}-${_pkgver_patch} -# _dir=${pkgname} -# source=("${_dir}"::"git+https://github.com/ros-gbp/geometry-release.git"#tag=${_tag}) -# sha256sums=('SKIP') +ros_depends=( + ros-melodic-python-orocos-kdl + ros-melodic-kdl-conversions + ros-melodic-tf + ros-melodic-geometry-msgs + ros-melodic-orocos-kdl +) -# Tarball version (faster download) -_dir="geometry-release-release-melodic-tf_conversions-${pkgver}-${_pkgver_patch}" -source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/geometry-release/archive/release/melodic/tf_conversions/${pkgver}-${_pkgver_patch}.tar.gz") -sha256sums=('eec87e068f5106c1835fb093d5995ca8c6972e3a5e127038d94c68701ad2029e') +depends=( + ${ros_depends[@]} + eigen3 +) + +_dir=${pkgname} +source=("${_dir}"::"git+https://github.com/ros-gbp/geometry-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 } |