Update graphics/opencv to 3.0.0.

Major changes (besides bugfixes):
- opencv_contrib (http://github.com/itseez/opencv_contrib) repository
  has been added.
- a subset of Intel IPP (IPPCV) is given to us and our users free
  of charge, free of licensing fees, for commercial and non-commerical
  use.
- T-API (transparent API) has been introduced, this is transparent GPU
  acceleration layer using OpenCL. It does not add any compile-time or
  runtime dependency of OpenCL. When OpenCL is available, it's detected
  and used, but it can be disabled at compile time or at runtime.
- ~40 OpenCV functions have been accelerated using NEON intrinsics and
  because these are mostly basic functions, some higher-level functions
  got accelerated as well.
- There is also new OpenCV HAL layer that will simplifies creation
  of NEON-optimized code and that should form a base for the open-source
  and proprietary OpenCV accelerators.
- The documentation is now in Doxygen: http://docs.opencv.org/master/
- We cleaned up API of many high-level algorithms from features2d, calib3d,
  objdetect etc. They now follow the uniform "abstract interface - hidden
  implementation" pattern and make extensive use of smart pointers (Ptr<>).
- Greatly improved and extended Python & Java bindings (also, see below on
  the Python bindings), newly introduced Matlab bindings
- Improved Android support - now OpenCV Manager is in Java and supports
  both 2.4 and 3.0.
- Greatly improved WinRT support, including video capturing and
  multi-threading capabilities. Thanks for Microsoft team for this!
- Big thanks to Google who funded several successive GSoC programs and
  let OpenCV in. The results of many successful GSoC 2013 and 2014 projects
  have been integrated in opencv 3.0 and opencv_contrib (earlier results
  are also available in OpenCV 2.4.x). We can name:
  - text detection
  - many computational photography algorithms (HDR, inpainting, edge-aware
    filters, superpixels,...)
  - tracking and optical flow algorithms
  - new features, including line descriptors, KAZE/AKAZE
  - general use optimization (hill climbing, linear programming)
  - greatly improved Python support, including Python 3.0 support, many new
    tutorials & samples on how to use OpenCV with Python.
  - 2d shape matching module and 3d surface matching module
  - RGB-D module
  - VTK-based 3D visualization module

For full changelog see:

  http://code.opencv.org/projects/opencv/wiki/ChangeLog

For 2.4 to 3.0 transition, see the transition guide:

  http://docs.opencv.org/master/db/dfa/tutorial_transition_guide.html

17 files changed, 241 insertions, 374 deletions

diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
index af0df870fdc..fe94bf84a80 100644
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.55 2015/06/30 09:57:36 ryoon Exp $
+# $NetBSD: Makefile,v 1.56 2015/10/08 17:45:59 fhajny Exp $
 
-DISTNAME=	opencv-2.4.9
-PKGREVISION=	4
+DISTNAME=	opencv-3.0.0
 CATEGORIES=	graphics devel
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=opencvlibrary/}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=Itseez/}
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	anthony.mallet@laas.fr
@@ -23,6 +22,7 @@ INSTALLATION_DIRS+=	share/OpenCV/haarcascades
 
 PKGCONFIG_OVERRIDE+=	opencv.pc.cmake.in
 
