Received: by mail.netbsd.org (Postfix, from userid 605) id AF62B84D2A; Mon, 16 Dec 2019 08:24:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 3528F84D20 for ; Mon, 16 Dec 2019 08:24:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id DyPXugSjq-DH for ; Mon, 16 Dec 2019 08:24:39 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id C50C184CE9 for ; Mon, 16 Dec 2019 08:24:39 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id B915AFA97; Mon, 16 Dec 2019 08:24:39 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1576484679236410" MIME-Version: 1.0 Date: Mon, 16 Dec 2019 08:24:39 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/graphics To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20191216082439.B915AFA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1576484679236410 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Mon Dec 16 08:24:39 UTC 2019 Modified Files: pkgsrc/graphics/opencv: Makefile Makefile.common PLIST distinfo pkgsrc/graphics/opencv-contrib-face: Makefile distinfo pkgsrc/graphics/opencv/patches: patch-CMakeLists.txt patch-modules_videoio_src_cap__v4l.cpp Added Files: pkgsrc/graphics/opencv/patches: patch-cmake_OpenCVDetectPython.cmake Removed Files: pkgsrc/graphics/opencv/patches: patch-modules_highgui_src_window__cocoa.mm Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.85 -r1.86 pkgsrc/graphics/opencv/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/opencv/Makefile.common cvs rdiff -u -r1.20 -r1.21 pkgsrc/graphics/opencv/PLIST cvs rdiff -u -r1.42 -r1.43 pkgsrc/graphics/opencv/distinfo cvs rdiff -u -r1.15 -r1.16 pkgsrc/graphics/opencv-contrib-face/Makefile cvs rdiff -u -r1.11 -r1.12 pkgsrc/graphics/opencv-contrib-face/distinfo cvs rdiff -u -r1.7 -r1.8 pkgsrc/graphics/opencv/patches/patch-CMakeLists.txt cvs rdiff -u -r0 -r1.1 \ pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVDetectPython.cmake cvs rdiff -u -r1.1 -r0 \ pkgsrc/graphics/opencv/patches/patch-modules_highgui_src_window__cocoa.mm cvs rdiff -u -r1.5 -r1.6 \ pkgsrc/graphics/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1576484679236410 Content-Disposition: inline Content-Length: 19648 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/opencv/Makefile diff -u pkgsrc/graphics/opencv/Makefile:1.85 pkgsrc/graphics/opencv/Makefile:1.86 --- pkgsrc/graphics/opencv/Makefile:1.85 Sun Jul 21 22:25:02 2019 +++ pkgsrc/graphics/opencv/Makefile Mon Dec 16 08:24:39 2019 @@ -1,6 +1,5 @@ -# $NetBSD: Makefile,v 1.85 2019/07/21 22:25:02 wiz Exp $ +# $NetBSD: Makefile,v 1.86 2019/12/16 08:24:39 adam Exp $ -PKGREVISION= 4 .include "Makefile.common" DISTNAME= opencv-${OPENCV_VERSION} Index: pkgsrc/graphics/opencv/Makefile.common diff -u pkgsrc/graphics/opencv/Makefile.common:1.2 pkgsrc/graphics/opencv/Makefile.common:1.3 --- pkgsrc/graphics/opencv/Makefile.common:1.2 Tue Jul 16 15:36:02 2019 +++ pkgsrc/graphics/opencv/Makefile.common Mon Dec 16 08:24:39 2019 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.common,v 1.2 2019/07/16 15:36:02 nia Exp $ +# $NetBSD: Makefile.common,v 1.3 2019/12/16 08:24:39 adam Exp $ # used by graphics/opencv/Makefile # used by graphics/opencv-contrib-face/Makefile -OPENCV_VERSION= 3.4.6 +OPENCV_VERSION= 3.4.8 CATEGORIES= graphics devel MASTER_SITES= ${MASTER_SITE_GITHUB:=opencv/} @@ -16,21 +16,21 @@ USE_CMAKE= yes USE_LANGUAGES= c c++11 USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake pkg-config - CONFIGURE_DIRS+= build -CMAKE_ARG_PATH= ${WRKSRC} +CONFIGURE_ENV+= MACHINE_ARCH=${MACHINE_ARCH} +CMAKE_ARG_PATH= ${WRKSRC} CMAKE_ARGS+= -DBUILD_PROTOBUF=OFF CMAKE_ARGS+= -DCV_ENABLE_INTRINSICS=OFF # XXX: problematic +CMAKE_ARGS+= -DENABLE_CCACHE=OFF CMAKE_ARGS+= -DOPENCV_GENERATE_SETUPVARS=OFF CMAKE_ARGS+= -DPROTOBUF_UPDATE_FILES=ON -CMAKE_ARGS+= -DPYTHON_EXECUTABLE:FILEPATH=${PYTHONBIN} CMAKE_ARGS+= -DWITH_EIGEN=OFF CMAKE_ARGS+= -DZLIB_ROOT=${BUILDLINK_PREFIX.zlib} CMAKE_ARGS.SunOS+= -DENABLE_PRECOMPILED_HEADERS=OFF CMAKE_ARGS.SunOS+= -DOPENCV_PYTHON_SKIP_LINKER_EXCLUDE_LIBS=ON -CONFIGURE_ENV+= MACHINE_ARCH=${MACHINE_ARCH} +PYTHON_VERSIONS_INCOMPATIBLE= 27 # avoid Python 2.7 pre-configure: ${MKDIR} ${WRKSRC}/build Index: pkgsrc/graphics/opencv/PLIST diff -u pkgsrc/graphics/opencv/PLIST:1.20 pkgsrc/graphics/opencv/PLIST:1.21 --- pkgsrc/graphics/opencv/PLIST:1.20 Wed Apr 24 19:34:44 2019 +++ pkgsrc/graphics/opencv/PLIST Mon Dec 16 08:24:39 2019 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.20 2019/04/24 19:34:44 adam Exp $ +@comment $NetBSD: PLIST,v 1.21 2019/12/16 08:24:39 adam Exp $ bin/opencv_annotation bin/opencv_createsamples bin/opencv_interactive-calibration @@ -21,6 +21,7 @@ include/opencv2/calib3d/calib3d.hpp include/opencv2/calib3d/calib3d_c.h include/opencv2/core.hpp include/opencv2/core/affine.hpp +include/opencv2/core/async.hpp include/opencv2/core/base.hpp include/opencv2/core/bindings_utils.hpp include/opencv2/core/bufferpool.hpp @@ -66,6 +67,8 @@ include/opencv2/core/cv_cpu_helper.h include/opencv2/core/cvdef.h include/opencv2/core/cvstd.hpp include/opencv2/core/cvstd.inl.hpp +include/opencv2/core/detail/async_promise.hpp +include/opencv2/core/detail/exception_ptr.hpp include/opencv2/core/directx.hpp include/opencv2/core/eigen.hpp include/opencv2/core/fast_math.hpp @@ -73,12 +76,16 @@ include/opencv2/core/hal/hal.hpp include/opencv2/core/hal/interface.h include/opencv2/core/hal/intrin.hpp include/opencv2/core/hal/intrin_avx.hpp +include/opencv2/core/hal/intrin_avx512.hpp include/opencv2/core/hal/intrin_cpp.hpp include/opencv2/core/hal/intrin_forward.hpp +include/opencv2/core/hal/intrin_msa.hpp include/opencv2/core/hal/intrin_neon.hpp include/opencv2/core/hal/intrin_sse.hpp include/opencv2/core/hal/intrin_sse_em.hpp include/opencv2/core/hal/intrin_vsx.hpp +include/opencv2/core/hal/intrin_wasm.hpp +include/opencv2/core/hal/msa_macros.h include/opencv2/core/ippasync.hpp include/opencv2/core/mat.hpp include/opencv2/core/mat.inl.hpp @@ -111,12 +118,15 @@ include/opencv2/core/ovx.hpp include/opencv2/core/persistence.hpp include/opencv2/core/ptr.inl.hpp include/opencv2/core/saturate.hpp +include/opencv2/core/simd_intrinsics.hpp include/opencv2/core/softfloat.hpp include/opencv2/core/sse_utils.hpp include/opencv2/core/traits.hpp include/opencv2/core/types.hpp include/opencv2/core/types_c.h include/opencv2/core/utility.hpp +include/opencv2/core/utils/allocator_stats.hpp +include/opencv2/core/utils/allocator_stats.impl.hpp include/opencv2/core/utils/filesystem.hpp include/opencv2/core/utils/logger.defines.hpp include/opencv2/core/utils/logger.hpp @@ -335,5 +345,5 @@ share/OpenCV/lbpcascades/lbpcascade_prof share/OpenCV/lbpcascades/lbpcascade_silverware.xml share/OpenCV/valgrind.supp share/OpenCV/valgrind_3rdparty.supp -@pkgdir share/doc/opencv/ref/pics @pkgdir share/doc/opencv/papers +@pkgdir share/doc/opencv/ref/pics Index: pkgsrc/graphics/opencv/distinfo diff -u pkgsrc/graphics/opencv/distinfo:1.42 pkgsrc/graphics/opencv/distinfo:1.43 --- pkgsrc/graphics/opencv/distinfo:1.42 Mon Apr 29 06:59:17 2019 +++ pkgsrc/graphics/opencv/distinfo Mon Dec 16 08:24:39 2019 @@ -1,18 +1,18 @@ -$NetBSD: distinfo,v 1.42 2019/04/29 06:59:17 wiz Exp $ +$NetBSD: distinfo,v 1.43 2019/12/16 08:24:39 adam Exp $ -SHA1 (opencv-3.4.6.tar.gz) = c445fe9f0a07a95837d2f39c0637da71158129c5 -RMD160 (opencv-3.4.6.tar.gz) = 9fba797c535a7c4366cbf8018ee61ccd396b6c51 -SHA512 (opencv-3.4.6.tar.gz) = 86870788cbe36062b8fdb359d516714df887b0bb894d82bc65d33f7c5e8435371908cf21cee57137a60334187c74f4dabd358a20e9f13bbb36308acec51260cc -Size (opencv-3.4.6.tar.gz) = 88174475 bytes +SHA1 (opencv-3.4.8.tar.gz) = ae032936ddbfecca7fbe6cd307d942604f26d403 +RMD160 (opencv-3.4.8.tar.gz) = 40652271f410d9d48904a7df428465296f71d874 +SHA512 (opencv-3.4.8.tar.gz) = 6c2dfa88e9a93747397f80e6a3dd7eed126bc14efe6c0ec5b064d10bc49f24fc6fb187029f3ac6f5d9f5c16465b96ba55e5d5cacc3584dce69e10567df423ccb +Size (opencv-3.4.8.tar.gz) = 87343996 bytes SHA1 (patch-3rdparty_ippicv_ippicv.cmake) = 14ce5de382084793ace32f43c6dfaf01f7ffb390 SHA1 (patch-3rdparty_protobuf_src_google_protobuf_message__lite.cc) = f1b77384ea8110d2bf3a30ff3fe9f2fa39608caf -SHA1 (patch-CMakeLists.txt) = d7b434783aca4d0999c6d888eb8e160142a3aa1b +SHA1 (patch-CMakeLists.txt) = 43fac541d6445186e335cb74c95d9e1c05749edd SHA1 (patch-cmake_OpenCVDetectCXXCompiler.cmake) = 221b0551d0f29d7e79afe3da8a33b1b3a4f7bf20 +SHA1 (patch-cmake_OpenCVDetectPython.cmake) = 4f3bfe574edf083ebc7e78d347355c58461b2c6b SHA1 (patch-modules_core_include_opencv2_core_types_c.h) = 75444e65677be99af8167f9060419d7970a7adaa SHA1 (patch-modules_core_src_downhill__simplex.cpp) = 1ad7c2fa126d15050b87785e8eec20dbe796b471 SHA1 (patch-modules_core_src_system.cpp) = 3b7ac545585a430d28c7077f360357079f127580 SHA1 (patch-modules_dnn_test__precomp.hpp) = 9bf15d32394f36b92e5fc5d57fd576b3860233ae SHA1 (patch-modules_flann_include_opencv2_flann_defines.h) = ab848e67c4e03219670598ac2d21071a617a5c33 -SHA1 (patch-modules_highgui_src_window__cocoa.mm) = 03a35cdbb32f40f7a234c406ddf0e4991873ae37 SHA1 (patch-modules_ts_src_ts.cpp) = b9a3992014b02dbd89d46375a2476385e91dc24c -SHA1 (patch-modules_videoio_src_cap__v4l.cpp) = 20e572d04a15b08180ad7d6671ab3d124b73b748 +SHA1 (patch-modules_videoio_src_cap__v4l.cpp) = 8e935a6d8128aaf536a9a431dc8b8a7ea58ae43d Index: pkgsrc/graphics/opencv-contrib-face/Makefile diff -u pkgsrc/graphics/opencv-contrib-face/Makefile:1.15 pkgsrc/graphics/opencv-contrib-face/Makefile:1.16 --- pkgsrc/graphics/opencv-contrib-face/Makefile:1.15 Thu Apr 25 07:32:59 2019 +++ pkgsrc/graphics/opencv-contrib-face/Makefile Mon Dec 16 08:24:39 2019 @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.15 2019/04/25 07:32:59 maya Exp $ +# $NetBSD: Makefile,v 1.16 2019/12/16 08:24:39 adam Exp $ .include "../../graphics/opencv/Makefile.common" DISTNAME= opencv_contrib-${OPENCV_VERSION} PKGNAME= ${DISTNAME:S/_contrib/-contrib-face/} -PKGREVISION= 1 GITHUB_PROJECT= opencv_contrib MAINTAINER= markd@NetBSD.org Index: pkgsrc/graphics/opencv-contrib-face/distinfo diff -u pkgsrc/graphics/opencv-contrib-face/distinfo:1.11 pkgsrc/graphics/opencv-contrib-face/distinfo:1.12 --- pkgsrc/graphics/opencv-contrib-face/distinfo:1.11 Thu May 2 08:58:01 2019 +++ pkgsrc/graphics/opencv-contrib-face/distinfo Mon Dec 16 08:24:39 2019 @@ -1,22 +1,21 @@ -$NetBSD: distinfo,v 1.11 2019/05/02 08:58:01 wiz Exp $ +$NetBSD: distinfo,v 1.12 2019/12/16 08:24:39 adam Exp $ -SHA1 (opencv-3.4.6.tar.gz) = c445fe9f0a07a95837d2f39c0637da71158129c5 -RMD160 (opencv-3.4.6.tar.gz) = 9fba797c535a7c4366cbf8018ee61ccd396b6c51 -SHA512 (opencv-3.4.6.tar.gz) = 86870788cbe36062b8fdb359d516714df887b0bb894d82bc65d33f7c5e8435371908cf21cee57137a60334187c74f4dabd358a20e9f13bbb36308acec51260cc -Size (opencv-3.4.6.tar.gz) = 88174475 bytes -SHA1 (opencv_contrib-3.4.6.tar.gz) = f87e11ac00550529853f19871429d062ef446c35 -RMD160 (opencv_contrib-3.4.6.tar.gz) = 2702fa3c9b17316441bc2a7b45d14641de680013 -SHA512 (opencv_contrib-3.4.6.tar.gz) = 27e9edeed2c995fcf2bd4a1f9226911f6bca2761d0ca615723eb851bb3fd5b46b7b55531db65d12593886e2484beb4ec7c8b2efaae2638c8427913cb9f3e0cb9 -Size (opencv_contrib-3.4.6.tar.gz) = 57262438 bytes +SHA1 (opencv-3.4.8.tar.gz) = ae032936ddbfecca7fbe6cd307d942604f26d403 +RMD160 (opencv-3.4.8.tar.gz) = 40652271f410d9d48904a7df428465296f71d874 +SHA512 (opencv-3.4.8.tar.gz) = 6c2dfa88e9a93747397f80e6a3dd7eed126bc14efe6c0ec5b064d10bc49f24fc6fb187029f3ac6f5d9f5c16465b96ba55e5d5cacc3584dce69e10567df423ccb +Size (opencv-3.4.8.tar.gz) = 87343996 bytes +SHA1 (opencv_contrib-3.4.8.tar.gz) = 4bbae66b0e75077a1a4d2e9b887aa78cb7ba386f +RMD160 (opencv_contrib-3.4.8.tar.gz) = 9e4c29c1e4df283288ea91ad5630822e5f60ca70 +SHA512 (opencv_contrib-3.4.8.tar.gz) = dcb8fbbe87f46739540989b49167c8663963656a935fb4e42785d00f2d95b85288aae6f4024c27322fb0589c9700cf99cadcaa710228c335097b2d5914f7c7fb +Size (opencv_contrib-3.4.8.tar.gz) = 57305269 bytes SHA1 (patch-3rdparty_ippicv_ippicv.cmake) = 14ce5de382084793ace32f43c6dfaf01f7ffb390 SHA1 (patch-3rdparty_protobuf_src_google_protobuf_message__lite.cc) = f1b77384ea8110d2bf3a30ff3fe9f2fa39608caf -SHA1 (patch-CMakeLists.txt) = d7b434783aca4d0999c6d888eb8e160142a3aa1b +SHA1 (patch-CMakeLists.txt) = 43fac541d6445186e335cb74c95d9e1c05749edd SHA1 (patch-cmake_OpenCVDetectCXXCompiler.cmake) = 221b0551d0f29d7e79afe3da8a33b1b3a4f7bf20 SHA1 (patch-modules_core_include_opencv2_core_types_c.h) = 75444e65677be99af8167f9060419d7970a7adaa SHA1 (patch-modules_core_src_downhill__simplex.cpp) = 1ad7c2fa126d15050b87785e8eec20dbe796b471 SHA1 (patch-modules_core_src_system.cpp) = 3b7ac545585a430d28c7077f360357079f127580 SHA1 (patch-modules_dnn_test__precomp.hpp) = 9bf15d32394f36b92e5fc5d57fd576b3860233ae SHA1 (patch-modules_flann_include_opencv2_flann_defines.h) = ab848e67c4e03219670598ac2d21071a617a5c33 -SHA1 (patch-modules_highgui_src_window__cocoa.mm) = 03a35cdbb32f40f7a234c406ddf0e4991873ae37 SHA1 (patch-modules_ts_src_ts.cpp) = b9a3992014b02dbd89d46375a2476385e91dc24c -SHA1 (patch-modules_videoio_src_cap__v4l.cpp) = 20e572d04a15b08180ad7d6671ab3d124b73b748 +SHA1 (patch-modules_videoio_src_cap__v4l.cpp) = 8e935a6d8128aaf536a9a431dc8b8a7ea58ae43d Index: pkgsrc/graphics/opencv/patches/patch-CMakeLists.txt diff -u pkgsrc/graphics/opencv/patches/patch-CMakeLists.txt:1.7 pkgsrc/graphics/opencv/patches/patch-CMakeLists.txt:1.8 --- pkgsrc/graphics/opencv/patches/patch-CMakeLists.txt:1.7 Wed Apr 24 19:34:45 2019 +++ pkgsrc/graphics/opencv/patches/patch-CMakeLists.txt Mon Dec 16 08:24:39 2019 @@ -1,10 +1,10 @@ -$NetBSD: patch-CMakeLists.txt,v 1.7 2019/04/24 19:34:45 adam Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.8 2019/12/16 08:24:39 adam Exp $ Do not build third party libraries on Darwin. ---- CMakeLists.txt.orig 2019-04-24 11:18:07.000000000 +0000 +--- CMakeLists.txt.orig 2019-10-09 11:42:29.000000000 +0000 +++ CMakeLists.txt -@@ -211,13 +211,13 @@ OCV_OPTION(OPENCV_ENABLE_NONFREE "Enable +@@ -201,13 +201,13 @@ OCV_OPTION(OPENCV_ENABLE_NONFREE "Enable # 3rd party libs OCV_OPTION(OPENCV_FORCE_3RDPARTY_BUILD "Force using 3rdparty code from source" OFF) @@ -24,4 +24,4 @@ Do not build third party libraries on Da +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" (NOT MINGW OR OPENCV_FORCE_3RDPARTY_BUILD) IF (X86_64 OR X86) AND NOT WINRT AND NOT APPLE_FRAMEWORK ) + OCV_OPTION(BUILD_ITT "Build Intel ITT from source" Index: pkgsrc/graphics/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp diff -u pkgsrc/graphics/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp:1.5 pkgsrc/graphics/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp:1.6 --- pkgsrc/graphics/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp:1.5 Wed Apr 24 19:34:45 2019 +++ pkgsrc/graphics/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp Mon Dec 16 08:24:39 2019 @@ -1,8 +1,8 @@ -$NetBSD: patch-modules_videoio_src_cap__v4l.cpp,v 1.5 2019/04/24 19:34:45 adam Exp $ +$NetBSD: patch-modules_videoio_src_cap__v4l.cpp,v 1.6 2019/12/16 08:24:39 adam Exp $ Conditionalize settings not available in NetBSD's v4l2 emulation. ---- modules/videoio/src/cap_v4l.cpp.orig 2019-04-06 21:43:23.000000000 +0000 +--- modules/videoio/src/cap_v4l.cpp.orig 2019-10-09 11:42:29.000000000 +0000 +++ modules/videoio/src/cap_v4l.cpp @@ -218,6 +218,7 @@ make & enjoy! #include @@ -12,7 +12,7 @@ Conditionalize settings not available in #include #include -@@ -239,17 +240,21 @@ make & enjoy! +@@ -239,24 +240,30 @@ make & enjoy! #endif // https://github.com/opencv/opencv/issues/13335 @@ -32,9 +32,18 @@ Conditionalize settings not available in #endif +#endif - /* Defaults - If your board can do better, set it here. Set for the most common type inputs. */ - #define DEFAULT_V4L_WIDTH 640 -@@ -482,13 +487,17 @@ bool CvCaptureCAM_V4L::autosetup_capture + #ifndef V4L2_CID_ROTATE + #define V4L2_CID_ROTATE (V4L2_CID_BASE+34) + #endif ++#ifdef V4L2_CID_CAMERA_CLASS_BASE + #ifndef V4L2_CID_IRIS_ABSOLUTE + #define V4L2_CID_IRIS_ABSOLUTE (V4L2_CID_CAMERA_CLASS_BASE+17) + #endif ++#endif + + #ifndef V4L2_PIX_FMT_Y10 + #define V4L2_PIX_FMT_Y10 v4l2_fourcc('Y', '1', '0', ' ') +@@ -493,13 +500,17 @@ bool CvCaptureCAM_V4L::autosetup_capture V4L2_PIX_FMT_NV12, V4L2_PIX_FMT_NV21, V4L2_PIX_FMT_SBGGR8, @@ -49,10 +58,10 @@ Conditionalize settings not available in +#ifdef V4L2_PIX_FMT_Y16 V4L2_PIX_FMT_Y16, +#endif - V4L2_PIX_FMT_GREY + V4L2_PIX_FMT_Y10, + V4L2_PIX_FMT_GREY, }; - -@@ -533,9 +542,13 @@ bool CvCaptureCAM_V4L::convertableToRgb( +@@ -545,9 +556,13 @@ bool CvCaptureCAM_V4L::convertableToRgb( case V4L2_PIX_FMT_UYVY: case V4L2_PIX_FMT_SBGGR8: case V4L2_PIX_FMT_SN9C10X: @@ -63,22 +72,20 @@ Conditionalize settings not available in +#ifdef V4L2_PIX_FMT_Y16 case V4L2_PIX_FMT_Y16: +#endif + case V4L2_PIX_FMT_Y10: case V4L2_PIX_FMT_GREY: case V4L2_PIX_FMT_BGR24: - return true; -@@ -569,9 +582,11 @@ void CvCaptureCAM_V4L::v4l2_create_frame +@@ -582,7 +597,9 @@ void CvCaptureCAM_V4L::v4l2_create_frame channels = 1; size.height = size.height * 3 / 2; // "1.5" channels break; +#ifdef V4L2_PIX_FMT_Y16 case V4L2_PIX_FMT_Y16: ++#endif + case V4L2_PIX_FMT_Y10: depth = IPL_DEPTH_16U; /* fallthru */ -+#endif - case V4L2_PIX_FMT_GREY: - channels = 1; - break; -@@ -1395,11 +1410,13 @@ void CvCaptureCAM_V4L::convertToRgb(cons +@@ -1408,11 +1425,13 @@ void CvCaptureCAM_V4L::convertToRgb(cons (unsigned char*)buffers[MAX_V4L_BUFFERS].start, (unsigned char*)frame.imageData); return; @@ -92,7 +99,7 @@ Conditionalize settings not available in default: break; } -@@ -1437,6 +1454,7 @@ void CvCaptureCAM_V4L::convertToRgb(cons +@@ -1450,6 +1469,7 @@ void CvCaptureCAM_V4L::convertToRgb(cons case V4L2_PIX_FMT_RGB24: cv::cvtColor(cv::Mat(imageSize, CV_8UC3, currentBuffer.start), destination, COLOR_RGB2BGR); return; @@ -100,7 +107,7 @@ Conditionalize settings not available in case V4L2_PIX_FMT_Y16: { cv::Mat temp(imageSize, CV_8UC1, buffers[MAX_V4L_BUFFERS].start); -@@ -1444,6 +1462,7 @@ void CvCaptureCAM_V4L::convertToRgb(cons +@@ -1464,6 +1484,7 @@ void CvCaptureCAM_V4L::convertToRgb(cons cv::cvtColor(temp, destination, COLOR_GRAY2BGR); return; } @@ -108,7 +115,7 @@ Conditionalize settings not available in case V4L2_PIX_FMT_GREY: cv::cvtColor(cv::Mat(imageSize, CV_8UC1, currentBuffer.start), destination, COLOR_GRAY2BGR); break; -@@ -1556,8 +1575,10 @@ static inline int capPropertyToV4L2(int +@@ -1576,8 +1597,10 @@ static inline int capPropertyToV4L2(int return -1; case cv::CAP_PROP_FOURCC: return -1; @@ -119,7 +126,7 @@ Conditionalize settings not available in case cv::CAP_PROP_FORMAT: return -1; case cv::CAP_PROP_MODE: -@@ -1572,8 +1593,10 @@ static inline int capPropertyToV4L2(int +@@ -1592,8 +1615,10 @@ static inline int capPropertyToV4L2(int return V4L2_CID_HUE; case cv::CAP_PROP_GAIN: return V4L2_CID_GAIN; @@ -130,7 +137,7 @@ Conditionalize settings not available in case cv::CAP_PROP_CONVERT_RGB: return -1; case cv::CAP_PROP_WHITE_BALANCE_BLUE_U: -@@ -1584,8 +1607,10 @@ static inline int capPropertyToV4L2(int +@@ -1604,8 +1629,10 @@ static inline int capPropertyToV4L2(int return -1; case cv::CAP_PROP_SHARPNESS: return V4L2_CID_SHARPNESS; @@ -141,7 +148,7 @@ Conditionalize settings not available in case cv::CAP_PROP_GAMMA: return V4L2_CID_GAMMA; case cv::CAP_PROP_TEMPERATURE: -@@ -1596,34 +1621,54 @@ static inline int capPropertyToV4L2(int +@@ -1616,34 +1643,54 @@ static inline int capPropertyToV4L2(int return -1; case cv::CAP_PROP_WHITE_BALANCE_RED_V: return V4L2_CID_RED_BALANCE; Added files: Index: pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVDetectPython.cmake diff -u /dev/null pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVDetectPython.cmake:1.1 --- /dev/null Mon Dec 16 08:24:39 2019 +++ pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVDetectPython.cmake Mon Dec 16 08:24:39 2019 @@ -0,0 +1,20 @@ +$NetBSD: patch-cmake_OpenCVDetectPython.cmake,v 1.1 2019/12/16 08:24:39 adam Exp $ + +Do not look for Python 2.x. + +--- cmake/OpenCVDetectPython.cmake.orig 2019-12-16 06:04:25.000000000 +0000 ++++ cmake/OpenCVDetectPython.cmake +@@ -268,13 +268,6 @@ if(OPENCV_PYTHON_SKIP_DETECTION) + return() + endif() + +-find_python("" "${MIN_VER_PYTHON2}" PYTHON2_LIBRARY PYTHON2_INCLUDE_DIR +- PYTHON2INTERP_FOUND PYTHON2_EXECUTABLE PYTHON2_VERSION_STRING +- PYTHON2_VERSION_MAJOR PYTHON2_VERSION_MINOR PYTHON2LIBS_FOUND +- PYTHON2LIBS_VERSION_STRING PYTHON2_LIBRARIES PYTHON2_LIBRARY +- PYTHON2_DEBUG_LIBRARIES PYTHON2_LIBRARY_DEBUG PYTHON2_INCLUDE_PATH +- PYTHON2_INCLUDE_DIR PYTHON2_INCLUDE_DIR2 PYTHON2_PACKAGES_PATH +- PYTHON2_NUMPY_INCLUDE_DIRS PYTHON2_NUMPY_VERSION) + + option(OPENCV_PYTHON3_VERSION "Python3 version" "") + find_python("${OPENCV_PYTHON3_VERSION}" "${MIN_VER_PYTHON3}" PYTHON3_LIBRARY PYTHON3_INCLUDE_DIR --_----------=_1576484679236410--