diff options
author | Gonçalo Camelo Neves Pereira | 2018-09-26 13:30:48 +0200 |
---|---|---|
committer | Gonçalo Camelo Neves Pereira | 2018-09-26 13:30:48 +0200 |
commit | 5a7e9e8f76f1c029500f0cdbc0f34a2988ceaa35 (patch) | |
tree | 5d09f114b82281ba7b6726e8cfde1dc5a083865a | |
parent | e82a0c4067a487e54fd2bbe940133f537643a2c7 (diff) | |
download | aur-5a7e9e8f76f1c029500f0cdbc0f34a2988ceaa35.tar.gz |
Update
-rw-r--r-- | .SRCINFO | 36 | ||||
-rw-r--r-- | PKGBUILD | 135 |
2 files changed, 78 insertions, 93 deletions
@@ -7,33 +7,33 @@ pkgbase = ros-melodic-rosbag license = BSD makedepends = cmake makedepends = ros-build-tools - makedepends = ros-melodic-roscpp-serialization - makedepends = ros-melodic-std-srvs - makedepends = ros-melodic-catkin - 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-roscpp-serialization + makedepends = ros-melodic-roscpp makedepends = ros-melodic-rosbag-storage - makedepends = boost + makedepends = ros-melodic-xmlrpcpp + makedepends = ros-melodic-std-srvs + makedepends = ros-melodic-topic-tools + makedepends = ros-melodic-catkin makedepends = python-pillow - depends = ros-melodic-genpy - depends = ros-melodic-std-srvs + makedepends = boost + depends = ros-melodic-rosconsole depends = ros-melodic-genmsg - depends = ros-melodic-xmlrpcpp - depends = ros-melodic-rospy - 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 = python-gnupg + 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 = python-rospkg depends = python-crypto - source = ros-melodic-rosbag::git+https://github.com/ros-gbp/ros_comm-release.git - sha256sums = SKIP + depends = boost + depends = python-gnupg + source = ros-melodic-rosbag-1.14.3-0.tar.gz::https://github.com/ros-gbp/ros_comm-release/archive/release/melodic/rosbag/1.14.3-0.tar.gz + sha256sums = 37736a1ad7ddeaddb4f651b8a4d10da75654bdf3ff6a4623f85f467c9125405d pkgname = ros-melodic-rosbag @@ -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 is a set of tools for recording from and playing back to ROS topics." url='http://ros.org/wiki/rosbag' @@ -10,88 +10,73 @@ arch=('any') pkgrel=1 license=('BSD') -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_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[@]} + python-pillow + boost) -makedepends=( - 'cmake' - 'ros-build-tools' - ${ros_makedepends[@]} - boost - python-pillow -) +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[@]} + python-rospkg + python-crypto + boost + python-gnupg) -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 -) +# 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') -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 -} +# 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=('37736a1ad7ddeaddb4f651b8a4d10da75654bdf3ff6a4623f85f467c9125405d') 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 the build directory. - [ -d ${srcdir}/build ] || mkdir ${srcdir}/build - cd ${srcdir}/build + # Create 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 3 ${srcdir}/${_dir} + # Fix Python2/Python3 conflicts + /usr/share/ros-build-tools/fix-python-scripts.sh -v 3 ${srcdir}/${_dir} - # 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 + # Build 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 } |