diff options
| author | Sean Greenslade | 2018-03-27 16:12:48 -0700 |
|---|---|---|
| committer | Sean Greenslade | 2018-03-27 16:12:48 -0700 |
| commit | 4f53064408b983189f2614e1e229718328bb1250 (patch) | |
| tree | 78ccc4cfce343a76ef91f2f0fd8c1e27f2b03ce2 | |
| parent | e578f2d7c59bf17121f28e4fc48c1beed6d98ca6 (diff) | |
| download | aur-4f53064408b983189f2614e1e229718328bb1250.tar.gz | |
Version bump and opencv compile fixes.
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 13 | ||||
| -rw-r--r-- | opencv_fixes.patch | 30 |
3 files changed, 44 insertions, 5 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Mon Jul 17 21:55:25 UTC 2017 +# Tue Mar 27 23:12:48 UTC 2018 pkgbase = ros-kinetic-opencv-apps pkgdesc = ROS - opencv_apps provides various nodes that run internally OpenCVs functionalities and publish the result as ROS topics. pkgver = 1.12.0 - pkgrel = 1 + pkgrel = 2 url = http://www.ros.org/ arch = any license = BSD @@ -27,7 +27,9 @@ pkgbase = ros-kinetic-opencv-apps depends = ros-kinetic-std-srvs depends = ros-kinetic-image-transport source = ros-kinetic-opencv-apps-1.12.0-0.tar.gz::https://github.com/ros-perception/opencv_apps-release/archive/release/kinetic/opencv_apps/1.12.0-0.tar.gz + source = opencv_fixes.patch sha256sums = 0d4b6b827ef9d2382b7d9e1e8a3f08f877e4c969924ec32965bcf28b40f8c6d1 + sha256sums = f68391128a350c1fa964437e0ff0285709cef87700063edc50f79ebd764a22ba pkgname = ros-kinetic-opencv-apps @@ -7,7 +7,7 @@ pkgname='ros-kinetic-opencv-apps' pkgver='1.12.0' _pkgver_patch=0 arch=('any') -pkgrel=1 +pkgrel=2 license=('BSD') ros_makedepends=(ros-kinetic-std-srvs @@ -40,8 +40,15 @@ depends=(${ros_depends[@]}) # Tarball version (faster download) _dir="opencv_apps-release-release-kinetic-opencv_apps-${pkgver}-${_pkgver_patch}" -source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-perception/opencv_apps-release/archive/release/kinetic/opencv_apps/${pkgver}-${_pkgver_patch}.tar.gz") -sha256sums=('0d4b6b827ef9d2382b7d9e1e8a3f08f877e4c969924ec32965bcf28b40f8c6d1') +source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-perception/opencv_apps-release/archive/release/kinetic/opencv_apps/${pkgver}-${_pkgver_patch}.tar.gz" + opencv_fixes.patch) +sha256sums=('0d4b6b827ef9d2382b7d9e1e8a3f08f877e4c969924ec32965bcf28b40f8c6d1' + 'f68391128a350c1fa964437e0ff0285709cef87700063edc50f79ebd764a22ba') + +prepare() { + cd ${srcdir} + patch -p1 <opencv_fixes.patch +} build() { # Use ROS environment variables diff --git a/opencv_fixes.patch b/opencv_fixes.patch new file mode 100644 index 000000000000..84066f7d6d58 --- /dev/null +++ b/opencv_fixes.patch @@ -0,0 +1,30 @@ +--- sro/opencv_apps-release-release-kinetic-opencv_apps-1.12.0-0/src/nodelet/face_recognition_nodelet.cpp 2018-03-27 15:57:14.491547530 -0700 ++++ src/opencv_apps-release-release-kinetic-opencv_apps-1.12.0-0/src/nodelet/face_recognition_nodelet.cpp 2018-03-27 15:58:06.492490437 -0700 +@@ -463,13 +463,13 @@ + 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); +--- sro/opencv_apps-release-release-kinetic-opencv_apps-1.12.0-0/src/nodelet/lk_flow_nodelet.cpp 2018-03-27 15:57:14.492547532 -0700 ++++ src/opencv_apps-release-release-kinetic-opencv_apps-1.12.0-0/src/nodelet/lk_flow_nodelet.cpp 2018-03-27 16:07:21.465943557 -0700 +@@ -159,7 +159,7 @@ + if( needToInit ) + { + // automatic initialization +- cv::goodFeaturesToTrack(gray, points[1], MAX_COUNT, 0.01, 10, cv::Mat(), 3, 0, 0.04); ++ cv::goodFeaturesToTrack(gray, points[1], MAX_COUNT, 0.01, 10, cv::Mat(), 3, false, 0.04); + cv::cornerSubPix(gray, points[1], subPixWinSize, cv::Size(-1,-1), termcrit); + addRemovePt = false; + } |