From 805aafb0c92c712d8c2b03d486166ffbfaab8d98 Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Tue, 10 Dec 2019 18:31:06 +0100 Subject: [PATCH] dev-ros/gazebo_plugins: fix build with opencv4 Package-Manager: Portage-2.3.81, Repoman-2.3.20 Signed-off-by: Alexis Ballier --- dev-ros/gazebo_plugins/files/ocv4.patch | 17 +++++++++++++++++ .../gazebo_plugins/gazebo_plugins-2.8.5.ebuild | 1 + 2 files changed, 18 insertions(+) create mode 100644 dev-ros/gazebo_plugins/files/ocv4.patch diff --git a/dev-ros/gazebo_plugins/files/ocv4.patch b/dev-ros/gazebo_plugins/files/ocv4.patch new file mode 100644 index 000000000000..6d93feac4be9 --- /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 + #include + +-#include +-#include +- +-#include ++#include ++#include + + #include + #include 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 af125170e28e..d2a12c5f8749 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" ) -- 2.26.2