Received: by mail.netbsd.org (Postfix, from userid 605) id DC18284D4E; Mon, 4 Sep 2017 15:23:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 6FEEE84D46 for ; Mon, 4 Sep 2017 15:23:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id jCOZZpGNwONp for ; Mon, 4 Sep 2017 15:23:50 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 08BA784CFB for ; Mon, 4 Sep 2017 15:23:50 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 0403DFA97; Mon, 4 Sep 2017 15:23:50 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_150453862978910" MIME-Version: 1.0 Date: Mon, 4 Sep 2017 15:23:49 +0000 From: "Filip Hajny" Subject: CVS commit: pkgsrc/graphics To: pkgsrc-changes@NetBSD.org Reply-To: fhajny@netbsd.org X-Mailer: log_accum Message-Id: <20170904152350.0403DFA97@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. --_----------=_150453862978910 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: fhajny Date: Mon Sep 4 15:23:49 UTC 2017 Modified Files: pkgsrc/graphics/opencv: Makefile PLIST distinfo pkgsrc/graphics/opencv-contrib-face: Makefile PLIST distinfo pkgsrc/graphics/opencv/patches: patch-modules_core_src_parallel__pthreads.cpp patch-modules_videoio_src_cap__v4l.cpp Added Files: pkgsrc/graphics/opencv/patches: patch-3rdparty_ippicv_ippicv.cmake patch-3rdparty_protobuf_src_google_protobuf_message__lite.cc Removed Files: pkgsrc/graphics/opencv/patches: patch-3rdparty_ippicv_downloader.cmake Log Message: Update graphics/opencv to 3.3.0. Sync opencv-contrib-face too. Main changes: - DNN module from opencv_contrib was promoted to the main repository, improved and accelerated it a lot. An external BLAS implementation is not needed anymore. For GPU there is experimental DNN acceleration using Halide (http://halide-lang.org). - OpenCV can now be built as C++ 11 library using the flag ENABLE_CXX11. Some cool features for C++ 11 programmers have been added. - We've also enabled quite a few AVX/AVX2 and SSE4.x optimizations in the default build of OpenCV thanks to the feature called 'dynamic dispatching'. The DNN module also has some AVX/AVX2 optimizations. - Intel Media SDK can now be utilized by our videoio module to do hardware-accelerated video encoding/decoding. MPEG1/2, as well as H.264 are supported. - Embedded into OpenCV Intel IPP subset has been upgraded from 2015.12 to 2017.2 version, resulting in ~15% speed improvement in our core & imgproc perf tests. Full release notes: https://github.com/opencv/opencv/wiki/ChangeLog To generate a diff of this commit: cvs rdiff -u -r1.71 -r1.72 pkgsrc/graphics/opencv/Makefile cvs rdiff -u -r1.17 -r1.18 pkgsrc/graphics/opencv/PLIST cvs rdiff -u -r1.37 -r1.38 pkgsrc/graphics/opencv/distinfo cvs rdiff -u -r1.10 -r1.11 pkgsrc/graphics/opencv-contrib-face/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/opencv-contrib-face/PLIST cvs rdiff -u -r1.6 -r1.7 pkgsrc/graphics/opencv-contrib-face/distinfo cvs rdiff -u -r1.2 -r0 \ pkgsrc/graphics/opencv/patches/patch-3rdparty_ippicv_downloader.cmake cvs rdiff -u -r0 -r1.1 \ pkgsrc/graphics/opencv/patches/patch-3rdparty_ippicv_ippicv.cmake \ pkgsrc/graphics/opencv/patches/patch-3rdparty_protobuf_src_google_protobuf_message__lite.cc cvs rdiff -u -r1.2 -r1.3 \ pkgsrc/graphics/opencv/patches/patch-modules_core_src_parallel__pthreads.cpp \ 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. --_----------=_150453862978910 Content-Disposition: inline Content-Length: 21069 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.71 pkgsrc/graphics/opencv/Makefile:1.72 --- pkgsrc/graphics/opencv/Makefile:1.71 Wed May 3 08:38:43 2017 +++ pkgsrc/graphics/opencv/Makefile Mon Sep 4 15:23:49 2017 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.71 2017/05/03 08:38:43 jperkin Exp $ +# $NetBSD: Makefile,v 1.72 2017/09/04 15:23:49 fhajny Exp $ -DISTNAME= opencv-3.2.0 +DISTNAME= opencv-3.3.0 CATEGORIES= graphics devel MASTER_SITES= ${MASTER_SITE_GITHUB:=opencv/} EXTRACT_SUFX= .zip @@ -19,7 +19,7 @@ INSTALLATION_DIRS+= share/doc/opencv/pap INSTALLATION_DIRS+= share/doc/opencv/ref/pics INSTALLATION_DIRS+= share/OpenCV/haarcascades -PKGCONFIG_OVERRIDE+= unix-install/opencv.pc +PKGCONFIG_OVERRIDE+= build/unix-install/opencv.pc PKGCONFIG_OVERRIDE_STAGE= post-configure PY_PATCHPLIST= yes @@ -40,6 +40,12 @@ CONFIGURE_ENV+= MACHINE_ARCH=${MACHINE_ # jasper uses SIZE_MAX and friends in its headers. CXXFLAGS+= -D__STDC_LIMIT_MACROS +CONFIGURE_DIRS+= build +CMAKE_ARG_PATH= ${WRKSRC} + +pre-configure: + ${MKDIR} -p ${WRKSRC}/build + .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/jasper/buildlink3.mk" .include "../../graphics/libwebp/buildlink3.mk" Index: pkgsrc/graphics/opencv/PLIST diff -u pkgsrc/graphics/opencv/PLIST:1.17 pkgsrc/graphics/opencv/PLIST:1.18 --- pkgsrc/graphics/opencv/PLIST:1.17 Thu Mar 16 21:59:13 2017 +++ pkgsrc/graphics/opencv/PLIST Mon Sep 4 15:23:49 2017 @@ -1,6 +1,7 @@ -@comment $NetBSD: PLIST,v 1.17 2017/03/16 21:59:13 prlw1 Exp $ +@comment $NetBSD: PLIST,v 1.18 2017/09/04 15:23:49 fhajny Exp $ bin/opencv_annotation bin/opencv_createsamples +bin/opencv_interactive-calibration bin/opencv_traincascade bin/opencv_version bin/opencv_visualisation @@ -58,6 +59,8 @@ include/opencv2/core/cuda/warp_reduce.hp include/opencv2/core/cuda/warp_shuffle.hpp include/opencv2/core/cuda_stream_accessor.hpp include/opencv2/core/cuda_types.hpp +include/opencv2/core/cv_cpu_dispatch.h +include/opencv2/core/cv_cpu_helper.h include/opencv2/core/cvdef.h include/opencv2/core/cvstd.hpp include/opencv2/core/cvstd.inl.hpp @@ -82,19 +85,28 @@ include/opencv2/core/operations.hpp include/opencv2/core/optim.hpp include/opencv2/core/ovx.hpp include/opencv2/core/persistence.hpp -include/opencv2/core/private.cuda.hpp -include/opencv2/core/private.hpp include/opencv2/core/ptr.inl.hpp include/opencv2/core/saturate.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/logger.hpp +include/opencv2/core/utils/trace.hpp include/opencv2/core/va_intel.hpp include/opencv2/core/version.hpp include/opencv2/core/wimage.hpp include/opencv2/cvconfig.h +include/opencv2/dnn.hpp +include/opencv2/dnn/all_layers.hpp +include/opencv2/dnn/dict.hpp +include/opencv2/dnn/dnn.hpp +include/opencv2/dnn/dnn.inl.hpp +include/opencv2/dnn/layer.details.hpp +include/opencv2/dnn/layer.hpp +include/opencv2/dnn/shape_utils.hpp include/opencv2/features2d.hpp include/opencv2/features2d/features2d.hpp include/opencv2/flann.hpp @@ -207,52 +219,55 @@ include/opencv2/videostab/ring_buffer.hp include/opencv2/videostab/stabilizer.hpp include/opencv2/videostab/wobble_suppression.hpp lib/libopencv_calib3d.so -lib/libopencv_calib3d.so.3.2 +lib/libopencv_calib3d.so.3.3 lib/libopencv_calib3d.so.${PKGVERSION} lib/libopencv_core.so -lib/libopencv_core.so.3.2 +lib/libopencv_core.so.3.3 lib/libopencv_core.so.${PKGVERSION} +lib/libopencv_dnn.so +lib/libopencv_dnn.so.3.3 +lib/libopencv_dnn.so.${PKGVERSION} lib/libopencv_features2d.so -lib/libopencv_features2d.so.3.2 +lib/libopencv_features2d.so.3.3 lib/libopencv_features2d.so.${PKGVERSION} lib/libopencv_flann.so -lib/libopencv_flann.so.3.2 +lib/libopencv_flann.so.3.3 lib/libopencv_flann.so.${PKGVERSION} lib/libopencv_highgui.so -lib/libopencv_highgui.so.3.2 +lib/libopencv_highgui.so.3.3 lib/libopencv_highgui.so.${PKGVERSION} lib/libopencv_imgcodecs.so -lib/libopencv_imgcodecs.so.3.2 +lib/libopencv_imgcodecs.so.3.3 lib/libopencv_imgcodecs.so.${PKGVERSION} lib/libopencv_imgproc.so -lib/libopencv_imgproc.so.3.2 +lib/libopencv_imgproc.so.3.3 lib/libopencv_imgproc.so.${PKGVERSION} lib/libopencv_ml.so -lib/libopencv_ml.so.3.2 +lib/libopencv_ml.so.3.3 lib/libopencv_ml.so.${PKGVERSION} lib/libopencv_objdetect.so -lib/libopencv_objdetect.so.3.2 +lib/libopencv_objdetect.so.3.3 lib/libopencv_objdetect.so.${PKGVERSION} lib/libopencv_photo.so -lib/libopencv_photo.so.3.2 +lib/libopencv_photo.so.3.3 lib/libopencv_photo.so.${PKGVERSION} lib/libopencv_shape.so -lib/libopencv_shape.so.3.2 +lib/libopencv_shape.so.3.3 lib/libopencv_shape.so.${PKGVERSION} lib/libopencv_stitching.so -lib/libopencv_stitching.so.3.2 +lib/libopencv_stitching.so.3.3 lib/libopencv_stitching.so.${PKGVERSION} lib/libopencv_superres.so -lib/libopencv_superres.so.3.2 +lib/libopencv_superres.so.3.3 lib/libopencv_superres.so.${PKGVERSION} lib/libopencv_video.so -lib/libopencv_video.so.3.2 +lib/libopencv_video.so.3.3 lib/libopencv_video.so.${PKGVERSION} lib/libopencv_videoio.so -lib/libopencv_videoio.so.3.2 +lib/libopencv_videoio.so.3.3 lib/libopencv_videoio.so.${PKGVERSION} lib/libopencv_videostab.so -lib/libopencv_videostab.so.3.2 +lib/libopencv_videostab.so.3.3 lib/libopencv_videostab.so.${PKGVERSION} lib/pkgconfig/opencv.pc ${PYSITELIB}/cv2.so @@ -279,5 +294,10 @@ share/OpenCV/haarcascades/haarcascade_sm share/OpenCV/haarcascades/haarcascade_upperbody.xml share/OpenCV/lbpcascades/lbpcascade_frontalcatface.xml share/OpenCV/lbpcascades/lbpcascade_frontalface.xml +share/OpenCV/lbpcascades/lbpcascade_frontalface_improved.xml share/OpenCV/lbpcascades/lbpcascade_profileface.xml 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 Index: pkgsrc/graphics/opencv/distinfo diff -u pkgsrc/graphics/opencv/distinfo:1.37 pkgsrc/graphics/opencv/distinfo:1.38 --- pkgsrc/graphics/opencv/distinfo:1.37 Thu Mar 16 21:59:13 2017 +++ pkgsrc/graphics/opencv/distinfo Mon Sep 4 15:23:49 2017 @@ -1,15 +1,16 @@ -$NetBSD: distinfo,v 1.37 2017/03/16 21:59:13 prlw1 Exp $ +$NetBSD: distinfo,v 1.38 2017/09/04 15:23:49 fhajny Exp $ -SHA1 (opencv-3.2.0.zip) = 7a7d2eb8cf617f58d610d856e531f3d92b89bc42 -RMD160 (opencv-3.2.0.zip) = 09da1443a5ef3de036b11bf0d1f384da36d459d9 -SHA512 (opencv-3.2.0.zip) = c6418d2a7654fe9d50611e756778df4c6736f2de76b85773efbf490bb475dd95ec1041fe57a87163ce11a7db44430cd378c8416af3319f979ced92532bf5ebb5 -Size (opencv-3.2.0.zip) = 82033498 bytes -SHA1 (patch-3rdparty_ippicv_downloader.cmake) = a0b7c1b52f9ec4f35ff3f846785fbbfec1eeac51 +SHA1 (opencv-3.3.0.zip) = 7ca35eceb3caa2d96b846b682dbcdf1e6fa66904 +RMD160 (opencv-3.3.0.zip) = d2cbf32ff7f62c8064e0ba774baa56fa1b168206 +SHA512 (opencv-3.3.0.zip) = 14430c6225926e5118daccb57c7276d9f9160c90a034b2c73a09b73ac90ba7ebd3ae78cccffb4a10b58bb0e5e16ebd03bf617030fa74cc67d9d18366bf6b4951 +Size (opencv-3.3.0.zip) = 84873317 bytes +SHA1 (patch-3rdparty_ippicv_ippicv.cmake) = 14ce5de382084793ace32f43c6dfaf01f7ffb390 +SHA1 (patch-3rdparty_protobuf_src_google_protobuf_message__lite.cc) = f1b77384ea8110d2bf3a30ff3fe9f2fa39608caf 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_parallel__pthreads.cpp) = c64ef8872c120db0ab92582496235858eec9bf92 +SHA1 (patch-modules_core_src_parallel__pthreads.cpp) = d8070117286b36a23a6788fc834aacc52d5919d7 SHA1 (patch-modules_core_src_system.cpp) = 3b7ac545585a430d28c7077f360357079f127580 SHA1 (patch-modules_flann_include_opencv2_flann_defines.h) = ab848e67c4e03219670598ac2d21071a617a5c33 SHA1 (patch-modules_ts_src_ts.cpp) = b9a3992014b02dbd89d46375a2476385e91dc24c -SHA1 (patch-modules_videoio_src_cap__v4l.cpp) = 96f33b2b209776ff8f38127c611d49413b308123 +SHA1 (patch-modules_videoio_src_cap__v4l.cpp) = 96aac9380d94818a52afd51f2d4b3f774debd080 Index: pkgsrc/graphics/opencv-contrib-face/Makefile diff -u pkgsrc/graphics/opencv-contrib-face/Makefile:1.10 pkgsrc/graphics/opencv-contrib-face/Makefile:1.11 --- pkgsrc/graphics/opencv-contrib-face/Makefile:1.10 Wed May 3 08:38:43 2017 +++ pkgsrc/graphics/opencv-contrib-face/Makefile Mon Sep 4 15:23:49 2017 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.10 2017/05/03 08:38:43 jperkin Exp $ +# $NetBSD: Makefile,v 1.11 2017/09/04 15:23:49 fhajny Exp $ -DISTNAME= opencv_contrib-3.2.0 +DISTNAME= opencv_contrib-3.3.0 PKGNAME= ${DISTNAME:S/_contrib/-contrib-face/} CATEGORIES= graphics devel MASTER_SITES= ${MASTER_SITE_GITHUB:=Itseez/} @@ -20,7 +20,16 @@ USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake pkg-config -INSTALL_DIRS= modules/face +# This is ugly, but we shouldn't let optional code download +# at configure time. Especially when it needs to be patched +# because of lame coding. +SUBST_CLASSES+= tnn +SUBST_FILES.tnn= ${WRKDIR}/${DISTNAME}/modules/dnn_modern/CMakeLists.txt +SUBST_MESSAGE.tnn= Disabling build-time fetch +SUBST_STAGE.tnn= pre-configure +SUBST_SED.tnn= -e 's,3.2,999,' + +INSTALL_DIRS= build/modules/face WRKSRC= ${WRKDIR}/opencv-${PKGVERSION_NOREV}/ @@ -75,6 +84,12 @@ CMAKE_ARGS+= -DBUILD_opencv_python2=OFF CONFIGURE_ENV+= MACHINE_ARCH=${MACHINE_ARCH} +CONFIGURE_DIRS+= build +CMAKE_ARG_PATH= ${WRKSRC} + +pre-configure: + ${MKDIR} -p ${WRKSRC}/build + .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/jasper/buildlink3.mk" .include "../../graphics/libwebp/buildlink3.mk" Index: pkgsrc/graphics/opencv-contrib-face/PLIST diff -u pkgsrc/graphics/opencv-contrib-face/PLIST:1.3 pkgsrc/graphics/opencv-contrib-face/PLIST:1.4 --- pkgsrc/graphics/opencv-contrib-face/PLIST:1.3 Tue Mar 28 11:29:50 2017 +++ pkgsrc/graphics/opencv-contrib-face/PLIST Mon Sep 4 15:23:49 2017 @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.3 2017/03/28 11:29:50 markd Exp $ +@comment $NetBSD: PLIST,v 1.4 2017/09/04 15:23:49 fhajny Exp $ include/opencv2/face.hpp include/opencv2/face/bif.hpp include/opencv2/face/facerec.hpp include/opencv2/face/predict_collector.hpp lib/libopencv_face.so -lib/libopencv_face.so.3.2 +lib/libopencv_face.so.3.3 lib/libopencv_face.so.${PKGVERSION} Index: pkgsrc/graphics/opencv-contrib-face/distinfo diff -u pkgsrc/graphics/opencv-contrib-face/distinfo:1.6 pkgsrc/graphics/opencv-contrib-face/distinfo:1.7 --- pkgsrc/graphics/opencv-contrib-face/distinfo:1.6 Tue Mar 28 11:29:50 2017 +++ pkgsrc/graphics/opencv-contrib-face/distinfo Mon Sep 4 15:23:49 2017 @@ -1,26 +1,20 @@ -$NetBSD: distinfo,v 1.6 2017/03/28 11:29:50 markd Exp $ +$NetBSD: distinfo,v 1.7 2017/09/04 15:23:49 fhajny Exp $ -SHA1 (opencv-3.2.0.zip) = 7a7d2eb8cf617f58d610d856e531f3d92b89bc42 -RMD160 (opencv-3.2.0.zip) = 09da1443a5ef3de036b11bf0d1f384da36d459d9 -SHA512 (opencv-3.2.0.zip) = c6418d2a7654fe9d50611e756778df4c6736f2de76b85773efbf490bb475dd95ec1041fe57a87163ce11a7db44430cd378c8416af3319f979ced92532bf5ebb5 -Size (opencv-3.2.0.zip) = 82033498 bytes -SHA1 (opencv_contrib-3.2.0.zip) = 9f34aef18d05cf7136d6b251c794cfdfcdb2e78d -RMD160 (opencv_contrib-3.2.0.zip) = 0973c57ea36f38a64cc95eced43b3cf52dc15b58 -SHA512 (opencv_contrib-3.2.0.zip) = da6cda7a7ae1d722967e18f9b8d60895b93bbc3664dfdb1645cb4d8b337a9c4207b9073fd546a596c48a489f92d15191aa34c7c607167b536fbe4937b8424b43 -Size (opencv_contrib-3.2.0.zip) = 55984686 bytes -SHA1 (patch-3rdparty_ippicv_downloader.cmake) = a0b7c1b52f9ec4f35ff3f846785fbbfec1eeac51 -SHA1 (patch-apps_annotation_CMakeLists.txt) = 4c3a00b0dfef5e978b10ba966f68d050a06208fe -SHA1 (patch-apps_createsamples_CMakeLists.txt) = 2d60ecc0e1674cde4414e91e837c24fa464d42aa -SHA1 (patch-apps_traincascade_CMakeLists.txt) = 7114cc4c2057e12dc8e47bc61334cb8e175987eb +SHA1 (opencv-3.3.0.zip) = 7ca35eceb3caa2d96b846b682dbcdf1e6fa66904 +RMD160 (opencv-3.3.0.zip) = d2cbf32ff7f62c8064e0ba774baa56fa1b168206 +SHA512 (opencv-3.3.0.zip) = 14430c6225926e5118daccb57c7276d9f9160c90a034b2c73a09b73ac90ba7ebd3ae78cccffb4a10b58bb0e5e16ebd03bf617030fa74cc67d9d18366bf6b4951 +Size (opencv-3.3.0.zip) = 84873317 bytes +SHA1 (opencv_contrib-3.3.0.zip) = 6c6021469bc1d91f5d9d09cd7b43d333a9793b54 +RMD160 (opencv_contrib-3.3.0.zip) = 1e99c0d4568a8bf34902eca69b41044c48dc9fa3 +SHA512 (opencv_contrib-3.3.0.zip) = 1c76d49689459708117acfbd0893cbfb915fbd0defff95702fb388a29d12b50fb53fbf246e64e68aa3adb347aa45ff478df5e2e8c6d9cfa57a628744bbb1bd04 +Size (opencv_contrib-3.3.0.zip) = 55968854 bytes +SHA1 (patch-3rdparty_ippicv_ippicv.cmake) = 14ce5de382084793ace32f43c6dfaf01f7ffb390 +SHA1 (patch-3rdparty_protobuf_src_google_protobuf_message__lite.cc) = f1b77384ea8110d2bf3a30ff3fe9f2fa39608caf SHA1 (patch-cmake_OpenCVDetectCXXCompiler.cmake) = 221b0551d0f29d7e79afe3da8a33b1b3a4f7bf20 -SHA1 (patch-cmake_OpenCVModule.cmake) = 7667f19f3e9c6ff757d92a6a49e7c3430c6c080d -SHA1 (patch-cmake_OpenCVPCHSupport.cmake) = 237fa2d000c402c55dfdbec3e27c89cffdfde8b1 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_parallel__pthreads.cpp) = c64ef8872c120db0ab92582496235858eec9bf92 +SHA1 (patch-modules_core_src_parallel__pthreads.cpp) = d8070117286b36a23a6788fc834aacc52d5919d7 SHA1 (patch-modules_core_src_system.cpp) = 3b7ac545585a430d28c7077f360357079f127580 SHA1 (patch-modules_flann_include_opencv2_flann_defines.h) = ab848e67c4e03219670598ac2d21071a617a5c33 -SHA1 (patch-modules_java_CMakeLists.txt) = 020a8d2048d927e5d3819867df0d889bb516d8b4 -SHA1 (patch-modules_objdetect_include_opencv_objdetect_detection__based__tracker.hpp) = 83575857156321ae07f3fb03d1b3c61b804b3832 SHA1 (patch-modules_ts_src_ts.cpp) = b9a3992014b02dbd89d46375a2476385e91dc24c -SHA1 (patch-modules_videoio_src_cap__v4l.cpp) = 96f33b2b209776ff8f38127c611d49413b308123 +SHA1 (patch-modules_videoio_src_cap__v4l.cpp) = 96aac9380d94818a52afd51f2d4b3f774debd080 Index: pkgsrc/graphics/opencv/patches/patch-modules_core_src_parallel__pthreads.cpp diff -u pkgsrc/graphics/opencv/patches/patch-modules_core_src_parallel__pthreads.cpp:1.2 pkgsrc/graphics/opencv/patches/patch-modules_core_src_parallel__pthreads.cpp:1.3 --- pkgsrc/graphics/opencv/patches/patch-modules_core_src_parallel__pthreads.cpp:1.2 Sun Feb 21 14:10:46 2016 +++ pkgsrc/graphics/opencv/patches/patch-modules_core_src_parallel__pthreads.cpp Mon Sep 4 15:23:49 2017 @@ -1,10 +1,10 @@ -$NetBSD: patch-modules_core_src_parallel__pthreads.cpp,v 1.2 2016/02/21 14:10:46 fhajny Exp $ +$NetBSD: patch-modules_core_src_parallel__pthreads.cpp,v 1.3 2017/09/04 15:23:49 fhajny Exp $ PTHREAD_RECURSIVE_MUTEX_INITIALIZER doesn't exist on SunOS. ---- modules/core/src/parallel_pthreads.cpp.orig 2015-12-18 15:02:16.000000000 +0000 +--- modules/core/src/parallel_pthreads.cpp.orig 2017-08-03 23:58:23.000000000 +0000 +++ modules/core/src/parallel_pthreads.cpp -@@ -221,6 +221,10 @@ private: +@@ -220,6 +220,10 @@ private: ThreadManagerPoolState m_pool_state; }; @@ -14,4 +14,4 @@ PTHREAD_RECURSIVE_MUTEX_INITIALIZER does + const char ThreadManager::m_env_name[] = "OPENCV_FOR_THREADS_NUM"; - #ifdef ANDROID + ForThread::~ForThread() 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.2 pkgsrc/graphics/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp:1.3 --- pkgsrc/graphics/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp:1.2 Thu Mar 16 21:59:13 2017 +++ pkgsrc/graphics/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp Mon Sep 4 15:23:49 2017 @@ -1,8 +1,8 @@ -$NetBSD: patch-modules_videoio_src_cap__v4l.cpp,v 1.2 2017/03/16 21:59:13 prlw1 Exp $ +$NetBSD: patch-modules_videoio_src_cap__v4l.cpp,v 1.3 2017/09/04 15:23:49 fhajny Exp $ Conditionalize settings not available in NetBSD's v4l2 emulation. ---- modules/videoio/src/cap_v4l.cpp.orig 2016-12-23 12:54:44.000000000 +0000 +--- modules/videoio/src/cap_v4l.cpp.orig 2017-08-03 23:58:23.000000000 +0000 +++ modules/videoio/src/cap_v4l.cpp @@ -216,6 +216,7 @@ make & enjoy! #include @@ -12,7 +12,7 @@ Conditionalize settings not available in #include #include -@@ -469,9 +470,13 @@ static int autosetup_capture_mode_v4l2(C +@@ -470,9 +471,13 @@ static int autosetup_capture_mode_v4l2(C V4L2_PIX_FMT_UYVY, V4L2_PIX_FMT_SN9C10X, V4L2_PIX_FMT_SBGGR8, @@ -28,7 +28,7 @@ Conditionalize settings not available in }; for (size_t i = 0; i < sizeof(try_order) / sizeof(__u32); i++) { -@@ -520,12 +525,16 @@ static void v4l2_control_range(CvCapture +@@ -521,12 +526,16 @@ static void v4l2_control_range(CvCapture case V4L2_CID_GAIN: cap->gain = range; break; @@ -45,7 +45,7 @@ Conditionalize settings not available in } } -@@ -547,7 +556,9 @@ static void v4l2_scan_controls(CvCapture +@@ -548,7 +557,9 @@ static void v4l2_scan_controls(CvCapture break; } @@ -55,7 +55,7 @@ Conditionalize settings not available in } static int v4l2_set_fps(CvCaptureCAM_V4L* capture) { -@@ -563,8 +574,10 @@ static int v4l2_num_channels(__u32 palet +@@ -564,8 +575,10 @@ static int v4l2_num_channels(__u32 palet case V4L2_PIX_FMT_YVU420: case V4L2_PIX_FMT_MJPEG: case V4L2_PIX_FMT_JPEG: @@ -66,7 +66,7 @@ Conditionalize settings not available in case V4L2_PIX_FMT_YUYV: case V4L2_PIX_FMT_UYVY: return 2; -@@ -592,11 +605,13 @@ static void v4l2_create_frame(CvCaptureC +@@ -593,11 +606,13 @@ static void v4l2_create_frame(CvCaptureC case V4L2_PIX_FMT_YVU420: size.height = size.height * 3 / 2; // "1.5" channels break; @@ -80,7 +80,7 @@ Conditionalize settings not available in } } -@@ -1555,18 +1570,21 @@ static IplImage* icvRetrieveFrameCAM_V4L +@@ -1558,18 +1573,21 @@ static IplImage* icvRetrieveFrameCAM_V4L (unsigned char*)capture->frame.imageData); break; @@ -102,15 +102,15 @@ Conditionalize settings not available in case V4L2_PIX_FMT_Y16: if(capture->convert_rgb){ y16_to_rgb24(capture->form.fmt.pix.width, -@@ -1579,6 +1597,7 @@ static IplImage* icvRetrieveFrameCAM_V4L +@@ -1582,6 +1600,7 @@ static IplImage* icvRetrieveFrameCAM_V4L capture->frame.imageSize); } break; +#endif } - return(&capture->frame); -@@ -1596,14 +1615,22 @@ static inline __u32 capPropertyToV4L2(in + if (capture->returnFrame) +@@ -1602,14 +1621,22 @@ static inline __u32 capPropertyToV4L2(in return V4L2_CID_HUE; case CV_CAP_PROP_GAIN: return V4L2_CID_GAIN; @@ -133,7 +133,7 @@ Conditionalize settings not available in default: return -1; } -@@ -1749,12 +1776,14 @@ static bool icvSetControl (CvCaptureCAM_ +@@ -1755,12 +1782,14 @@ static bool icvSetControl (CvCaptureCAM_ return false; } Added files: Index: pkgsrc/graphics/opencv/patches/patch-3rdparty_ippicv_ippicv.cmake diff -u /dev/null pkgsrc/graphics/opencv/patches/patch-3rdparty_ippicv_ippicv.cmake:1.1 --- /dev/null Mon Sep 4 15:23:49 2017 +++ pkgsrc/graphics/opencv/patches/patch-3rdparty_ippicv_ippicv.cmake Mon Sep 4 15:23:49 2017 @@ -0,0 +1,12 @@ +$NetBSD: patch-3rdparty_ippicv_ippicv.cmake,v 1.1 2017/09/04 15:23:49 fhajny Exp $ + +Do not download at build time. + +--- 3rdparty/ippicv/ippicv.cmake.orig 2017-08-03 23:58:23.000000000 +0000 ++++ 3rdparty/ippicv/ippicv.cmake +@@ -1,4 +1,5 @@ + function(download_ippicv root_var) ++ return() + set(${root_var} "" PARENT_SCOPE) + + # Commit SHA in the opencv_3rdparty repo Index: pkgsrc/graphics/opencv/patches/patch-3rdparty_protobuf_src_google_protobuf_message__lite.cc diff -u /dev/null pkgsrc/graphics/opencv/patches/patch-3rdparty_protobuf_src_google_protobuf_message__lite.cc:1.1 --- /dev/null Mon Sep 4 15:23:49 2017 +++ pkgsrc/graphics/opencv/patches/patch-3rdparty_protobuf_src_google_protobuf_message__lite.cc Mon Sep 4 15:23:49 2017 @@ -0,0 +1,14 @@ +$NetBSD: patch-3rdparty_protobuf_src_google_protobuf_message__lite.cc,v 1.1 2017/09/04 15:23:49 fhajny Exp $ + +Needed for INT_MAX. + +--- 3rdparty/protobuf/src/google/protobuf/message_lite.cc.orig 2017-08-03 23:58:23.000000000 +0000 ++++ 3rdparty/protobuf/src/google/protobuf/message_lite.cc +@@ -38,6 +38,7 @@ + #include + #include + #include ++#include + #include + #include + #include --_----------=_150453862978910--