Update graphics/opencv to 3.1.0.

* A lot of new functionality has been introduced during GSoC 2015:
  - "Omnidirectional Cameras Calibration and Stereo 3D Reconstruction"
    opencv_contrib/ccalib module
  - "Structure From Motion" - opencv_contrib/sfm module
  - "Improved Deformable Part-based Models" - opencv_contrib/dpm module
  - "Real-time Multi-object Tracking using Kernelized Correlation Filter"
    - opencv_contrib/tracking module
  - "Improved and expanded Scene Text Detection" - opencv_contrib/text
    module
  - "Stereo correspondence improvements" - opencv_contrib/stereo module
  - "Structured-Light System Calibration" - opencv_contrib/structured_light
  - "Chessboard+ArUco for camera calibration" - opencv_contrib/aruco
  - "Implementation of universal interface for deep neural network
    frameworks" - opencv_contrib/dnn module
  - "Recent advances in edge-aware filtering, improved SGBM stereo
    algorithm" - opencv/calib3d and opencv_contrib/ximgproc
  - "Improved ICF detector, waldboost implementation"
    - opencv_contrib/xobjdetect
  - "Multi-target TLD tracking" - opencv_contrib/tracking module
  - "3D pose estimation using CNNs" - opencv_contrib/cnn_3dobj

* Many great contributions made by the community, such as:
  - Support for HDF5 format
  - New/Improved optical flow algorithms
  - Multiple new image processing algorithms for filtering, segmentation
    and feature detection
  - Superpixel segmentation

* IPPICV is now based on IPP 9.0.1, which should make OpenCV even faster
  on modern Intel chips
* opencv_contrib modules can now be included into the opencv2.framework
  for iOS
* Newest operating systems are supported: Windows 10 and OSX 10.11
  (Visual Studio 2015 and XCode 7.1.1)
* Interoperability between T-API and OpenCL, OpenGL, DirectX and Video
  Acceleration API on Linux, as well as Android 5 camera.
* HAL (Hardware Acceleration Layer) module functionality has been moved
  into corresponding basic modules; the HAL replacement mechanism has
  been implemented along with the examples

See full changelog:

  https://github.com/Itseez/opencv/wiki/ChangeLog

8 files changed, 57 insertions, 79 deletions

diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
index ed2c8a4e03b..48df7c73dda 100644
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.59 2016/02/08 02:04:18 dbj Exp $
+# $NetBSD: Makefile,v 1.60 2016/02/21 14:10:46 fhajny Exp $
 
-DISTNAME=	opencv-3.0.0
-PKGREVISION=	3
+DISTNAME=	opencv-3.1.0
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=Itseez/}
 EXTRACT_SUFX=	.zip
diff --git a/graphics/opencv/PLIST b/graphics/opencv/PLIST
index 5b28d648b84..7738c103024 100644
--- a/graphics/opencv/PLIST
+++ b/graphics/opencv/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2015/10/08 17:45:59 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.16 2016/02/21 14:10:46 fhajny Exp $
 bin/opencv_annotation
 bin/opencv_createsamples
 bin/opencv_traincascade
@@ -61,10 +61,18 @@ include/opencv2/core/cvstd.hpp
 include/opencv2/core/cvstd.inl.hpp
 include/opencv2/core/directx.hpp
 include/opencv2/core/eigen.hpp
+include/opencv2/core/fast_math.hpp
+include/opencv2/core/hal/hal.hpp
+include/opencv2/core/hal/interface.h
+include/opencv2/core/hal/intrin.hpp
+include/opencv2/core/hal/intrin_cpp.hpp
+include/opencv2/core/hal/intrin_neon.hpp
+include/opencv2/core/hal/intrin_sse.hpp
 include/opencv2/core/ippasync.hpp
 include/opencv2/core/mat.hpp
 include/opencv2/core/mat.inl.hpp
 include/opencv2/core/matx.hpp
+include/opencv2/core/neon_utils.hpp
 include/opencv2/core/ocl.hpp
 include/opencv2/core/ocl_genbase.hpp
 include/opencv2/core/opengl.hpp
@@ -74,11 +82,13 @@ include/opencv2/core/persistence.hpp
 include/opencv2/core/private.cuda.hpp
 include/opencv2/core/private.hpp
 include/opencv2/core/ptr.inl.hpp
