dev-ros/gazebo_plugins: fix build with opencv4

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

diff --git a/dev-ros/gazebo_plugins/files/ocv4.patch b/dev-ros/gazebo_plugins/files/ocv4.patch
new file mode 100644 (file)
index 0000000..6d93fea
--- /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 af125170e28ea6a371740292a7cf48e1cd0e609a..d2a12c5f8749052751440c27245b6aaf20afe664 100644 (file)
--- 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" )