diff options
| -rw-r--r-- | .SRCINFO | 21 | ||||
| -rw-r--r-- | PKGBUILD | 42 |
2 files changed, 26 insertions, 37 deletions
@@ -1,29 +1,24 @@ # Generated by mksrcinfo v8 -# Sun Aug 13 11:21:32 UTC 2017 +# Sun Nov 12 16:15:29 UTC 2017 pkgbase = ros-lunar-cv-bridge pkgdesc = ROS - This contains CvBridge, which converts between ROS Image messages and OpenCV images. - pkgver = 1.12.4 - pkgrel = 2 + pkgver = 1.12.6 + pkgrel = 1 url = http://www.ros.org/wiki/cv_bridge arch = any license = BSD + checkdepends = ros-lunar-rostest + checkdepends = python2-numpy makedepends = cmake makedepends = ros-build-tools - makedepends = ros-lunar-sensor-msgs makedepends = ros-lunar-catkin - makedepends = ros-lunar-rosconsole - makedepends = opencv - makedepends = boost - makedepends = python2 depends = ros-lunar-sensor-msgs depends = ros-lunar-rosconsole - depends = opencv depends = boost + depends = opencv depends = python2 - source = ros-lunar-cv-bridge-1.12.4-0.tar.gz::https://github.com/ros-gbp/vision_opencv-release/archive/release/lunar/cv_bridge/1.12.4-0.tar.gz - source = hdf5.patch - sha256sums = e4640ef69d7bb912649ed7986fca3aabb093ead1d3736a7a4a58d0340ec696ea - sha256sums = 0c67b512e0531f189978a81ef3927a5bc6764a1d6f42e53ab67c73cd91bb85f3 + source = ros-lunar-cv-bridge-1.12.6-0.tar.gz::https://github.com/ros-gbp/vision_opencv-release/archive/release/lunar/cv_bridge/1.12.6-0.tar.gz + sha256sums = bf51aa2c481f5c586fadda45d00f3ffe01d3aa286bf15d1baa5ca292052c68b0 pkgname = ros-lunar-cv-bridge @@ -4,28 +4,27 @@ pkgdesc="ROS - This contains CvBridge, which converts between ROS Image messages url='http://www.ros.org/wiki/cv_bridge' pkgname='ros-lunar-cv-bridge' -pkgver='1.12.4' +pkgver='1.12.6' _pkgver_patch=0 arch=('any') -pkgrel=2 +pkgrel=1 license=('BSD') -ros_makedepends=(ros-lunar-sensor-msgs - ros-lunar-catkin - ros-lunar-rosconsole - opencv) +ros_makedepends=(ros-lunar-catkin) makedepends=('cmake' 'ros-build-tools' - ${ros_makedepends[@]} - boost - python2) + ${ros_makedepends[@]}) ros_depends=(ros-lunar-sensor-msgs - ros-lunar-rosconsole - opencv) + ros-lunar-rosconsole) depends=(${ros_depends[@]} boost + opencv python2) +ros_checkdepends=(ros-lunar-rostest) +checkdepends=(${ros_checkdepends[@]} + python2-numpy) + # Git version (e.g. for debugging) # _tag=release/lunar/cv_bridge/${pkgver}-${_pkgver_patch} # _dir=${pkgname} @@ -34,14 +33,8 @@ depends=(${ros_depends[@]} # Tarball version (faster download) _dir="vision_opencv-release-release-lunar-cv_bridge-${pkgver}-${_pkgver_patch}" -source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/vision_opencv-release/archive/release/lunar/cv_bridge/${pkgver}-${_pkgver_patch}.tar.gz" "hdf5.patch") -sha256sums=('e4640ef69d7bb912649ed7986fca3aabb093ead1d3736a7a4a58d0340ec696ea' - '0c67b512e0531f189978a81ef3927a5bc6764a1d6f42e53ab67c73cd91bb85f3') - -prepare() { - cd ${srcdir} - patch -p1 < hdf5.patch -} +source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/vision_opencv-release/archive/release/lunar/cv_bridge/${pkgver}-${_pkgver_patch}.tar.gz") +sha256sums=('bf51aa2c481f5c586fadda45d00f3ffe01d3aa286bf15d1baa5ca292052c68b0') build() { # Use ROS environment variables @@ -49,14 +42,14 @@ build() { [ -f /opt/ros/lunar/setup.bash ] && source /opt/ros/lunar/setup.bash # Create build directory - [ -d ${srcdir}/build ] || mkdir ${srcdir}/build - cd ${srcdir}/build + [ -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} + /usr/share/ros-build-tools/fix-python-scripts.sh -v 2 "${srcdir}/${_dir}" # Build project - cmake ${srcdir}/${_dir} \ + cmake "${srcdir}/${_dir}" \ -DCMAKE_BUILD_TYPE=Release \ -DCATKIN_BUILD_BINARY_PACKAGE=ON \ -DCMAKE_INSTALL_PREFIX=/opt/ros/lunar \ @@ -64,7 +57,8 @@ build() { -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \ -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \ -DPYTHON_BASENAME=-python2.7 \ - -DSETUPTOOLS_DEB_LAYOUT=OFF + -DSETUPTOOLS_DEB_LAYOUT=OFF \ + -DCATKIN_ENABLE_TESTING=OFF make } |