summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rakowski2017-11-12 17:34:11 +0100
committerTim Rakowski2017-11-12 17:34:11 +0100
commit7a130c88c8142bfdc7e2c57eb2d7f4756fc80890 (patch)
tree76eba1ebbc40a935657ef12a76423a4925b62804
parentafeca2cfc28eafecc5117d545382d446eca38cad (diff)
downloadaur-7a130c88c8142bfdc7e2c57eb2d7f4756fc80890.tar.gz
Update to version 1.12.6-1
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD18
2 files changed, 15 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 093a691327f6..3d75afac641e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Mon May 22 17:06:37 UTC 2017
+# Sun Nov 12 16:15:33 UTC 2017
pkgbase = ros-lunar-vision-opencv
pkgdesc = ROS - Packages for interfacing ROS with OpenCV, a library of programming functions for real time computer vision.
- pkgver = 1.12.4
+ pkgver = 1.12.6
pkgrel = 1
url = http://www.ros.org/wiki/vision_opencv
arch = any
@@ -12,8 +12,8 @@ pkgbase = ros-lunar-vision-opencv
makedepends = ros-lunar-catkin
depends = ros-lunar-image-geometry
depends = ros-lunar-cv-bridge
- source = ros-lunar-vision-opencv-1.12.4-0.tar.gz::https://github.com/ros-gbp/vision_opencv-release/archive/release/lunar/vision_opencv/1.12.4-0.tar.gz
- sha256sums = e3990a66a7d208de726003361f2b9a0a72e76afce26e8a741920b53be770af15
+ source = ros-lunar-vision-opencv-1.12.6-0.tar.gz::https://github.com/ros-gbp/vision_opencv-release/archive/release/lunar/vision_opencv/1.12.6-0.tar.gz
+ sha256sums = f78f829e4b78658965c7a7f83d05f5cbe325851294934e60081ffd9b23552b41
pkgname = ros-lunar-vision-opencv
diff --git a/PKGBUILD b/PKGBUILD
index 555bc5007d96..6597ddf0e845 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ pkgdesc="ROS - Packages for interfacing ROS with OpenCV, a library of programmin
url='http://www.ros.org/wiki/vision_opencv'
pkgname='ros-lunar-vision-opencv'
-pkgver='1.12.4'
+pkgver='1.12.6'
_pkgver_patch=0
arch=('any')
pkgrel=1
@@ -18,6 +18,9 @@ ros_depends=(ros-lunar-image-geometry
ros-lunar-cv-bridge)
depends=(${ros_depends[@]})
+ros_checkdepends=()
+checkdepends=(${ros_checkdepends[@]})
+
# Git version (e.g. for debugging)
# _tag=release/lunar/vision_opencv/${pkgver}-${_pkgver_patch}
# _dir=${pkgname}
@@ -27,7 +30,7 @@ depends=(${ros_depends[@]})
# Tarball version (faster download)
_dir="vision_opencv-release-release-lunar-vision_opencv-${pkgver}-${_pkgver_patch}"
source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/vision_opencv-release/archive/release/lunar/vision_opencv/${pkgver}-${_pkgver_patch}.tar.gz")
-sha256sums=('e3990a66a7d208de726003361f2b9a0a72e76afce26e8a741920b53be770af15')
+sha256sums=('f78f829e4b78658965c7a7f83d05f5cbe325851294934e60081ffd9b23552b41')
build() {
# Use ROS environment variables
@@ -35,14 +38,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 \
@@ -50,7 +53,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
}