Update to 2.4.9

Changelog:
2.4.9

April, 2014

    Several improvements in OpenCL optimizations (ocl::sum, ocl::countNonZero, ocl::minMax, bitwise operationss, Haar face detector, etc)

    Multiple fixes in Naitve Camera (NativeCameraView, cv::VideoCapture);
    Improved CUDA support for all CUDA-enabled SoCs.

    New VTK-based 3D visualization module viz stabilized and back-ported to 2.4 branch.
    The module provides a very convenient way to display and position clouds, meshes, cameras and trajectories, and simple widgets (cube, line, circle, etc.).
    Full demo video can be found at Itseez Youtube channel

    Numerous bugfixes in code and docs from community

    156 pull requests have been merged since 2.4.8

    55 reported bugs have been closed since 2.4.8


2.4.8

December, 2013

    User provided OpenCL context can be used by OpenCV ( ocl::initializeContext )
    A separate OpenCL command queue is created for every CPU thread (allows concurrent kernels execution)
    Some new OpenCL optimizations and bug-fixes

    NVidia CUDA support on CUDA capable SoCs;
    Android 4.4 support, including native camera;
    Java wrappers for GPU-detection functions from core module were added;
    New sample with CUDA on Android was added;
    OpenCV Manager and apps hanging were fixed on Samsung devices with Android 4.3 (#3368, #3372, #3403, #3414, #3436).

    Static linkage support for native C++ libraries;

    139 pull requests have been merged since version:2.4.7!

    32 reported bugs have been closed since version:2.4.7


2.4.7

November, 2013

    Now 'ocl' module can be built without installing OpenCL SDK (Khronos headers in OpenCV tree);
    Dynamic dependency on OpenCL runtime (allows run-time branching between OCL and non-OCL implementation);
    Changing default OpenCL device via OPENCV_OPENCL_DEVICE environment variable (without app re-build);
    Refactoring/extending/bug-fixing of existing OpenCL optimizations, updated documentation;
    New OpenCL optimizations of SVM, MOG/MOG2, KalmanFilter and more;

    New optimization for histograms, TV-L1 optical flow and resize;
    Updated multi gpu sample for stereo matching;
    Fixed BGR<->YUV color conversion and bitwize operations;
    Fixed several build issues;

    Android NDK-r9 (x86, x86_64) support;
    Android 4.3 support: hardware detector (Bugs #3124, #3265, #3270) and native camera (Bug #3185);
    MediaRecorder hint enabled for all Android devices with API level 14 and above;
    Fixed JavaCameraView slowdown (Bugs #3033, #3238);

    Fixed MS Certification test issues for all algorithmical modules and highgui, except OpenEXR and Media Foundation code for camera;
    Implemented XAML-based sample for video processing using OpenCV;
    Fixed issue in Media Foundation back-end for VideoCapture (#3189);

    382 pull requests have been merged since 2.4.6!

    54 reported bugs have been fixed since 2.4.6 (issue tracker query).

5 files changed, 31 insertions, 68 deletions

diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
index ba5607ecfbf..cf47dcbb3a5 100644
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.46 2014/05/05 00:47:59 ryoon Exp $
+# $NetBSD: Makefile,v 1.47 2014/07/09 19:57:36 ryoon Exp $
 
-DISTNAME=	opencv-2.4.6.1
-PKGREVISION=	4
+DISTNAME=	opencv-2.4.9
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=opencvlibrary/}
+EXTRACT_SUFX=	.zip
 
 MAINTAINER=	anthony.mallet@laas.fr
 HOMEPAGE=	http://code.opencv.org/projects/OpenCV/wiki/WikiStart
@@ -38,7 +38,7 @@ CXXFLAGS+=	-std=c++11
 
 PLIST_VARS+=	opencl
 
-.if ${OPSYS} == "Darwin"
+.if ${OPSYS} == "Darwin" || ${OPSYS} == "NetBSD"
 PLIST.opencl=	yes
 .else
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/graphics/opencv/PLIST b/graphics/opencv/PLIST
index 8b2c22a9933..f0e569a1983 100644
--- a/graphics/opencv/PLIST
+++ b/graphics/opencv/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2013/09/01 09:46:13 adam Exp $
+@comment $NetBSD: PLIST,v 1.14 2014/07/09 19:57:36 ryoon Exp $
 bin/opencv_createsamples
 bin/opencv_haartraining
 bin/opencv_performance
@@ -20,6 +20,7 @@ include/opencv2/contrib/detection_based_tracker.hpp
 include/opencv2/contrib/hybridtracker.hpp
 include/opencv2/contrib/openfabmap.hpp
 include/opencv2/contrib/retina.hpp
+include/opencv2/core/affine.hpp
 include/opencv2/core/core.hpp
 include/opencv2/core/core_c.h
 include/opencv2/core/cuda_devptrs.hpp
@@ -165,66 +166,66 @@ include/opencv2/videostab/stabilizer.hpp
 include/opencv2/videostab/videostab.hpp
 lib/libopencv_calib3d.so
 lib/libopencv_calib3d.so.2.4
-lib/libopencv_calib3d.so.2.4.6
+lib/libopencv_calib3d.so.${PKGVERSION}
 lib/libopencv_contrib.so
 lib/libopencv_contrib.so.2.4
-lib/libopencv_contrib.so.2.4.6
+lib/libopencv_contrib.so.${PKGVERSION}
 lib/libopencv_core.so
 lib/libopencv_core.so.2.4
-lib/libopencv_core.so.2.4.6
+lib/libopencv_core.so.${PKGVERSION}
 lib/libopencv_features2d.so
 lib/libopencv_features2d.so.2.4
-lib/libopencv_features2d.so.2.4.6
+lib/libopencv_features2d.so.${PKGVERSION}
 lib/libopencv_flann.so
 lib/libopencv_flann.so.2.4
-lib/libopencv_flann.so.2.4.6
+lib/libopencv_flann.so.${PKGVERSION}
 lib/libopencv_gpu.so
 lib/libopencv_gpu.so.2.4
-lib/libopencv_gpu.so.2.4.6
+lib/libopencv_gpu.so.${PKGVERSION}
 lib/libopencv_highgui.so
 lib/libopencv_highgui.so.2.4
-lib/libopencv_highgui.so.2.4.6
+lib/libopencv_highgui.so.${PKGVERSION}
 lib/libopencv_imgproc.so
 lib/libopencv_imgproc.so.2.4
-lib/libopencv_imgproc.so.2.4.6
+lib/libopencv_imgproc.so.${PKGVERSION}
 lib/libopencv_legacy.so
 lib/libopencv_legacy.so.2.4
-lib/libopencv_legacy.so.2.4.6
+lib/libopencv_legacy.so.${PKGVERSION}
 lib/libopencv_ml.so
 lib/libopencv_ml.so.2.4
-lib/libopencv_ml.so.2.4.6
+lib/libopencv_ml.so.${PKGVERSION}
 lib/libopencv_nonfree.so
 lib/libopencv_nonfree.so.2.4
-lib/libopencv_nonfree.so.2.4.6
+lib/libopencv_nonfree.so.${PKGVERSION}
 lib/libopencv_objdetect.so
 lib/libopencv_objdetect.so.2.4
-lib/libopencv_objdetect.so.2.4.6
+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.2.4.6
+${PLIST.opencl}lib/libopencv_ocl.so.${PKGVERSION}
 lib/libopencv_photo.so
 lib/libopencv_photo.so.2.4
-lib/libopencv_photo.so.2.4.6
+lib/libopencv_photo.so.${PKGVERSION}
 lib/libopencv_stitching.so
 lib/libopencv_stitching.so.2.4
-lib/libopencv_stitching.so.2.4.6
+lib/libopencv_stitching.so.${PKGVERSION}
 lib/libopencv_superres.so
 lib/libopencv_superres.so.2.4
-lib/libopencv_superres.so.2.4.6
-lib/libopencv_ts.so
-lib/libopencv_ts.so.2.4
-lib/libopencv_ts.so.2.4.6
+lib/libopencv_superres.so.${PKGVERSION}
+lib/libopencv_ts.a
 lib/libopencv_video.so
 lib/libopencv_video.so.2.4
-lib/libopencv_video.so.2.4.6
+lib/libopencv_video.so.${PKGVERSION}
 lib/libopencv_videostab.so
 lib/libopencv_videostab.so.2.4
-lib/libopencv_videostab.so.2.4.6
+lib/libopencv_videostab.so.${PKGVERSION}
 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/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_frontalface_alt.xml
diff --git a/graphics/opencv/distinfo b/graphics/opencv/distinfo
index b3853990a4e..aedcf147e7e 100644
--- a/graphics/opencv/distinfo
+++ b/graphics/opencv/distinfo
@@ -1,14 +1,12 @@
-$NetBSD: distinfo,v 1.25 2014/05/27 09:57:21 joerg Exp $
+$NetBSD: distinfo,v 1.26 2014/07/09 19:57:36 ryoon Exp $
 
-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 (opencv-2.4.9.zip) = 4f5166e2bd22bd6167cb56dd04f2c6ed68148b2c
+RMD160 (opencv-2.4.9.zip) = 1b0b80ecb50270fa7e4b1dea6f075982b5d15d81
+Size (opencv-2.4.9.zip) = 91684751 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_calibfilter.cpp) = a388e646cd0b09af1b9ad4844f1097855808f316
-SHA1 (patch-modules_legacy_src_dpstereo.cpp) = da9955fb6cc81054427b69efb97a58160b64f262
-SHA1 (patch-modules_ts_include_opencv2_ts_ts__perf.hpp) = ecaba97683c0f389aa911d405d8a9f37a58be541
 SHA1 (patch-modules_ts_src_ts.cpp) = 61e4ab59f2ca57f75212743bf869616dfc9e5f13
diff --git a/graphics/opencv/patches/patch-modules_legacy_src_dpstereo.cpp b/graphics/opencv/patches/patch-modules_legacy_src_dpstereo.cpp
deleted file mode 100644
index bb64d1c3b49..00000000000
--- a/graphics/opencv/patches/patch-modules_legacy_src_dpstereo.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-modules_legacy_src_dpstereo.cpp,v 1.1 2013/02/26 23:38:08 joerg Exp $
-
---- modules/legacy/src/dpstereo.cpp.orig	2012-10-22 22:55:11.000000000 +0000
-+++ modules/legacy/src/dpstereo.cpp
-@@ -65,6 +65,8 @@
- 
- #define ICV_MAX_DP_SUM_VAL (INT_MAX/4)
- 
-+#include <algorithm>
-+
- typedef struct _CvDPCell
- {
-     uchar  step; //local-optimal step
-@@ -76,8 +78,8 @@ typedef struct _CvRightImData
-     uchar min_val, max_val;
- } _CvRightImData;
- 
--#define CV_IMAX3(a,b,c) ((temp3 = (a) >= (b) ? (a) : (b)),(temp3 >= (c) ? temp3 : (c)))
--#define CV_IMIN3(a,b,c) ((temp3 = (a) <= (b) ? (a) : (b)),(temp3 <= (c) ? temp3 : (c)))
-+#define CV_IMAX3(a,b,c) std::max((a), std::max((b), (c)))
-+#define CV_IMIN3(a,b,c) std::min((a), std::min((b), (c)))
- 
- static void icvFindStereoCorrespondenceByBirchfieldDP( uchar* src1, uchar* src2,
-                                                 uchar* disparities,
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
deleted file mode 100644
index 06c901e4035..00000000000
--- a/graphics/opencv/patches/patch-modules_ts_include_opencv2_ts_ts__perf.hpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-modules_ts_include_opencv2_ts_ts__perf.hpp,v 1.3 2013/08/07 13:01:20 fhajny Exp $
-
---- modules/ts/include/opencv2/ts/ts_perf.hpp.orig	2013-07-10 11:49:00.000000000 +0000
-+++ modules/ts/include/opencv2/ts/ts_perf.hpp
-@@ -477,7 +477,6 @@ CV_EXPORTS void PrintTo(const Size& sz,
- 
- 
- #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(#modulename);\
-     ::perf::TestBase::Init(std::vector<std::string>(impls, impls + sizeof impls / sizeof *impls),\
-                            argc, argv);\