[gentoo-commits] repo/gentoo:master commit in: dev-ros/compressed_image_transport/, dev-ros/compressed_image_transport/files/

[gentoo-commits] repo/gentoo:master commit in: dev-ros/compressed_image_transport/, dev-ros/compressed_image_transport/files/

[Alexis Ballier]

commit:     cfad122869fdc354164d71266938ed50658ffaf4
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 10 16:18:38 2019 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Dec 10 17:34:46 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfad1228

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 <AT> gentoo.org>

 .../compressed_image_transport-1.9.5-r1.ebuild     |  5 +++--
 .../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 46fc3201419..044d1c36121 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 00000000000..6b3406b5c00
--- /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

[gentoo-commits] repo/gentoo:master commit in: dev-ros/compressed_image_transport/, dev-ros/compressed_image_transport/files/

[Alexis Ballier]

commit:     ce738fe0e08dec841e50300a67636ab14ba3198d
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 19 15:06:36 2020 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Oct 20 09:51:57 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce738fe0

dev-ros/compressed_image_transport: only use required ocv components

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 ...0.ebuild => compressed_image_transport-1.14.0-r1.ebuild} |  1 +
 .../compressed_image_transport-9999.ebuild                  |  1 +
 dev-ros/compressed_image_transport/files/ocv_leak.patch     | 13 +++++++++++++
 3 files changed, 15 insertions(+)

diff --git a/dev-ros/compressed_image_transport/compressed_image_transport-1.14.0.ebuild b/dev-ros/compressed_image_transport/compressed_image_transport-1.14.0-r1.ebuild
similarity index 93%
rename from dev-ros/compressed_image_transport/compressed_image_transport-1.14.0.ebuild
rename to dev-ros/compressed_image_transport/compressed_image_transport-1.14.0-r1.ebuild
index f2997bda2e2..310a1c7220b 100644
--- a/dev-ros/compressed_image_transport/compressed_image_transport-1.14.0.ebuild
+++ b/dev-ros/compressed_image_transport/compressed_image_transport-1.14.0-r1.ebuild
@@ -22,3 +22,4 @@ RDEPEND="
 	dev-libs/console_bridge:=
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/ocv_leak.patch" )

diff --git a/dev-ros/compressed_image_transport/compressed_image_transport-9999.ebuild b/dev-ros/compressed_image_transport/compressed_image_transport-9999.ebuild
index f2997bda2e2..310a1c7220b 100644
--- a/dev-ros/compressed_image_transport/compressed_image_transport-9999.ebuild
+++ b/dev-ros/compressed_image_transport/compressed_image_transport-9999.ebuild
@@ -22,3 +22,4 @@ RDEPEND="
 	dev-libs/console_bridge:=
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/ocv_leak.patch" )

diff --git a/dev-ros/compressed_image_transport/files/ocv_leak.patch b/dev-ros/compressed_image_transport/files/ocv_leak.patch
new file mode 100644
index 00000000000..cdc103bb0a2
--- /dev/null
+++ b/dev-ros/compressed_image_transport/files/ocv_leak.patch
@@ -0,0 +1,13 @@
+Index: compressed_image_transport/CMakeLists.txt
+===================================================================
+--- compressed_image_transport.orig/CMakeLists.txt
++++ compressed_image_transport/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ cmake_minimum_required(VERSION 3.0.2)
+ project(compressed_image_transport)
+ 
+-find_package(OpenCV REQUIRED)
++find_package(OpenCV REQUIRED COMPONENTS opencv_core opencv_imgproc opencv_imgcodecs opencv_highgui)
+ find_package(catkin REQUIRED COMPONENTS cv_bridge dynamic_reconfigure image_transport)
+ 
+ # generate the dynamic_reconfigure config file