diff options
| -rw-r--r-- | .SRCINFO | 7 | ||||
| -rw-r--r-- | PKGBUILD | 20 | ||||
| -rw-r--r-- | fix-opencv2-path.patch | 17 |
3 files changed, 38 insertions, 6 deletions
@@ -1,7 +1,7 @@ pkgbase = ros-indigo-pano-core pkgdesc = ROS - Library for the opencv-based panorama stitching algorithm. pkgver = 2.3.3 - pkgrel = 1 + pkgrel = 2 url = http://ros.org/wiki/pano_core arch = any license = BSD @@ -11,10 +11,13 @@ pkgbase = ros-indigo-pano-core makedepends = ros-indigo-catkin makedepends = ros-indigo-roscpp makedepends = ros-indigo-cv-bridge + depends = opencv2-opt depends = ros-indigo-roscpp depends = ros-indigo-cv-bridge source = pano_core::git+https://github.com/turtlebot-release/turtlebot_apps-release.git#tag=release/indigo/pano_core/2.3.3-0 - md5sums = SKIP + source = fix-opencv2-path.patch + sha256sums = SKIP + sha256sums = b165c3d25e56cc6ce86c5cca6dc947496eac6c03597c10f7d36d53df59d88369 pkgname = ros-indigo-pano-core @@ -7,7 +7,7 @@ pkgname='ros-indigo-pano-core' pkgver='2.3.3' _pkgver_patch=0 arch=('any') -pkgrel=1 +pkgrel=2 license=('BSD') ros_makedepends=(ros-indigo-catkin @@ -18,12 +18,24 @@ makedepends=('cmake' 'git' 'ros-build-tools' ros_depends=(ros-indigo-roscpp ros-indigo-cv-bridge) -depends=(${ros_depends[@]}) +depends=( + 'opencv2-opt' + ${ros_depends[@]} +) _tag=release/indigo/pano_core/${pkgver}-${_pkgver_patch} _dir=pano_core -source=("${_dir}"::"git+https://github.com/turtlebot-release/turtlebot_apps-release.git"#tag=${_tag}) -md5sums=('SKIP') +source=( + "${_dir}"::"git+https://github.com/turtlebot-release/turtlebot_apps-release.git#tag=${_tag}" + 'fix-opencv2-path.patch' +) +sha256sums=('SKIP' + 'b165c3d25e56cc6ce86c5cca6dc947496eac6c03597c10f7d36d53df59d88369') + +prepare () { + cd ${srcdir}/${_dir} + patch -Np1 -i ${srcdir}/fix-opencv2-path.patch +} build() { # Use ROS environment variables diff --git a/fix-opencv2-path.patch b/fix-opencv2-path.patch new file mode 100644 index 000000000000..18895b0320af --- /dev/null +++ b/fix-opencv2-path.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4a89596d..0e338491 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,9 +1,11 @@ + cmake_minimum_required(VERSION 2.8.3) + project(pano_core) + ++set("OpenCV_DIR" "/opt/opencv2/share/opencv2") ++ + find_package(catkin REQUIRED COMPONENTS cv_bridge roscpp) + find_package(Boost REQUIRED COMPONENTS program_options) +-find_package(OpenCV REQUIRED) ++find_package(OpenCV REQUIRED NO_DEFAULT_PATH) + + ################################### + ## catkin specific configuration ## |