diff options
author | Gonçalo Camelo Neves Pereira | 2018-09-26 13:36:40 +0200 |
---|---|---|
committer | Gonçalo Camelo Neves Pereira | 2018-09-26 13:36:40 +0200 |
commit | 64a3dbfcd44d41a99ebc902136bfbde999e96e4f (patch) | |
tree | 8f8874ca46ad181e715ecf6afde1181b11e13fc8 | |
parent | d9a774e76e952ce7ef4caaf9e76163f5fba99055 (diff) | |
download | aur-64a3dbfcd44d41a99ebc902136bfbde999e96e4f.tar.gz |
Update
-rw-r--r-- | .SRCINFO | 12 | ||||
-rw-r--r-- | PKGBUILD | 109 |
2 files changed, 53 insertions, 68 deletions
@@ -7,20 +7,20 @@ pkgbase = ros-melodic-rqt-rviz license = BSD makedepends = cmake makedepends = ros-build-tools - makedepends = ros-melodic-rviz makedepends = ros-melodic-pluginlib - makedepends = ros-melodic-catkin + makedepends = ros-melodic-rviz makedepends = ros-melodic-rqt-gui-cpp + makedepends = ros-melodic-catkin makedepends = ros-melodic-rqt-gui makedepends = boost makedepends = qt5-base - depends = ros-melodic-rqt-gui + depends = ros-melodic-pluginlib depends = ros-melodic-rviz depends = ros-melodic-rqt-gui-cpp - depends = ros-melodic-pluginlib + depends = ros-melodic-rqt-gui depends = boost - source = ros-melodic-rqt-rviz::git+https://github.com/ros-gbp/rqt_rviz-release.git - sha256sums = SKIP + source = ros-melodic-rqt-rviz-0.6.0-0.tar.gz::https://github.com/ros-gbp/rqt_rviz-release/archive/release/melodic/rqt_rviz/0.6.0-0.tar.gz + sha256sums = 23e3aa89701e33665c95e1bd0f0df853a52a8bfd433c352071ba9ff597b8ecb7 pkgname = ros-melodic-rqt-rviz @@ -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 - rqt_rviz provides a GUI plugin embedding RViz." url='http://wiki.ros.org/rqt_rviz' @@ -10,75 +10,60 @@ arch=('any') pkgrel=1 license=('BSD') -ros_makedepends=( - ros-melodic-rviz - ros-melodic-pluginlib - ros-melodic-catkin - ros-melodic-rqt-gui-cpp - ros-melodic-rqt-gui -) +ros_makedepends=(ros-melodic-pluginlib + ros-melodic-rviz + ros-melodic-rqt-gui-cpp + ros-melodic-catkin + ros-melodic-rqt-gui) +makedepends=('cmake' 'ros-build-tools' + ${ros_makedepends[@]} + boost + qt5-base) -makedepends=( - 'cmake' - 'ros-build-tools' - ${ros_makedepends[@]} - boost - qt5-base -) +ros_depends=(ros-melodic-pluginlib + ros-melodic-rviz + ros-melodic-rqt-gui-cpp + ros-melodic-rqt-gui) +depends=(${ros_depends[@]} + boost) -ros_depends=( - ros-melodic-rqt-gui - ros-melodic-rviz - ros-melodic-rqt-gui-cpp - ros-melodic-pluginlib -) +# Git version (e.g. for debugging) +# _tag=release/melodic/rqt_rviz/${pkgver}-${_pkgver_patch} +# _dir=${pkgname} +# source=("${_dir}"::"git+https://github.com/ros-gbp/rqt_rviz-release.git"#tag=${_tag}) +# sha256sums=('SKIP') -depends=( - ${ros_depends[@]} - boost -) - -_dir=${pkgname} -source=("${_dir}"::"git+https://github.com/ros-gbp/rqt_rviz-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="rqt_rviz-release-release-melodic-rqt_rviz-${pkgver}-${_pkgver_patch}" +source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/rqt_rviz-release/archive/release/melodic/rqt_rviz/${pkgver}-${_pkgver_patch}.tar.gz") +sha256sums=('23e3aa89701e33665c95e1bd0f0df853a52a8bfd433c352071ba9ff597b8ecb7') 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 } |