From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- dev-ros/compressed_depth_image_transport/Manifest | 5 ++-- ...mpressed_depth_image_transport-1.14.0-r1.ebuild | 29 ++++++++++++++++++++++ .../compressed_depth_image_transport-1.14.0.ebuild | 28 --------------------- .../compressed_depth_image_transport-9999.ebuild | 1 + .../files/ocv_leak.patch | 13 ++++++++++ 5 files changed, 46 insertions(+), 30 deletions(-) create mode 100644 dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.14.0-r1.ebuild delete mode 100644 dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.14.0.ebuild create mode 100644 dev-ros/compressed_depth_image_transport/files/ocv_leak.patch (limited to 'dev-ros/compressed_depth_image_transport') diff --git a/dev-ros/compressed_depth_image_transport/Manifest b/dev-ros/compressed_depth_image_transport/Manifest index d8e657e8a1ef..a12dd0091d27 100644 --- a/dev-ros/compressed_depth_image_transport/Manifest +++ b/dev-ros/compressed_depth_image_transport/Manifest @@ -1,4 +1,5 @@ +AUX ocv_leak.patch 604 BLAKE2B c7d937c796415a1f4f3f131b0006b6674ca4033428c66fc12530e5c588530e59c99c80d25e26881c39fe92c3c8c273c44f9ec57cb33319cb895d007bc77e2982 SHA512 e78c666b44de6e42bce51e20531d0883c38caabbd39149998654e58b35b2f1a05acc386c8bafa0ceb9a657730e0e44f1b016b2aba5b29b2c675ee51ad79d58fc DIST image_transport_plugins-1.14.0.tar.gz 28803 BLAKE2B fc3fc34c0dc01c5dc0ed7f2a88fd691f9b955009bbf91a2280e39455e0325a46edc67c25cf79d8e4882789c20235c13fb87bfc64669ffda40a1fe37224a346e9 SHA512 1333f18a3208ecda4f788dc2d974b5787a89d33a1ad1ea2c6b4cc07593c677686aa5e9df3346d2e5f307699b88b42f341a989eebecc3cd7885768e3dcdbbcdcb -EBUILD compressed_depth_image_transport-1.14.0.ebuild 585 BLAKE2B 0b8b19deef36e366964662b6b0d7748cfb66f6e4bb4d4e5cca1b28f5c04dddf77fc296dc267d6d7ac2226f69850be63735f0dbe3a64dea0236181bdf504908dd SHA512 332f93b0ece052ab11ef4ef6cf532861e359675da30a74dd4d95427f4678c1dfadc30f48f78ecb2c833ce1bc0f8756eb6966bc0144a8f8a5b513eeea91df8e01 -EBUILD compressed_depth_image_transport-9999.ebuild 585 BLAKE2B 0b8b19deef36e366964662b6b0d7748cfb66f6e4bb4d4e5cca1b28f5c04dddf77fc296dc267d6d7ac2226f69850be63735f0dbe3a64dea0236181bdf504908dd SHA512 332f93b0ece052ab11ef4ef6cf532861e359675da30a74dd4d95427f4678c1dfadc30f48f78ecb2c833ce1bc0f8756eb6966bc0144a8f8a5b513eeea91df8e01 +EBUILD compressed_depth_image_transport-1.14.0-r1.ebuild 626 BLAKE2B 919acd6e6a1bdf0c2cb4ac66befc67212b3abd17298cadb7fa614385f5e922f923b1e3b571eb350a86b64d262d67576298bf03b1932d7c37f84b89647dcedf40 SHA512 4a048d043172009958a688d1683515c325f41b6e5d1ab8269287bf92f871d9473c20ade73783d974d5f0e0f9c86b16810f2045f7e28623c55788dc83c281029c +EBUILD compressed_depth_image_transport-9999.ebuild 626 BLAKE2B 919acd6e6a1bdf0c2cb4ac66befc67212b3abd17298cadb7fa614385f5e922f923b1e3b571eb350a86b64d262d67576298bf03b1932d7c37f84b89647dcedf40 SHA512 4a048d043172009958a688d1683515c325f41b6e5d1ab8269287bf92f871d9473c20ade73783d974d5f0e0f9c86b16810f2045f7e28623c55788dc83c281029c MISC metadata.xml 352 BLAKE2B d741d3235de6a630917b5785819ea9a3b13d8602bc5fd27b9fb8d4cea1df216fb64eaa0fd2fee5c5f11012a823311155331e2ae65af23874322679dc57bc32a9 SHA512 855c756eea98c52acb020fb394646008db35b41b864a0983f67bbf07ffce658d394c0de13d6622286770e4aa4152b74f2f6028c575b11b66233431d1fffa0347 diff --git a/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.14.0-r1.ebuild b/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.14.0-r1.ebuild new file mode 100644 index 000000000000..ee76a3e1f2b2 --- /dev/null +++ b/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.14.0-r1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +ROS_REPO_URI="https://github.com/ros-perception/image_transport_plugins" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=${PN} + +inherit ros-catkin + +DESCRIPTION="Plugin for transparently sending depth images using PNG compression" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/cv_bridge + dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}] + dev-ros/image_transport + media-libs/opencv:= + dev-libs/boost:= + dev-libs/console_bridge:= +" +DEPEND="${RDEPEND} + test? ( + dev-cpp/gtest + ) +" +PATCHES=( "${FILESDIR}/ocv_leak.patch" ) diff --git a/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.14.0.ebuild b/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.14.0.ebuild deleted file mode 100644 index 97f465fd4872..000000000000 --- a/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.14.0.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -ROS_REPO_URI="https://github.com/ros-perception/image_transport_plugins" -KEYWORDS="~amd64 ~arm" -ROS_SUBDIR=${PN} - -inherit ros-catkin - -DESCRIPTION="Plugin for transparently sending depth images using PNG compression" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/cv_bridge - dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}] - dev-ros/image_transport - media-libs/opencv:= - dev-libs/boost:= - dev-libs/console_bridge:= -" -DEPEND="${RDEPEND} - test? ( - dev-cpp/gtest - ) -" diff --git a/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-9999.ebuild b/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-9999.ebuild index 97f465fd4872..ee76a3e1f2b2 100644 --- a/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-9999.ebuild +++ b/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-9999.ebuild @@ -26,3 +26,4 @@ DEPEND="${RDEPEND} dev-cpp/gtest ) " +PATCHES=( "${FILESDIR}/ocv_leak.patch" ) diff --git a/dev-ros/compressed_depth_image_transport/files/ocv_leak.patch b/dev-ros/compressed_depth_image_transport/files/ocv_leak.patch new file mode 100644 index 000000000000..8e1f81ae32fa --- /dev/null +++ b/dev-ros/compressed_depth_image_transport/files/ocv_leak.patch @@ -0,0 +1,13 @@ +Index: compressed_depth_image_transport/CMakeLists.txt +=================================================================== +--- compressed_depth_image_transport.orig/CMakeLists.txt ++++ compressed_depth_image_transport/CMakeLists.txt +@@ -5,7 +5,7 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COM + # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror") + endif() + +-find_package(OpenCV REQUIRED) ++find_package(OpenCV REQUIRED COMPONENTS opencv_core opencv_imgcodecs opencv_highgui) + find_package(catkin REQUIRED cv_bridge dynamic_reconfigure image_transport) + + # generate the dynamic_reconfigure config file -- cgit v1.2.3