diff options
author | Tim Rakowski | 2017-08-13 13:20:13 +0200 |
---|---|---|
committer | Tim Rakowski | 2017-08-13 13:20:13 +0200 |
commit | aca3d075ba4c8b7ac02699e9ca0014feb8aa4984 (patch) | |
tree | 467efa52f0577f59c73d63c114c92277540ce9b7 /hdf5.patch | |
parent | 7b7a6e0e1001be1466dc4d23173b486856e7c491 (diff) | |
download | aur-aca3d075ba4c8b7ac02699e9ca0014feb8aa4984.tar.gz |
Removed hdf5 dependency and backported upstream fix instead
Diffstat (limited to 'hdf5.patch')
-rw-r--r-- | hdf5.patch | 33 |
1 files changed, 33 insertions, 0 deletions
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> |