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_depth_image_transport | |
| parent | b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff) | |
gentoo resync : 15.12.2019
Diffstat (limited to 'dev-ros/compressed_depth_image_transport')
3 files changed, 18 insertions, 3 deletions
diff --git a/dev-ros/compressed_depth_image_transport/Manifest b/dev-ros/compressed_depth_image_transport/Manifest index f488283a7af9..b44237b93bb9 100644 --- a/dev-ros/compressed_depth_image_transport/Manifest +++ b/dev-ros/compressed_depth_image_transport/Manifest @@ -1,4 +1,5 @@ +AUX ocv4.patch 534 BLAKE2B 344016d8bacd6f2ee93604a94fb82a2b548b584540d8d39a6910d6ba7ed9882667e8da47f6b2654a9cc89e0424944728e34bb97a02ddba23f8621bd26baf9e1d SHA512 890b27946567e9290250bb8af10821ba8519dead141c8ff22cb2be8a201ca6bf26955503edbd767dec878a77609c3d9d50adefb8f02b75ce1d4aee8a2998d5b9 DIST image_transport_plugins-1.9.5.tar.gz 26268 BLAKE2B 2d7e71f891bc3ae548193a9671fb10fb4dc6c7a24fda0c0dc52d75d43793d55e35da37155496740624e4ebe34fcf0e8d3926345ca1581fa521096c01b773f551 SHA512 54f459719a386f028578889f9b88b8b080f495d75899cee6c8bfb58204970fb2395b2a8da70034eb391ba62f4ce462cb89b97bcdc576a177444613076b5ed02c -EBUILD compressed_depth_image_transport-1.9.5-r1.ebuild 599 BLAKE2B a522cfae31f5b06a5c71893ec4219a50f108f6cab778cf6af8f819c3bd9929fa4f12825eb9e4dccdaa2679975e4cd30e19ed9057875c9370e847c9761ca4d0bf SHA512 f7e0dbab6bf3f1bd59e90d5569b4df97ba210fafe2883f2125c98da1675b1203d84790ee1e10958f7912eef478d29235735b0d3e246006bc40aedbeaba14583d +EBUILD compressed_depth_image_transport-1.9.5-r1.ebuild 637 BLAKE2B 1d292d3d1600dd00176be37b0855767ed69d37cb99a96b2cbdab227ae34331cf40e91cad68b0a4967de854b2e20f95598b1fdc44ed35951addb4d7274224d789 SHA512 2eb7fe38a27eb416b12d0de400cac49fd68e475264ef1f2be2fdc5a3051c8ff80626daba2141849d21104f6cf3eecf7e11ab3b2a690e74fdecc089d5d66e8bf0 EBUILD compressed_depth_image_transport-9999.ebuild 599 BLAKE2B a522cfae31f5b06a5c71893ec4219a50f108f6cab778cf6af8f819c3bd9929fa4f12825eb9e4dccdaa2679975e4cd30e19ed9057875c9370e847c9761ca4d0bf SHA512 f7e0dbab6bf3f1bd59e90d5569b4df97ba210fafe2883f2125c98da1675b1203d84790ee1e10958f7912eef478d29235735b0d3e246006bc40aedbeaba14583d MISC metadata.xml 352 BLAKE2B d741d3235de6a630917b5785819ea9a3b13d8602bc5fd27b9fb8d4cea1df216fb64eaa0fd2fee5c5f11012a823311155331e2ae65af23874322679dc57bc32a9 SHA512 855c756eea98c52acb020fb394646008db35b41b864a0983f67bbf07ffce658d394c0de13d6622286770e4aa4152b74f2f6028c575b11b66233431d1fffa0347 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) + { |