Update opencv to 2.4.6.1

Changes in 2.4.6.1:
* Hotfix for camera pipeline for Linux (V4L).

Changes in 2.4.6:
* Windows RT: added video file i/o and sample application using camera,
  enabled parallelization with TBB or MS Concurrency
* CUDA 5.5: added support for desktop and ARM
* Added Qt 5 support
* Binary compatiblility with both OpenCL 1.1/1.2 platforms. Now the binaries
  compiled with any of AMD/Intel/Nvidia's SDK can run on all other platforms.
* New functions ported, CLAHE, GoodFeaturesToTrack, TVL1 optical flow and more
* Performance optimizations, HOG and more.
* More kernel binary cache options though setBinaryDiskCache interface.
* OpenCL binaries are now included into the superpack for Windows (for VS2010
  and VS2012 only)
* Switched all the remaining parallel loops from TBB-only
  'tbb::parallel_for()' to universal 'cv::parallel_for_()' with many possible
  backends (MS Concurrency, Apple's GDC, OpenMP, Intel TBB etc.)
* iOS build scripts (together with Android ones) moved to 'opencv/platforms'
  directory
* Fixed bug with incorrect saved video from camera through CvVideoCamera
* Added 'rotateVideo' flag to the CvVideoCamera class to control camera
  preview rotation on device rotation
* Added functions to convert between UIImage and cv::Mat (just include
  opencv2/highgui/ios.h)
* Numerous bug-fixes across all the library

4 files changed, 37 insertions, 38 deletions

diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
index 7a5a004a76d..7de0195287b 100644
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.40 2013/06/14 21:28:42 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2013/08/05 12:27:48 fhajny Exp $
 
-DISTNAME=	opencv-2.4.5
+DISTNAME=	opencv-2.4.6.1
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=opencvlibrary/}
 
diff --git a/graphics/opencv/PLIST b/graphics/opencv/PLIST
index c8a923579b9..26152c17767 100644
--- a/graphics/opencv/PLIST
+++ b/graphics/opencv/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2013/06/14 21:28:42 wiz Exp $
+@comment $NetBSD: PLIST,v 1.11 2013/08/05 12:27:48 fhajny Exp $
 bin/opencv_createsamples
 bin/opencv_haartraining
 bin/opencv_performance
@@ -109,6 +109,7 @@ include/opencv2/gpu/stream_accessor.hpp
 include/opencv2/highgui/cap_ios.h
 include/opencv2/highgui/highgui.hpp
 include/opencv2/highgui/highgui_c.h
+include/opencv2/highgui/ios.h
 include/opencv2/imgproc/imgproc.hpp
 include/opencv2/imgproc/imgproc_c.h
 include/opencv2/imgproc/types_c.h
@@ -162,61 +163,59 @@ include/opencv2/videostab/stabilizer.hpp
 include/opencv2/videostab/videostab.hpp
 lib/libopencv_calib3d.so
 lib/libopencv_calib3d.so.2.4
-lib/libopencv_calib3d.so.${PKGVERSION}
+lib/libopencv_calib3d.so.2.4.6
 lib/libopencv_contrib.so
 lib/libopencv_contrib.so.2.4
-lib/libopencv_contrib.so.${PKGVERSION}
+lib/libopencv_contrib.so.2.4.6
 lib/libopencv_core.so
 lib/libopencv_core.so.2.4
-lib/libopencv_core.so.${PKGVERSION}
+lib/libopencv_core.so.2.4.6
 lib/libopencv_features2d.so
 lib/libopencv_features2d.so.2.4
-lib/libopencv_features2d.so.${PKGVERSION}
+lib/libopencv_features2d.so.2.4.6
 lib/libopencv_flann.so
 lib/libopencv_flann.so.2.4
-lib/libopencv_flann.so.${PKGVERSION}
+lib/libopencv_flann.so.2.4.6
 lib/libopencv_gpu.so
 lib/libopencv_gpu.so.2.4
-lib/libopencv_gpu.so.${PKGVERSION}
+lib/libopencv_gpu.so.2.4.6
 lib/libopencv_highgui.so
 lib/libopencv_highgui.so.2.4
-lib/libopencv_highgui.so.${PKGVERSION}
+lib/libopencv_highgui.so.2.4.6
 lib/libopencv_imgproc.so
 lib/libopencv_imgproc.so.2.4
-lib/libopencv_imgproc.so.${PKGVERSION}
+lib/libopencv_imgproc.so.2.4.6
 lib/libopencv_legacy.so
 lib/libopencv_legacy.so.2.4
-lib/libopencv_legacy.so.${PKGVERSION}
+lib/libopencv_legacy.so.2.4.6
 lib/libopencv_ml.so
 lib/libopencv_ml.so.2.4
-lib/libopencv_ml.so.${PKGVERSION}
+lib/libopencv_ml.so.2.4.6
 lib/libopencv_nonfree.so
 lib/libopencv_nonfree.so.2.4
-lib/libopencv_nonfree.so.${PKGVERSION}
+lib/libopencv_nonfree.so.2.4.6
 lib/libopencv_objdetect.so
 lib/libopencv_objdetect.so.2.4
-lib/libopencv_objdetect.so.${PKGVERSION}
+lib/libopencv_objdetect.so.2.4.6
 lib/libopencv_photo.so
 lib/libopencv_photo.so.2.4
-lib/libopencv_photo.so.${PKGVERSION}
+lib/libopencv_photo.so.2.4.6
 lib/libopencv_stitching.so
 lib/libopencv_stitching.so.2.4
