diff options
author | Gonçalo Camelo Neves Pereira | 2018-09-08 14:56:45 +0200 |
---|---|---|
committer | Gonçalo Camelo Neves Pereira | 2018-09-08 14:56:45 +0200 |
commit | e82a0c4067a487e54fd2bbe940133f537643a2c7 (patch) | |
tree | f02d31c9a9fb7744c36eacfc34cf3a695b147f4d | |
parent | 5db4fa5cac0df0c96a7b4136485937edc3d8ce10 (diff) | |
download | aur-e82a0c4067a487e54fd2bbe940133f537643a2c7.tar.gz |
Update!
-rw-r--r-- | .SRCINFO | 40 | ||||
-rw-r--r-- | PKGBUILD | 137 |
2 files changed, 96 insertions, 81 deletions
@@ -1,39 +1,39 @@ pkgbase = ros-melodic-rosbag pkgdesc = ROS - This is a set of tools for recording from and playing back to ROS topics. - pkgver = 1.14.2 + pkgver = 1.14.3 pkgrel = 1 url = http://ros.org/wiki/rosbag arch = any license = BSD makedepends = cmake makedepends = ros-build-tools - makedepends = ros-melodic-rosconsole - makedepends = ros-melodic-cpp-common makedepends = ros-melodic-roscpp-serialization - makedepends = ros-melodic-roscpp - makedepends = ros-melodic-rosbag-storage - makedepends = ros-melodic-xmlrpcpp makedepends = ros-melodic-std-srvs - makedepends = ros-melodic-topic-tools makedepends = ros-melodic-catkin - makedepends = python2-pillow + makedepends = ros-melodic-xmlrpcpp + makedepends = ros-melodic-roscpp + makedepends = ros-melodic-rosconsole + makedepends = ros-melodic-topic-tools + makedepends = ros-melodic-cpp-common + makedepends = ros-melodic-rosbag-storage makedepends = boost - depends = ros-melodic-rosconsole + makedepends = python-pillow + depends = ros-melodic-genpy + depends = ros-melodic-std-srvs depends = ros-melodic-genmsg - depends = ros-melodic-roscpp - depends = ros-melodic-rosbag-storage - depends = ros-melodic-roslib depends = ros-melodic-xmlrpcpp - depends = ros-melodic-std-srvs - depends = ros-melodic-topic-tools - depends = ros-melodic-genpy depends = ros-melodic-rospy - depends = python2-rospkg - depends = python2-crypto + depends = ros-melodic-roslib + depends = ros-melodic-roscpp + depends = ros-melodic-rosconsole + depends = ros-melodic-topic-tools + depends = ros-melodic-rosbag-storage depends = boost - depends = python2-gnupg - source = ros-melodic-rosbag-1.14.2-0.tar.gz::https://github.com/ros-gbp/ros_comm-release/archive/release/melodic/rosbag/1.14.2-0.tar.gz - sha256sums = 48d079002813246b8e5e0633a20ea65420cef36f12af29ac171f58e2e5c3c682 + depends = python-gnupg + depends = python-rospkg + depends = python-crypto + source = ros-melodic-rosbag::git+https://github.com/ros-gbp/ros_comm-release.git + sha256sums = SKIP pkgname = ros-melodic-rosbag @@ -1,82 +1,97 @@ -# 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 is a set of tools for recording from and playing back to ROS topics." url='http://ros.org/wiki/rosbag' pkgname='ros-melodic-rosbag' -pkgver='1.14.2' +pkgver='1.14.3' _pkgver_patch=0 arch=('any') pkgrel=1 license=('BSD') -ros_makedepends=(ros-melodic-rosconsole - ros-melodic-cpp-common - ros-melodic-roscpp-serialization - ros-melodic-roscpp - ros-melodic-rosbag-storage - ros-melodic-xmlrpcpp - ros-melodic-std-srvs - ros-melodic-topic-tools - ros-melodic-catkin) -makedepends=('cmake' 'ros-build-tools' - ${ros_makedepends[@]} - python2-pillow - boost) +ros_makedepends=( + ros-melodic-roscpp-serialization + ros-melodic-std-srvs + ros-melodic-catkin + ros-melodic-xmlrpcpp + ros-melodic-roscpp + ros-melodic-rosconsole + ros-melodic-topic-tools + ros-melodic-cpp-common + ros-melodic-rosbag-storage +) -ros_depends=(ros-melodic-rosconsole - ros-melodic-genmsg - ros-melodic-roscpp - ros-melodic-rosbag-storage - ros-melodic-roslib - ros-melodic-xmlrpcpp - ros-melodic-std-srvs - ros-melodic-topic-tools - ros-melodic-genpy - ros-melodic-rospy) -depends=(${ros_depends[@]} - python2-rospkg - python2-crypto - boost - python2-gnupg) +makedepends=( + 'cmake' + 'ros-build-tools' + ${ros_makedepends[@]} + boost + python-pillow +) -# Git version (e.g. for debugging) -# _tag=release/melodic/rosbag/${pkgver}-${_pkgver_patch} -# _dir=${pkgname} -# source=("${_dir}"::"git+https://github.com/ros-gbp/ros_comm-release.git"#tag=${_tag}) -# sha256sums=('SKIP') +ros_depends=( + ros-melodic-genpy + ros-melodic-std-srvs + ros-melodic-genmsg + ros-melodic-xmlrpcpp + ros-melodic-rospy + ros-melodic-roslib + ros-melodic-roscpp + ros-melodic-rosconsole + ros-melodic-topic-tools + ros-melodic-rosbag-storage +) -# Tarball version (faster download) -_dir="ros_comm-release-release-melodic-rosbag-${pkgver}-${_pkgver_patch}" -source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/ros_comm-release/archive/release/melodic/rosbag/${pkgver}-${_pkgver_patch}.tar.gz") -sha256sums=('48d079002813246b8e5e0633a20ea65420cef36f12af29ac171f58e2e5c3c682') +depends=( + ${ros_depends[@]} + boost + python-gnupg + python-rospkg + python-crypto +) + +_dir=${pkgname} +source=("${_dir}"::"git+https://github.com/ros-gbp/ros_comm-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 } |