diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2019-12-10 17:18:38 +0100 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2019-12-10 18:34:46 +0100 |
| commit | cfad122869fdc354164d71266938ed50658ffaf4 (patch) | |
| tree | b5cbf94341190028d359ada05f9ffdfd6c53b270 /dev-ros/compressed_image_transport | |
| parent | dev-ros/image_publisher: fix build with opencv 4 (diff) | |
| download | gentoo-cfad122869fdc354164d71266938ed50658ffaf4.tar.gz gentoo-cfad122869fdc354164d71266938ed50658ffaf4.tar.bz2 gentoo-cfad122869fdc354164d71266938ed50658ffaf4.zip | |
dev-ros/compressed_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/compressed_image_transport')
| -rw-r--r-- | dev-ros/compressed_image_transport/compressed_image_transport-1.9.5-r1.ebuild | 5 | ||||
| -rw-r--r-- | dev-ros/compressed_image_transport/files/ocv4.patch | 22 |
2 files changed, 25 insertions, 2 deletions
diff --git a/dev-ros/compressed_image_transport/compressed_image_transport-1.9.5-r1.ebuild b/dev-ros/compressed_image_transport/compressed_image_transport-1.9.5-r1.ebuild index 46fc32014194..044d1c361210 100644 --- a/dev-ros/compressed_image_transport/compressed_image_transport-1.9.5-r1.ebuild +++ b/dev-ros/compressed_image_transport/compressed_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_image_transport/files/ocv4.patch b/dev-ros/compressed_image_transport/files/ocv4.patch new file mode 100644 index 000000000000..6b3406b5c006 --- /dev/null +++ b/dev-ros/compressed_image_transport/files/ocv4.patch @@ -0,0 +1,22 @@ +Index: compressed_image_transport/src/compressed_publisher.cpp +=================================================================== +--- compressed_image_transport.orig/src/compressed_publisher.cpp ++++ compressed_image_transport/src/compressed_publisher.cpp +@@ -97,7 +97,7 @@ void CompressedPublisher::publish(const + // JPEG Compression + case JPEG: + { +- params[0] = CV_IMWRITE_JPEG_QUALITY; ++ params[0] = cv::IMWRITE_JPEG_QUALITY; + params[1] = config_.jpeg_quality; + + // Update ros message format header +@@ -154,7 +154,7 @@ void CompressedPublisher::publish(const + // PNG Compression + case PNG: + { +- params[0] = CV_IMWRITE_PNG_COMPRESSION; ++ params[0] = cv::IMWRITE_PNG_COMPRESSION; + params[1] = config_.png_level; + + // Update ros message format header |