diff options
author | Gonçalo Camelo Neves Pereira | 2018-09-26 13:30:58 +0200 |
---|---|---|
committer | Gonçalo Camelo Neves Pereira | 2018-09-26 13:30:58 +0200 |
commit | 0f3b4f3d572652714672d9b0bbdb755b7e44fea0 (patch) | |
tree | d36535ed349e4bca37814f3ebf8f2416d3bbaae1 | |
parent | bf55c1679ddfff7dd7c74ee638fd9024597c2e99 (diff) | |
download | aur-0f3b4f3d572652714672d9b0bbdb755b7e44fea0.tar.gz |
Update
-rw-r--r-- | .SRCINFO | 26 | ||||
-rw-r--r-- | PKGBUILD | 133 |
2 files changed, 72 insertions, 87 deletions
@@ -7,32 +7,32 @@ pkgbase = ros-melodic-rosbag-storage license = BSD makedepends = cmake makedepends = ros-build-tools + makedepends = ros-melodic-roscpp-traits + makedepends = ros-melodic-cpp-common makedepends = ros-melodic-roscpp-serialization - makedepends = ros-melodic-pluginlib + makedepends = ros-melodic-rostest makedepends = ros-melodic-roslz4 makedepends = ros-melodic-catkin - makedepends = ros-melodic-roscpp-traits + makedepends = ros-melodic-pluginlib makedepends = ros-melodic-rostime - makedepends = ros-melodic-rostest - makedepends = ros-melodic-cpp-common makedepends = bzip2 - makedepends = gpgme - makedepends = console-bridge makedepends = openssl makedepends = boost + makedepends = console-bridge + makedepends = gpgme + depends = ros-melodic-roscpp-traits + depends = ros-melodic-cpp-common depends = ros-melodic-roscpp-serialization - depends = ros-melodic-pluginlib depends = ros-melodic-roslz4 - depends = ros-melodic-roscpp-traits + depends = ros-melodic-pluginlib depends = ros-melodic-rostime - depends = ros-melodic-cpp-common depends = bzip2 - depends = gpgme - depends = console-bridge depends = openssl depends = boost - source = ros-melodic-rosbag-storage::git+https://github.com/ros-gbp/ros_comm-release.git - sha256sums = SKIP + depends = console-bridge + depends = gpgme + source = ros-melodic-rosbag-storage-1.14.3-0.tar.gz::https://github.com/ros-gbp/ros_comm-release/archive/release/melodic/rosbag_storage/1.14.3-0.tar.gz + sha256sums = 670edf72be59ce0c5d2fce6df933f1c50895c8351f250f9d192164157c2fc46e pkgname = ros-melodic-rosbag-storage @@ -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 ROS message without relying on the ROS client library." url='http://www.ros.org/' @@ -10,87 +10,72 @@ arch=('any') pkgrel=1 license=('BSD') -ros_makedepends=( - ros-melodic-roscpp-serialization - ros-melodic-pluginlib - ros-melodic-roslz4 - ros-melodic-catkin - ros-melodic-roscpp-traits - ros-melodic-rostime - ros-melodic-rostest - ros-melodic-cpp-common -) +ros_makedepends=(ros-melodic-roscpp-traits + ros-melodic-cpp-common + ros-melodic-roscpp-serialization + ros-melodic-rostest + ros-melodic-roslz4 + ros-melodic-catkin + ros-melodic-pluginlib + ros-melodic-rostime) +makedepends=('cmake' 'ros-build-tools' + ${ros_makedepends[@]} + bzip2 + openssl + boost + console-bridge + gpgme) -makedepends=( - 'cmake' - 'ros-build-tools' - ${ros_makedepends[@]} - bzip2 - gpgme - console-bridge - openssl - boost -) +ros_depends=(ros-melodic-roscpp-traits + ros-melodic-cpp-common + ros-melodic-roscpp-serialization + ros-melodic-roslz4 + ros-melodic-pluginlib + ros-melodic-rostime) +depends=(${ros_depends[@]} + bzip2 + openssl + boost + console-bridge + gpgme) -ros_depends=( - ros-melodic-roscpp-serialization - ros-melodic-pluginlib - ros-melodic-roslz4 - ros-melodic-roscpp-traits - ros-melodic-rostime - ros-melodic-cpp-common -) +# Git version (e.g. for debugging) +# _tag=release/melodic/rosbag_storage/${pkgver}-${_pkgver_patch} +# _dir=${pkgname} +# source=("${_dir}"::"git+https://github.com/ros-gbp/ros_comm-release.git"#tag=${_tag}) +# sha256sums=('SKIP') -depends=( - ${ros_depends[@]} - bzip2 - gpgme - console-bridge - openssl - boost -) - -_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_storage-${pkgver}-${_pkgver_patch}" +source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/ros_comm-release/archive/release/melodic/rosbag_storage/${pkgver}-${_pkgver_patch}.tar.gz") +sha256sums=('670edf72be59ce0c5d2fce6df933f1c50895c8351f250f9d192164157c2fc46e') 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 } |