diff options
| -rw-r--r-- | .SRCINFO | 20 | ||||
| -rw-r--r-- | PKGBUILD | 109 |
2 files changed, 72 insertions, 57 deletions
@@ -1,6 +1,6 @@ pkgbase = ros-melodic-roslaunch pkgdesc = ROS - roslaunch is a tool for easily launching multiple ROS nodes locally and remotely via SSH, as well as setting parameters on the Parameter Server. - pkgver = 1.14.2 + pkgver = 1.14.3 pkgrel = 1 url = http://ros.org/wiki/roslaunch arch = any @@ -8,18 +8,18 @@ pkgbase = ros-melodic-roslaunch makedepends = cmake makedepends = ros-build-tools makedepends = ros-melodic-catkin - depends = ros-melodic-rosunit - depends = ros-melodic-rosgraph-msgs - depends = ros-melodic-rosparam - depends = ros-melodic-roslib depends = ros-melodic-rosclean depends = ros-melodic-rosmaster + depends = ros-melodic-rosparam + depends = ros-melodic-roslib + depends = ros-melodic-rosgraph-msgs depends = ros-melodic-rosout - depends = python2-rospkg - depends = python2-paramiko - depends = python2-yaml - source = ros-melodic-roslaunch-1.14.2-0.tar.gz::https://github.com/ros-gbp/ros_comm-release/archive/release/melodic/roslaunch/1.14.2-0.tar.gz - sha256sums = 00dc65bbceee360a79f6f36ed5182727072a48f4e656e82240a4c700cdcc7376 + depends = ros-melodic-rosunit + depends = python-yaml + depends = python-rospkg + depends = python-paramiko + source = ros-melodic-roslaunch::git+https://github.com/ros-gbp/ros_comm-release.git + sha256sums = SKIP pkgname = ros-melodic-roslaunch @@ -1,68 +1,83 @@ -# 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 - roslaunch is a tool for easily launching multiple ROS nodes locally and remotely via SSH, as well as setting parameters on the Parameter Server." url='http://ros.org/wiki/roslaunch' pkgname='ros-melodic-roslaunch' -pkgver='1.14.2' +pkgver='1.14.3' _pkgver_patch=0 arch=('any') pkgrel=1 license=('BSD') -ros_makedepends=(ros-melodic-catkin) -makedepends=('cmake' 'ros-build-tools' - ${ros_makedepends[@]}) +ros_makedepends=( + ros-melodic-catkin +) -ros_depends=(ros-melodic-rosunit - ros-melodic-rosgraph-msgs - ros-melodic-rosparam - ros-melodic-roslib - ros-melodic-rosclean - ros-melodic-rosmaster - ros-melodic-rosout) -depends=(${ros_depends[@]} - python2-rospkg - python2-paramiko - python2-yaml) +makedepends=( + 'cmake' + 'ros-build-tools' + ${ros_makedepends[@]} +) -# Git version (e.g. for debugging) -# _tag=release/melodic/roslaunch/${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-rosclean + ros-melodic-rosmaster + ros-melodic-rosparam + ros-melodic-roslib + ros-melodic-rosgraph-msgs + ros-melodic-rosout + ros-melodic-rosunit +) -# Tarball version (faster download) -_dir="ros_comm-release-release-melodic-roslaunch-${pkgver}-${_pkgver_patch}" -source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/ros_comm-release/archive/release/melodic/roslaunch/${pkgver}-${_pkgver_patch}.tar.gz") -sha256sums=('00dc65bbceee360a79f6f36ed5182727072a48f4e656e82240a4c700cdcc7376') +depends=( + ${ros_depends[@]} + python-yaml + python-rospkg + python-paramiko +) + +_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 } |