+include/opencv2/core/saturate.hpp
 include/opencv2/core/sse_utils.hpp
 include/opencv2/core/traits.hpp
 include/opencv2/core/types.hpp
 include/opencv2/core/types_c.h
 include/opencv2/core/utility.hpp
+include/opencv2/core/va_intel.hpp
 include/opencv2/core/version.hpp
 include/opencv2/core/wimage.hpp
 include/opencv2/cvconfig.h
@@ -121,12 +131,6 @@ include/opencv2/flann/sampling.h
 include/opencv2/flann/saving.h
 include/opencv2/flann/simplex_downhill.h
 include/opencv2/flann/timer.h
-include/opencv2/hal.hpp
-include/opencv2/hal/defs.h
-include/opencv2/hal/intrin.hpp
-include/opencv2/hal/intrin_cpp.hpp
-include/opencv2/hal/intrin_neon.hpp
-include/opencv2/hal/intrin_sse.hpp
 include/opencv2/highgui.hpp
 include/opencv2/highgui/highgui.hpp
 include/opencv2/highgui/highgui_c.h
@@ -135,6 +139,7 @@ include/opencv2/imgcodecs/imgcodecs.hpp
 include/opencv2/imgcodecs/imgcodecs_c.h
 include/opencv2/imgcodecs/ios.h
 include/opencv2/imgproc.hpp
+include/opencv2/imgproc/detail/distortion_model.hpp
 include/opencv2/imgproc/imgproc.hpp
 include/opencv2/imgproc/imgproc_c.h
 include/opencv2/imgproc/types_c.h
@@ -197,54 +202,53 @@ include/opencv2/videostab/ring_buffer.hpp
 include/opencv2/videostab/stabilizer.hpp
 include/opencv2/videostab/wobble_suppression.hpp
 lib/libopencv_calib3d.so
-lib/libopencv_calib3d.so.3.0
+lib/libopencv_calib3d.so.3.1
 lib/libopencv_calib3d.so.${PKGVERSION}
 lib/libopencv_core.so
-lib/libopencv_core.so.3.0
+lib/libopencv_core.so.3.1
 lib/libopencv_core.so.${PKGVERSION}
 lib/libopencv_features2d.so
-lib/libopencv_features2d.so.3.0
+lib/libopencv_features2d.so.3.1
 lib/libopencv_features2d.so.${PKGVERSION}
 lib/libopencv_flann.so
-lib/libopencv_flann.so.3.0
+lib/libopencv_flann.so.3.1
 lib/libopencv_flann.so.${PKGVERSION}
-lib/libopencv_hal.a
 lib/libopencv_highgui.so
-lib/libopencv_highgui.so.3.0
+lib/libopencv_highgui.so.3.1
 lib/libopencv_highgui.so.${PKGVERSION}
 lib/libopencv_imgcodecs.so
-lib/libopencv_imgcodecs.so.3.0
+lib/libopencv_imgcodecs.so.3.1
 lib/libopencv_imgcodecs.so.${PKGVERSION}
 lib/libopencv_imgproc.so
-lib/libopencv_imgproc.so.3.0
+lib/libopencv_imgproc.so.3.1
 lib/libopencv_imgproc.so.${PKGVERSION}
 lib/libopencv_ml.so
-lib/libopencv_ml.so.3.0
+lib/libopencv_ml.so.3.1
 lib/libopencv_ml.so.${PKGVERSION}
 lib/libopencv_objdetect.so
-lib/libopencv_objdetect.so.3.0
+lib/libopencv_objdetect.so.3.1
 lib/libopencv_objdetect.so.${PKGVERSION}
 lib/libopencv_photo.so
-lib/libopencv_photo.so.3.0
+lib/libopencv_photo.so.3.1
 lib/libopencv_photo.so.${PKGVERSION}
 lib/libopencv_shape.so
-lib/libopencv_shape.so.3.0
+lib/libopencv_shape.so.3.1
 lib/libopencv_shape.so.${PKGVERSION}
 lib/libopencv_stitching.so
-lib/libopencv_stitching.so.3.0
+lib/libopencv_stitching.so.3.1
 lib/libopencv_stitching.so.${PKGVERSION}
 lib/libopencv_superres.so
-lib/libopencv_superres.so.3.0
+lib/libopencv_superres.so.3.1
 lib/libopencv_superres.so.${PKGVERSION}
 lib/libopencv_ts.a
 lib/libopencv_video.so