-lib/libopencv_stitching.so.${PKGVERSION}
+lib/libopencv_stitching.so.2.4.6
 lib/libopencv_superres.so
 lib/libopencv_superres.so.2.4
-lib/libopencv_superres.so.${PKGVERSION}
+lib/libopencv_superres.so.2.4.6
 lib/libopencv_ts.so
 lib/libopencv_ts.so.2.4
-lib/libopencv_ts.so.${PKGVERSION}
+lib/libopencv_ts.so.2.4.6
 lib/libopencv_video.so
 lib/libopencv_video.so.2.4
-lib/libopencv_video.so.${PKGVERSION}
+lib/libopencv_video.so.2.4.6
 lib/libopencv_videostab.so
 lib/libopencv_videostab.so.2.4
-lib/libopencv_videostab.so.${PKGVERSION}
+lib/libopencv_videostab.so.2.4.6
 lib/pkgconfig/opencv.pc
-${PLIST.python}${PYSITELIB}/cv.py
-${PLIST.python}${PYSITELIB}/cv2.so
 share/OpenCV/OpenCVConfig-version.cmake
 share/OpenCV/OpenCVConfig.cmake
 share/OpenCV/haarcascades/haarcascade_eye.xml
diff --git a/graphics/opencv/distinfo b/graphics/opencv/distinfo
index ff342ec4aa0..8d4003f8792 100644
--- a/graphics/opencv/distinfo
+++ b/graphics/opencv/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.22 2013/06/19 11:54:04 fhajny Exp $
+$NetBSD: distinfo,v 1.23 2013/08/05 12:27:48 fhajny Exp $
 
-SHA1 (opencv-2.4.5.tar.gz) = 9e25f821db9e25aa454a31976ba6b5a3a50b6fa4
-RMD160 (opencv-2.4.5.tar.gz) = 3b7dc9da2e0b616a19e50ed5999ca0dd65c45d5f
-Size (opencv-2.4.5.tar.gz) = 81884985 bytes
+SHA1 (opencv-2.4.6.1.tar.gz) = e015bd67218844b38daf3cea8aab505b592a66c0
+RMD160 (opencv-2.4.6.1.tar.gz) = 805193fc2e129bc4183c48057ca305774dfa5ed4
+Size (opencv-2.4.6.1.tar.gz) = 80762052 bytes
 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 (patch-modules_core_src_system.cpp) = 3b7ac545585a430d28c7077f360357079f127580
 SHA1 (patch-modules_flann_include_opencv2_flann_defines.h) = ab848e67c4e03219670598ac2d21071a617a5c33
 SHA1 (patch-modules_legacy_src_dpstereo.cpp) = da9955fb6cc81054427b69efb97a58160b64f262
-SHA1 (patch-modules_ts_include_opencv2_ts_ts__perf.hpp) = 8a7f08b176cedec85fd613e715d7b12d666a3e45
+SHA1 (patch-modules_ts_include_opencv2_ts_ts__perf.hpp) = 3d12be4031ad60ca9cf571feacbbb58a0189378a
 SHA1 (patch-modules_ts_src_ts.cpp) = 61e4ab59f2ca57f75212743bf869616dfc9e5f13
diff --git a/graphics/opencv/patches/patch-modules_ts_include_opencv2_ts_ts__perf.hpp b/graphics/opencv/patches/patch-modules_ts_include_opencv2_ts_ts__perf.hpp
index ce6128e36ef..36b1ded1b8f 100644
--- a/graphics/opencv/patches/patch-modules_ts_include_opencv2_ts_ts__perf.hpp
+++ b/graphics/opencv/patches/patch-modules_ts_include_opencv2_ts_ts__perf.hpp
@@ -1,12 +1,12 @@
-$NetBSD: patch-modules_ts_include_opencv2_ts_ts__perf.hpp,v 1.1 2013/02/26 23:38:08 joerg Exp $
+$NetBSD: patch-modules_ts_include_opencv2_ts_ts__perf.hpp,v 1.2 2013/08/05 12:27:48 fhajny Exp $
 
---- modules/ts/include/opencv2/ts/ts_perf.hpp.orig	2013-02-26 16:47:16.000000000 +0000
-+++ modules/ts/include/opencv2/ts/ts_perf.hpp
-@@ -478,7 +478,6 @@ CV_EXPORTS void PrintTo(const Size& sz, 
- #define CV_PERF_TEST_MAIN(testsuitname, ...) \
- int main(int argc, char **argv)\
- {\
+--- /tmp/pkgsrc/graphics/opencv/work/opencv-2.4.6.1/modules/ts/include/opencv2/ts/ts_perf.hpp.orig	Wed Jul 10 11:49:00 2013
++++ /tmp/pkgsrc/graphics/opencv/work/opencv-2.4.6.1/modules/ts/include/opencv2/ts/ts_perf.hpp	Mon Aug  5 11:34:21 2013
+@@ -477,7 +477,6 @@
+ 
+ 
+ #define CV_PERF_TEST_MAIN_INTERNALS(modulename, impls, ...) \
 -    while (++argc >= (--argc,-1)) {__VA_ARGS__; break;} /*this ugly construction is needed for VS 2005*/\
-     ::perf::Regression::Init(#testsuitname);\
-     ::perf::TestBase::Init(argc, argv);\
-     ::testing::InitGoogleTest(&argc, argv);\
+     ::perf::Regression::Init(#modulename);\
+     ::perf::TestBase::Init(std::vector<std::string>(impls, impls + sizeof impls / sizeof *impls),\
+                            argc, argv);\