Update to 2.4.1. Now builds with clang. Python option

not tested. New ffmpeg support not enabled in package.

2.4.1

June, 2012

The changes since 2.4.0

    The GPU module now supports CUDA 4.1 and CUDA 4.2 and can be
    compiled with CUDA 5.0 preview.

    Added API for storing OpenCV data structures to text string
    and reading them back:

    cv::calcOpticalFlowPyrLK now supports precomputed pyramids as
    input.

    Function signatures in documentation are made consistent with
    source code.

    Restored python wrappers for SURF and MSER.

    45 more bugs in our bug tracker have been fixed

2.4.0

May, 2012

The major changes since 2.4 beta

    OpenCV now provides pretty complete build information via
    (surprise) cv::getBuildInformation().

    reading/writing video via ffmpeg finally works and it's now
    available on MacOSX too.
    note 1: we now demand reasonably fresh versions of ffmpeg/libav
    with libswscale included.
    note 2: if possible, do not read or write more than 1 video
    simultaneously (even within a single thread) with ffmpeg 0.7.x
    or earlier versions, since they seem to use some global structures
    that are destroyed by simultaneously executed codecs. Either
    build and install a newer ffmpeg (0.10.x is recommended), or
    serialize your video i/o, or use parallel processes instead of
    threads.

    MOG2 background subtraction by Zoran Zivkovic was optimized
    using TBB.

    The reference manual has been updated to match OpenCV 2.4.0
    better (though, not perfectly).

    >20 more bugs in our bug tracker have been closed
    (http://code.opencv.org/projects/opencv/roadmap).

    Asus Xtion is now properly supported for HighGUI. For now, you
    have to manually specify this device by using
    VideoCapture(CV_CAP_OPENNI_ASUS) instead of
    VideoCapture(CV_CAP_OPENNI).

2.4 beta

April, 2012

As usual, we created 2.4 branch in our repository
(http://code.opencv.org/svn/opencv/branches/2.4), where we will
further stabilize the code. You can check this branch periodically,
before as well as after 2.4 release.

Common changes

    At the age of 12, OpenCV got its own home! http://code.opencv.org
    is now the primary site for OpenCV development and http://opencv.org
    (to be launched soon) will be the official OpenCV user site.

    Some of the old functionality from the modules imgproc, video,
    calib3d, features2d, objdetect has been moved to legacy.

    CMake scripts have been substantially modified. Now it's very
    easy to add new modules - just put the directory with include,
    src, doc and test sub-directories to the modules directory,
    create a very simple CMakeLists.txt and your module will be
    built as a part of OpenCV. Also, it's possible to exclude
    certain modules from build (the CMake variables
    "BUILD_opencv_<modulename>" control that).

New functionality

    The new very base cv::Algorithm class has been introduced. It's
    planned to be the base of all the "non-trivial" OpenCV
    functionality. All Algorithm-based classes have the following
    features:
        "virtual constructor", i.e. an algorithm instance can be created by name;
        there is a list of available algorithms;
        one can retrieve and set algorithm parameters by name;
        one can save algorithm parameters to XML/YAML file and then load them.

    A new ffmpeg wrapper has been created that features multi-threaded
    decoding, more robust video positioning etc. It's used with
    ffmpeg starting with 0.7.x versions.

    features2d API has been cleaned up. There are no more numerous
    classes with duplicated functionality. The base classes
    FeatureDetector and DescriptorExtractor are now derivatives of
    cv::Algorithm. There is also the base Feature2D, using which
    you can detect keypoints and compute the descriptors in a single
    call. This is also more efficient.

    SIFT and SURF have been moved to a separate module named nonfree
    to indicate possible legal issues of using those algorithms in
    user applications. Also, SIFT performance has been substantially
    improved (by factor of 3-4x).

    The current state-of-art textureless detection algorithm,
    Line-Mod by S. Hinterstoisser, has been contributed by Patrick
    Mihelich. See objdetect/objdetect.hpp, class Detector.

    3 face recognition algorithms have been contributed by Philipp
    Wagner. Please, check opencv/contrib/contrib.hpp, FaceRecognizer
    class, and opencv/samples/cpp/facerec_demo.cpp.

    2 algorithms for solving PnP problem have been added. Please,
    check flags parameter in solvePnP and solvePnPRansac functions.

    Enhanced LogPolar implementation (that uses Blind-Spot model)
    has been contributed by Fabio Solari and Manuela Chessa, see
    opencv/contrib/contrib.hpp, LogPolar_* classes and
    opencv/samples/cpp/logpolar_bsm.cpp sample.

    A stub module photo has been created to support a quickly
    growing "computational photography" area. Currently, it only
    contains inpainting algorithm, moved from imgproc, but it's
    planned to add much more functionality.

    Another module videostab (beta version) has been added that
    solves a specific yet very important task of video stabiliion.
    The module is under active development. Please, check
    opencv/samples/cpp/videostab.cpp sample.

    findContours can now find contours on a 32-bit integer image
    of labels (not only on a black-and-white 8-bit image). This is
    a step towards more convenhich results in better edge maps

    Python bindings can now be used within python threads, so one
    can write multi-threaded computer vision applications in Python.

OpenCV on GPU

    Different Optical Flow algorithms have been added:
        Brox (contrtions;
        Improved performance.

    pyrUp/pyrDown implementations.

    Matrix multiplication on GPU (wrapper for the CUBLAS library).
    This is optional, user need to compile OpenCV with CUBLAS
    support.

    OpenGL back-end has been implemented for highgui module, that
    allows to display GpuMat directly without downloading them to
    CPU.

Performance

    A few OpenCV functions, like color conversion, morphology, data
    type conversions, brute-force feature mer have been optimized
    using TBB and/or SSE intrinisics.

    Along with regression tests, now many OpenCV functions have
    got performance tests. Now for most modules one can build
    opencv_perf_<modulename> executables that run various functions
    from the particular module and produce a XML file. Note that
    if you want to run those tests, as well as the normal regression
    tests, you will need to get (a rather big)
    http://code.opencv.org/svn/opencv/trunk/opencv_extra directory
    and set environment variable OPENCV_TEST_DATA_PATH to
    "<your_copy_of_opencv_extra>/testdata".

Bug fixes

    In this version we fixed literally hundreds of bugs. Please,
    check http://code.opencv.org/projects/opencv/versions/1 for a
    list of fixed bugs.

Known issues

    When OpenCV is built statically, dynamically created classes
    (via Algorithm::create) can fail because linker excludes the
    "unused" object files. To avoid this problem, create classes
    explicitly, e.g

    1 Ptr<DescriptorExtractor> d = new BriefDescriptorExtractor;

4 files changed, 85 insertions, 41 deletions

diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
index a26941eed8a..65c76aecbb0 100644
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2012/04/15 03:49:00 markd Exp $
+# $NetBSD: Makefile,v 1.23 2012/06/01 20:53:56 wiz Exp $
 
-DISTNAME=	OpenCV-2.3.1a
+DISTNAME=	OpenCV-2.4.1
 PKGNAME=	${DISTNAME:S/OpenCV/opencv/:S/a$//}
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=opencvlibrary/}
@@ -27,12 +27,10 @@ REPLACE_PYTHON+=	samples/python/*.py
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/a$//}
 
-.include "options.mk"
-
-post-install:
-	${RM} ${DESTDIR}${PREFIX}/include/opencv2/core/*.orig
+# includes configure output and paths to gmake etc.
+CHECK_WRKREF_SKIP=	${PREFIX}/lib/libopencv_core.so*
 
-.include "../../mk/bsd.prefs.mk"
+.include "options.mk"
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/jasper/buildlink3.mk"
diff --git a/graphics/opencv/PLIST b/graphics/opencv/PLIST
index 51d63dfa4b5..bd4317de0d9 100644
--- a/graphics/opencv/PLIST
+++ b/graphics/opencv/PLIST
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.6 2012/04/15 03:49:00 markd Exp $
+@comment $NetBSD: PLIST,v 1.7 2012/06/01 20:53:56 wiz Exp $
 bin/opencv_createsamples
 bin/opencv_haartraining
 bin/opencv_performance
-bin/opencv_stitching
 bin/opencv_traincascade
 include/opencv/cv.h
 include/opencv/cv.hpp
@@ -17,12 +16,17 @@ include/opencv/highgui.h
 include/opencv/ml.h
 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/retina.hpp
 include/opencv2/core/core.hpp
 include/opencv2/core/core_c.h
+include/opencv2/core/devmem2d.hpp
 include/opencv2/core/eigen.hpp
+include/opencv2/core/gpumat.hpp
 include/opencv2/core/internal.hpp
 include/opencv2/core/mat.hpp
+include/opencv2/core/opengl_interop.hpp
 include/opencv2/core/operations.hpp
 include/opencv2/core/types_c.h
 include/opencv2/core/version.hpp
@@ -64,12 +68,9 @@ include/opencv2/flann/sampling.h
 include/opencv2/flann/saving.h
 include/opencv2/flann/simplex_downhill.h
 include/opencv2/flann/timer.h
-include/opencv2/gpu/NCV.hpp
-include/opencv2/gpu/NPP_staging.hpp
 include/opencv2/gpu/devmem2d.hpp
 include/opencv2/gpu/gpu.hpp
 include/opencv2/gpu/gpumat.hpp
-include/opencv2/gpu/matrix_operations.hpp
 include/opencv2/gpu/stream_accessor.hpp
 include/opencv2/highgui/highgui.hpp
 include/opencv2/highgui/highgui_c.h
@@ -81,52 +82,94 @@ include/opencv2/legacy/compat.hpp
 include/opencv2/legacy/legacy.hpp
 include/opencv2/legacy/streams.hpp
 include/opencv2/ml/ml.hpp
+include/opencv2/nonfree/features2d.hpp
+include/opencv2/nonfree/nonfree.hpp
 include/opencv2/objdetect/objdetect.hpp
 include/opencv2/opencv.hpp
+include/opencv2/opencv_modules.hpp
+include/opencv2/photo/photo.hpp
+include/opencv2/photo/photo_c.h
+include/opencv2/stitching/detail/autocalib.hpp
+include/opencv2/stitching/detail/blenders.hpp
+include/opencv2/stitching/detail/camera.hpp
+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/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/ts/ts.hpp
 include/opencv2/ts/ts_gtest.h
+include/opencv2/ts/ts_perf.hpp
 include/opencv2/video/background_segm.hpp
 include/opencv2/video/tracking.hpp
 include/opencv2/video/video.hpp
+include/opencv2/videostab/deblurring.hpp
+include/opencv2/videostab/fast_marching.hpp
+include/opencv2/videostab/fast_marching_inl.hpp
+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_stabilizing.hpp
+include/opencv2/videostab/optical_flow.hpp
+include/opencv2/videostab/stabilizer.hpp
+include/opencv2/videostab/videostab.hpp
 lib/libopencv_calib3d.so
-lib/libopencv_calib3d.so.2.3
+lib/libopencv_calib3d.so.2.4
 lib/libopencv_calib3d.so.${PKGVERSION}
 lib/libopencv_contrib.so
-lib/libopencv_contrib.so.2.3
+lib/libopencv_contrib.so.2.4
 lib/libopencv_contrib.so.${PKGVERSION}
 lib/libopencv_core.so
-lib/libopencv_core.so.2.3
+lib/libopencv_core.so.2.4
 lib/libopencv_core.so.${PKGVERSION}
 lib/libopencv_features2d.so
-lib/libopencv_features2d.so.2.3
+lib/libopencv_features2d.so.2.4
 lib/libopencv_features2d.so.${PKGVERSION}
 lib/libopencv_flann.so
-lib/libopencv_flann.so.2.3
+lib/libopencv_flann.so.2.4
 lib/libopencv_flann.so.${PKGVERSION}
 lib/libopencv_gpu.so
-lib/libopencv_gpu.so.2.3
+lib/libopencv_gpu.so.2.4
 lib/libopencv_gpu.so.${PKGVERSION}
 lib/libopencv_highgui.so
-lib/libopencv_highgui.so.2.3
+lib/libopencv_highgui.so.2.4
 lib/libopencv_highgui.so.${PKGVERSION}
 lib/libopencv_imgproc.so
-lib/libopencv_imgproc.so.2.3
+lib/libopencv_imgproc.so.2.4
 lib/libopencv_imgproc.so.${PKGVERSION}
 lib/libopencv_legacy.so
-lib/libopencv_legacy.so.2.3
+lib/libopencv_legacy.so.2.4
 lib/libopencv_legacy.so.${PKGVERSION}
 lib/libopencv_ml.so
-lib/libopencv_ml.so.2.3
+lib/libopencv_ml.so.2.4
 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.3
+lib/libopencv_objdetect.so.2.4
 lib/libopencv_objdetect.so.${PKGVERSION}
+lib/libopencv_photo.so
+lib/libopencv_photo.so.2.4
+lib/libopencv_photo.so.${PKGVERSION}
+lib/libopencv_stitching.so
+lib/libopencv_stitching.so.2.4
+lib/libopencv_stitching.so.${PKGVERSION}
 lib/libopencv_ts.so
-lib/libopencv_ts.so.2.3
+lib/libopencv_ts.so.2.4
 lib/libopencv_ts.so.${PKGVERSION}
 lib/libopencv_video.so
-lib/libopencv_video.so.2.3
+lib/libopencv_video.so.2.4
 lib/libopencv_video.so.${PKGVERSION}
+lib/libopencv_videostab.so
+lib/libopencv_videostab.so.2.4
+lib/libopencv_videostab.so.${PKGVERSION}
 lib/pkgconfig/opencv.pc
 ${PLIST.python}${PYSITELIB}/cv.py
 ${PLIST.python}${PYSITELIB}/cv2.so
@@ -137,6 +180,7 @@ share/OpenCV/doc/acircles_pattern.png
 share/OpenCV/doc/check_docs_whitelist.txt
 share/OpenCV/doc/haartraining.htm
 share/OpenCV/doc/license.txt
+share/OpenCV/doc/opencv-logo-white.png
 share/OpenCV/doc/opencv-logo.png
 share/OpenCV/doc/opencv-logo2.png
 share/OpenCV/doc/opencv.jpg
diff --git a/graphics/opencv/distinfo b/graphics/opencv/distinfo
index fe534c73da3..f31362045fb 100644
--- a/graphics/opencv/distinfo
+++ b/graphics/opencv/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.10 2012/04/15 03:49:00 markd Exp $
+$NetBSD: distinfo,v 1.11 2012/06/01 20:53:56 wiz Exp $
 
-SHA1 (OpenCV-2.3.1a.tar.bz2) = 9784e6824c5f677fac82ae83a2f366743adb3299
-RMD160 (OpenCV-2.3.1a.tar.bz2) = f2f459bf7c163acb90427db2b0b425ab8008cde5
-Size (OpenCV-2.3.1a.tar.bz2) = 32669613 bytes
-SHA1 (patch-CMakeLists.txt) = eb27b6cf8877b22bce4a27b7c27e637f5f3b4c52
+SHA1 (OpenCV-2.4.1.tar.bz2) = bc6f23c62c8e3e0746f6f95067d54340d12aed56
+RMD160 (OpenCV-2.4.1.tar.bz2) = c28fec73cc9fcf2a7ca38990a315babc0310f501
+Size (OpenCV-2.4.1.tar.bz2) = 47211018 bytes
+SHA1 (patch-CMakeLists.txt) = d4a48460328c6ef30bd1abd9d90895d186758565
 SHA1 (patch-modules_core_include_opencv2_core_core.hpp) = 3936d23ad51f82536bb73428754d131259b8bf05
diff --git a/graphics/opencv/patches/patch-CMakeLists.txt b/graphics/opencv/patches/patch-CMakeLists.txt
index da5d7fa6e89..ce7e5b5522d 100644
--- a/graphics/opencv/patches/patch-CMakeLists.txt
+++ b/graphics/opencv/patches/patch-CMakeLists.txt
@@ -1,13 +1,15 @@
-$NetBSD: patch-CMakeLists.txt,v 1.3 2012/04/15 03:49:00 markd Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.4 2012/06/01 20:53:56 wiz Exp $
 
---- CMakeLists.txt.orig	2010-12-05 03:35:23.000000000 +0000
+Handle DragonFly like NetBSD and FreeBSD.
+
+--- CMakeLists.txt.orig	2012-05-31 14:06:56.000000000 +0000
 +++ CMakeLists.txt
-@@ -590,7 +590,7 @@ if(UNIX)
- 
-         if(ANDROID)
-             set(OPENCV_LINKER_LIBS dl m log)
--        elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
-+        elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "DragonFly")
-             set(OPENCV_LINKER_LIBS m pthread)
-         else()
-             set(OPENCV_LINKER_LIBS dl m pthread rt)
+@@ -318,7 +318,7 @@ if(UNIX)
+     CHECK_INCLUDE_FILE(pthread.h HAVE_LIBPTHREAD)
+     if(ANDROID)
+       set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} dl m log)
+-    elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
++    elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "DragonFly")
+       set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} m pthread)
+     else()
+       set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} dl m pthread rt)