-lib/libopencv_video.so.3.0
+lib/libopencv_video.so.3.1
 lib/libopencv_video.so.${PKGVERSION}
 lib/libopencv_videoio.so
-lib/libopencv_videoio.so.3.0
+lib/libopencv_videoio.so.3.1
 lib/libopencv_videoio.so.${PKGVERSION}
 lib/libopencv_videostab.so
-lib/libopencv_videostab.so.3.0
+lib/libopencv_videostab.so.3.1
 lib/libopencv_videostab.so.${PKGVERSION}
 lib/pkgconfig/opencv.pc
 ${PYSITELIB}/cv2.so
diff --git a/graphics/opencv/distinfo b/graphics/opencv/distinfo
index e2c13c80584..690b5b5ce3f 100644
--- a/graphics/opencv/distinfo
+++ b/graphics/opencv/distinfo
@@ -1,21 +1,20 @@
-$NetBSD: distinfo,v 1.33 2016/02/08 02:04:18 dbj Exp $
+$NetBSD: distinfo,v 1.34 2016/02/21 14:10:46 fhajny Exp $
 
-SHA1 (opencv-3.0.0.zip) = 7b7cd6cb3b7bad537cacad04bb7aa264a897d545
-RMD160 (opencv-3.0.0.zip) = 7b4dff26502e71e6570c2452c35fd03a1982bc7e
-SHA512 (opencv-3.0.0.zip) = 108d0fdcc60b5688ebf61c930fb965ec81f0d3c36bb1797f6cc571fac35331f540773207fd1cb81b12c05c8f4d1af20c4a2452d9f75cd0cae4acd8131be92375
-Size (opencv-3.0.0.zip) = 100980799 bytes
-SHA1 (patch-3rdparty_ippicv_downloader.cmake) = 8d99b26a39aa184a4dfc03e4928ea7b7b62e71d9
+SHA1 (opencv-3.1.0.zip) = 8c932b68fe2e1575e88dde759ab1ed1d53d6f41b
+RMD160 (opencv-3.1.0.zip) = d7a811c67cfb16243470822150760252d5770165
+SHA512 (opencv-3.1.0.zip) = b4915e8838fce8ba9e1af8b11e46678624435e9a41592e645413dfdc830993eaa017d337fe4c212a49f096421a6317a1892546087fbc3cfdab554522336c0f1a
+Size (opencv-3.1.0.zip) = 79186131 bytes
+SHA1 (patch-3rdparty_ippicv_downloader.cmake) = a0b7c1b52f9ec4f35ff3f846785fbbfec1eeac51
 SHA1 (patch-apps_annotation_CMakeLists.txt) = 4c3a00b0dfef5e978b10ba966f68d050a06208fe
 SHA1 (patch-apps_createsamples_CMakeLists.txt) = 2d60ecc0e1674cde4414e91e837c24fa464d42aa
 SHA1 (patch-apps_traincascade_CMakeLists.txt) = 7114cc4c2057e12dc8e47bc61334cb8e175987eb
 SHA1 (patch-cmake_OpenCVDetectCXXCompiler.cmake) = 221b0551d0f29d7e79afe3da8a33b1b3a4f7bf20
-SHA1 (patch-cmake_OpenCVModule.cmake) = 440788935a55ae1056407243b730fc13328e12f5
+SHA1 (patch-cmake_OpenCVModule.cmake) = 7667f19f3e9c6ff757d92a6a49e7c3430c6c080d
 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) = dba43f8252eda7807379469cf9359581bf4d41ad
+SHA1 (patch-modules_core_src_parallel__pthreads.cpp) = c64ef8872c120db0ab92582496235858eec9bf92
 SHA1 (patch-modules_core_src_system.cpp) = 3b7ac545585a430d28c7077f360357079f127580
 SHA1 (patch-modules_flann_include_opencv2_flann_defines.h) = ab848e67c4e03219670598ac2d21071a617a5c33
 SHA1 (patch-modules_java_CMakeLists.txt) = 020a8d2048d927e5d3819867df0d889bb516d8b4
-SHA1 (patch-modules_objdetect_include_opencv_objdetect_detection__based__tracker.hpp) = 2f4d2f43afe370eef748e05bec199bc963e1ecab
-SHA1 (patch-modules_python_common.cmake) = 23d5c21ad4b2e09f1223f02c45bd51e373d1b520
+SHA1 (patch-modules_objdetect_include_opencv_objdetect_detection__based__tracker.hpp) = 83575857156321ae07f3fb03d1b3c61b804b3832
 SHA1 (patch-modules_ts_src_ts.cpp) = b9a3992014b02dbd89d46375a2476385e91dc24c
