head 1.11; access; symbols pkgsrc-2024Q4:1.10.0.10 pkgsrc-2024Q4-base:1.10 pkgsrc-2024Q3:1.10.0.8 pkgsrc-2024Q3-base:1.10 pkgsrc-2024Q2:1.10.0.6 pkgsrc-2024Q2-base:1.10 pkgsrc-2024Q1:1.10.0.4 pkgsrc-2024Q1-base:1.10 pkgsrc-2023Q4:1.10.0.2 pkgsrc-2023Q4-base:1.10 pkgsrc-2023Q3:1.9.0.30 pkgsrc-2023Q3-base:1.9 pkgsrc-2023Q2:1.9.0.28 pkgsrc-2023Q2-base:1.9 pkgsrc-2023Q1:1.9.0.26 pkgsrc-2023Q1-base:1.9 pkgsrc-2022Q4:1.9.0.24 pkgsrc-2022Q4-base:1.9 pkgsrc-2022Q3:1.9.0.22 pkgsrc-2022Q3-base:1.9 pkgsrc-2022Q2:1.9.0.20 pkgsrc-2022Q2-base:1.9 pkgsrc-2022Q1:1.9.0.18 pkgsrc-2022Q1-base:1.9 pkgsrc-2021Q4:1.9.0.16 pkgsrc-2021Q4-base:1.9 pkgsrc-2021Q3:1.9.0.14 pkgsrc-2021Q3-base:1.9 pkgsrc-2021Q2:1.9.0.12 pkgsrc-2021Q2-base:1.9 pkgsrc-2021Q1:1.9.0.10 pkgsrc-2021Q1-base:1.9 pkgsrc-2020Q4:1.9.0.8 pkgsrc-2020Q4-base:1.9 pkgsrc-2020Q3:1.9.0.6 pkgsrc-2020Q3-base:1.9 pkgsrc-2020Q2:1.9.0.4 pkgsrc-2020Q2-base:1.9 pkgsrc-2020Q1:1.9.0.2 pkgsrc-2020Q1-base:1.9 pkgsrc-2019Q4:1.8.0.4 pkgsrc-2019Q4-base:1.8 pkgsrc-2019Q3:1.7.0.4 pkgsrc-2019Q3-base:1.7 pkgsrc-2019Q2:1.7.0.2 pkgsrc-2019Q2-base:1.7 pkgsrc-2013Q2:1.6.0.4 pkgsrc-2013Q2-base:1.6 pkgsrc-2012Q4:1.6.0.2 pkgsrc-2012Q4-base:1.6 pkgsrc-2012Q2:1.5.0.2 pkgsrc-2012Q2-base:1.5 pkgsrc-2012Q1:1.2.0.2 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.1.0.2 pkgsrc-2011Q4-base:1.1; locks; strict; comment @# @; 1.11 date 2025.02.07.21.54.16; author wiz; state dead; branches; next 1.10; commitid RS8OGY8QeR4wlAIF; 1.10 date 2023.12.22.07.35.07; author thor; state Exp; branches; next 1.9; commitid RcajIgvK2sg8QqRE; 1.9 date 2019.12.29.10.00.08; author markd; state Exp; branches; next 1.8; commitid LiNZOlcY3GRhnAQB; 1.8 date 2019.12.16.08.24.39; author adam; state Exp; branches; next 1.7; commitid QXHthrrxK9IwiUOB; 1.7 date 2019.04.24.19.34.45; author adam; state Exp; branches; next 1.6; commitid ufHYOOmjLekzADkB; 1.6 date 2012.07.13.18.13.59; author prlw1; state dead; branches; next 1.5; 1.5 date 2012.06.01.21.24.57; author wiz; state Exp; branches; next 1.4; 1.4 date 2012.06.01.20.53.56; author wiz; state Exp; branches; next 1.3; 1.3 date 2012.04.15.03.49.00; author markd; state Exp; branches; next 1.2; 1.2 date 2012.04.03.18.57.22; author adam; state Exp; branches; next 1.1; 1.1 date 2011.12.14.18.27.22; author marino; state Exp; branches; next ; desc @@ 1.11 log @opencv: update to 4.11.0. This is the new major version under the Apache 2 license. Too many changes to list, no concise summary found. Details at: https://github.com/opencv/opencv/wiki/OpenCV-Change-Logs-v2.2%E2%80%90v4.10 https://github.com/opencv/opencv/wiki/OpenCV-Change-Logs#version4110 @ text @$NetBSD: patch-CMakeLists.txt,v 1.10 2023/12/22 07:35:07 thor Exp $ Don't add to CMAKE_LIBRARY_PATH, may cause other versions of packages to be found in preference to pkgsrc ones. Do not build third party libraries on Darwin. --- CMakeLists.txt.orig 2021-12-24 16:39:15.000000000 +0000 +++ CMakeLists.txt @@@@ -169,34 +169,6 @@@@ OCV_OPTION(ENABLE_CXX11 "Enable C++11 co include(cmake/OpenCVDetectCXXCompiler.cmake) ocv_cmake_hook(POST_DETECT_COMPILER) -# Add these standard paths to the search paths for FIND_LIBRARY -# to find libraries from these locations first -if(UNIX AND NOT ANDROID) - if(X86_64 OR CMAKE_SIZEOF_VOID_P EQUAL 8) - if(EXISTS /lib64) - list(APPEND CMAKE_LIBRARY_PATH /lib64) - else() - list(APPEND CMAKE_LIBRARY_PATH /lib) - endif() - if(EXISTS /usr/lib64) - list(APPEND CMAKE_LIBRARY_PATH /usr/lib64) - else() - list(APPEND CMAKE_LIBRARY_PATH /usr/lib) - endif() - elseif(X86 OR CMAKE_SIZEOF_VOID_P EQUAL 4) - if(EXISTS /lib32) - list(APPEND CMAKE_LIBRARY_PATH /lib32) - else() - list(APPEND CMAKE_LIBRARY_PATH /lib) - endif() - if(EXISTS /usr/lib32) - list(APPEND CMAKE_LIBRARY_PATH /usr/lib32) - else() - list(APPEND CMAKE_LIBRARY_PATH /usr/lib) - endif() - endif() -endif() - # Add these standard paths to the search paths for FIND_PATH # to find include files from these locations first if(MINGW) @@@@ -219,13 +191,13 @@@@ OCV_OPTION(OPENCV_ENABLE_NONFREE "Enable # 3rd party libs OCV_OPTION(OPENCV_FORCE_3RDPARTY_BUILD "Force using 3rdparty code from source" OFF) -OCV_OPTION(BUILD_ZLIB "Build zlib from source" (WIN32 OR APPLE OR OPENCV_FORCE_3RDPARTY_BUILD) ) -OCV_OPTION(BUILD_TIFF "Build libtiff from source" (WIN32 OR ANDROID OR APPLE OR OPENCV_FORCE_3RDPARTY_BUILD) ) -OCV_OPTION(BUILD_JASPER "Build libjasper from source" (WIN32 OR ANDROID OR APPLE OR OPENCV_FORCE_3RDPARTY_BUILD) ) -OCV_OPTION(BUILD_JPEG "Build libjpeg from source" (WIN32 OR ANDROID OR APPLE OR OPENCV_FORCE_3RDPARTY_BUILD) ) -OCV_OPTION(BUILD_PNG "Build libpng from source" (WIN32 OR ANDROID OR APPLE OR OPENCV_FORCE_3RDPARTY_BUILD) ) +OCV_OPTION(BUILD_ZLIB "Build zlib from source" (WIN32 OR OPENCV_FORCE_3RDPARTY_BUILD) ) +OCV_OPTION(BUILD_TIFF "Build libtiff from source" (WIN32 OR ANDROID OR OPENCV_FORCE_3RDPARTY_BUILD) ) +OCV_OPTION(BUILD_JASPER "Build libjasper from source" (WIN32 OR ANDROID OR OPENCV_FORCE_3RDPARTY_BUILD) ) +OCV_OPTION(BUILD_JPEG "Build libjpeg from source" (WIN32 OR ANDROID OR OPENCV_FORCE_3RDPARTY_BUILD) ) +OCV_OPTION(BUILD_PNG "Build libpng from source" (WIN32 OR ANDROID OR OPENCV_FORCE_3RDPARTY_BUILD) ) OCV_OPTION(BUILD_OPENEXR "Build openexr from source" (OPENCV_FORCE_3RDPARTY_BUILD) ) -OCV_OPTION(BUILD_WEBP "Build WebP from source" (((WIN32 OR ANDROID OR APPLE) AND NOT WINRT) OR OPENCV_FORCE_3RDPARTY_BUILD) ) +OCV_OPTION(BUILD_WEBP "Build WebP from source" (((WIN32 OR ANDROID) AND NOT WINRT) OR OPENCV_FORCE_3RDPARTY_BUILD) ) OCV_OPTION(BUILD_TBB "Download and build TBB from source" (ANDROID OR OPENCV_FORCE_3RDPARTY_BUILD) ) OCV_OPTION(BUILD_IPP_IW "Build IPP IW from source" (NOT MINGW OR OPENCV_FORCE_3RDPARTY_BUILD) IF (X86_64 OR X86) AND NOT WINRT ) OCV_OPTION(BUILD_ITT "Build Intel ITT from source" @ 1.10 log @opencv: version 3.4.17 with proper explicit BLAS (CBLAS + LAPACKE) usage This does the small bugfix update from 3.4.16 to 3.4.17 and adds proper usage of BLAS stuff. There was linkage to BLAS before via numpy, but the internal explicit BLAS-using code was not built, as the CMake machinery did not find it. This commit drops an actually counterproductive patch and adds pkg-config calls to find the BLAS-related libraries. Note that vor opencv-contrib-face, the BLAS choice during its build doesn't really enter the result, apparently, but the build process does use it and it would not help to confuse matters there. I am not sure if the buildlink3.mk should also add blas.buildlink3.mk now. It does not feature numpy right now. Should it? Next step should be move towards 4.x at least. Upstream: December, 2021 OpenCV 3.4.17 has been released. Bug fixes, optimizations and other enhancements are propagated into OpenCV 4.5.5. Long-lived OpenCV 3.x release series is here since 2015. We are going to reduce support of 3.x branch in the future to move forward to OpenCV 5.0. @ text @d1 1 a1 1 $NetBSD: patch-CMakeLists.txt,v 1.9 2019/12/29 10:00:08 markd Exp $ @ 1.9 log @opencv: switch to ffmpeg4. Don't pick up stray packages. @ text @d1 1 a1 1 $NetBSD: patch-CMakeLists.txt,v 1.8 2019/12/16 08:24:39 adam Exp $ d7 1 a7 1 --- CMakeLists.txt.orig 2019-10-09 11:42:29.000000000 +0000 d9 1 a9 1 @@@@ -151,34 +151,6 @@@@ OCV_OPTION(ENABLE_CXX11 "Enable C++11 co d44 1 a44 1 @@@@ -201,13 +173,13 @@@@ OCV_OPTION(OPENCV_ENABLE_NONFREE "Enable a52 2 -OCV_OPTION(BUILD_OPENEXR "Build openexr from source" (((WIN32 OR ANDROID OR APPLE) AND NOT WINRT) OR OPENCV_FORCE_3RDPARTY_BUILD) ) -OCV_OPTION(BUILD_WEBP "Build WebP from source" (((WIN32 OR ANDROID OR APPLE) AND NOT WINRT) OR OPENCV_FORCE_3RDPARTY_BUILD) ) d58 2 a59 1 +OCV_OPTION(BUILD_OPENEXR "Build openexr from source" (((WIN32 OR ANDROID) AND NOT WINRT) OR OPENCV_FORCE_3RDPARTY_BUILD) ) @ 1.8 log @opencv: updated to 3.4.8 version:3.4.8 OpenCV 3.4.8 has been released. Bug fixes, optimizations and other enhancements are propagated into OpenCV 4.1.2. version:3.4.7 OpenCV 3.4.7 has been released. Bug fixes, optimizations and other enhancements are propagated into OpenCV 4.1.1. @ text @d1 1 a1 1 $NetBSD: patch-CMakeLists.txt,v 1.7 2019/04/24 19:34:45 adam Exp $ d3 2 d9 36 a44 1 @@@@ -201,13 +201,13 @@@@ OCV_OPTION(OPENCV_ENABLE_NONFREE "Enable @ 1.7 log @opencv: updated to 3.4.6 version:3.4.6 OpenCV 3.4.6 has been released. Bug fixes, optimizations and other enhancements are propagated into OpenCV 4.1.0. version:3.4.5 OpenCV 3.4.5 has been released. Bug fixes, optimizations and other enhancements are propagated into OpenCV 4.0.1. version:3.4.4 OpenCV 3.4.4 has been released. This is a mantenance release. New features are landed in OpenCV 4.0. version:3.4.3 OpenCV 3.4.3 has been released, with further extended dnn module, documentation improvements, some other new functionality and bug fixes. version:3.4.2 OpenCV 3.4.2 has been released, with further extended dnn module, documentation improvements, some other new functionality and bug fixes. OpenCV 3.4.x development is switched from "master" to "3.4" branch. "master" branch is used for development of upcoming OpenCV 4.x releases. Bugfixes / optimizations / small improvemets should go into "3.4" branch. We will merge changes from "3.4" into "master" regularly (weekly/bi-weekly). @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 --- CMakeLists.txt.orig 2019-04-24 11:18:07.000000000 +0000 d7 1 a7 1 @@@@ -211,13 +211,13 @@@@ OCV_OPTION(OPENCV_ENABLE_NONFREE "Enable d27 1 a27 1 OCV_OPTION(BUILD_ITT "Build Intel ITT from source" (NOT MINGW OR OPENCV_FORCE_3RDPARTY_BUILD) IF (X86_64 OR X86) AND NOT WINRT AND NOT APPLE_FRAMEWORK ) @ 1.6 log @Update OpenCV to 2.4.2, highlights include: - New keypoint descriptor FREAK contributed by EPFL group - Improved face recognizer class and tutorial added by Philipp Wagner @ text @d1 1 a1 1 $NetBSD: patch-CMakeLists.txt,v 1.5 2012/06/01 21:24:57 wiz Exp $ d3 1 a3 2 Handle DragonFly like NetBSD and FreeBSD. http://code.opencv.org/issues/2010 d5 1 a5 1 --- CMakeLists.txt.orig 2012-05-31 14:06:56.000000000 +0000 d7 21 a27 9 @@@@ -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) @ 1.5 log @Add upstream bug report URLs. @ text @d1 1 a1 1 $NetBSD: patch-CMakeLists.txt,v 1.4 2012/06/01 20:53:56 wiz Exp $ @ 1.4 log @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_" 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_ 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 "/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 d = new BriefDescriptorExtractor; @ text @d1 1 a1 1 $NetBSD: patch-CMakeLists.txt,v 1.3 2012/04/15 03:49:00 markd Exp $ d4 1 @ 1.3 log @Update to 2.3.1 Add a python option (off by default). 2.3.1 (August, 2011) New Functionality and Features * Retina module has been contributed by Alexandre Benoit (in opencv_contrib module). * Planar subdivisions construction (Delaunay triangulation and Voronoi tesselation) have been ported to C++. See the new delaunay2.cpp sample. * Several new Python samples have been added. * FLANN in OpenCV has been upgraded to v1.6. Also, added Python bindings for FLANN. * We now support the latest FFMPEG (0.8.x) that features multi-threaded decoding. Reading videos in OpenCV has never been that fast. * Over 100 issues have been resolved since 2.3 release. 2.3 (July, 2011) Modifications and Improvements since 2.3rc * A few more bugs reported in the OpenCV bug tracker have been fixed. * Documentation has been improved a lot! 2.3rc (June, 2011) New Functionality, Features * Many functions and methods now take InputArray/OutputArray instead of "cv::Mat" references. It retains compatibility with the existing code and yet brings more natural support for STL vectors and potentially other "foreign" data structures to OpenCV. core: * LAPACK is not used by OpenCV anymore. * Arithmetic operations now support mixed-type operands and arbitrary number of channels. features2d: * Completely new patent-free BRIEF and ORB feature descriptors have been added. * Very fast LSH matcher for BRIEF and ORB descriptors will be added in 2.3.1. calib3d: * calibration.cpp sample. With the new pattern calibration accuracy is usually much higher. stitching: * opencv_stitching is a beta version of new application that makes a panorama out of a set of photos taken from the same point. python: * Now there are 2 extension modules: cv and cv2. cv2 includes wrappers for OpenCV 2.x functionality. opencv/samples/python2 contain a few samples demonstrating cv2 in use. * Over 250 issues have been resolved. @ text @d1 1 a1 1 $NetBSD: patch-CMakeLists.txt,v 1.1 2011/12/14 18:27:22 marino Exp $ d3 3 a5 1 --- CMakeLists.txt.orig 2010-12-05 03:35:23.000000000 +0000 d7 9 a15 9 @@@@ -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) @ 1.2 log @Fix building on Mac OS X (PR#46117) @ text @d1 1 a1 3 $NetBSD$ Fix configuring on Mac OS X. d5 9 a13 80 @@@@ -206,7 +206,7 @@@@ set(BUILD_TESTS ON CACHE BOOL "Build tes # Build 3rdparty libraries under unix # =================================================== -if(WIN32 OR APPLE) +if(WIN32) set(OPENCV_BUILD_3RDPARTY_LIBS TRUE CACHE BOOL "Build 3rd party libraries") else() set(OPENCV_BUILD_3RDPARTY_LIBS FALSE CACHE BOOL "Build 3rd party libraries") @@@@ -437,34 +437,7 @@@@ if(UNIX) set(HAVE_CAMV4L2 FALSE) endif() - if(NOT OPENCV_BUILD_3RDPARTY_LIBS) - if(WITH_PNG) - include(FindPNG) - if(PNG_FOUND) - CHECK_INCLUDE_FILE(${PNG_PNG_INCLUDE_DIR}/png.h HAVE_PNG_H) - CHECK_INCLUDE_FILE(${PNG_PNG_INCLUDE_DIR}/libpng/png.h HAVE_LIBPNG_PNG_H) - endif() - else() - set(PNG_FOUND FALSE) - endif() - if(WITH_TIFF) - include(FindTIFF) - else() - set(TIFF_FOUND FALSE) - endif() - if(WITH_JASPER) - include(FindJasper) - else() - set(JASPER_FOUND FALSE) - endif() - if(WITH_JPEG) - include(FindJPEG) - else() - set(JPEG_FOUND FALSE) - endif() - endif() - - if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD") + if(${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) @@@@ -472,6 +445,34 @@@@ if(UNIX) else() add_definitions(-DHAVE_ALLOCA -DHAVE_ALLOCA_H -DHAVE_LIBPTHREAD -DHAVE_UNISTD_H) endif() + + if(NOT OPENCV_BUILD_3RDPARTY_LIBS) + if(WITH_PNG) + include(FindPNG) + if(PNG_FOUND) + CHECK_INCLUDE_FILE(${PNG_PNG_INCLUDE_DIR}/png.h HAVE_PNG_H) + CHECK_INCLUDE_FILE(${PNG_PNG_INCLUDE_DIR}/libpng/png.h HAVE_LIBPNG_PNG_H) + endif() + else() + set(PNG_FOUND FALSE) + endif() + if(WITH_TIFF) + include(FindTIFF) + else() + set(TIFF_FOUND FALSE) + endif() + if(WITH_JASPER) + include(FindJasper) + else() + set(JASPER_FOUND FALSE) + endif() + if(WITH_JPEG) + include(FindJPEG) + else() + set(JPEG_FOUND FALSE) + endif() + endif() + endif() if(WITH_PNG AND NOT PNG_FOUND) @ 1.1 log @graphics/opencv: Add support for DragonFly @ text @d3 2 d7 11 a17 2 @@@@ -464,7 +464,7 @@@@ if(UNIX) endif() d20 27 d52 35 @