diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-12-15 18:09:03 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-12-15 18:09:03 +0000 |
| commit | 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch) | |
| tree | 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /dev-ros/compressed_image_transport | |
| parent | b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff) | |
gentoo resync : 15.12.2019
Diffstat (limited to 'dev-ros/compressed_image_transport')
3 files changed, 27 insertions, 3 deletions
diff --git a/dev-ros/compressed_image_transport/Manifest b/dev-ros/compressed_image_transport/Manifest index a5521d65dc37..c31e789ccc48 100644 --- a/dev-ros/compressed_image_transport/Manifest +++ b/dev-ros/compressed_image_transport/Manifest @@ -1,4 +1,5 @@ +AUX ocv4.patch 823 BLAKE2B e435db081e4fb82fb3ab6a0aa46dc157c06c5d4e89b8f93bca737300b4a34c63a77101907e0ccd4d11764a5aeba084cbba98fa25cd5eb0923217cb6961b207da SHA512 0372e0c4401424dccd6e5e20d9d9eae37a7d38801a2d73a93631545d347569a685d9540a9e73b65db83e8cb6499874e0675b1eed25d0b0a8c9ca5c6557609ccb DIST image_transport_plugins-1.9.5.tar.gz 26268 BLAKE2B 2d7e71f891bc3ae548193a9671fb10fb4dc6c7a24fda0c0dc52d75d43793d55e35da37155496740624e4ebe34fcf0e8d3926345ca1581fa521096c01b773f551 SHA512 54f459719a386f028578889f9b88b8b080f495d75899cee6c8bfb58204970fb2395b2a8da70034eb391ba62f4ce462cb89b97bcdc576a177444613076b5ed02c -EBUILD compressed_image_transport-1.9.5-r1.ebuild 594 BLAKE2B 0371f8f25fc02e5ce6dc843a2642c0bf9138f1696ec940bff8508a79bc66ccc193f317610a8587720f6c6daf0db53feec6b82bcd8d8d63815dd0b481fc8f82f1 SHA512 f5711ff9ac19b3f2d38627aee4c2e7ea88202d892eff1cd38ef6e256173a81e4e4245034f01cd0c80b4feb01e2a44ea3e8e1b97dfef18882465813ab529c2fc5 +EBUILD compressed_image_transport-1.9.5-r1.ebuild 632 BLAKE2B 5431debfeda9cf204fa8e3213d7524de051885ee2db0e2b5b96e11f1f34ea2a7cfb0b3c6e2d353b07b1539f43448df400374ecb5bf7ba6dbd112cd0b5fd9cc6f SHA512 33dc22784dcc6ab9fd4ce13c17e9cf42342cd2f60f2494b7c0ab1816495a615ada381ae94e12d4c12f05ebc60318ae00a30132693cf9a169d0ff14d18342612c EBUILD compressed_image_transport-9999.ebuild 594 BLAKE2B 0371f8f25fc02e5ce6dc843a2642c0bf9138f1696ec940bff8508a79bc66ccc193f317610a8587720f6c6daf0db53feec6b82bcd8d8d63815dd0b481fc8f82f1 SHA512 f5711ff9ac19b3f2d38627aee4c2e7ea88202d892eff1cd38ef6e256173a81e4e4245034f01cd0c80b4feb01e2a44ea3e8e1b97dfef18882465813ab529c2fc5 MISC metadata.xml 352 BLAKE2B d741d3235de6a630917b5785819ea9a3b13d8602bc5fd27b9fb8d4cea1df216fb64eaa0fd2fee5c5f11012a823311155331e2ae65af23874322679dc57bc32a9 SHA512 855c756eea98c52acb020fb394646008db35b41b864a0983f67bbf07ffce658d394c0de13d6622286770e4aa4152b74f2f6028c575b11b66233431d1fffa0347 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 |