diff --git a/graphics/opencv/patches/patch-3rdparty_ippicv_downloader.cmake b/graphics/opencv/patches/patch-3rdparty_ippicv_downloader.cmake
index d47187abc79..3249aa20f38 100644
--- a/graphics/opencv/patches/patch-3rdparty_ippicv_downloader.cmake
+++ b/graphics/opencv/patches/patch-3rdparty_ippicv_downloader.cmake
@@ -1,12 +1,12 @@
-$NetBSD: patch-3rdparty_ippicv_downloader.cmake,v 1.1 2015/10/13 14:37:43 joerg Exp $
+$NetBSD: patch-3rdparty_ippicv_downloader.cmake,v 1.2 2016/02/21 14:10:46 fhajny Exp $
 
---- 3rdparty/ippicv/downloader.cmake.orig	2015-10-13 13:00:47.000000000 +0000
+--- 3rdparty/ippicv/downloader.cmake.orig	2015-12-18 15:02:16.000000000 +0000
 +++ 3rdparty/ippicv/downloader.cmake
 @@ -6,6 +6,7 @@
  #
  
  function(_icv_downloader)
 +  return()
+   # Commit SHA in the opencv_3rdparty repo
+   set(IPPICV_BINARIES_COMMIT "81a676001ca8075ada498583e4166079e5744668")
    # Define actual ICV versions
-   if(APPLE)
-     set(OPENCV_ICV_PACKAGE_NAME "ippicv_macosx_20141027.tgz")
diff --git a/graphics/opencv/patches/patch-cmake_OpenCVModule.cmake b/graphics/opencv/patches/patch-cmake_OpenCVModule.cmake
index e3234a449fe..bc0a9c262f1 100644
--- a/graphics/opencv/patches/patch-cmake_OpenCVModule.cmake
+++ b/graphics/opencv/patches/patch-cmake_OpenCVModule.cmake
@@ -1,11 +1,11 @@
-$NetBSD: patch-cmake_OpenCVModule.cmake,v 1.1 2016/02/08 02:04:18 dbj Exp $
+$NetBSD: patch-cmake_OpenCVModule.cmake,v 1.2 2016/02/21 14:10:46 fhajny Exp $
 
 Fix library id handling on Darwin
 
---- cmake/OpenCVModule.cmake.orig	2015-06-03 17:21:34.000000000 +0000
+--- cmake/OpenCVModule.cmake.orig	2015-12-18 15:02:16.000000000 +0000
 +++ cmake/OpenCVModule.cmake
-@@ -754,7 +754,7 @@ macro(_ocv_create_module)
-     ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
+@@ -834,7 +834,7 @@ macro(_ocv_create_module)
+     COMPILE_PDB_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
      LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
      RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
 -    INSTALL_NAME_DIR lib
diff --git a/graphics/opencv/patches/patch-modules_core_src_parallel__pthreads.cpp b/graphics/opencv/patches/patch-modules_core_src_parallel__pthreads.cpp
index b4b34cdde4c..e6380163bac 100644
--- a/graphics/opencv/patches/patch-modules_core_src_parallel__pthreads.cpp
+++ b/graphics/opencv/patches/patch-modules_core_src_parallel__pthreads.cpp
@@ -1,10 +1,10 @@
-$NetBSD: patch-modules_core_src_parallel__pthreads.cpp,v 1.1 2015/10/08 17:45:59 fhajny Exp $
+$NetBSD: patch-modules_core_src_parallel__pthreads.cpp,v 1.2 2016/02/21 14:10:46 fhajny Exp $
 
 PTHREAD_RECURSIVE_MUTEX_INITIALIZER doesn't exist on SunOS.
 
---- modules/core/src/parallel_pthreads.cpp.orig	2015-06-03 17:21:34.000000000 +0000
+--- modules/core/src/parallel_pthreads.cpp.orig	2015-12-18 15:02:16.000000000 +0000
 +++ modules/core/src/parallel_pthreads.cpp
-@@ -244,6 +244,10 @@ private:
+@@ -221,6 +221,10 @@ private:
      ThreadManagerPoolState m_pool_state;
  };
  
