diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2019-12-10 17:21:52 +0100 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2019-12-10 18:34:47 +0100 |
| commit | ed5d0a390a90af5320dbf3c0929753be4fdd820d (patch) | |
| tree | 906f4a584be514fc910acb477dc3a9b28e049057 /dev-ros | |
| parent | dev-ros/compressed_image_transport: fix build with opencv4 (diff) | |
| download | gentoo-ed5d0a390a90af5320dbf3c0929753be4fdd820d.tar.gz gentoo-ed5d0a390a90af5320dbf3c0929753be4fdd820d.tar.bz2 gentoo-ed5d0a390a90af5320dbf3c0929753be4fdd820d.zip | |
dev-ros/compressed_depth_image_transport: fix build with opencv4
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Alexis Ballier <aballier@gentoo.org>
Diffstat (limited to 'dev-ros')
| -rw-r--r-- | dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.9.5-r1.ebuild | 5 | ||||
| -rw-r--r-- | dev-ros/compressed_depth_image_transport/files/ocv4.patch | 13 |
2 files changed, 16 insertions, 2 deletions
diff --git a/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.9.5-r1.ebuild b/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.9.5-r1.ebuild index d4ef693e9dd2..d3bccdcdc1cc 100644 --- a/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.9.5-r1.ebuild +++ b/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.9.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -18,8 +18,9 @@ RDEPEND=" dev-ros/cv_bridge dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}] dev-ros/image_transport - media-libs/opencv:= + >=media-libs/opencv-4:= dev-libs/boost:= dev-libs/console_bridge:= " DEPEND="${RDEPEND}" +PATCHES=( "${FILESDIR}/ocv4.patch" ) diff --git a/dev-ros/compressed_depth_image_transport/files/ocv4.patch b/dev-ros/compressed_depth_image_transport/files/ocv4.patch new file mode 100644 index 000000000000..9d1c7d79ce62 --- /dev/null +++ b/dev-ros/compressed_depth_image_transport/files/ocv4.patch @@ -0,0 +1,13 @@ +Index: compressed_depth_image_transport/src/codec.cpp +=================================================================== +--- compressed_depth_image_transport.orig/src/codec.cpp ++++ compressed_depth_image_transport/src/codec.cpp +@@ -135,7 +135,7 @@ sensor_msgs::Image::Ptr decodeCompressed + // Decode raw image + try + { +- cv_ptr->image = cv::imdecode(imageData, CV_LOAD_IMAGE_UNCHANGED); ++ cv_ptr->image = cv::imdecode(imageData, cv::IMREAD_UNCHANGED); + } + catch (cv::Exception& e) + { |