diff options
author | Gonçalo Camelo Neves Pereira | 2018-09-08 14:50:25 +0200 |
---|---|---|
committer | Gonçalo Camelo Neves Pereira | 2018-09-08 14:50:25 +0200 |
commit | 2bac95071d963c0ffa128bfdf20a77db9ca05f60 (patch) | |
tree | d772b73c5fc51e9463f460bf996b0e22c9284401 | |
parent | 9551dc129ca57c500934226f0ae72306e8ec8f79 (diff) | |
download | aur-2bac95071d963c0ffa128bfdf20a77db9ca05f60.tar.gz |
Update!
-rw-r--r-- | .SRCINFO | 20 | ||||
-rw-r--r-- | PKGBUILD | 111 |
2 files changed, 73 insertions, 58 deletions
@@ -7,21 +7,21 @@ 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-catkin - makedepends = opencv - makedepends = python2-numpy + makedepends = ros-melodic-rosconsole makedepends = boost - makedepends = python2 - depends = ros-melodic-rosconsole + makedepends = opencv + makedepends = python + makedepends = python-numpy depends = ros-melodic-sensor-msgs - depends = opencv - depends = python2-numpy + depends = ros-melodic-rosconsole depends = boost - depends = python2 - 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 + depends = opencv + depends = python + depends = python-numpy + source = ros-melodic-cv-bridge::git+https://github.com/ros-gbp/vision_opencv-release.git + sha256sums = SKIP pkgname = ros-melodic-cv-bridge @@ -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,76 @@ 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 - python2-numpy - boost - python2) +ros_makedepends=( + ros-melodic-sensor-msgs + ros-melodic-catkin + ros-melodic-rosconsole +) -ros_depends=(ros-melodic-rosconsole - ros-melodic-sensor-msgs) -depends=(${ros_depends[@]} - opencv - python2-numpy - boost - python2) +makedepends=( + 'cmake' + 'ros-build-tools' + ${ros_makedepends[@]} + boost + opencv + python + python-numpy +) -# 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 +) -# 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') +depends=( + ${ros_depends[@]} + boost + opencv + python + python-numpy +) + +_dir=${pkgname} +source=("${_dir}"::"git+https://github.com/ros-gbp/vision_opencv-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 } |