diff options
| -rw-r--r-- | .SRCINFO | 3 | ||||
| -rw-r--r-- | PKGBUILD | 14 | ||||
| -rw-r--r-- | hdf5.patch | 33 |
3 files changed, 44 insertions, 6 deletions
@@ -1,5 +1,5 @@ # Generated by mksrcinfo v8 -# Sun Aug 13 11:04:21 UTC 2017 +# Sun Aug 13 11:13:49 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 @@ -20,7 +20,6 @@ pkgbase = ros-lunar-cv-bridge depends = opencv depends = boost depends = python2 - depends = hdf5 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 sha256sums = e4640ef69d7bb912649ed7986fca3aabb093ead1d3736a7a4a58d0340ec696ea @@ -24,8 +24,7 @@ ros_depends=(ros-lunar-sensor-msgs opencv) depends=(${ros_depends[@]} boost - python2 - hdf5) + python2) # Git version (e.g. for debugging) # _tag=release/lunar/cv_bridge/${pkgver}-${_pkgver_patch} @@ -35,8 +34,15 @@ 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") -sha256sums=('e4640ef69d7bb912649ed7986fca3aabb093ead1d3736a7a4a58d0340ec696ea') +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 < ${srcdir}/hdf5.patch + patch -p1 < hdf5.patch +} build() { # Use ROS environment variables diff --git a/hdf5.patch b/hdf5.patch new file mode 100644 index 000000000000..ac99f5af03eb --- /dev/null +++ b/hdf5.patch @@ -0,0 +1,33 @@ +diff -ura src/vision_opencv-release-release-lunar-cv_bridge-1.12.4-0/CMakeLists.txt src2/vision_opencv-release-release-lunar-cv_bridge-1.12.4-0/CMakeLists.txt +--- src/vision_opencv-release-release-lunar-cv_bridge-1.12.4-0/CMakeLists.txt 2017-03-13 22:50:18.000000000 +0100 ++++ src2/vision_opencv-release-release-lunar-cv_bridge-1.12.4-0/CMakeLists.txt 2017-08-13 13:11:08.629954737 +0200 +@@ -13,7 +13,13 @@ + else() + find_package(Boost REQUIRED) + endif() +-find_package(OpenCV REQUIRED) ++find_package(OpenCV 3 REQUIRED ++ COMPONENTS ++ opencv_core ++ opencv_imgproc ++ opencv_imgcodecs ++ CONFIG ++) + + catkin_package( + INCLUDE_DIRS include +diff -ura src/vision_opencv-release-release-lunar-cv_bridge-1.12.4-0/src/cv_bridge.cpp src2/vision_opencv-release-release-lunar-cv_bridge-1.12.4-0/src/cv_bridge.cpp +--- src/vision_opencv-release-release-lunar-cv_bridge-1.12.4-0/src/cv_bridge.cpp 2017-03-13 22:50:18.000000000 +0100 ++++ src2/vision_opencv-release-release-lunar-cv_bridge-1.12.4-0/src/cv_bridge.cpp 2017-08-13 13:12:00.615948618 +0200 +@@ -40,10 +40,9 @@ + #include <boost/make_shared.hpp> + #include <boost/regex.hpp> + ++#include <opencv2/imgcodecs.hpp> + #include <opencv2/imgproc/imgproc.hpp> + +-#include <opencv2/highgui/highgui.hpp> +- + #include <sensor_msgs/image_encodings.h> + + #include <cv_bridge/cv_bridge.h> |