diff options
author | Gonçalo Camelo Neves Pereira | 2018-09-08 14:51:43 +0200 |
---|---|---|
committer | Gonçalo Camelo Neves Pereira | 2018-09-08 14:51:43 +0200 |
commit | 0765a5da686f5ecd5afa8593030d5ad06321c0ca (patch) | |
tree | c4ac322ea94b4208884ec4928f4b3b2e2384edf2 | |
parent | 96ca71d0d748fdb2339defeb41a804763fc4f3d5 (diff) | |
download | aur-0765a5da686f5ecd5afa8593030d5ad06321c0ca.tar.gz |
Update!
-rw-r--r-- | .SRCINFO | 66 | ||||
-rw-r--r-- | PKGBUILD | 183 |
2 files changed, 132 insertions, 117 deletions
@@ -7,57 +7,57 @@ pkgbase = ros-melodic-gazebo-plugins license = BSD, Apache 2.0 makedepends = cmake makedepends = ros-build-tools - makedepends = ros-melodic-diagnostic-updater + makedepends = ros-melodic-message-generation + makedepends = ros-melodic-angles + makedepends = ros-melodic-rospy makedepends = ros-melodic-rosgraph-msgs + makedepends = ros-melodic-gazebo-dev + makedepends = ros-melodic-roscpp makedepends = ros-melodic-std-srvs - makedepends = ros-melodic-cv-bridge - makedepends = ros-melodic-rosconsole - makedepends = ros-melodic-tf - makedepends = ros-melodic-std-msgs - makedepends = ros-melodic-gazebo-msgs makedepends = ros-melodic-catkin - makedepends = ros-melodic-gazebo-dev - makedepends = ros-melodic-geometry-msgs - makedepends = ros-melodic-dynamic-reconfigure - makedepends = ros-melodic-trajectory-msgs - makedepends = ros-melodic-nodelet makedepends = ros-melodic-tf2-ros + makedepends = ros-melodic-geometry-msgs makedepends = ros-melodic-urdf + makedepends = ros-melodic-rosconsole + makedepends = ros-melodic-gazebo-msgs + makedepends = ros-melodic-trajectory-msgs makedepends = ros-melodic-nav-msgs + makedepends = ros-melodic-image-transport + makedepends = ros-melodic-tf + makedepends = ros-melodic-nodelet + makedepends = ros-melodic-std-msgs makedepends = ros-melodic-sensor-msgs + makedepends = ros-melodic-diagnostic-updater makedepends = ros-melodic-camera-info-manager - makedepends = ros-melodic-angles - makedepends = ros-melodic-roscpp + makedepends = ros-melodic-dynamic-reconfigure + makedepends = ros-melodic-cv-bridge makedepends = ros-melodic-polled-camera - makedepends = ros-melodic-image-transport - makedepends = ros-melodic-message-generation - makedepends = ros-melodic-rospy - depends = ros-melodic-diagnostic-updater + depends = ros-melodic-angles + depends = ros-melodic-rospy depends = ros-melodic-rosgraph-msgs + depends = ros-melodic-gazebo-dev + depends = ros-melodic-roscpp depends = ros-melodic-std-srvs - depends = ros-melodic-cv-bridge - depends = ros-melodic-rosconsole - depends = ros-melodic-tf - depends = ros-melodic-std-msgs - depends = ros-melodic-gazebo-msgs - depends = ros-melodic-geometry-msgs - depends = ros-melodic-trajectory-msgs - depends = ros-melodic-dynamic-reconfigure depends = ros-melodic-message-runtime - depends = ros-melodic-nodelet depends = ros-melodic-tf2-ros + depends = ros-melodic-geometry-msgs depends = ros-melodic-urdf + depends = ros-melodic-rosconsole + depends = ros-melodic-gazebo-msgs + depends = ros-melodic-trajectory-msgs depends = ros-melodic-nav-msgs + depends = ros-melodic-image-transport + depends = ros-melodic-tf + depends = ros-melodic-nodelet + depends = ros-melodic-std-msgs depends = ros-melodic-sensor-msgs + depends = ros-melodic-diagnostic-updater depends = ros-melodic-camera-info-manager - depends = ros-melodic-angles - depends = ros-melodic-roscpp + depends = ros-melodic-dynamic-reconfigure + depends = ros-melodic-cv-bridge depends = ros-melodic-polled-camera - depends = ros-melodic-image-transport - depends = ros-melodic-gazebo-dev - depends = ros-melodic-rospy - source = ros-melodic-gazebo-plugins-2.8.4-0.tar.gz::https://github.com/ros-gbp/gazebo_ros_pkgs-release/archive/release/melodic/gazebo_plugins/2.8.4-0.tar.gz - sha256sums = 94c5485bf4de9cbdb17df841f0ba08aa28e245dd533f88c78f3533b763622ca7 + source = ros-melodic-gazebo-plugins::git+https://github.com/ros-gbp/gazebo_ros_pkgs-release.git + sha256sums = SKIP pkgname = ros-melodic-gazebo-plugins @@ -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 - Robot-independent Gazebo plugins for sensors, motors and dynamic reconfigurable components." url='http://gazebosim.org/tutorials?cat=connect_ros' @@ -10,97 +10,112 @@ arch=('any') pkgrel=1 license=('BSD, Apache 2.0') -ros_makedepends=(ros-melodic-diagnostic-updater - ros-melodic-rosgraph-msgs - ros-melodic-std-srvs - ros-melodic-cv-bridge - ros-melodic-rosconsole - ros-melodic-tf - ros-melodic-std-msgs - ros-melodic-gazebo-msgs - ros-melodic-catkin - ros-melodic-gazebo-dev - ros-melodic-geometry-msgs - ros-melodic-dynamic-reconfigure - ros-melodic-trajectory-msgs - ros-melodic-nodelet - ros-melodic-tf2-ros - ros-melodic-urdf - ros-melodic-nav-msgs - ros-melodic-sensor-msgs - ros-melodic-camera-info-manager - ros-melodic-angles - ros-melodic-roscpp - ros-melodic-polled-camera - ros-melodic-image-transport - ros-melodic-message-generation - ros-melodic-rospy) -makedepends=('cmake' 'ros-build-tools' - ${ros_makedepends[@]}) +ros_makedepends=( + ros-melodic-message-generation + ros-melodic-angles + ros-melodic-rospy + ros-melodic-rosgraph-msgs + ros-melodic-gazebo-dev + ros-melodic-roscpp + ros-melodic-std-srvs + ros-melodic-catkin + ros-melodic-tf2-ros + ros-melodic-geometry-msgs + ros-melodic-urdf + ros-melodic-rosconsole + ros-melodic-gazebo-msgs + ros-melodic-trajectory-msgs + ros-melodic-nav-msgs + ros-melodic-image-transport + ros-melodic-tf + ros-melodic-nodelet + ros-melodic-std-msgs + ros-melodic-sensor-msgs + ros-melodic-diagnostic-updater + ros-melodic-camera-info-manager + ros-melodic-dynamic-reconfigure + ros-melodic-cv-bridge + ros-melodic-polled-camera +) -ros_depends=(ros-melodic-diagnostic-updater - ros-melodic-rosgraph-msgs - ros-melodic-std-srvs - ros-melodic-cv-bridge - ros-melodic-rosconsole - ros-melodic-tf - ros-melodic-std-msgs - ros-melodic-gazebo-msgs - ros-melodic-geometry-msgs - ros-melodic-trajectory-msgs - ros-melodic-dynamic-reconfigure - ros-melodic-message-runtime - ros-melodic-nodelet - ros-melodic-tf2-ros - ros-melodic-urdf - ros-melodic-nav-msgs - ros-melodic-sensor-msgs - ros-melodic-camera-info-manager - ros-melodic-angles - ros-melodic-roscpp - ros-melodic-polled-camera - ros-melodic-image-transport - ros-melodic-gazebo-dev - ros-melodic-rospy) -depends=(${ros_depends[@]}) +makedepends=( + 'cmake' + 'ros-build-tools' + ${ros_makedepends[@]} +) -# Git version (e.g. for debugging) -# _tag=release/melodic/gazebo_plugins/${pkgver}-${_pkgver_patch} -# _dir=${pkgname} -# source=("${_dir}"::"git+https://github.com/ros-gbp/gazebo_ros_pkgs-release.git"#tag=${_tag}) -# sha256sums=('SKIP') +ros_depends=( + ros-melodic-angles + ros-melodic-rospy + ros-melodic-rosgraph-msgs + ros-melodic-gazebo-dev + ros-melodic-roscpp + ros-melodic-std-srvs + ros-melodic-message-runtime + ros-melodic-tf2-ros + ros-melodic-geometry-msgs + ros-melodic-urdf + ros-melodic-rosconsole + ros-melodic-gazebo-msgs + ros-melodic-trajectory-msgs + ros-melodic-nav-msgs + ros-melodic-image-transport + ros-melodic-tf + ros-melodic-nodelet + ros-melodic-std-msgs + ros-melodic-sensor-msgs + ros-melodic-diagnostic-updater + ros-melodic-camera-info-manager + ros-melodic-dynamic-reconfigure + ros-melodic-cv-bridge + ros-melodic-polled-camera +) -# Tarball version (faster download) -_dir="gazebo_ros_pkgs-release-release-melodic-gazebo_plugins-${pkgver}-${_pkgver_patch}" -source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/gazebo_ros_pkgs-release/archive/release/melodic/gazebo_plugins/${pkgver}-${_pkgver_patch}.tar.gz") -sha256sums=('94c5485bf4de9cbdb17df841f0ba08aa28e245dd533f88c78f3533b763622ca7') +depends=( + ${ros_depends[@]} +) + +_dir=${pkgname} +source=("${_dir}"::"git+https://github.com/ros-gbp/gazebo_ros_pkgs-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 } |