diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2017-09-22 12:36:03 +0200 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2017-09-22 12:36:13 +0200 |
| commit | db018c46f468674d7f28254742ef4bc940bd483c (patch) | |
| tree | a2b6ae0251216f95b0155b1c71e30a770ff6674d /dev-ros | |
| parent | app-admin/qtpass: drop old ebuilds (bug #631640), metadata cleanup (diff) | |
| download | gentoo-db018c46f468674d7f28254742ef4bc940bd483c.tar.gz gentoo-db018c46f468674d7f28254742ef4bc940bd483c.tar.bz2 gentoo-db018c46f468674d7f28254742ef4bc940bd483c.zip | |
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
Diffstat (limited to 'dev-ros')
| -rw-r--r-- | dev-ros/opencv_apps/files/ocv33.patch | 21 | ||||
| -rw-r--r-- | dev-ros/opencv_apps/opencv_apps-1.12.0.ebuild | 4 | ||||
| -rw-r--r-- | dev-ros/opencv_apps/opencv_apps-9999.ebuild | 4 |
3 files changed, 27 insertions, 2 deletions
diff --git a/dev-ros/opencv_apps/files/ocv33.patch b/dev-ros/opencv_apps/files/ocv33.patch new file mode 100644 index 000000000000..aa034ce3456c --- /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 db370bce8e19..1bb75ae5f0f2 100644 --- 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 db370bce8e19..1bb75ae5f0f2 100644 --- 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" ) |