diff options
author | Gonçalo Camelo Neves Pereira | 2019-01-09 19:30:50 +0100 |
---|---|---|
committer | Gonçalo Camelo Neves Pereira | 2019-01-09 19:30:50 +0100 |
commit | a2b2ae610f4a4889d6545a1ac7dd09c4e7962da8 (patch) | |
tree | b546158e3edda1a616b7ae9016389cf1571f4f26 | |
parent | d297ac2a9ea09a1952e1f008b4681666a64d2416 (diff) | |
download | aur-a2b2ae610f4a4889d6545a1ac7dd09c4e7962da8.tar.gz |
New Version
-rw-r--r-- | .SRCINFO | 12 | ||||
-rw-r--r-- | PKGBUILD | 94 |
2 files changed, 55 insertions, 51 deletions
@@ -7,19 +7,19 @@ pkgbase = ros-melodic-cv-bridge license = BSD makedepends = cmake makedepends = ros-build-tools - makedepends = ros-melodic-rosconsole makedepends = ros-melodic-sensor-msgs + makedepends = ros-melodic-rosconsole makedepends = ros-melodic-catkin - makedepends = opencv - makedepends = python-numpy makedepends = boost makedepends = python - depends = ros-melodic-rosconsole + makedepends = python-numpy + makedepends = opencv depends = ros-melodic-sensor-msgs - depends = opencv - depends = python-numpy + depends = ros-melodic-rosconsole depends = boost depends = python + depends = python-numpy + depends = opencv source = ros-melodic-cv-bridge-1.13.0-0.tar.gz::https://github.com/ros-gbp/vision_opencv-release/archive/release/melodic/cv_bridge/1.13.0-0.tar.gz sha256sums = fb812741718a40399f538eaef7c887b79004afcdbe0271b3258c5c8ee9c55023 @@ -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 contains CvBridge, which converts between ROS Image messages and OpenCV images." url='http://www.ros.org/wiki/cv_bridge' @@ -10,61 +10,65 @@ arch=('any') pkgrel=1 license=('BSD') -ros_makedepends=(ros-melodic-rosconsole - ros-melodic-sensor-msgs - ros-melodic-catkin) -makedepends=('cmake' 'ros-build-tools' - ${ros_makedepends[@]} - opencv - python-numpy - boost - python) +ros_makedepends=( + ros-melodic-sensor-msgs + ros-melodic-rosconsole + ros-melodic-catkin +) -ros_depends=(ros-melodic-rosconsole - ros-melodic-sensor-msgs) -depends=(${ros_depends[@]} - opencv - python-numpy - boost - python) +makedepends=( + 'cmake' + 'ros-build-tools' + ${ros_makedepends[@]} + boost + python + python-numpy + opencv +) -# Git version (e.g. for debugging) -# _tag=release/melodic/cv_bridge/${pkgver}-${_pkgver_patch} -# _dir=${pkgname} -# source=("${_dir}"::"git+https://github.com/ros-gbp/vision_opencv-release.git"#tag=${_tag}) -# sha256sums=('SKIP') +ros_depends=( + ros-melodic-sensor-msgs + ros-melodic-rosconsole +) + +depends=( + ${ros_depends[@]} + boost + python + python-numpy + opencv +) -# Tarball version (faster download) _dir="vision_opencv-release-release-melodic-cv_bridge-${pkgver}-${_pkgver_patch}" source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/vision_opencv-release/archive/release/melodic/cv_bridge/${pkgver}-${_pkgver_patch}.tar.gz") sha256sums=('fb812741718a40399f538eaef7c887b79004afcdbe0271b3258c5c8ee9c55023') 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 3 ${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/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 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 } |