[pkgsrc/trunk]: pkgsrc/graphics/opencv-contrib-face graphics/opencv-contrib-f...

[fhajny <fhajny%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bcfd9edc42a1
branches:  trunk
changeset: 376476:bcfd9edc42a1
user:      fhajny <fhajny%pkgsrc.org@localhost>
date:      Fri Mar 02 16:26:21 2018 +0000

description:
graphics/opencv-contrib-face: Update to 3.4.1 to match graphics/opencv.

diffstat:

 graphics/opencv-contrib-face/Makefile |  17 +++++++++++------
 graphics/opencv-contrib-face/PLIST    |  23 +++++++++++++++++++++--
 graphics/opencv-contrib-face/distinfo |  21 ++++++++++-----------
 3 files changed, 42 insertions(+), 19 deletions(-)

diffs (119 lines):

diff -r a98fb77d5709 -r bcfd9edc42a1 graphics/opencv-contrib-face/Makefile
--- a/graphics/opencv-contrib-face/Makefile     Fri Mar 02 16:24:33 2018 +0000
+++ b/graphics/opencv-contrib-face/Makefile     Fri Mar 02 16:26:21 2018 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2017/09/30 07:46:40 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2018/03/02 16:26:21 fhajny Exp $
 
-DISTNAME=      opencv_contrib-3.3.0
+DISTNAME=      opencv_contrib-3.4.1
 PKGNAME=       ${DISTNAME:S/_contrib/-contrib-face/}
 CATEGORIES=    graphics devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=Itseez/}
@@ -29,7 +29,7 @@
 SUBST_STAGE.tnn=       pre-configure
 SUBST_SED.tnn=         -e 's,3.2,999,'
 
-INSTALL_DIRS=  build/modules/face
+INSTALL_DIRS=  build/modules/face build/modules/plot build/modules/tracking
 
 WRKSRC=                ${WRKDIR}/opencv-${PKGVERSION_NOREV}/
 
@@ -63,15 +63,12 @@
 CMAKE_ARGS+=           -DBUILD_opencv_saliency=OFF
 CMAKE_ARGS+=           -DBUILD_opencv_surface_matching=OFF
 CMAKE_ARGS+=           -DBUILD_opencv_text=OFF
-CMAKE_ARGS+=           -DBUILD_opencv_tracking=OFF
 CMAKE_ARGS+=           -DBUILD_opencv_xfeatures2d=OFF
 CMAKE_ARGS+=           -DBUILD_opencv_ximgproc=OFF
 CMAKE_ARGS+=           -DBUILD_opencv_xobjdetect=OFF
 CMAKE_ARGS+=           -DBUILD_opencv_xphoto=OFF
 
 CMAKE_ARGS+=           -DBUILD_opencv_flann=OFF
-CMAKE_ARGS+=           -DBUILD_opencv_photo=OFF
-CMAKE_ARGS+=           -DBUILD_opencv_video=OFF
 CMAKE_ARGS+=           -DBUILD_opencv_videoio=OFF
 CMAKE_ARGS+=           -DBUILD_opencv_highgui=OFF
 CMAKE_ARGS+=           -DBUILD_opencv_superres=OFF
@@ -82,6 +79,14 @@
 CMAKE_ARGS+=           -DBUILD_opencv_videostab=OFF
 CMAKE_ARGS+=           -DBUILD_opencv_python2=OFF
 
+# At least as of 3.4.1, these are dependencies of the 'face' module
+# and need to be built and installed ('photo' and 'video' are
+# part of the main opencv package already
+#CMAKE_ARGS+=          -DBUILD_opencv_photo=OFF
+#CMAKE_ARGS+=          -DBUILD_opencv_plot=OFF
+#CMAKE_ARGS+=          -DBUILD_opencv_tracking=OFF
+#CMAKE_ARGS+=          -DBUILD_opencv_video=OFF
+
 CONFIGURE_ENV+=                MACHINE_ARCH=${MACHINE_ARCH}
 
 CONFIGURE_DIRS+=       build
diff -r a98fb77d5709 -r bcfd9edc42a1 graphics/opencv-contrib-face/PLIST
--- a/graphics/opencv-contrib-face/PLIST        Fri Mar 02 16:24:33 2018 +0000
+++ b/graphics/opencv-contrib-face/PLIST        Fri Mar 02 16:26:21 2018 +0000
@@ -1,8 +1,27 @@
-@comment $NetBSD: PLIST,v 1.4 2017/09/04 15:23:49 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.5 2018/03/02 16:26:21 fhajny Exp $
 include/opencv2/face.hpp
 include/opencv2/face/bif.hpp
+include/opencv2/face/face_alignment.hpp
+include/opencv2/face/facemark.hpp
+include/opencv2/face/facemarkAAM.hpp
+include/opencv2/face/facemarkLBF.hpp
 include/opencv2/face/facerec.hpp
 include/opencv2/face/predict_collector.hpp
+include/opencv2/plot.hpp
+include/opencv2/tracking.hpp
+include/opencv2/tracking/feature.hpp
+include/opencv2/tracking/kalman_filters.hpp
+include/opencv2/tracking/onlineBoosting.hpp
+include/opencv2/tracking/onlineMIL.hpp
+include/opencv2/tracking/tldDataset.hpp
+include/opencv2/tracking/tracker.hpp
+include/opencv2/tracking/tracking.hpp
 lib/libopencv_face.so
