dev-ros/opencv_apps: fix build with opencv 3.3 and raise dep on it

Package-Manager: Portage-2.3.10, Repoman-2.3.3

diff --git a/dev-ros/opencv_apps/files/ocv33.patch b/dev-ros/opencv_apps/files/ocv33.patch
new file mode 100644 (file)
index 0000000..aa034ce
--- /dev/null
+++ b/dev-ros/opencv_apps/files/ocv33.patch
@@ -0,0 +1,21 @@
+Index: opencv_apps-1.12.0/src/nodelet/face_recognition_nodelet.cpp
+===================================================================
+--- opencv_apps-1.12.0.orig/src/nodelet/face_recognition_nodelet.cpp
++++ opencv_apps-1.12.0/src/nodelet/face_recognition_nodelet.cpp
+@@ -463,13 +463,13 @@ namespace face_recognition {
+       if (need_recreate_model) {
+         try {
+           if (config.model_method == "eigen") {
+-            model_ = face::createEigenFaceRecognizer(config.model_num_components,
++            model_ = face::EigenFaceRecognizer::create(config.model_num_components,
+                                                    config.model_threshold);
+           } else if (config.model_method == "fisher") {
+-            model_ = face::createFisherFaceRecognizer(config.model_num_components,
++            model_ = face::FisherFaceRecognizer::create(config.model_num_components,
+                                                     config.model_threshold);
+           } else if (config.model_method == "LBPH") {
+-            model_ = face::createLBPHFaceRecognizer(config.lbph_radius,
++            model_ = face::LBPHFaceRecognizer::create(config.lbph_radius,
+                                                   config.lbph_neighbors,
+                                                   config.lbph_grid_x,
+                                                   config.lbph_grid_y);

diff --git a/dev-ros/opencv_apps/opencv_apps-1.12.0.ebuild b/dev-ros/opencv_apps/opencv_apps-1.12.0.ebuild
index db370bce8e196a69fe1deb07a6124b7976700d8e..1bb75ae5f0f2abaf0713cb525f1242254cb44b40 100644 (file)
--- a/dev-ros/opencv_apps/opencv_apps-1.12.0.ebuild
+++ b/dev-ros/opencv_apps/opencv_apps-1.12.0.ebuild
@@ -22,7 +22,9 @@ RDEPEND="
        dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
        dev-ros/nodelet
        dev-ros/roscpp
-       >=media-libs/opencv-3:0=[contrib]
+       >=media-libs/opencv-3.3:0=[contrib]
        dev-libs/boost:=
 "
 DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/ocv33.patch" )

diff --git a/dev-ros/opencv_apps/opencv_apps-9999.ebuild b/dev-ros/opencv_apps/opencv_apps-9999.ebuild
index db370bce8e196a69fe1deb07a6124b7976700d8e..1bb75ae5f0f2abaf0713cb525f1242254cb44b40 100644 (file)
--- a/dev-ros/opencv_apps/opencv_apps-9999.ebuild
+++ b/dev-ros/opencv_apps/opencv_apps-9999.ebuild
@@ -22,7 +22,9 @@ RDEPEND="
        dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
        dev-ros/nodelet
        dev-ros/roscpp
-       >=media-libs/opencv-3:0=[contrib]
+       >=media-libs/opencv-3.3:0=[contrib]
        dev-libs/boost:=
 "
 DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/ocv33.patch" )