diff options
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 21 | ||||
| -rw-r--r-- | fix-opencv2-and-numpy-path.patch | 34 |
3 files changed, 57 insertions, 6 deletions
@@ -1,7 +1,7 @@ pkgbase = ros-indigo-pano-py pkgdesc = ROS - This is a python wraper around the pano_core library (I think). pkgver = 2.3.3 - pkgrel = 1 + pkgrel = 2 url = http://ros.org/wiki/pano_py arch = any license = BSD @@ -15,6 +15,8 @@ pkgbase = ros-indigo-pano-py makedepends = ros-indigo-rospy makedepends = ros-indigo-catkin makedepends = ros-indigo-image-transport + depends = opencv2-opt + depends = python2-numpy depends = ros-indigo-roscpp depends = ros-indigo-cv-bridge depends = ros-indigo-std-msgs @@ -22,7 +24,9 @@ pkgbase = ros-indigo-pano-py depends = ros-indigo-rospy depends = ros-indigo-image-transport source = pano_py::git+https://github.com/turtlebot-release/turtlebot_apps-release.git#tag=release/indigo/pano_py/2.3.3-0 - md5sums = SKIP + source = fix-opencv2-and-numpy-path.patch + sha256sums = SKIP + sha256sums = c787e445acbf53d2b546279d3cef2b77b978ff3082dad9f03cea4ea24bd60696 pkgname = ros-indigo-pano-py @@ -7,7 +7,7 @@ pkgname='ros-indigo-pano-py' pkgver='2.3.3' _pkgver_patch=0 arch=('any') -pkgrel=1 +pkgrel=2 license=('BSD') ros_makedepends=(ros-indigo-roscpp @@ -26,12 +26,25 @@ ros_depends=(ros-indigo-roscpp ros-indigo-pano-core ros-indigo-rospy ros-indigo-image-transport) -depends=(${ros_depends[@]}) +depends=( + 'opencv2-opt' + 'python2-numpy' + ${ros_depends[@]} +) _tag=release/indigo/pano_py/${pkgver}-${_pkgver_patch} _dir=pano_py -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-and-numpy-path.patch' +) +sha256sums=('SKIP' + 'c787e445acbf53d2b546279d3cef2b77b978ff3082dad9f03cea4ea24bd60696') + +prepare () { + cd ${srcdir}/${_dir} + patch -Np1 -i ${srcdir}/fix-opencv2-and-numpy-path.patch +} build() { # Use ROS environment variables diff --git a/fix-opencv2-and-numpy-path.patch b/fix-opencv2-and-numpy-path.patch new file mode 100644 index 000000000000..92c5febb95d7 --- /dev/null +++ b/fix-opencv2-and-numpy-path.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 96d0ef7d..c192b6b5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,13 +1,20 @@ + cmake_minimum_required(VERSION 2.8.3) + project(pano_py) + ++set("OpenCV_DIR" "/opt/opencv2/share/opencv2") ++ + # Load catkin and all dependencies required for this package + find_package(catkin REQUIRED COMPONENTS pano_core rospy roscpp std_msgs image_transport cv_bridge) + find_package(Boost REQUIRED COMPONENTS python) + find_package(PythonLibs REQUIRED) +-find_package(OpenCV REQUIRED) ++find_package(OpenCV REQUIRED NO_DEFAULT_PATH) ++ ++execute_process( ++ COMMAND "${PYTHON_EXECUTABLE}" -c ++ "from __future__ import print_function\ntry: import numpy; print(numpy.get_include(), end='')\nexcept:pass\n" ++ OUTPUT_VARIABLE __numpy_include_dir) + +-include_directories(include ${Boost_INCLUDE_DIR} ${catkin_INCLUDE_DIRS} ${PYTHON_INCLUDE_PATH} ${OpenCV_INCLUDE_DIRS}) ++include_directories(include ${Boost_INCLUDE_DIR} ${catkin_INCLUDE_DIRS} ${PYTHON_INCLUDE_PATH} ${OpenCV_INCLUDE_DIRS} ${__numpy_include_dir}) + + add_subdirectory(src/pano_cv) + add_subdirectory(src/pano_py) +@@ -30,4 +37,4 @@ catkin_add_env_hooks(15.ld_lib_path SHELLS bash tcsh zsh DIRECTORY ${CMAKE_CURRE + + install(DIRECTORY include/${PROJECT_NAME}/ + DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION} +-) +\ No newline at end of file ++) |