-lib/libopencv_face.so.3.3
+lib/libopencv_face.so.3.4
 lib/libopencv_face.so.${PKGVERSION}
+lib/libopencv_plot.so
+lib/libopencv_plot.so.3.4
+lib/libopencv_plot.so.${PKGVERSION}
+lib/libopencv_tracking.so
+lib/libopencv_tracking.so.3.4
+lib/libopencv_tracking.so.${PKGVERSION}
diff -r a98fb77d5709 -r bcfd9edc42a1 graphics/opencv-contrib-face/distinfo
--- a/graphics/opencv-contrib-face/distinfo     Fri Mar 02 16:24:33 2018 +0000
+++ b/graphics/opencv-contrib-face/distinfo     Fri Mar 02 16:26:21 2018 +0000
@@ -1,20 +1,19 @@
-$NetBSD: distinfo,v 1.7 2017/09/04 15:23:49 fhajny Exp $
+$NetBSD: distinfo,v 1.8 2018/03/02 16:26:21 fhajny Exp $
 
-SHA1 (opencv-3.3.0.zip) = 7ca35eceb3caa2d96b846b682dbcdf1e6fa66904
-RMD160 (opencv-3.3.0.zip) = d2cbf32ff7f62c8064e0ba774baa56fa1b168206
-SHA512 (opencv-3.3.0.zip) = 14430c6225926e5118daccb57c7276d9f9160c90a034b2c73a09b73ac90ba7ebd3ae78cccffb4a10b58bb0e5e16ebd03bf617030fa74cc67d9d18366bf6b4951
-Size (opencv-3.3.0.zip) = 84873317 bytes
-SHA1 (opencv_contrib-3.3.0.zip) = 6c6021469bc1d91f5d9d09cd7b43d333a9793b54
-RMD160 (opencv_contrib-3.3.0.zip) = 1e99c0d4568a8bf34902eca69b41044c48dc9fa3
-SHA512 (opencv_contrib-3.3.0.zip) = 1c76d49689459708117acfbd0893cbfb915fbd0defff95702fb388a29d12b50fb53fbf246e64e68aa3adb347aa45ff478df5e2e8c6d9cfa57a628744bbb1bd04
-Size (opencv_contrib-3.3.0.zip) = 55968854 bytes
+SHA1 (opencv-3.4.1.zip) = 1e2a04746eaeee520e58f81002c556c435ef0dce
+RMD160 (opencv-3.4.1.zip) = d9f6de36b3d43e0ec5ce7dcfe752a7529f1c4daa
+SHA512 (opencv-3.4.1.zip) = 23610b7f909963ed3d7df233932e8ca0ef0604683affcbdec099b9b991bd4c0af275ec808c874ea29a5e8fbd5f02ad284aa0749c99748e01a73845aa25ebc3b9
+Size (opencv-3.4.1.zip) = 90982898 bytes
+SHA1 (opencv_contrib-3.4.1.zip) = 4190f17296b92d39235274c4305106387236d2cd
+RMD160 (opencv_contrib-3.4.1.zip) = 6581d0d190bdcf43de542e8f4c2a263ec1e741c3
+SHA512 (opencv_contrib-3.4.1.zip) = 2448cf22208a890d2ab48f75b05b2bed07efadca2ce4df24eacdefcd5b00fe80a0519edeaead017c340050e4563e9c6659666e16af8b6c19eafba04bd8a4360b
+Size (opencv_contrib-3.4.1.zip) = 58319978 bytes
 SHA1 (patch-3rdparty_ippicv_ippicv.cmake) = 14ce5de382084793ace32f43c6dfaf01f7ffb390
 SHA1 (patch-3rdparty_protobuf_src_google_protobuf_message__lite.cc) = f1b77384ea8110d2bf3a30ff3fe9f2fa39608caf
 SHA1 (patch-cmake_OpenCVDetectCXXCompiler.cmake) = 221b0551d0f29d7e79afe3da8a33b1b3a4f7bf20
 SHA1 (patch-modules_core_include_opencv2_core_types_c.h) = 75444e65677be99af8167f9060419d7970a7adaa
 SHA1 (patch-modules_core_src_downhill__simplex.cpp) = 1ad7c2fa126d15050b87785e8eec20dbe796b471
-SHA1 (patch-modules_core_src_parallel__pthreads.cpp) = d8070117286b36a23a6788fc834aacc52d5919d7
 SHA1 (patch-modules_core_src_system.cpp) = 3b7ac545585a430d28c7077f360357079f127580
 SHA1 (patch-modules_flann_include_opencv2_flann_defines.h) = ab848e67c4e03219670598ac2d21071a617a5c33
 SHA1 (patch-modules_ts_src_ts.cpp) = b9a3992014b02dbd89d46375a2476385e91dc24c
-SHA1 (patch-modules_videoio_src_cap__v4l.cpp) = 96aac9380d94818a52afd51f2d4b3f774debd080
+SHA1 (patch-modules_videoio_src_cap__v4l.cpp) = 985d91d9a4c63f081c3fff495cc86d8d0a1c6aa4