@@ -12,6 +12,6 @@ PTHREAD_RECURSIVE_MUTEX_INITIALIZER doesn't exist on SunOS.
 +#define PTHREAD_RECURSIVE_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER
 +#endif
 +
- #ifndef PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
- #define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP PTHREAD_RECURSIVE_MUTEX_INITIALIZER
- #endif
+ const char ThreadManager::m_env_name[] = "OPENCV_FOR_THREADS_NUM";
+ 
+ #ifdef ANDROID
diff --git a/graphics/opencv/patches/patch-modules_objdetect_include_opencv_objdetect_detection__based__tracker.hpp b/graphics/opencv/patches/patch-modules_objdetect_include_opencv_objdetect_detection__based__tracker.hpp
index 0eac4343be8..f4b5eeac253 100644
--- a/graphics/opencv/patches/patch-modules_objdetect_include_opencv_objdetect_detection__based__tracker.hpp
+++ b/graphics/opencv/patches/patch-modules_objdetect_include_opencv_objdetect_detection__based__tracker.hpp
@@ -1,10 +1,10 @@
-$NetBSD: patch-modules_objdetect_include_opencv_objdetect_detection__based__tracker.hpp,v 1.1 2015/10/13 14:37:43 joerg Exp $
+$NetBSD: patch-modules_objdetect_include_opencv_objdetect_detection__based__tracker.hpp,v 1.2 2016/02/21 14:10:46 fhajny Exp $
 
---- modules/objdetect/include/opencv2/objdetect/detection_based_tracker.hpp.orig	2015-10-13 12:31:00.000000000 +0000
+--- modules/objdetect/include/opencv2/objdetect/detection_based_tracker.hpp.orig	2015-12-18 15:02:16.000000000 +0000
 +++ modules/objdetect/include/opencv2/objdetect/detection_based_tracker.hpp
-@@ -45,7 +45,7 @@
- #define __OPENCV_OBJDETECT_DBT_HPP__
+@@ -46,7 +46,7 @@
  
+ // After this condition removal update blacklist for bindings: modules/python/common.cmake
  #if defined(__linux__) || defined(LINUX) || defined(__APPLE__) || defined(__ANDROID__) || \
 -  (defined(__cplusplus) &&  __cplusplus > 201103L) || (defined(_MSC_VER) && _MSC_VER >= 1700)
 +  (defined(__cplusplus) &&  __cplusplus >= 201103L) || (defined(_MSC_VER) && _MSC_VER >= 1700)
diff --git a/graphics/opencv/patches/patch-modules_python_common.cmake b/graphics/opencv/patches/patch-modules_python_common.cmake
deleted file mode 100644
index 64fd2eadfdb..00000000000
--- a/graphics/opencv/patches/patch-modules_python_common.cmake
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-modules_python_common.cmake,v 1.2 2016/02/08 02:04:18 dbj Exp $
-
-Backport fix from https://github.com/Itseez/opencv/pull/4109
-Also, fix library id handling on Darwin
-
---- modules/python/common.cmake.orig	2015-06-03 17:21:34.000000000 +0000
-+++ modules/python/common.cmake
-@@ -28,6 +28,7 @@ endforeach(m)
- ocv_list_filterout(opencv_hdrs ".h$")
- ocv_list_filterout(opencv_hdrs "cuda")
- ocv_list_filterout(opencv_hdrs "cudev")
-+ocv_list_filterout(opencv_hdrs "detection_based_tracker.hpp") # Conditional compilation
- 
- set(cv2_generated_hdrs
-     "${CMAKE_CURRENT_BINARY_DIR}/pyopencv_generated_include.h"
-@@ -45,7 +46,7 @@ add_custom_command(
-    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/headers.txt
-    DEPENDS ${opencv_hdrs})
- 
--ocv_add_library(${the_module} SHARED ${PYTHON_SOURCE_DIR}/src2/cv2.cpp ${cv2_generated_hdrs})
-+ocv_add_library(${the_module} MODULE ${PYTHON_SOURCE_DIR}/src2/cv2.cpp ${cv2_generated_hdrs})
- 
- if(PYTHON_DEBUG_LIBRARIES AND NOT PYTHON_LIBRARIES MATCHES "optimized.*debug")
-   ocv_target_link_libraries(${the_module} debug ${PYTHON_DEBUG_LIBRARIES} optimized ${PYTHON_LIBRARIES})