diff options
author | Gonçalo Camelo Neves Pereira | 2018-09-26 13:27:04 +0200 |
---|---|---|
committer | Gonçalo Camelo Neves Pereira | 2018-09-26 13:27:04 +0200 |
commit | aade4d93f392169eb2e42cfafdf071b9926895c0 (patch) | |
tree | 4228c965a71f5dd6c9e1d45371095036ba9f1f64 | |
parent | e20cef49ad47942036de754fe740c5cd9341edac (diff) | |
download | aur-aade4d93f392169eb2e42cfafdf071b9926895c0.tar.gz |
Update
-rw-r--r-- | .SRCINFO | 32 | ||||
-rw-r--r-- | PKGBUILD | 133 |
2 files changed, 75 insertions, 90 deletions
@@ -7,32 +7,32 @@ pkgbase = ros-melodic-image-view license = BSD makedepends = cmake makedepends = ros-build-tools - makedepends = ros-melodic-sensor-msgs + makedepends = ros-melodic-rosconsole + makedepends = ros-melodic-dynamic-reconfigure + makedepends = ros-melodic-camera-calibration-parsers makedepends = ros-melodic-message-filters - makedepends = ros-melodic-std-srvs - makedepends = ros-melodic-message-generation + makedepends = ros-melodic-roscpp makedepends = ros-melodic-catkin - makedepends = ros-melodic-dynamic-reconfigure - makedepends = ros-melodic-nodelet makedepends = ros-melodic-stereo-msgs + makedepends = ros-melodic-std-srvs makedepends = ros-melodic-cv-bridge - makedepends = ros-melodic-rosconsole - makedepends = ros-melodic-roscpp - makedepends = ros-melodic-camera-calibration-parsers makedepends = ros-melodic-image-transport + makedepends = ros-melodic-message-generation + makedepends = ros-melodic-sensor-msgs + makedepends = ros-melodic-nodelet makedepends = gtk2 - depends = ros-melodic-message-filters - depends = ros-melodic-std-srvs - depends = ros-melodic-dynamic-reconfigure - depends = ros-melodic-nodelet - depends = ros-melodic-cv-bridge depends = ros-melodic-rosconsole - depends = ros-melodic-roscpp + depends = ros-melodic-dynamic-reconfigure depends = ros-melodic-camera-calibration-parsers depends = ros-melodic-image-transport + depends = ros-melodic-roscpp + depends = ros-melodic-std-srvs + depends = ros-melodic-cv-bridge + depends = ros-melodic-nodelet + depends = ros-melodic-message-filters depends = gtk2 - source = ros-melodic-image-view::git+https://github.com/ros-gbp/image_pipeline-release.git - sha256sums = SKIP + source = ros-melodic-image-view-1.12.23-0.tar.gz::https://github.com/ros-gbp/image_pipeline-release/archive/release/melodic/image_view/1.12.23-0.tar.gz + sha256sums = db828d83d6f3afbd0b9478c6311ea0da425a062269e91a001da1aaadcdabd5b4 pkgname = ros-melodic-image-view @@ -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 - A simple viewer for ROS image topics." url='http://www.ros.org/wiki/image_view' @@ -10,87 +10,72 @@ arch=('any') pkgrel=1 license=('BSD') -ros_makedepends=( - ros-melodic-sensor-msgs - ros-melodic-message-filters - ros-melodic-std-srvs - ros-melodic-message-generation - ros-melodic-catkin - ros-melodic-dynamic-reconfigure - ros-melodic-nodelet - ros-melodic-stereo-msgs - ros-melodic-cv-bridge - ros-melodic-rosconsole - ros-melodic-roscpp - ros-melodic-camera-calibration-parsers - ros-melodic-image-transport -) +ros_makedepends=(ros-melodic-rosconsole + ros-melodic-dynamic-reconfigure + ros-melodic-camera-calibration-parsers + ros-melodic-message-filters + ros-melodic-roscpp + ros-melodic-catkin + ros-melodic-stereo-msgs + ros-melodic-std-srvs + ros-melodic-cv-bridge + ros-melodic-image-transport + ros-melodic-message-generation + ros-melodic-sensor-msgs + ros-melodic-nodelet) +makedepends=('cmake' 'ros-build-tools' + ${ros_makedepends[@]} + gtk2) -makedepends=( - 'cmake' - 'ros-build-tools' - ${ros_makedepends[@]} - gtk2 -) +ros_depends=(ros-melodic-rosconsole + ros-melodic-dynamic-reconfigure + ros-melodic-camera-calibration-parsers + ros-melodic-image-transport + ros-melodic-roscpp + ros-melodic-std-srvs + ros-melodic-cv-bridge + ros-melodic-nodelet + ros-melodic-message-filters) +depends=(${ros_depends[@]} + gtk2) -ros_depends=( - ros-melodic-message-filters - ros-melodic-std-srvs - ros-melodic-dynamic-reconfigure - ros-melodic-nodelet - ros-melodic-cv-bridge - ros-melodic-rosconsole - ros-melodic-roscpp - ros-melodic-camera-calibration-parsers - ros-melodic-image-transport -) +# Git version (e.g. for debugging) +# _tag=release/melodic/image_view/${pkgver}-${_pkgver_patch} +# _dir=${pkgname} +# source=("${_dir}"::"git+https://github.com/ros-gbp/image_pipeline-release.git"#tag=${_tag}) +# sha256sums=('SKIP') -depends=( - ${ros_depends[@]} - gtk2 -) - -_dir=${pkgname} -source=("${_dir}"::"git+https://github.com/ros-gbp/image_pipeline-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="image_pipeline-release-release-melodic-image_view-${pkgver}-${_pkgver_patch}" +source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/image_pipeline-release/archive/release/melodic/image_view/${pkgver}-${_pkgver_patch}.tar.gz") +sha256sums=('db828d83d6f3afbd0b9478c6311ea0da425a062269e91a001da1aaadcdabd5b4') 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 } |