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

[Alexis Ballier]

commit:     4b71037afa32a69ff3709a1f986362f688e2e7c8
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 12 10:24:24 2019 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Dec 12 10:42:06 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b71037a

dev-ros/visp_auto_tracker: fix build with opencv 4

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

 dev-ros/visp_auto_tracker/files/ocv4.patch         | 25 ++++++++++++++++++++++
 ...1.ebuild => visp_auto_tracker-0.11.1-r1.ebuild} |  3 ++-
 .../visp_auto_tracker-9999.ebuild                  |  5 ++++-
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/dev-ros/visp_auto_tracker/files/ocv4.patch 
b/dev-ros/visp_auto_tracker/files/ocv4.patch
new file mode 100644
index 00000000000..79a6970af9f
--- /dev/null
+++ b/dev-ros/visp_auto_tracker/files/ocv4.patch
@@ -0,0 +1,25 @@
+Index: visp_auto_tracker/flashcode_mbt/libauto_tracker/states.hpp
+===================================================================
+--- visp_auto_tracker.orig/flashcode_mbt/libauto_tracker/states.hpp
++++ visp_auto_tracker/flashcode_mbt/libauto_tracker/states.hpp
+@@ -1,6 +1,6 @@
+ #ifndef __EVENTS_H__
+ #define __EVENTS_H__
+-#include "cv.h"
++#include <opencv2/core/core_c.h>
+ // back-end
+ #include <boost/msm/back/state_machine.hpp>
+ //front-end
+Index: visp_auto_tracker/flashcode_mbt/libauto_tracker/tracking.cpp
+===================================================================
+--- visp_auto_tracker.orig/flashcode_mbt/libauto_tracker/tracking.cpp
++++ visp_auto_tracker/flashcode_mbt/libauto_tracker/tracking.cpp
+@@ -1,6 +1,6 @@
+ #include "ros/ros.h"
+-#include "cv.h"
+-#include "highgui.h"
++#include <opencv2/core/core_c.h>
++#include <opencv2/highgui/highgui_c.h>
+ #include "tracking.h"
+ #include <visp3/core/vpImageConvert.h>
+ #include <visp3/core/vpPixelMeterConversion.h>

diff --git a/dev-ros/visp_auto_tracker/visp_auto_tracker-0.11.1.ebuild 
b/dev-ros/visp_auto_tracker/visp_auto_tracker-0.11.1-r1.ebuild
similarity index 90%
rename from dev-ros/visp_auto_tracker/visp_auto_tracker-0.11.1.ebuild
rename to dev-ros/visp_auto_tracker/visp_auto_tracker-0.11.1-r1.ebuild
index dcd584eb264..0b8d3920995 100644
--- a/dev-ros/visp_auto_tracker/visp_auto_tracker-0.11.1.ebuild
+++ b/dev-ros/visp_auto_tracker/visp_auto_tracker-0.11.1-r1.ebuild
@@ -25,10 +25,11 @@ RDEPEND="
        dev-ros/visp_tracker
        sci-libs/ViSP:=[dmtx,zbar]
        dev-libs/boost:=[threads]
+       media-libs/opencv:=
 "
 DEPEND="${RDEPEND}"
 if [ "${PV#9999}" = "${PV}" ] ; then
        S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
 fi
 
-PATCHES=( "${FILESDIR}/boost170.patch" )
+PATCHES=( "${FILESDIR}/boost170.patch" "${FILESDIR}/ocv4.patch" )

diff --git a/dev-ros/visp_auto_tracker/visp_auto_tracker-9999.ebuild 
b/dev-ros/visp_auto_tracker/visp_auto_tracker-9999.ebuild
index 119d92d4d31..0b8d3920995 100644
--- a/dev-ros/visp_auto_tracker/visp_auto_tracker-9999.ebuild
+++ b/dev-ros/visp_auto_tracker/visp_auto_tracker-9999.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
@@ -25,8 +25,11 @@ RDEPEND="
        dev-ros/visp_tracker
        sci-libs/ViSP:=[dmtx,zbar]
        dev-libs/boost:=[threads]
+       media-libs/opencv:=
 "
 DEPEND="${RDEPEND}"
 if [ "${PV#9999}" = "${PV}" ] ; then
        S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
 fi
+
+PATCHES=( "${FILESDIR}/boost170.patch" "${FILESDIR}/ocv4.patch" )