+PY_PATCHPLIST=		yes
 REPLACE_PYTHON+=	samples/python/*.py
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/a$//}
@@ -34,24 +34,24 @@ CHECK_WRKREF_SKIP=	${PREFIX}/lib/libopencv_core.*
 
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mclang)
-CXXFLAGS+=	-std=c++11
+CXXFLAGS+=		-std=c++11
 .endif
 
 OPSYSVARS+=		CMAKE_ARGS
+CMAKE_ARGS+=		-DPYTHON_EXECUTABLE:FILEPATH=${PYTHONBIN}
 CMAKE_ARGS+=		-DZLIB_ROOT=${BUILDLINK_PREFIX.zlib}
 CMAKE_ARGS.SunOS+=	-DENABLE_PRECOMPILED_HEADERS=NO
 
-PLIST_VARS+=	opencl
-
-.if ${OPSYS} == "Darwin" || ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS" || ${OPSYS} == "Linux" || ${OPSYS} == "FreeBSD"
-PLIST.opencl=	yes
-.endif
+CONFIGURE_ENV+=		MACHINE_ARCH=${MACHINE_ARCH}
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/jasper/buildlink3.mk"
+.include "../../graphics/libwebp/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
+.include "../../lang/python/extension.mk"
+.include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/opencv/PLIST b/graphics/opencv/PLIST
index f0e569a1983..5b28d648b84 100644
--- a/graphics/opencv/PLIST
+++ b/graphics/opencv/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.14 2014/07/09 19:57:36 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.15 2015/10/08 17:45:59 fhajny Exp $
+bin/opencv_annotation
 bin/opencv_createsamples
-bin/opencv_haartraining
-bin/opencv_performance
 bin/opencv_traincascade
 include/opencv/cv.h
 include/opencv/cv.hpp
@@ -14,28 +13,78 @@ include/opencv/cxeigen.hpp
 include/opencv/cxmisc.h
 include/opencv/highgui.h
 include/opencv/ml.h
+include/opencv2/calib3d.hpp
 include/opencv2/calib3d/calib3d.hpp
-include/opencv2/contrib/contrib.hpp
-include/opencv2/contrib/detection_based_tracker.hpp
-include/opencv2/contrib/hybridtracker.hpp
-include/opencv2/contrib/openfabmap.hpp
-include/opencv2/contrib/retina.hpp
+include/opencv2/calib3d/calib3d_c.h
+include/opencv2/core.hpp
 include/opencv2/core/affine.hpp
+include/opencv2/core/base.hpp
+include/opencv2/core/bufferpool.hpp
 include/opencv2/core/core.hpp
 include/opencv2/core/core_c.h
-include/opencv2/core/cuda_devptrs.hpp
-include/opencv2/core/devmem2d.hpp
+include/opencv2/core/cuda.hpp
+include/opencv2/core/cuda.inl.hpp
+include/opencv2/core/cuda/block.hpp
+include/opencv2/core/cuda/border_interpolate.hpp
+include/opencv2/core/cuda/color.hpp
+include/opencv2/core/cuda/common.hpp
+include/opencv2/core/cuda/datamov_utils.hpp
+include/opencv2/core/cuda/detail/color_detail.hpp
+include/opencv2/core/cuda/detail/reduce.hpp
+include/opencv2/core/cuda/detail/reduce_key_val.hpp
+include/opencv2/core/cuda/detail/transform_detail.hpp
+include/opencv2/core/cuda/detail/type_traits_detail.hpp
+include/opencv2/core/cuda/detail/vec_distance_detail.hpp
+include/opencv2/core/cuda/dynamic_smem.hpp
+include/opencv2/core/cuda/emulation.hpp
+include/opencv2/core/cuda/filters.hpp
+include/opencv2/core/cuda/funcattrib.hpp
+include/opencv2/core/cuda/functional.hpp
+include/opencv2/core/cuda/limits.hpp
+include/opencv2/core/cuda/reduce.hpp
+include/opencv2/core/cuda/saturate_cast.hpp
+include/opencv2/core/cuda/scan.hpp
+include/opencv2/core/cuda/simd_functions.hpp
+include/opencv2/core/cuda/transform.hpp
+include/opencv2/core/cuda/type_traits.hpp
+include/opencv2/core/cuda/utility.hpp
+include/opencv2/core/cuda/vec_distance.hpp
+include/opencv2/core/cuda/vec_math.hpp
+include/opencv2/core/cuda/vec_traits.hpp
+include/opencv2/core/cuda/warp.hpp
+include/opencv2/core/cuda/warp_reduce.hpp
+include/opencv2/core/cuda/warp_shuffle.hpp
+include/opencv2/core/cuda_stream_accessor.hpp
+include/opencv2/core/cuda_types.hpp
+include/opencv2/core/cvdef.h
+include/opencv2/core/cvstd.hpp
+include/opencv2/core/cvstd.inl.hpp
+include/opencv2/core/directx.hpp
 include/opencv2/core/eigen.hpp
-include/opencv2/core/gpumat.hpp
-include/opencv2/core/internal.hpp
+include/opencv2/core/ippasync.hpp
 include/opencv2/core/mat.hpp
-include/opencv2/core/opengl_interop.hpp
-include/opencv2/core/opengl_interop_deprecated.hpp
+include/opencv2/core/mat.inl.hpp
+include/opencv2/core/matx.hpp
+include/opencv2/core/ocl.hpp
+include/opencv2/core/ocl_genbase.hpp
+include/opencv2/core/opengl.hpp
 include/opencv2/core/operations.hpp
+include/opencv2/core/optim.hpp
+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/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/version.hpp
 include/opencv2/core/wimage.hpp
+include/opencv2/cvconfig.h
+include/opencv2/features2d.hpp
 include/opencv2/features2d/features2d.hpp
+include/opencv2/flann.hpp
 include/opencv2/flann/all_indices.h
 include/opencv2/flann/allocator.h
 include/opencv2/flann/any.h
@@ -72,64 +121,42 @@ include/opencv2/flann/sampling.h
 include/opencv2/flann/saving.h
 include/opencv2/flann/simplex_downhill.h
 include/opencv2/flann/timer.h
-include/opencv2/gpu/device/block.hpp
-include/opencv2/gpu/device/border_interpolate.hpp
-include/opencv2/gpu/device/color.hpp
-include/opencv2/gpu/device/common.hpp
-include/opencv2/gpu/device/datamov_utils.hpp
-include/opencv2/gpu/device/detail/color_detail.hpp
-include/opencv2/gpu/device/detail/reduce.hpp
-include/opencv2/gpu/device/detail/reduce_key_val.hpp
-include/opencv2/gpu/device/detail/transform_detail.hpp
-include/opencv2/gpu/device/detail/type_traits_detail.hpp
-include/opencv2/gpu/device/detail/vec_distance_detail.hpp
-include/opencv2/gpu/device/dynamic_smem.hpp
-include/opencv2/gpu/device/emulation.hpp
-include/opencv2/gpu/device/filters.hpp
-include/opencv2/gpu/device/funcattrib.hpp
-include/opencv2/gpu/device/functional.hpp
-include/opencv2/gpu/device/limits.hpp
-include/opencv2/gpu/device/reduce.hpp
-include/opencv2/gpu/device/saturate_cast.hpp
-include/opencv2/gpu/device/scan.hpp
-include/opencv2/gpu/device/simd_functions.hpp
-include/opencv2/gpu/device/static_check.hpp
-include/opencv2/gpu/device/transform.hpp
-include/opencv2/gpu/device/type_traits.hpp
-include/opencv2/gpu/device/utility.hpp
-include/opencv2/gpu/device/vec_distance.hpp
-include/opencv2/gpu/device/vec_math.hpp
-include/opencv2/gpu/device/vec_traits.hpp
-include/opencv2/gpu/device/warp.hpp
-include/opencv2/gpu/device/warp_reduce.hpp
-include/opencv2/gpu/device/warp_shuffle.hpp
-include/opencv2/gpu/devmem2d.hpp
-include/opencv2/gpu/gpu.hpp
-include/opencv2/gpu/gpumat.hpp
-include/opencv2/gpu/stream_accessor.hpp
-include/opencv2/highgui/cap_ios.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
-include/opencv2/highgui/ios.h
+include/opencv2/imgcodecs.hpp
+include/opencv2/imgcodecs/imgcodecs.hpp
+include/opencv2/imgcodecs/imgcodecs_c.h
+include/opencv2/imgcodecs/ios.h
+include/opencv2/imgproc.hpp
 include/opencv2/imgproc/imgproc.hpp
 include/opencv2/imgproc/imgproc_c.h
 include/opencv2/imgproc/types_c.h
-include/opencv2/legacy/blobtrack.hpp
-include/opencv2/legacy/compat.hpp
-include/opencv2/legacy/legacy.hpp
-include/opencv2/legacy/streams.hpp
+include/opencv2/ml.hpp
 include/opencv2/ml/ml.hpp
-include/opencv2/nonfree/features2d.hpp
-include/opencv2/nonfree/gpu.hpp
-include/opencv2/nonfree/nonfree.hpp
-include/opencv2/nonfree/ocl.hpp
+include/opencv2/objdetect.hpp
+include/opencv2/objdetect/detection_based_tracker.hpp
 include/opencv2/objdetect/objdetect.hpp
-${PLIST.opencl}include/opencv2/ocl/matrix_operations.hpp
-${PLIST.opencl}include/opencv2/ocl/ocl.hpp
+include/opencv2/objdetect/objdetect_c.h
 include/opencv2/opencv.hpp
 include/opencv2/opencv_modules.hpp
+include/opencv2/photo.hpp
+include/opencv2/photo/cuda.hpp
 include/opencv2/photo/photo.hpp
 include/opencv2/photo/photo_c.h
+include/opencv2/shape.hpp
+include/opencv2/shape/emdL1.hpp
+include/opencv2/shape/hist_cost.hpp
+include/opencv2/shape/shape.hpp
+include/opencv2/shape/shape_distance.hpp
+include/opencv2/shape/shape_transformer.hpp
+include/opencv2/stitching.hpp
 include/opencv2/stitching/detail/autocalib.hpp
 include/opencv2/stitching/detail/blenders.hpp
 include/opencv2/stitching/detail/camera.hpp
@@ -137,22 +164,24 @@ include/opencv2/stitching/detail/exposure_compensate.hpp
 include/opencv2/stitching/detail/matchers.hpp
 include/opencv2/stitching/detail/motion_estimators.hpp
 include/opencv2/stitching/detail/seam_finders.hpp
+include/opencv2/stitching/detail/timelapsers.hpp
 include/opencv2/stitching/detail/util.hpp
 include/opencv2/stitching/detail/util_inl.hpp
 include/opencv2/stitching/detail/warpers.hpp
 include/opencv2/stitching/detail/warpers_inl.hpp
-include/opencv2/stitching/stitcher.hpp
 include/opencv2/stitching/warpers.hpp
+include/opencv2/superres.hpp
 include/opencv2/superres/optical_flow.hpp
-include/opencv2/superres/superres.hpp
-include/opencv2/ts/gpu_perf.hpp
-include/opencv2/ts/gpu_test.hpp
-include/opencv2/ts/ts.hpp
-include/opencv2/ts/ts_gtest.h
-include/opencv2/ts/ts_perf.hpp
+include/opencv2/video.hpp
 include/opencv2/video/background_segm.hpp
 include/opencv2/video/tracking.hpp
+include/opencv2/video/tracking_c.h
 include/opencv2/video/video.hpp
+include/opencv2/videoio.hpp
+include/opencv2/videoio/cap_ios.h
+include/opencv2/videoio/videoio.hpp
+include/opencv2/videoio/videoio_c.h
+include/opencv2/videostab.hpp
 include/opencv2/videostab/deblurring.hpp
 include/opencv2/videostab/fast_marching.hpp
 include/opencv2/videostab/fast_marching_inl.hpp
@@ -160,96 +189,87 @@ include/opencv2/videostab/frame_source.hpp
 include/opencv2/videostab/global_motion.hpp
 include/opencv2/videostab/inpainting.hpp
 include/opencv2/videostab/log.hpp
+include/opencv2/videostab/motion_core.hpp
 include/opencv2/videostab/motion_stabilizing.hpp
 include/opencv2/videostab/optical_flow.hpp
+include/opencv2/videostab/outlier_rejection.hpp
+include/opencv2/videostab/ring_buffer.hpp
 include/opencv2/videostab/stabilizer.hpp
-include/opencv2/videostab/videostab.hpp
+include/opencv2/videostab/wobble_suppression.hpp
 lib/libopencv_calib3d.so
-lib/libopencv_calib3d.so.2.4
+lib/libopencv_calib3d.so.3.0
 lib/libopencv_calib3d.so.${PKGVERSION}
-lib/libopencv_contrib.so
-lib/libopencv_contrib.so.2.4
-lib/libopencv_contrib.so.${PKGVERSION}
 lib/libopencv_core.so
-lib/libopencv_core.so.2.4
+lib/libopencv_core.so.3.0
 lib/libopencv_core.so.${PKGVERSION}
 lib/libopencv_features2d.so
-lib/libopencv_features2d.so.2.4
+lib/libopencv_features2d.so.3.0
 lib/libopencv_features2d.so.${PKGVERSION}
 lib/libopencv_flann.so
-lib/libopencv_flann.so.2.4
+lib/libopencv_flann.so.3.0
 lib/libopencv_flann.so.${PKGVERSION}
-lib/libopencv_gpu.so
-lib/libopencv_gpu.so.2.4
-lib/libopencv_gpu.so.${PKGVERSION}
+lib/libopencv_hal.a
 lib/libopencv_highgui.so
-lib/libopencv_highgui.so.2.4
+lib/libopencv_highgui.so.3.0
 lib/libopencv_highgui.so.${PKGVERSION}
+lib/libopencv_imgcodecs.so
+lib/libopencv_imgcodecs.so.3.0
+lib/libopencv_imgcodecs.so.${PKGVERSION}
 lib/libopencv_imgproc.so
-lib/libopencv_imgproc.so.2.4
+lib/libopencv_imgproc.so.3.0
 lib/libopencv_imgproc.so.${PKGVERSION}
-lib/libopencv_legacy.so
-lib/libopencv_legacy.so.2.4
-lib/libopencv_legacy.so.${PKGVERSION}
 lib/libopencv_ml.so
-lib/libopencv_ml.so.2.4
+lib/libopencv_ml.so.3.0
 lib/libopencv_ml.so.${PKGVERSION}
-lib/libopencv_nonfree.so
-lib/libopencv_nonfree.so.2.4
-lib/libopencv_nonfree.so.${PKGVERSION}
 lib/libopencv_objdetect.so
-lib/libopencv_objdetect.so.2.4
+lib/libopencv_objdetect.so.3.0
 lib/libopencv_objdetect.so.${PKGVERSION}
-${PLIST.opencl}lib/libopencv_ocl.so
-${PLIST.opencl}lib/libopencv_ocl.so.2.4
-${PLIST.opencl}lib/libopencv_ocl.so.${PKGVERSION}
 lib/libopencv_photo.so
-lib/libopencv_photo.so.2.4
+lib/libopencv_photo.so.3.0
 lib/libopencv_photo.so.${PKGVERSION}
+lib/libopencv_shape.so
+lib/libopencv_shape.so.3.0
+lib/libopencv_shape.so.${PKGVERSION}
 lib/libopencv_stitching.so
-lib/libopencv_stitching.so.2.4
+lib/libopencv_stitching.so.3.0
 lib/libopencv_stitching.so.${PKGVERSION}
 lib/libopencv_superres.so
-lib/libopencv_superres.so.2.4
+lib/libopencv_superres.so.3.0
 lib/libopencv_superres.so.${PKGVERSION}
 lib/libopencv_ts.a
 lib/libopencv_video.so
-lib/libopencv_video.so.2.4
+lib/libopencv_video.so.3.0
 lib/libopencv_video.so.${PKGVERSION}
+lib/libopencv_videoio.so
+lib/libopencv_videoio.so.3.0
+lib/libopencv_videoio.so.${PKGVERSION}
 lib/libopencv_videostab.so
-lib/libopencv_videostab.so.2.4
+lib/libopencv_videostab.so.3.0
 lib/libopencv_videostab.so.${PKGVERSION}
 lib/pkgconfig/opencv.pc
-${PLIST.python}${PYSITELIB}/cv.py
-${PLIST.python}${PYSITELIB}/cv2.so
+${PYSITELIB}/cv2.so
 share/OpenCV/OpenCVConfig-version.cmake
 share/OpenCV/OpenCVConfig.cmake
 share/OpenCV/OpenCVModules-release.cmake
 share/OpenCV/OpenCVModules.cmake
 share/OpenCV/haarcascades/haarcascade_eye.xml
 share/OpenCV/haarcascades/haarcascade_eye_tree_eyeglasses.xml
+share/OpenCV/haarcascades/haarcascade_frontalcatface.xml
+share/OpenCV/haarcascades/haarcascade_frontalcatface_extended.xml
 share/OpenCV/haarcascades/haarcascade_frontalface_alt.xml
 share/OpenCV/haarcascades/haarcascade_frontalface_alt2.xml
 share/OpenCV/haarcascades/haarcascade_frontalface_alt_tree.xml
 share/OpenCV/haarcascades/haarcascade_frontalface_default.xml
 share/OpenCV/haarcascades/haarcascade_fullbody.xml
 share/OpenCV/haarcascades/haarcascade_lefteye_2splits.xml
+share/OpenCV/haarcascades/haarcascade_licence_plate_rus_16stages.xml
 share/OpenCV/haarcascades/haarcascade_lowerbody.xml
-share/OpenCV/haarcascades/haarcascade_mcs_eyepair_big.xml
-share/OpenCV/haarcascades/haarcascade_mcs_eyepair_small.xml
-share/OpenCV/haarcascades/haarcascade_mcs_leftear.xml
-share/OpenCV/haarcascades/haarcascade_mcs_lefteye.xml
-share/OpenCV/haarcascades/haarcascade_mcs_mouth.xml
-share/OpenCV/haarcascades/haarcascade_mcs_nose.xml
-share/OpenCV/haarcascades/haarcascade_mcs_rightear.xml
-share/OpenCV/haarcascades/haarcascade_mcs_righteye.xml
-share/OpenCV/haarcascades/haarcascade_mcs_upperbody.xml
 share/OpenCV/haarcascades/haarcascade_profileface.xml
 share/OpenCV/haarcascades/haarcascade_righteye_2splits.xml
+share/OpenCV/haarcascades/haarcascade_russian_plate_number.xml
 share/OpenCV/haarcascades/haarcascade_smile.xml
 share/OpenCV/haarcascades/haarcascade_upperbody.xml
+share/OpenCV/lbpcascades/lbpcascade_frontalcatface.xml
 share/OpenCV/lbpcascades/lbpcascade_frontalface.xml
 share/OpenCV/lbpcascades/lbpcascade_profileface.xml
 share/OpenCV/lbpcascades/lbpcascade_silverware.xml
-@pkgdir share/doc/opencv/ref/pics
-@pkgdir share/doc/opencv/papers
diff --git a/graphics/opencv/buildlink3.mk b/graphics/opencv/buildlink3.mk
index 690c92047ad..5dbaeb466de 100644
--- a/graphics/opencv/buildlink3.mk
+++ b/graphics/opencv/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.1 2009/11/18 23:08:48 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2015/10/08 17:45:59 fhajny Exp $
 
 BUILDLINK_TREE+=	opencv
 
 .if !defined(OPENCV_BUILDLINK3_MK)
 OPENCV_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.opencv+=	opencv>=1.0.0nb3
+BUILDLINK_API_DEPENDS.opencv+=	opencv>=3.0.0
 BUILDLINK_PKGSRCDIR.opencv?=	../../graphics/opencv
 
 .endif	# OPENCV_BUILDLINK3_MK
diff --git a/graphics/opencv/distinfo b/graphics/opencv/distinfo
index 6b5e39b3f95..9ed6e9708f3 100644
--- a/graphics/opencv/distinfo
+++ b/graphics/opencv/distinfo
@@ -1,15 +1,13 @@
-$NetBSD: distinfo,v 1.29 2015/07/28 16:43:25 rumko Exp $
+$NetBSD: distinfo,v 1.30 2015/10/08 17:45:59 fhajny Exp $
 
-SHA1 (opencv-2.4.9.zip) = 4f5166e2bd22bd6167cb56dd04f2c6ed68148b2c
-RMD160 (opencv-2.4.9.zip) = 1b0b80ecb50270fa7e4b1dea6f075982b5d15d81
-Size (opencv-2.4.9.zip) = 91684751 bytes
-SHA1 (patch-cmake_OpenCVFindLibsVideo.cmake) = ffe4d102dc9e0bd467dccd8fab02f3cc2d7d7fa3
-SHA1 (patch-modules_contrib_src_inputoutput.cpp) = dc3413182c94b670823d509ab38f21ce36d4f432
-SHA1 (patch-modules_contrib_src_spinimages.cpp) = b3e465700059616be991d597230bc8dc42f15be1
-SHA1 (patch-modules_core_include_opencv2_core_types_c.h) = c056068c01c417dc262f21c00324da7f86c0cd8e
+SHA1 (opencv-3.0.0.zip) = 7b7cd6cb3b7bad537cacad04bb7aa264a897d545
+RMD160 (opencv-3.0.0.zip) = 7b4dff26502e71e6570c2452c35fd03a1982bc7e
+Size (opencv-3.0.0.zip) = 100980799 bytes
+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) = dba43f8252eda7807379469cf9359581bf4d41ad
 SHA1 (patch-modules_core_src_system.cpp) = 3b7ac545585a430d28c7077f360357079f127580
 SHA1 (patch-modules_flann_include_opencv2_flann_defines.h) = ab848e67c4e03219670598ac2d21071a617a5c33
-SHA1 (patch-modules_legacy_src_calibfilter.cpp) = a388e646cd0b09af1b9ad4844f1097855808f316
-SHA1 (patch-modules_ocl_src_gftt.cpp) = fe1107c1613881d050ec5a87fad12b916ac8b8fc
-SHA1 (patch-modules_python_src2_cv2.cv.hpp) = 477bc2dd2090fd2aa955a7335717e7a0f23ebdf8
-SHA1 (patch-modules_ts_src_ts.cpp) = 61e4ab59f2ca57f75212743bf869616dfc9e5f13
+SHA1 (patch-modules_python_common.cmake) = d6289a316712bb8be4d590965c87f6bb3525a938
+SHA1 (patch-modules_ts_src_ts.cpp) = b9a3992014b02dbd89d46375a2476385e91dc24c
diff --git a/graphics/opencv/options.mk b/graphics/opencv/options.mk
index e407e639c96..3ebd4092c26 100644
--- a/graphics/opencv/options.mk
+++ b/graphics/opencv/options.mk
@@ -1,21 +1,10 @@
-# $NetBSD: options.mk,v 1.5 2015/02/05 03:51:13 tnn Exp $
+# $NetBSD: options.mk,v 1.6 2015/10/08 17:45:59 fhajny Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.opencv
-PKG_SUPPORTED_OPTIONS=	python ffmpeg
+PKG_SUPPORTED_OPTIONS=	ffmpeg
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=	python
-.if !empty(PKG_OPTIONS:Mpython)
-CMAKE_ARGS+=	-DPYTHON_EXECUTABLE:FILEPATH=${PYTHONBIN}
-PY_PATCHPLIST=	yes
-.include "../../lang/python/extension.mk"
-.include "../../math/py-numpy/buildlink3.mk"
-PLIST.python=	yes
-.else
-CMAKE_ARGS+=	-D BUILD_NEW_PYTHON_SUPPORT=OFF
-.endif
-
 .if !empty(PKG_OPTIONS:Mffmpeg)
 CMAKE_ARGS+=	-D WITH_FFMPEG=ON
 CMAKE_ARGS+=	-D FFMPEG_INCLUDE_DIR=${PREFIX}/include/ffmpeg2
diff --git a/graphics/opencv/patches/patch-cmake_OpenCVDetectCXXCompiler.cmake b/graphics/opencv/patches/patch-cmake_OpenCVDetectCXXCompiler.cmake
new file mode 100644
index 00000000000..b9bca6a3985
--- /dev/null
+++ b/graphics/opencv/patches/patch-cmake_OpenCVDetectCXXCompiler.cmake
@@ -0,0 +1,17 @@
+$NetBSD: patch-cmake_OpenCVDetectCXXCompiler.cmake,v 1.1 2015/10/08 17:45:59 fhajny Exp $
+
+Rely on pkgsrc to set architeture, see CONFIGURE_ENV.
+
+--- cmake/OpenCVDetectCXXCompiler.cmake.orig	2015-06-03 17:21:34.000000000 +0000
++++ cmake/OpenCVDetectCXXCompiler.cmake
+@@ -103,6 +103,10 @@ if(MSVC64 OR MINGW64)
+   set(X86_64 1)
+ elseif(MINGW OR (MSVC AND NOT CMAKE_CROSSCOMPILING))
+   set(X86 1)
++elseif("$ENV{MACHINE_ARCH}" MATCHES "x86_64")
++  set(X86_64 1)
++elseif("$ENV{MACHINE_ARCH}" MATCHES "i386")
++  set(X86 1)
+ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*")
+   set(X86_64 1)
+ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i686.*|i386.*|x86.*|amd64.*|AMD64.*")
diff --git a/graphics/opencv/patches/patch-cmake_OpenCVFindLibsVideo.cmake b/graphics/opencv/patches/patch-cmake_OpenCVFindLibsVideo.cmake
deleted file mode 100644
index f1e3f50c24f..00000000000
--- a/graphics/opencv/patches/patch-cmake_OpenCVFindLibsVideo.cmake
+++ /dev/null
@@ -1,75 +0,0 @@
-$NetBSD: patch-cmake_OpenCVFindLibsVideo.cmake,v 1.1 2015/02/26 17:52:12 tnn Exp $
-
-OSX ffmpeg option build fixes from upstream 2.4 branch.
-
---- cmake/OpenCVFindLibsVideo.cmake.orig	2014-04-11 10:15:26.000000000 +0000
-+++ cmake/OpenCVFindLibsVideo.cmake
-@@ -177,42 +177,35 @@ if(WITH_FFMPEG)
-         # Do an other trial
-         FIND_FILE(BZIP2_LIBRARIES NAMES libbz2.so.1 PATHS /lib)
-       endif()
--    endif(HAVE_FFMPEG)
--  endif()
--
--  if(APPLE)
--    find_path(FFMPEG_INCLUDE_DIR "libavformat/avformat.h"
--              PATHS /usr/local /usr /opt
--              PATH_SUFFIXES include
--              DOC "The path to FFMPEG headers")
--    if(FFMPEG_INCLUDE_DIR)
--      set(HAVE_GENTOO_FFMPEG TRUE)
--      set(FFMPEG_LIB_DIR "${FFMPEG_INCLUDE_DIR}/../lib" CACHE PATH "Full path of FFMPEG library directory")
--      if(EXISTS "${FFMPEG_LIB_DIR}/libavcodec.a")
--        set(HAVE_FFMPEG_CODEC 1)
--        set(ALIASOF_libavcodec_VERSION "Unknown")
--        if(EXISTS "${FFMPEG_LIB_DIR}/libavformat.a")
--          set(HAVE_FFMPEG_FORMAT 1)
-+    else()
-+      find_path(FFMPEG_INCLUDE_DIR "libavformat/avformat.h"
-+                PATHS /usr/local /usr /opt
-+                PATH_SUFFIXES include
-+                DOC "The path to FFMPEG headers")
-+      if(FFMPEG_INCLUDE_DIR)
-+        set(HAVE_GENTOO_FFMPEG TRUE)
-+        set(FFMPEG_LIB_DIR "${FFMPEG_INCLUDE_DIR}/../lib" CACHE PATH "Full path of FFMPEG library directory")
-+        find_library(FFMPEG_CODEC_LIB "avcodec" HINTS "${FFMPEG_LIB_DIR}")
-+        find_library(FFMPEG_FORMAT_LIB "avformat" HINTS "${FFMPEG_LIB_DIR}")
-+        find_library(FFMPEG_UTIL_LIB "avutil" HINTS "${FFMPEG_LIB_DIR}")
-+        find_library(FFMPEG_SWSCALE_LIB "swscale" HINTS "${FFMPEG_LIB_DIR}")
-+        if(FFMPEG_CODEC_LIB AND FFMPEG_FORMAT_LIB AND
-+           FFMPEG_UTIL_LIB AND FFMPEG_SWSCALE_LIB)
-+          set(ALIASOF_libavcodec_VERSION "Unknown")
-           set(ALIASOF_libavformat_VERSION "Unknown")
--          if(EXISTS "${FFMPEG_LIB_DIR}/libavutil.a")
--            set(HAVE_FFMPEG_UTIL 1)
--            set(ALIASOF_libavutil_VERSION "Unknown")
--            if(EXISTS "${FFMPEG_LIB_DIR}/libswscale.a")
--              set(HAVE_FFMPEG_SWSCALE 1)
--              set(ALIASOF_libswscale_VERSION "Unknown")
--              set(HAVE_FFMPEG 1)
--            endif()
--          endif()
-+          set(ALIASOF_libavutil_VERSION "Unknown")
-+          set(ALIASOF_libswscale_VERSION "Unknown")
-+          set(HAVE_FFMPEG 1)
-         endif()
--      endif()
--    endif(FFMPEG_INCLUDE_DIR)
--    if(HAVE_FFMPEG)
--      set(HIGHGUI_LIBRARIES ${HIGHGUI_LIBRARIES} "${FFMPEG_LIB_DIR}/libavcodec.a"
--          "${FFMPEG_LIB_DIR}/libavformat.a" "${FFMPEG_LIB_DIR}/libavutil.a"
--          "${FFMPEG_LIB_DIR}/libswscale.a")
--      ocv_include_directories(${FFMPEG_INCLUDE_DIR})
-+      endif(FFMPEG_INCLUDE_DIR)
-+      if(HAVE_FFMPEG)
-+        set(HIGHGUI_LIBRARIES ${HIGHGUI_LIBRARIES}
-+            ${FFMPEG_CODEC_LIB} ${FFMPEG_FORMAT_LIB}
-+            ${FFMPEG_UTIL_LIB} ${FFMPEG_SWSCALE_LIB})
-+        ocv_include_directories(${FFMPEG_INCLUDE_DIR})
-+      endif(HAVE_FFMPEG)
-     endif()
--  endif(APPLE)
-+  endif()
- endif(WITH_FFMPEG)
- 
- # --- VideoInput/DirectShow ---
diff --git a/graphics/opencv/patches/patch-modules_contrib_src_inputoutput.cpp b/graphics/opencv/patches/patch-modules_contrib_src_inputoutput.cpp
deleted file mode 100644
index 793df328e89..00000000000
--- a/graphics/opencv/patches/patch-modules_contrib_src_inputoutput.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-$NetBSD: patch-modules_contrib_src_inputoutput.cpp,v 1.1 2013/06/12 10:13:58 jperkin Exp $
-
-SunOS does not have dirent d_type.
-
---- modules/contrib/src/inputoutput.cpp.orig	2012-10-17 22:55:38.000000000 +0000
-+++ modules/contrib/src/inputoutput.cpp
-@@ -5,6 +5,9 @@
-     #include <windows.h>
-     #include <tchar.h>
- #else
-+#ifdef __sun
-+    #include <sys/stat.h>
-+#endif
-     #include <dirent.h>
- #endif
- 
-@@ -47,6 +50,10 @@ namespace cv
-             (void)addPath;
-             DIR *dp;
-             struct dirent *dirp;
-+#ifdef __sun
-+            struct stat sb;
-+            char buf[PATH_MAX];
-+#endif
-             if((dp = opendir(path.c_str())) == NULL)
-             {
-                 return list;
-@@ -54,7 +61,13 @@ namespace cv
- 
-             while ((dirp = readdir(dp)) != NULL)
-             {
-+#ifdef __sun
-+                snprintf(buf, PATH_MAX, "%s/%s", path.c_str(), dirp->d_name);
-+                stat(buf, &sb);
-+                if (S_ISREG(sb.st_mode))
-+#else
-                 if (dirp->d_type == DT_REG)
-+#endif
-                 {
-                     if (exten.compare("*") == 0)
-                         list.push_back(static_cast<std::string>(dirp->d_name));
-@@ -105,6 +118,10 @@ namespace cv
-             (void)addPath;
-             DIR *dp;
-             struct dirent *dirp;
-+#ifdef __sun
-+            struct stat sb;
-+            char buf[PATH_MAX];
-+#endif
-             if((dp = opendir(path_f.c_str())) == NULL)
-             {
-                 return list;
-@@ -112,7 +129,13 @@ namespace cv
- 
-             while ((dirp = readdir(dp)) != NULL)
-             {
-+#ifdef __sun
-+                snprintf(buf, PATH_MAX, "%s/%s", path.c_str(), dirp->d_name);
-+                stat(buf, &sb);
-+                if (S_ISDIR(sb.st_mode) &&
-+#else
-                 if (dirp->d_type == DT_DIR &&
-+#endif
-                     strcmp(dirp->d_name, ".") != 0 &&
-                     strcmp(dirp->d_name, "..") != 0 )
-                 {
diff --git a/graphics/opencv/patches/patch-modules_contrib_src_spinimages.cpp b/graphics/opencv/patches/patch-modules_contrib_src_spinimages.cpp
deleted file mode 100644
index 8d9a31ff5bb..00000000000
--- a/graphics/opencv/patches/patch-modules_contrib_src_spinimages.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-modules_contrib_src_spinimages.cpp,v 1.1 2013/05/06 14:48:22 joerg Exp $
-
---- modules/contrib/src/spinimages.cpp.orig	2013-05-05 18:32:00.000000000 +0000
-+++ modules/contrib/src/spinimages.cpp
-@@ -46,6 +46,7 @@
- #include <functional>
- #include <fstream>
- #include <limits>
-+#include <numeric>
- #include <set>
- 
- using namespace cv;
diff --git a/graphics/opencv/patches/patch-modules_core_include_opencv2_core_types_c.h b/graphics/opencv/patches/patch-modules_core_include_opencv2_core_types_c.h
index d42f154a69b..6b5a47374b8 100644
--- a/graphics/opencv/patches/patch-modules_core_include_opencv2_core_types_c.h
+++ b/graphics/opencv/patches/patch-modules_core_include_opencv2_core_types_c.h
@@ -1,15 +1,15 @@
-$NetBSD: patch-modules_core_include_opencv2_core_types_c.h,v 1.1 2012/12/07 21:37:10 adam Exp $
+$NetBSD: patch-modules_core_include_opencv2_core_types_c.h,v 1.2 2015/10/08 17:45:59 fhajny Exp $
 
 Define 'depth' as unsigned int, or IPL_DEPTH_SIGN=0x8000000 won't fit in int.
 
---- modules/core/include/opencv2/core/types_c.h.orig	2012-12-07 21:15:58.000000000 +0000
+--- modules/core/include/opencv2/core/types_c.h.orig	2015-06-03 17:21:34.000000000 +0000
 +++ modules/core/include/opencv2/core/types_c.h
-@@ -473,7 +473,7 @@ typedef struct _IplImage
-     int  ID;                /* version (=0)*/
-     int  nChannels;         /* Most of OpenCV functions support 1,2,3 or 4 channels */
-     int  alphaChannel;      /* Ignored by OpenCV */
--    int  depth;             /* Pixel depth in bits: IPL_DEPTH_8U, IPL_DEPTH_8S, IPL_DEPTH_16S,
-+    unsigned int  depth;             /* Pixel depth in bits: IPL_DEPTH_8U, IPL_DEPTH_8S, IPL_DEPTH_16S,
+@@ -303,7 +303,7 @@ _IplImage
+     int  ID;                /**< version (=0)*/
+     int  nChannels;         /**< Most of OpenCV functions support 1,2,3 or 4 channels */
+     int  alphaChannel;      /**< Ignored by OpenCV */
+-    int  depth;             /**< Pixel depth in bits: IPL_DEPTH_8U, IPL_DEPTH_8S, IPL_DEPTH_16S,
++    unsigned int  depth;             /**< Pixel depth in bits: IPL_DEPTH_8U, IPL_DEPTH_8S, IPL_DEPTH_16S,
                                 IPL_DEPTH_32S, IPL_DEPTH_32F and IPL_DEPTH_64F are supported.  */
