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

[Alexis Ballier]

commit:     805aafb0c92c712d8c2b03d486166ffbfaab8d98
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 10 17:31:06 2019 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Dec 10 17:34:50 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=805aafb0

dev-ros/gazebo_plugins: fix build with opencv4

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

 dev-ros/gazebo_plugins/files/ocv4.patch            | 17 +++++++++++++++++
 dev-ros/gazebo_plugins/gazebo_plugins-2.8.5.ebuild |  1 +
 2 files changed, 18 insertions(+)

diff --git a/dev-ros/gazebo_plugins/files/ocv4.patch 
b/dev-ros/gazebo_plugins/files/ocv4.patch
new file mode 100644
index 00000000000..6d93feac4be
--- /dev/null
+++ b/dev-ros/gazebo_plugins/files/ocv4.patch
@@ -0,0 +1,17 @@
+Index: gazebo_plugins/src/gazebo_ros_prosilica.cpp
+===================================================================
+--- gazebo_plugins.orig/src/gazebo_ros_prosilica.cpp
++++ gazebo_plugins/src/gazebo_ros_prosilica.cpp
+@@ -44,10 +44,8 @@
+ #include <diagnostic_updater/diagnostic_updater.h>
+ #include <sensor_msgs/RegionOfInterest.h>
+ 
+-#include <opencv/cv.h>
+-#include <opencv/highgui.h>
+-
+-#include <opencv/cvwimage.h>
++#include <opencv2/core/core_c.h>
++#include <opencv2/highgui/highgui_c.h>
+ 
+ #include <boost/scoped_ptr.hpp>
+ #include <boost/bind.hpp>

diff --git a/dev-ros/gazebo_plugins/gazebo_plugins-2.8.5.ebuild 
b/dev-ros/gazebo_plugins/gazebo_plugins-2.8.5.ebuild
index af125170e28..d2a12c5f874 100644
--- a/dev-ros/gazebo_plugins/gazebo_plugins-2.8.5.ebuild
+++ b/dev-ros/gazebo_plugins/gazebo_plugins-2.8.5.ebuild
@@ -51,3 +51,4 @@ RDEPEND="
        dev-ros/roslib[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/ocv4.patch" )