Sun Dec 5 10:01:53 2010 UTC ()
Update to 2.1. Changelog of most insteresting changes:

2.1

   (April, 2010)

   General Modifications
       - The whole OpenCV is now using exceptions instead of the old
       libc-style mechanism.
          * That is, instead of checking error code with cvGetErrStatus()
            (which currently always returns 0) you can now just call OpenCV
            functions inside C++ try-catch statements, cv::Exception is now
            derived from std::exception.
       - All the parallel loops in OpenCV have been converted from OpenMP
          * to Intel TBB (http://www.threadingbuildingblocks.org/). Thus
            parallel version of OpenCV can now be built using MSVC 2008
            Express Edition or using earlier than 4.2 versions of GCC.

       - SWIG-based Python wrappers are still included,
          * but they are not built by default and it's generally preferable
            to use the new wrappers. The python samples have been rewritten
            by James Bowman to use the new-style Python wrappers, which have
            been also created by James.
       - OpenCV can now be built and run in 64-bit mode on MacOSX 10.6 and
       Windows (see HighGUI and known problems below).
          * On Windows both MSVC 2008 and mingw64 are known to work.
       - In theory OpenCV is now able to determine the host CPU on-fly and
       make use of SSE/SSE2/... instructions,
          * if they are available. That is, it should be more safe to use
            WITH_SSE* flags in CMake. However, if you want maximum
            portability, it's recommended to turn on just WITH_SSE and
            WITH_SSE2 and leave other SSE* turned off, as we found that using
            WITH_SSE3, WITH_SSSE3 and WITH_SSE4_1 can yield the code
            incompatible with Intel's pre-Penryn or AMD chips.
       - Experimental "static" OpenCV configuration in CMake was contributed
       by Jose Luis Blanco.
          * Pass "BUILD_SHARED_LIBS=OFF" to CMake to build OpenCV statically.

   New Functionality, Features
     * - cxcore, cv, cvaux:
          * Grabcut (http://en.wikipedia.org/wiki/GrabCut) image segmentation
            algorithm has been implemented.
               * See opencv/samples/c/grabcut.cpp
          * new improved version of one-way descriptor is added. See
            opencv/samples/c/one_way_sample.cpp
          * modified version of H. Hirschmuller semi-global stereo matching
            algorithm that we call SGBM
               * (semi-global block matching) has been created. It is much
                 faster than Kolmogorov's graph cuts-based algorithm and yet
                 it's usually better than the block matching StereoBM
                 algorithm. See opencv/samples/c/stereo_matching.cpp.
          * existing StereoBM stereo correspondence algorithm by K. Konolige
            was noticeably improved:
               * added the optional left-right consistency check and speckle
                 filtering, improved performance (by ~20%).
          * User can now control the image areas visible after the stereo
            rectification
               * (see the extended stereoRectify/cvStereoRectify), and also
                 limit the region where the disparity is computed (see
                 CvStereoBMState::roi1, roi2; getValidDisparityROI).
          * Mixture-of-Gaussian based background subtraction algorithm has
            been rewritten for better performance
               * and better accuracy. Alternative C++ interface
                 BackgroundSubtractor has been provided, along with the
                 possibility to use the trained background model to segment
                 the foreground without updating the model. See
                 opencv/samples/c/bgfg_segm.cpp.

       - highgui:
          * MacOSX: OpenCV now includes Cocoa and QTKit backends, in addition
            to Carbon and Quicktime.
               * Therefore you can build OpenCV as 64-bit library. Thanks to
                 Andre Cohen and Nicolas Butko, which components Note however
                 that the backend are now in the alpha state, they can crash
                 or leak memory, so for anything more serious than quick
                 experiments you may prefer to use Carbon and Quicktime. To
                 do that, pass USE_CARBON=ON and USE_QUICKTIME=ON to CMake
                 and build OpenCV in 32-bit mode (i.e. select i386
                 architecture in Xcode).
          * Windows. OpenCV can now be built in 64-bit mode with MSVC 2008
            and also mingw64.
          * Fullscreen has been added (thanks to Yannick Verdie).
               * Call cvSetWindowProperty(window_name, CV_WINDOW_FULLSCREEN,
                 1) to make the particular window to fill the whole screen.
                 This feature is not supported in the Cocoa bindings yet.
          * gstreamer backend has been improved a lot (thanks to Stefano
            Fabri)

   Bug Fixes
     * - about 200 bugs have been fixed

2.0

   (September, 2009)

   New functionality, features:
     * - General:
          * New Python interface officially in.
       - MLL:
          * The new-style class aliases (e.g. cv::SVM ~ CvSVM) and the
            train/predict methods, taking cv::Mat in addition to CvMat, have
            been added. So now MLL can be used more seamlesly with the rest
            of the restyled OpenCV.

2.0 beta

   (September, 2009)

   New functionality, features:
     * General:
          * The brand-new C++ interface for most of OpenCV functionality
            (cxcore, cv, highgui) has been introduced. Generally it means
            that you will need to do less coding to achieve the same results;
            it brings automatic memory management and many other advantages.
               * See the C++ Reference section in opencv/doc/opencv.pdf and
                 opencv/include/opencv/*.hpp.
                    * The previous interface is retained and still supported.
          * The source directory structure has been reorganized; now all the
            external headers are placed in the single directory on all
            platforms.
          * The primary build system is CMake,

     * CXCORE, CV, CVAUX:
          * CXCORE now uses Lapack (CLapack 3.1.1.1 in OpenCV 2.0) in its
            various linear algebra functions (such as solve, invert, SVD,
            determinant, eigen etc.) and the corresponding old-style
            functions (cvSolve, cvInvert etc.
          * Lots of new feature and object detectors and descriptors have
            been added (there is no documentation on them yet), see cv.hpp
            and cvaux.hpp:
               * FAST - the fast corner detector, submitted by Edward Rosten
               * MSER - maximally stable extremal regions, submitted by Liu
                 Liu
               * LDetector - fast circle-based feature detector
                    * by V. Lepetit (a.k.a. YAPE)

               * Fern-based point classifier and the planar object detector -
                    * based on the works by M. Ozuysal and V. Lepetit

               * One-way descriptor - a powerful PCA-based feature
                 descriptor,
                    * S. Hinterstoisser, O. Kutter, N. Navab, P. Fua, and V.
                      Lepetit, "Real-Time Learning of Accurate Patch
                      Rectification". Contributed by Victor Eruhimov

               * Spin Images 3D feature descriptor
                    * based on the A. Johnson PhD thesis; implemented by
                      Anatoly Baksheev

               * Self-similarity features - contributed by Rainer Leinhar
               * HOG people and object detector - the reimplementation of
                 Navneet Dalal framework
                    * (http://pascal.inrialpes.fr/soft/olt/). Currently, only
                      the detection part is ported, but it is fully
                      compatible with the original training code.
                    * See cvaux.hpp and opencv/samples/c/peopledetect.cpp.
               * LBP (Local Binary Pattern) features
               * Extended variant of the Haar feature-based object detector -
                 implemented by Maria Dimashova. It now supports Haar
                 features and LBPs, other features can be added in the same
                 way.
               * Adaptive skin detector and the fuzzy meanshift tracker -
                 contributed by Farhad Dadgostar, see cvaux.hpp and
                 opencv/samples/c/adaptiveskindetector.cpp

          * The new traincascade application complementing the new-style
            HAAR+LBP object detector has been added. See
            opencv/apps/traincascade.
          * The powerful library for approximate nearest neighbor search
            FLANN by Marius Muja is now shipped with OpenCV, and the
            OpenCV-style interface to the library is included into cxcore.
            See cxcore.hpp and opencv/samples/c/find_obj.cpp
          * The bundle adjustment engine has been contributed by PhaseSpace;
            see cvaux.hp
          * Added dense optical flow estimation function based on the paper
               * "Two-Frame Motion Estimation Based on Polynomial Expansion"
                 by G. Farnerback.
               * See cv::calcOpticalFlowFarneback and the C++ documentation
          * Image warping operations (resize, remap, warpAffine,
            warpPerspective) now all support bicubic and Lanczos
            interpolation.
          * Most of the new linear and non-linear filtering operations
            (filter2D, sepFilter2D, erode, dilate ...) support arbitrary
            border modes and can use the valid image pixels outside of the
            ROI (i.e. the ROIs are not "isolated" anymore), see the C++
            documentation.
          * The data can now be saved to and loaded from GZIP-compressed
            XML/YML files, e.g.: cvSave("a.xml.gz", my_huge_matrix);
     * MLL:
          * Added the Extremely Random Trees that train super-fast, comparing
            to Boosting or Random Trees (by Maria Dimashova).
          * The decision tree engine and based on it classes (Decision Tree
            itself, Boost, Random Trees) have been reworked and now:
               * they consume much less memory (up to 200% savings)
               * the training can be run in multiple threads (when OpenCV is
                 built with OpenMP support)
               * the boosting classification on numerical variables is
                 especially fast because of the specialized low-overhead
                 branch.
          * mltest has been added. While far from being complete, it contains
            correctness tests for some of the MLL classes.
     * HighGUI:
          * [Linux] The support for stereo cameras (currently Videre only)
            has been added.
          * There is now uniform interface for capturing video from two-,
            three- ... n-head cameras.
          * Images can now be compressed to or decompressed from buffers in
            the memory, see the C++ HighGUI reference manual
     * Documentation:
          * The reference manual has been converted from HTML to LaTeX (by
            James Bowman and Caroline Pantofaru)

     * Samples, misc.:
          * Better eye detector has been contributed by Shiqi Yu, see
            opencv/data/haarcascades/*[lefteye|righteye]*.xml
          * sample LBP (Local Binary Pattern) cascade for the frontal face
            detection has been created by Maria Dimashova, see
            opencv/data/lbpcascades/lbpcascade_frontalface.xml
          * Several high-quality body parts and facial feature detectors have
            been
               * contributed by Modesto Castrillon-Santana,
               * see opencv/data/haarcascades/haarcascade_mcs*.xml

   Optimization:
     * Many of the basic functions and the image processing operations(like
       arithmetic operations, geometric image transformations, filtering
       etc.) have got SSE2 optimization, so they are several times faster.
     * The model of IPP support has been changed. Now IPP is supposed to be
       detected by CMake at the configuration stage and linked against
       OpenCV. (In the beta it is not implemented yet though).
     * PNG encoder performance improved by factor of 4 by tuning the
       parameters

1.1pre1

   (October, 2008)

   New functionality/features:
     * General:
          * Octave bindings have been added. See interfaces/swig/octave (for
            now, Linux only)
     * CXCORE, CV, CVAUX:
          * Speeded-up Robust Features (SURF), contributed by Liu Liu. see
            samples/c/find_obj.cpp and the documentation opencvref_cv.htm
          * Many improvements in camera calibration:
               * Added stereo camera calibration: cvStereoCalibrate,
                 cvStereoRectify etc.
               * Single camera calibration now uses Levenberg-Marquardt
                 method and supports extra flags to switch on/off
                 optimization of individual camera parameters
               * The optional 3rd radial distortion parameter (k3*r^6) is now
                 supported in every calibration-related function
          * 2 stereo correspondence algorithms:
               * very fast block matching method by Kurt Konolige (processes
                 the Tsukuba stereo pair in <10ms on Core2Duo laptop)
               * slow but more accurate graph-cut based algorithm by
                 Kolmogorov and Zabin
          * Better homography estimation algorithms (RANSAC and LMEDs)
          * new C++ template image classes contributed by Daniel Filip
            (Google inc.). see opencv/cxcore/include/cvwimage.h
          * Fast approximate nearest neighbor search (by Xavier Delacour)
          * Codebook method for background/foreground segmentation (by Gary
            Bradski)
          * Sort function (contributed by Shiqi Yu)
          * [OpenCV+IPP] Face Detection (cvHaarDetectObjects) now runs much
            faster (up to 2x faster) when using IPP 5.3 or higher.
          * Much faster (~4x faster) fixed-point variant of cvRemap has been
            added
     * MLL:
          * Python bindings for MLL have been added. There are no samples
            yet.
     * HighGUI:
          * [Windows, 32bit] Added support for videoInput library. Hence,
            cvcam is [almost] not needed anymore
          * [Windows, 32bit] FFMPEG can now be used for video
            decoding/encoding via ffopencv*.dll
          * [Linux] Added unicap support
          * Improved internal video capturing and video encoding APIs
     * Documentation:
          * OpenCV book has been published (sold separately :) see
            docs/index.htm)

     * New samples (opencv/samples):
          * Many Octave samples
          * find_obj.cpp (SURF), bgfg_codebook.cpp (Codebook BG/FG
            segmentation),
               * stereo_calib.cpp (Stereo calibration and stereo
                 correspondence)


(wiz)
diff -r1.10 -r1.11 pkgsrc/graphics/opencv/Makefile
diff -r1.3 -r1.4 pkgsrc/graphics/opencv/PLIST
diff -r1.2 -r1.3 pkgsrc/graphics/opencv/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/graphics/opencv/patches/patch-aa
diff -r1.1 -r1.2 pkgsrc/graphics/opencv/patches/patch-ab
diff -r1.1 -r0 pkgsrc/graphics/opencv/patches/patch-ac

cvs diff -r1.10 -r1.11 pkgsrc/graphics/opencv/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/opencv/Makefile 2010/11/15 22:57:22 1.10
+++ pkgsrc/graphics/opencv/Makefile 2010/12/05 10:01:52 1.11
@@ -1,39 +1,41 @@ @@ -1,39 +1,41 @@
1# $NetBSD: Makefile,v 1.10 2010/11/15 22:57:22 abs Exp $ 1# $NetBSD: Makefile,v 1.11 2010/12/05 10:01:52 wiz Exp $
2# 2#
3 3
4DISTNAME= opencv-1.0.0 4DISTNAME= OpenCV-2.1.0
5PKGREVISION= 7 5PKGNAME= ${DISTNAME:S/OpenCV/opencv/}
6CATEGORIES= graphics devel 6CATEGORIES= graphics devel
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=opencvlibrary/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=opencvlibrary/}
 8EXTRACT_SUFX= .tar.bz2
8 9
9MAINTAINER= anthony.mallet@laas.fr 10MAINTAINER= anthony.mallet@laas.fr
10HOMEPAGE= http://opencvlibrary.sourceforge.net/ 11HOMEPAGE= http://opencvlibrary.sourceforge.net/
11COMMENT= Library for computer vision problems 12COMMENT= Library for computer vision problems
12 13
13PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
14 15
 16USE_CMAKE= yes
15USE_PKGLOCALEDIR= yes 17USE_PKGLOCALEDIR= yes
16USE_TOOLS+= gmake pkg-config 18USE_TOOLS+= gmake pkg-config
17USE_LANGUAGES= c c++ 19USE_LANGUAGES= c c++
18USE_LIBTOOL= yes 20USE_LIBTOOL= yes
19INSTALLATION_DIRS+= share/doc/opencv/papers share/doc/opencv/ref/pics \ 21INSTALLATION_DIRS+= share/doc/opencv/papers share/doc/opencv/ref/pics \
20 share/opencv/haarcascades 22 share/opencv/haarcascades
21 23
22GNU_CONFIGURE= yes 24PKGCONFIG_OVERRIDE+= opencv.pc.cmake.in
23PKGCONFIG_OVERRIDE+= opencv.pc.in 
24 25
25SUBST_CLASSES+= py 26SUBST_CLASSES+= py
26SUBST_STAGE.py= pre-configure 27SUBST_STAGE.py= pre-configure
27SUBST_FILES.py= samples/python/*.py 28SUBST_FILES.py= samples/python/*.py
28SUBST_SED.py= -e 's,/usr/bin/python,/usr/bin/env python,' 29SUBST_SED.py= -e 's,/usr/bin/python,/usr/bin/env python,'
29 30
30CONFIGURE_ARGS+=--with-swig=no 31#CONFIGURE_ARGS+=--with-swig=no
31CONFIGURE_ARGS+=--with-python=no 32CMAKE_ARGS+= -D BUILD_NEW_PYTHON_SUPPORT=OFF
32 33
33.include "../../x11/gtk2/buildlink3.mk" 34.include "../../x11/gtk2/buildlink3.mk"
34.include "../../graphics/png/buildlink3.mk" 35.include "../../graphics/png/buildlink3.mk"
 36.include "../../graphics/jasper/buildlink3.mk"
35.include "../../graphics/jpeg/buildlink3.mk" 37.include "../../graphics/jpeg/buildlink3.mk"
36.include "../../graphics/tiff/buildlink3.mk" 38.include "../../graphics/tiff/buildlink3.mk"
37.include "../../devel/zlib/buildlink3.mk" 39.include "../../devel/zlib/buildlink3.mk"
38 40
39.include "../../mk/bsd.pkg.mk" 41.include "../../mk/bsd.pkg.mk"

cvs diff -r1.3 -r1.4 pkgsrc/graphics/opencv/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/opencv/PLIST 2009/06/14 17:59:24 1.3
+++ pkgsrc/graphics/opencv/PLIST 2010/12/05 10:01:52 1.4
@@ -1,324 +1,83 @@ @@ -1,324 +1,83 @@
1@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:59:24 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.4 2010/12/05 10:01:52 wiz Exp $
2bin/opencv-createsamples 2bin/opencv_createsamples
3bin/opencv-haartraining 3bin/opencv_haartraining
4bin/opencv-performance 4bin/opencv_performance
 5bin/opencv_traincascade
5include/opencv/cv.h 6include/opencv/cv.h
6include/opencv/cv.hpp 7include/opencv/cv.hpp
7include/opencv/cvaux.h 8include/opencv/cvaux.h
8include/opencv/cvaux.hpp 9include/opencv/cvaux.hpp
9include/opencv/cvcompat.h 10include/opencv/cvcompat.h
10include/opencv/cvhaartraining.h 11include/opencv/cvinternal.h
11include/opencv/cvmat.hpp 
12include/opencv/cvtypes.h 12include/opencv/cvtypes.h
13include/opencv/cvver.h 13include/opencv/cvver.h
14include/opencv/cvvidsurv.hpp 14include/opencv/cvvidsurv.hpp
 15include/opencv/cvwimage.h
15include/opencv/cxcore.h 16include/opencv/cxcore.h
16include/opencv/cxcore.hpp 17include/opencv/cxcore.hpp
17include/opencv/cxerror.h 18include/opencv/cxerror.h
 19include/opencv/cxflann.h
 20include/opencv/cxmat.hpp
18include/opencv/cxmisc.h 21include/opencv/cxmisc.h
 22include/opencv/cxoperations.hpp
19include/opencv/cxtypes.h 23include/opencv/cxtypes.h
20include/opencv/highgui.h 24include/opencv/highgui.h
 25include/opencv/highgui.hpp
21include/opencv/ml.h 26include/opencv/ml.h
22lib/libcv.la 27lib/libcv.so
23lib/libcvaux.la 28lib/libcv.so.2.1
24lib/libcvhaartraining.a 29lib/libcv.so.${PKGVERSION}
25lib/libcxcore.la 30lib/libcvaux.so
26lib/libhighgui.la 31lib/libcvaux.so.2.1
27lib/libml.la 32lib/libcvaux.so.${PKGVERSION}
 33lib/libcxcore.so
 34lib/libcxcore.so.2.1
 35lib/libcxcore.so.${PKGVERSION}
 36lib/libhighgui.so
 37lib/libhighgui.so.2.1
 38lib/libhighgui.so.${PKGVERSION}
 39lib/libml.so
 40lib/libml.so.2.1
 41lib/libml.so.${PKGVERSION}
28lib/pkgconfig/opencv.pc 42lib/pkgconfig/opencv.pc
29share/doc/opencv/papers/algo_tracking.pdf 43share/opencv/OpenCVConfig.cmake
30share/doc/opencv/papers/avbpa99.ps 44share/opencv/doc/CMakeLists.txt
31share/doc/opencv/papers/camshift.pdf 45share/opencv/doc/ChangeLog.htm
32share/doc/opencv/ref/pics/backprojectpatch.png 46share/opencv/doc/README.txt
33share/doc/opencv/ref/pics/boundingrect.png 47share/opencv/doc/haartraining.htm
34share/doc/opencv/ref/pics/building.jpg 48share/opencv/doc/index.htm
35share/doc/opencv/ref/pics/contoursecarea.png 49share/opencv/doc/license.txt
36share/doc/opencv/ref/pics/cornersubpix.png 50share/opencv/doc/opencv-logo.png
37share/doc/opencv/ref/pics/defects.png 51share/opencv/doc/opencv-logo2.png
38share/doc/opencv/ref/pics/ellipse.png 52share/opencv/doc/opencv.jpg
39share/doc/opencv/ref/pics/em1.png 53share/opencv/doc/opencv.pdf
40share/doc/opencv/ref/pics/em3.png 54share/opencv/doc/packaging.txt
41share/doc/opencv/ref/pics/em4.png 55share/opencv/doc/papers/algo_tracking.pdf
42share/doc/opencv/ref/pics/em5.png 56share/opencv/doc/papers/avbpa99.ps
43share/doc/opencv/ref/pics/em6.png 57share/opencv/doc/papers/camshift.pdf
44share/doc/opencv/ref/pics/em7.png 58share/opencv/doc/pattern.pdf
45share/doc/opencv/ref/pics/em8.png 59share/opencv/doc/vidsurv/Blob_Tracking_Modules.doc
46share/doc/opencv/ref/pics/em9.png 60share/opencv/doc/vidsurv/Blob_Tracking_Tests.doc
47share/doc/opencv/ref/pics/errmsg.png 61share/opencv/doc/vidsurv/TestSeq.doc
48share/doc/opencv/ref/pics/face.png 62share/opencv/haarcascades/haarcascade_eye.xml
49share/doc/opencv/ref/pics/haarfeatures.png 63share/opencv/haarcascades/haarcascade_eye_tree_eyeglasses.xml
50share/doc/opencv/ref/pics/houghp.png 
51share/doc/opencv/ref/pics/inv_logpolar.jpg 
52share/doc/opencv/ref/pics/left.jpg 
53share/doc/opencv/ref/pics/logpolar.jpg 
54share/doc/opencv/ref/pics/maxrect.png 
55share/doc/opencv/ref/pics/memstorage1.png 
56share/doc/opencv/ref/pics/memstorage2.png 
57share/doc/opencv/ref/pics/minareabox.png 
58share/doc/opencv/ref/pics/mlp_.png 
59share/doc/opencv/ref/pics/neuron_model.png 
60share/doc/opencv/ref/pics/pointpolygon.png 
61share/doc/opencv/ref/pics/quadedge.png 
62share/doc/opencv/ref/pics/right.jpg 
63share/doc/opencv/ref/pics/sigmoid_bipolar.png 
64share/doc/opencv/ref/pics/subdiv.png 
65share/doc/opencv/ref/pics/threshold.png 
66share/doc/opencv/ref/opencvref.css 
67share/doc/opencv/ref/opencvref_cv.htm 
68share/doc/opencv/ref/opencvref_cvaux.htm 
69share/doc/opencv/ref/opencvref_cxcore.htm 
70share/doc/opencv/ref/opencvref_highgui.htm 
71share/doc/opencv/ref/opencvref_ml.htm 
72share/doc/opencv/cvcam.rtf 
73share/doc/opencv/faq.htm 
74share/doc/opencv/index.htm 
75share/doc/opencv/license.txt 
76share/doc/opencv/opencv.jpg 
77share/doc/opencv/opencvman_old.pdf 
78share/doc/opencv/python.txt 
79share/doc/opencv/python-wrappers-on-windows.txt 
80share/opencv/haarcascades/haarcascade_frontalface_alt.xml 64share/opencv/haarcascades/haarcascade_frontalface_alt.xml
81share/opencv/haarcascades/haarcascade_frontalface_alt.xml 
82share/opencv/haarcascades/haarcascade_frontalface_alt2.xml 
83share/opencv/haarcascades/haarcascade_frontalface_alt2.xml 65share/opencv/haarcascades/haarcascade_frontalface_alt2.xml
84share/opencv/haarcascades/haarcascade_frontalface_alt_tree.xml 66share/opencv/haarcascades/haarcascade_frontalface_alt_tree.xml
85share/opencv/haarcascades/haarcascade_frontalface_alt_tree.xml 
86share/opencv/haarcascades/haarcascade_frontalface_default.xml 
87share/opencv/haarcascades/haarcascade_frontalface_default.xml 67share/opencv/haarcascades/haarcascade_frontalface_default.xml
88share/opencv/haarcascades/haarcascade_fullbody.xml 68share/opencv/haarcascades/haarcascade_fullbody.xml
89share/opencv/haarcascades/haarcascade_fullbody.xml 69share/opencv/haarcascades/haarcascade_lefteye_2splits.xml
90share/opencv/haarcascades/haarcascade_lowerbody.xml 
91share/opencv/haarcascades/haarcascade_lowerbody.xml 70share/opencv/haarcascades/haarcascade_lowerbody.xml
 71share/opencv/haarcascades/haarcascade_mcs_eyepair_big.xml
 72share/opencv/haarcascades/haarcascade_mcs_eyepair_small.xml
 73share/opencv/haarcascades/haarcascade_mcs_lefteye.xml
 74share/opencv/haarcascades/haarcascade_mcs_mouth.xml
 75share/opencv/haarcascades/haarcascade_mcs_nose.xml
 76share/opencv/haarcascades/haarcascade_mcs_righteye.xml
 77share/opencv/haarcascades/haarcascade_mcs_upperbody.xml
92share/opencv/haarcascades/haarcascade_profileface.xml 78share/opencv/haarcascades/haarcascade_profileface.xml
93share/opencv/haarcascades/haarcascade_profileface.xml 79share/opencv/haarcascades/haarcascade_righteye_2splits.xml
94share/opencv/haarcascades/haarcascade_upperbody.xml 
95share/opencv/haarcascades/haarcascade_upperbody.xml 80share/opencv/haarcascades/haarcascade_upperbody.xml
96share/opencv/readme.txt 81share/opencv/lbpcascades/lbpcascade_frontalface.xml
97share/opencv/samples/c/agaricus-lepiota.data 82@pkgdir share/doc/opencv/ref/pics
98share/opencv/samples/c/agaricus-lepiota.data 83@pkgdir share/doc/opencv/papers
99share/opencv/samples/c/agaricus-lepiota.data 
100share/opencv/samples/c/airplane.jpg 
101share/opencv/samples/c/airplane.jpg 
102share/opencv/samples/c/airplane.jpg 
103share/opencv/samples/c/baboon.jpg 
104share/opencv/samples/c/baboon.jpg 
105share/opencv/samples/c/baboon.jpg 
106share/opencv/samples/c/blobtrack.cpp 
107share/opencv/samples/c/blobtrack.cpp 
108share/opencv/samples/c/blobtrack.cpp 
109share/opencv/samples/c/build_all.sh 
110share/opencv/samples/c/build_all.sh 
111share/opencv/samples/c/build_all.sh 
112share/opencv/samples/c/camshiftdemo.c 
113share/opencv/samples/c/camshiftdemo.c 
114share/opencv/samples/c/camshiftdemo.c 
115share/opencv/samples/c/contours.c 
116share/opencv/samples/c/contours.c 
117share/opencv/samples/c/contours.c 
118share/opencv/samples/c/convert_cascade.c 
119share/opencv/samples/c/convert_cascade.c 
120share/opencv/samples/c/convert_cascade.c 
121share/opencv/samples/c/convexhull.c 
122share/opencv/samples/c/convexhull.c 
123share/opencv/samples/c/convexhull.c 
124share/opencv/samples/c/cvsample.dsp 
125share/opencv/samples/c/cvsample.dsp 
126share/opencv/samples/c/cvsample.dsp 
127share/opencv/samples/c/cvsample.vcproj 
128share/opencv/samples/c/cvsample.vcproj 
129share/opencv/samples/c/cvsample.vcproj 
130share/opencv/samples/c/delaunay.c 
131share/opencv/samples/c/delaunay.c 
132share/opencv/samples/c/delaunay.c 
133share/opencv/samples/c/demhist.c 
134share/opencv/samples/c/demhist.c 
135share/opencv/samples/c/demhist.c 
136share/opencv/samples/c/dft.c 
137share/opencv/samples/c/dft.c 
138share/opencv/samples/c/dft.c 
139share/opencv/samples/c/distrans.c 
140share/opencv/samples/c/distrans.c 
141share/opencv/samples/c/distrans.c 
142share/opencv/samples/c/drawing.c 
143share/opencv/samples/c/drawing.c 
144share/opencv/samples/c/drawing.c 
145share/opencv/samples/c/edge.c 
146share/opencv/samples/c/edge.c 
147share/opencv/samples/c/edge.c 
148share/opencv/samples/c/facedetect.c 
149share/opencv/samples/c/facedetect.c 
150share/opencv/samples/c/facedetect.c 
151share/opencv/samples/c/facedetect.cmd 
152share/opencv/samples/c/facedetect.cmd 
153share/opencv/samples/c/facedetect.cmd 
154share/opencv/samples/c/ffilldemo.c 
155share/opencv/samples/c/ffilldemo.c 
156share/opencv/samples/c/ffilldemo.c 
157share/opencv/samples/c/fitellipse.c 
158share/opencv/samples/c/fitellipse.c 
159share/opencv/samples/c/fitellipse.c 
160share/opencv/samples/c/fruits.jpg 
161share/opencv/samples/c/fruits.jpg 
162share/opencv/samples/c/fruits.jpg 
163share/opencv/samples/c/houghlines.c 
164share/opencv/samples/c/houghlines.c 
165share/opencv/samples/c/houghlines.c 
166share/opencv/samples/c/image.cpp 
167share/opencv/samples/c/image.cpp 
168share/opencv/samples/c/image.cpp 
169share/opencv/samples/c/inpaint.cpp 
170share/opencv/samples/c/inpaint.cpp 
171share/opencv/samples/c/inpaint.cpp 
172share/opencv/samples/c/kalman.c 
173share/opencv/samples/c/kalman.c 
174share/opencv/samples/c/kalman.c 
175share/opencv/samples/c/kmeans.c 
176share/opencv/samples/c/kmeans.c 
177share/opencv/samples/c/kmeans.c 
178share/opencv/samples/c/laplace.c 
179share/opencv/samples/c/laplace.c 
180share/opencv/samples/c/laplace.c 
181share/opencv/samples/c/lena.jpg 
182share/opencv/samples/c/lena.jpg 
183share/opencv/samples/c/lena.jpg 
184share/opencv/samples/c/letter-recognition.data 
185share/opencv/samples/c/letter-recognition.data 
186share/opencv/samples/c/letter-recognition.data 
187share/opencv/samples/c/letter_recog.cpp 
188share/opencv/samples/c/letter_recog.cpp 
189share/opencv/samples/c/letter_recog.cpp 
190share/opencv/samples/c/lkdemo.c 
191share/opencv/samples/c/lkdemo.c 
192share/opencv/samples/c/lkdemo.c 
193share/opencv/samples/c/makefile.gnu 
194share/opencv/samples/c/makefile.gnu 
195share/opencv/samples/c/makefile.gnu 
196share/opencv/samples/c/makefile.ms 
197share/opencv/samples/c/makefile.ms 
198share/opencv/samples/c/makefile.ms 
199share/opencv/samples/c/minarea.c 
200share/opencv/samples/c/minarea.c 
201share/opencv/samples/c/minarea.c 
202share/opencv/samples/c/morphology.c 
203share/opencv/samples/c/morphology.c 
204share/opencv/samples/c/morphology.c 
205share/opencv/samples/c/motempl.c 
206share/opencv/samples/c/motempl.c 
207share/opencv/samples/c/motempl.c 
208share/opencv/samples/c/mushroom.cpp 
209share/opencv/samples/c/mushroom.cpp 
210share/opencv/samples/c/mushroom.cpp 
211share/opencv/samples/c/pic1.png 
212share/opencv/samples/c/pic1.png 
213share/opencv/samples/c/pic1.png 
214share/opencv/samples/c/pic2.png 
215share/opencv/samples/c/pic2.png 
216share/opencv/samples/c/pic2.png 
217share/opencv/samples/c/pic3.png 
218share/opencv/samples/c/pic3.png 
219share/opencv/samples/c/pic3.png 
220share/opencv/samples/c/pic4.png 
221share/opencv/samples/c/pic4.png 
222share/opencv/samples/c/pic4.png 
223share/opencv/samples/c/pic5.png 
224share/opencv/samples/c/pic5.png 
225share/opencv/samples/c/pic5.png 
226share/opencv/samples/c/pic6.png 
227share/opencv/samples/c/pic6.png 
228share/opencv/samples/c/pic6.png 
229share/opencv/samples/c/pyramid_segmentation.c 
230share/opencv/samples/c/pyramid_segmentation.c 
231share/opencv/samples/c/pyramid_segmentation.c 
232share/opencv/samples/c/squares.c 
233share/opencv/samples/c/squares.c 
234share/opencv/samples/c/squares.c 
235share/opencv/samples/c/stuff.jpg 
236share/opencv/samples/c/stuff.jpg 
237share/opencv/samples/c/stuff.jpg 
238share/opencv/samples/c/watershed.cpp 
239share/opencv/samples/c/watershed.cpp 
240share/opencv/samples/c/watershed.cpp 
241share/opencv/samples/python/cam-histo.py 
242share/opencv/samples/python/cam-histo.py 
243share/opencv/samples/python/cam-histo.py 
244share/opencv/samples/python/capture-cam.py 
245share/opencv/samples/python/capture-cam.py 
246share/opencv/samples/python/capture-cam.py 
247share/opencv/samples/python/chessboard.py 
248share/opencv/samples/python/chessboard.py 
249share/opencv/samples/python/chessboard.py 
250share/opencv/samples/python/contours.py 
251share/opencv/samples/python/contours.py 
252share/opencv/samples/python/contours.py 
253share/opencv/samples/python/convexhull.py 
254share/opencv/samples/python/convexhull.py 
255share/opencv/samples/python/convexhull.py 
256share/opencv/samples/python/delaunay.py 
257share/opencv/samples/python/delaunay.py 
258share/opencv/samples/python/delaunay.py 
259share/opencv/samples/python/demhist.py 
260share/opencv/samples/python/demhist.py 
261share/opencv/samples/python/demhist.py 
262share/opencv/samples/python/dft.py 
263share/opencv/samples/python/dft.py 
264share/opencv/samples/python/dft.py 
265share/opencv/samples/python/distrans.py 
266share/opencv/samples/python/distrans.py 
267share/opencv/samples/python/distrans.py 
268share/opencv/samples/python/drawing.py 
269share/opencv/samples/python/drawing.py 
270share/opencv/samples/python/drawing.py 
271share/opencv/samples/python/edge.py 
272share/opencv/samples/python/edge.py 
273share/opencv/samples/python/edge.py 
274share/opencv/samples/python/facedetect.py 
275share/opencv/samples/python/facedetect.py 
276share/opencv/samples/python/facedetect.py 
277share/opencv/samples/python/ffilldemo.py 
278share/opencv/samples/python/ffilldemo.py 
279share/opencv/samples/python/ffilldemo.py 
280share/opencv/samples/python/fitellipse.py 
281share/opencv/samples/python/fitellipse.py 
282share/opencv/samples/python/fitellipse.py 
283share/opencv/samples/python/houghlines.py 
284share/opencv/samples/python/houghlines.py 
285share/opencv/samples/python/houghlines.py 
286share/opencv/samples/python/inpaint.py 
287share/opencv/samples/python/inpaint.py 
288share/opencv/samples/python/inpaint.py 
289share/opencv/samples/python/kalman.py 
290share/opencv/samples/python/kalman.py 
291share/opencv/samples/python/kalman.py 
292share/opencv/samples/python/kmeans.py 
293share/opencv/samples/python/kmeans.py 
294share/opencv/samples/python/kmeans.py 
295share/opencv/samples/python/laplace.py 
296share/opencv/samples/python/laplace.py 
297share/opencv/samples/python/laplace.py 
298share/opencv/samples/python/lkdemo.py 
299share/opencv/samples/python/lkdemo.py 
300share/opencv/samples/python/lkdemo.py 
301share/opencv/samples/python/logpolar.py 
302share/opencv/samples/python/logpolar.py 
303share/opencv/samples/python/logpolar.py 
304share/opencv/samples/python/minarea.py 
305share/opencv/samples/python/minarea.py 
306share/opencv/samples/python/minarea.py 
307share/opencv/samples/python/minidemo.py 
308share/opencv/samples/python/minidemo.py 
309share/opencv/samples/python/minidemo.py 
310share/opencv/samples/python/morphology.py 
311share/opencv/samples/python/morphology.py 
312share/opencv/samples/python/morphology.py 
313share/opencv/samples/python/motempl.py 
314share/opencv/samples/python/motempl.py 
315share/opencv/samples/python/motempl.py 
316share/opencv/samples/python/pyramid_segmentation.py 
317share/opencv/samples/python/pyramid_segmentation.py 
318share/opencv/samples/python/pyramid_segmentation.py 
319share/opencv/samples/python/squares.py 
320share/opencv/samples/python/squares.py 
321share/opencv/samples/python/squares.py 
322share/opencv/samples/python/watershed.py 
323share/opencv/samples/python/watershed.py 
324share/opencv/samples/python/watershed.py 

cvs diff -r1.2 -r1.3 pkgsrc/graphics/opencv/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/opencv/distinfo 2006/11/19 23:13:42 1.2
+++ pkgsrc/graphics/opencv/distinfo 2010/12/05 10:01:52 1.3
@@ -1,8 +1,7 @@ @@ -1,8 +1,7 @@
1$NetBSD: distinfo,v 1.2 2006/11/19 23:13:42 rillig Exp $ 1$NetBSD: distinfo,v 1.3 2010/12/05 10:01:52 wiz Exp $
2 2
3SHA1 (opencv-1.0.0.tar.gz) = c7dd500703b0060cedfa049fcb33de0846e631fb 3SHA1 (OpenCV-2.1.0.tar.bz2) = 8e2d6b653296364ab2ca0fa5a5e6b0edfca114a7
4RMD160 (opencv-1.0.0.tar.gz) = f041798ea63101b90e945957e0d0ad3f7497dcd4 4RMD160 (OpenCV-2.1.0.tar.bz2) = e31cdbd30e7925e3725f5957616ffc59c58db247
5Size (opencv-1.0.0.tar.gz) = 11146334 bytes 5Size (OpenCV-2.1.0.tar.bz2) = 14459566 bytes
6SHA1 (patch-aa) = 2411f8ccfc2c9b1d5713840bbea939caee1b5bca 6SHA1 (patch-aa) = 63c22048e3027000dd8600e4c6791bbd447a7733
7SHA1 (patch-ab) = 7ece3d9908fa5cda8fc6d0cf81154a2aa899862a 7SHA1 (patch-ab) = 91ddf39e1ab31102771ba571587391c08621e97b
8SHA1 (patch-ac) = b2e20615b2d295991ee7146b937ed43e3192f255 

cvs diff -r1.1.1.1 -r1.2 pkgsrc/graphics/opencv/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/graphics/opencv/patches/Attic/patch-aa 2006/11/09 05:13:41 1.1.1.1
+++ pkgsrc/graphics/opencv/patches/Attic/patch-aa 2010/12/05 10:01:52 1.2
@@ -1,13 +1,17 @@ @@ -1,13 +1,17 @@
1$NetBSD: patch-aa,v 1.1.1.1 2006/11/09 05:13:41 uebayasi Exp $ 1$NetBSD: patch-aa,v 1.2 2010/12/05 10:01:52 wiz Exp $
2 2
3--- docs/Makefile.in.orig 2006-11-04 00:54:54.000000000 +0900 3Avoid linking against non-existent libdl. From upstream, see
4+++ docs/Makefile.in 4https://code.ros.org/trac/opencv/ticket/726
5@@ -224,7 +224,7 @@ target_alias = @target_alias@ 5Already included in repository.
6 target_cpu = @target_cpu@ 6
7 target_os = @target_os@ 7--- CMakeLists.txt.orig 2010-04-06 01:24:37.000000000 +0000
8 target_vendor = @target_vendor@ 8+++ CMakeLists.txt
9-opencvdocdir = $(pkgdatadir)/doc 9@@ -438,7 +438,7 @@ if(UNIX)
10+opencvdocdir = $(datadir)/doc/opencv 10 endif()
11 nobase_dist_opencvdoc_DATA = cvcam.rtf faq.htm index.htm \ 11 endif()
12 license.txt opencv.jpg opencvman_old.pdf \ 12
13 papers/algo_tracking.pdf papers/avbpa99.ps papers/camshift.pdf \ 13- if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
 14+ if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
 15 set(OPENCV_LINKER_LIBS m pthread)
 16 else()
 17 set(OPENCV_LINKER_LIBS dl m pthread rt)

cvs diff -r1.1 -r1.2 pkgsrc/graphics/opencv/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/graphics/opencv/patches/Attic/patch-ab 2006/11/19 23:13:42 1.1
+++ pkgsrc/graphics/opencv/patches/Attic/patch-ab 2010/12/05 10:01:52 1.2
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1$NetBSD: patch-ab,v 1.1 2006/11/19 23:13:42 rillig Exp $ 1$NetBSD: patch-ab,v 1.2 2010/12/05 10:01:52 wiz Exp $
2 2
3Tags: pkgsrc-only 3png-1.4.x compatibility.
 4Already included in upstream repository.
4 5
5--- configure.orig 2006-11-03 16:54:49.000000000 +0100 6--- src/highgui/grfmt_png.cpp.orig 2010-04-06 01:24:44.000000000 +0000
6+++ configure 2006-11-19 23:03:44.000000000 +0100 7+++ src/highgui/grfmt_png.cpp
7@@ -20433,7 +20433,7 @@ else 8@@ -223,7 +223,7 @@ bool PngDecoder::readData( Mat& img )
8 echo "${ECHO_T}no" >&6 9 png_set_palette_to_rgb( png_ptr );
9 fi 
10  10
11- if test x"$PKG_CONFIG" == "xno"; then 11 if( m_color_type == PNG_COLOR_TYPE_GRAY && m_bit_depth < 8 )
12+ if test x"$PKG_CONFIG" = "xno"; then 12- png_set_gray_1_2_4_to_8( png_ptr );
13 { { echo "$as_me:$LINENO: error: You have to install pkg-config to compile OpenCV with GTK+" >&5 13+ png_set_expand_gray_1_2_4_to_8( png_ptr );
14 echo "$as_me: error: You have to install pkg-config to compile OpenCV with GTK+" >&2;} 14
15 { (exit 1); exit 1; }; } 15 if( CV_MAT_CN(m_type) > 1 && color )
 16 png_set_bgr( png_ptr ); // convert RGB to BGR

File Deleted: pkgsrc/graphics/opencv/patches/Attic/patch-ac