-     char colorModel[4];     /* Ignored by OpenCV */
-     char channelSeq[4];     /* ditto */
+     char colorModel[4];     /**< Ignored by OpenCV */
+     char channelSeq[4];     /**< ditto */
diff --git a/graphics/opencv/patches/patch-modules_core_src_downhill__simplex.cpp b/graphics/opencv/patches/patch-modules_core_src_downhill__simplex.cpp
new file mode 100644
index 00000000000..83635988539
--- /dev/null
+++ b/graphics/opencv/patches/patch-modules_core_src_downhill__simplex.cpp
@@ -0,0 +1,16 @@
+$NetBSD: patch-modules_core_src_downhill__simplex.cpp,v 1.1 2015/10/08 17:45:59 fhajny Exp $
+
+Avoid DS conflict on SunOS.
+
+--- modules/core/src/downhill_simplex.cpp.orig	2015-06-03 17:21:34.000000000 +0000
++++ modules/core/src/downhill_simplex.cpp
+@@ -450,6 +450,9 @@ protected:
+ };
+ 
+ 
++#if defined(__sun)
++#undef DS
++#endif
+ // both minRange & minError are specified by termcrit.epsilon;
+ // In addition, user may specify the number of iterations that the algorithm does.
+ Ptr<DownhillSolver> DownhillSolver::create( const Ptr<MinProblemSolver::Function>& f,
diff --git a/graphics/opencv/patches/patch-modules_core_src_parallel__pthreads.cpp b/graphics/opencv/patches/patch-modules_core_src_parallel__pthreads.cpp
new file mode 100644
index 00000000000..b4b34cdde4c
--- /dev/null
+++ b/graphics/opencv/patches/patch-modules_core_src_parallel__pthreads.cpp
@@ -0,0 +1,17 @@
+$NetBSD: patch-modules_core_src_parallel__pthreads.cpp,v 1.1 2015/10/08 17:45:59 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
+@@ -244,6 +244,10 @@ private:
+     ThreadManagerPoolState m_pool_state;
+ };
+ 
++#ifndef PTHREAD_RECURSIVE_MUTEX_INITIALIZER
++#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
diff --git a/graphics/opencv/patches/patch-modules_legacy_src_calibfilter.cpp b/graphics/opencv/patches/patch-modules_legacy_src_calibfilter.cpp
deleted file mode 100644
index e0716b33d8b..00000000000
--- a/graphics/opencv/patches/patch-modules_legacy_src_calibfilter.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-modules_legacy_src_calibfilter.cpp,v 1.1 2014/05/27 09:57:21 joerg Exp $
-
---- modules/legacy/src/calibfilter.cpp.orig	2014-05-22 13:56:04.000000000 +0000
-+++ modules/legacy/src/calibfilter.cpp
-@@ -95,10 +95,12 @@ bool CvCalibFilter::SetEtalon( CvCalibEt
- 
-     Stop();
- 
--    if (latestPoints != NULL)
-+    for( i = 0; i < MAX_CAMERAS; i++ )
-     {
--        for( i = 0; i < MAX_CAMERAS; i++ )
-+        if (latestPoints[i] != NULL)
-+        {
-             cvFree( latestPoints + i );
-+        }
-     }
- 
-     if( type == CV_CALIB_ETALON_USER || type != etalonType )
-@@ -529,7 +531,7 @@ void CvCalibFilter::DrawPoints( CvMat** 
-         return;
-     }
- 
--    if( latestCounts )
-+    if( 1 )
-     {
-         for( i = 0; i < cameraCount; i++ )
-         {
diff --git a/graphics/opencv/patches/patch-modules_ocl_src_gftt.cpp b/graphics/opencv/patches/patch-modules_ocl_src_gftt.cpp
deleted file mode 100644
index e79bebc95ac..00000000000
--- a/graphics/opencv/patches/patch-modules_ocl_src_gftt.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-modules_ocl_src_gftt.cpp,v 1.1 2014/07/24 17:16:02 jperkin Exp $
-
-Avoid GS define from sys/regset.h on SunOS.
-
---- modules/ocl/src/gftt.cpp.orig	2014-04-11 10:15:26.000000000 +0000
-+++ modules/ocl/src/gftt.cpp
-@@ -69,6 +69,9 @@ struct DefCornerCompare
-     }
- };
- 
-+#if defined(__sun)
-+#undef GS
-+#endif
- // sort corner point using opencl bitonicosrt implementation
- static void sortCorners_caller(oclMat& corners, const int count)
- {
diff --git a/graphics/opencv/patches/patch-modules_python_common.cmake b/graphics/opencv/patches/patch-modules_python_common.cmake
new file mode 100644
index 00000000000..dde4584dd33
--- /dev/null
+++ b/graphics/opencv/patches/patch-modules_python_common.cmake
@@ -0,0 +1,14 @@
+$NetBSD: patch-modules_python_common.cmake,v 1.1 2015/10/08 17:45:59 fhajny Exp $
+
+Backport fix from https://github.com/Itseez/opencv/pull/4109
+
+--- 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"
diff --git a/graphics/opencv/patches/patch-modules_python_src2_cv2.cv.hpp b/graphics/opencv/patches/patch-modules_python_src2_cv2.cv.hpp
deleted file mode 100644
index 0744c1faf48..00000000000
--- a/graphics/opencv/patches/patch-modules_python_src2_cv2.cv.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-modules_python_src2_cv2.cv.hpp,v 1.1 2015/07/28 16:43:25 rumko Exp $
-
-Fix build under clang.
-"error: C-style cast from 'nullprt_t' to 'CvNextEdgeType' is not allowed."
-
---- modules/python/src2/cv2.cv.hpp.orig	2014-04-11 10:15:26.000000000 +0000
-+++ modules/python/src2/cv2.cv.hpp
-@@ -2155,7 +2155,7 @@ static int convert_to_CvSubdiv2DPTR(PyOb
- static int convert_to_CvNextEdgeType(PyObject *o, CvNextEdgeType *dst, const char *name = "no_name")
- {
-   if (!PyInt_Check(o)) {
--    *dst = (CvNextEdgeType)NULL;
-+    *dst = (CvNextEdgeType)0;
-     return failmsg("Expected number for CvNextEdgeType argument '%s'", name);
-   } else {
-     *dst = (CvNextEdgeType)PyInt_AsLong(o);
diff --git a/graphics/opencv/patches/patch-modules_ts_src_ts.cpp b/graphics/opencv/patches/patch-modules_ts_src_ts.cpp
index bc39ab17078..c9d3832d3fa 100644
--- a/graphics/opencv/patches/patch-modules_ts_src_ts.cpp
+++ b/graphics/opencv/patches/patch-modules_ts_src_ts.cpp
@@ -1,10 +1,19 @@
-$NetBSD: patch-modules_ts_src_ts.cpp,v 1.2 2013/06/19 11:54:04 fhajny Exp $
+$NetBSD: patch-modules_ts_src_ts.cpp,v 1.3 2015/10/08 17:45:59 fhajny Exp $
 
 Avoid std::foo conflict.
 
---- modules/ts/src/ts.cpp.orig	2013-04-05 09:00:20.000000000 +0000
+--- modules/ts/src/ts.cpp.orig	2015-06-03 17:21:34.000000000 +0000
 +++ modules/ts/src/ts.cpp
-@@ -562,7 +562,7 @@ void TS::vprintf( int streams, const cha
+@@ -235,7 +235,7 @@ void BaseTest::safe_run( int start_from
+         }
+         catch (const TS::FailureCode& fc)
+         {
+-            std::string errorStr = TS::str_from_code(fc);
++            ::std::string errorStr = TS::str_from_code(fc);
+             ts->printf(TS::LOG, "General failure:\n\t%s (%d)\n", errorStr.c_str(), fc);
+ 
+             ts->set_failed_test_info( fc );
+@@ -558,7 +558,7 @@ void TS::vprintf( int streams, const cha
      for( int i = 0; i < MAX_IDX; i++ )
          if( (streams & (1 << i)) )
          {
@@ -13,7 +22,7 @@ Avoid std::foo conflict.
              // in the new GTest-based framework we do not use
              // any output files (except for the automatically generated xml report).
              // if a test fails, all the buffers are printed, so we do not want to duplicate the information and
-@@ -617,7 +617,7 @@ void smoothBorder(Mat& img, const Scalar
+@@ -613,7 +613,7 @@ void smoothBorder(Mat& img, const Scalar
      Scalar s;
      uchar *p = NULL;
      int n = 100/delta;