Fri Mar 2 16:24:21 2018 UTC ()
graphics/opencv: Update to 3.4.1.

== OpenCV 3.4.1

dnn
- Added support for quantized TensorFlow networks
- OpenCV is now able to use Intel DL inference engine as DNN
  acceleration backend
- Added AVX-512 acceleration to the performance-critical kernels, such
  as convolution and fully-connected layers
- SSD-based models trained and retrained in TensorFlow Object
  Detection API can be easier imported by a single invocation of
  python script making a text graph representation
- Performance of pthreads backend of cv::parallel_for_() has been
  greatly improved on many core machines
- OpenCL backend has been expanded to cover more layers
- Several bugs in various layers have been fixed

OpenCL
- On-disk caching of precompiled OpenCL kernels has been fixed to
  comply with OpenCL standard
- Certain cases with UMat deadlock when copying UMats in different
  threads has been fixed

Android
- Supported Android NDK16
- Added build.gradle into OpenCV 4 Android SDK
- Added initial support of Camera2 API via JavaCamera2View interface

C++
- C++11: added support of multi-dimentional cv::Mat creation via C++
  initializers lists
- C++17: OpenCV source code and tests comply C++17 standard

Misc
- opencv_contrib: added GMS matching
- opencv_contrib: added CSR-DCF tracker
- opencv_contrib: several improvements in OVIS module

== OpenCV 3.4

- New background subtraction algorithms have been integrated.

dnn
- Added faster R-CNN support
- Javascript bindings have been extended to cover DNN module
- DNN has been further accelerated for iGPU using OpenCL

OpenCL
- On-disk caching of precompiled OpenCL kernels has been finally
  implemented
- It's now possible to load and run pre-compiled OpenCL kernels via
  T-API
- Bit-exact 8-bit and 16-bit resize has been implemented


(fhajny)
diff -r1.74 -r1.75 pkgsrc/graphics/opencv/Makefile
diff -r1.18 -r1.19 pkgsrc/graphics/opencv/PLIST
diff -r1.38 -r1.39 pkgsrc/graphics/opencv/distinfo
diff -r1.3 -r0 pkgsrc/graphics/opencv/patches/patch-modules_core_src_parallel__pthreads.cpp
diff -r1.3 -r1.4 pkgsrc/graphics/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp
cvs diff -r1.74 -r1.75 pkgsrc/graphics/opencv/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/opencv/Makefile 2018/02/26 08:19:28 1.74
+++ pkgsrc/graphics/opencv/Makefile 2018/03/02 16:24:21 1.75
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.74 2018/02/26 08:19:28 adam Exp $ 1# $NetBSD: Makefile,v 1.75 2018/03/02 16:24:21 fhajny Exp $
2 2
3DISTNAME= opencv-3.3.0 3DISTNAME= opencv-3.4.1
4PKGREVISION= 1 
5CATEGORIES= graphics devel 4CATEGORIES= graphics devel
6MASTER_SITES= ${MASTER_SITE_GITHUB:=opencv/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=opencv/}
7EXTRACT_SUFX= .zip 6EXTRACT_SUFX= .zip
8 7
9MAINTAINER= anthony.mallet@laas.fr 8MAINTAINER= anthony.mallet@laas.fr
10HOMEPAGE= https://opencv.org/ 9HOMEPAGE= https://opencv.org/
11COMMENT= Library for computer vision problems 10COMMENT= Library for computer vision problems
12LICENSE= modified-bsd 11LICENSE= modified-bsd
13 12
14USE_CMAKE= yes 13USE_CMAKE= yes
15USE_LANGUAGES= c c++11 14USE_LANGUAGES= c c++11
16USE_PKGLOCALEDIR= yes 15USE_PKGLOCALEDIR= yes
17USE_TOOLS+= gmake pkg-config 16USE_TOOLS+= gmake pkg-config
@@ -24,26 +23,27 @@ PKGCONFIG_OVERRIDE+= build/unix-install @@ -24,26 +23,27 @@ PKGCONFIG_OVERRIDE+= build/unix-install
24PKGCONFIG_OVERRIDE_STAGE= post-configure 23PKGCONFIG_OVERRIDE_STAGE= post-configure
25 24
26PY_PATCHPLIST= yes 25PY_PATCHPLIST= yes
27REPLACE_PYTHON+= samples/python/*.py 26REPLACE_PYTHON+= samples/python/*.py
28 27
29# includes configure output and paths to gmake etc. 28# includes configure output and paths to gmake etc.
30CHECK_WRKREF_SKIP= ${PREFIX}/lib/libopencv_core.* 29CHECK_WRKREF_SKIP= ${PREFIX}/lib/libopencv_core.*
31 30
32.include "options.mk" 31.include "options.mk"
33 32
34CMAKE_ARGS+= -DPYTHON_EXECUTABLE:FILEPATH=${PYTHONBIN} 33CMAKE_ARGS+= -DPYTHON_EXECUTABLE:FILEPATH=${PYTHONBIN}
35CMAKE_ARGS+= -DZLIB_ROOT=${BUILDLINK_PREFIX.zlib} 34CMAKE_ARGS+= -DZLIB_ROOT=${BUILDLINK_PREFIX.zlib}
36CMAKE_ARGS.SunOS+= -DENABLE_PRECOMPILED_HEADERS=NO 35CMAKE_ARGS.SunOS+= -DENABLE_PRECOMPILED_HEADERS=NO
 36CMAKE_ARGS.SunOS+= -DOPENCV_PYTHON_SKIP_LINKER_EXCLUDE_LIBS=YES
37CMAKE_ARGS+= -DWITH_EIGEN=NO 37CMAKE_ARGS+= -DWITH_EIGEN=NO
38 38
39CONFIGURE_ENV+= MACHINE_ARCH=${MACHINE_ARCH} 39CONFIGURE_ENV+= MACHINE_ARCH=${MACHINE_ARCH}
40 40
41# jasper uses SIZE_MAX and friends in its headers. 41# jasper uses SIZE_MAX and friends in its headers.
42CXXFLAGS+= -D__STDC_LIMIT_MACROS 42CXXFLAGS+= -D__STDC_LIMIT_MACROS
43 43
44CONFIGURE_DIRS+= build 44CONFIGURE_DIRS+= build
45CMAKE_ARG_PATH= ${WRKSRC} 45CMAKE_ARG_PATH= ${WRKSRC}
46 46
47pre-configure: 47pre-configure:
48 ${MKDIR} -p ${WRKSRC}/build 48 ${MKDIR} -p ${WRKSRC}/build
49 49
cvs diff -r1.18 -r1.19 pkgsrc/graphics/opencv/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/opencv/PLIST 2017/09/04 15:23:49 1.18
+++ pkgsrc/graphics/opencv/PLIST 2018/03/02 16:24:21 1.19
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.18 2017/09/04 15:23:49 fhajny Exp $ 1@comment $NetBSD: PLIST,v 1.19 2018/03/02 16:24:21 fhajny Exp $
2bin/opencv_annotation 2bin/opencv_annotation
3bin/opencv_createsamples 3bin/opencv_createsamples
4bin/opencv_interactive-calibration 4bin/opencv_interactive-calibration
5bin/opencv_traincascade 5bin/opencv_traincascade
6bin/opencv_version 6bin/opencv_version
7bin/opencv_visualisation 7bin/opencv_visualisation
8include/opencv/cv.h 8include/opencv/cv.h
9include/opencv/cv.hpp 9include/opencv/cv.hpp
10include/opencv/cvaux.h 10include/opencv/cvaux.h
11include/opencv/cvaux.hpp 11include/opencv/cvaux.hpp
12include/opencv/cvwimage.h 12include/opencv/cvwimage.h
13include/opencv/cxcore.h 13include/opencv/cxcore.h
14include/opencv/cxcore.hpp 14include/opencv/cxcore.hpp
@@ -63,62 +63,85 @@ include/opencv2/core/cv_cpu_dispatch.h @@ -63,62 +63,85 @@ include/opencv2/core/cv_cpu_dispatch.h
63include/opencv2/core/cv_cpu_helper.h 63include/opencv2/core/cv_cpu_helper.h
64include/opencv2/core/cvdef.h 64include/opencv2/core/cvdef.h
65include/opencv2/core/cvstd.hpp 65include/opencv2/core/cvstd.hpp
66include/opencv2/core/cvstd.inl.hpp 66include/opencv2/core/cvstd.inl.hpp
67include/opencv2/core/directx.hpp 67include/opencv2/core/directx.hpp
68include/opencv2/core/eigen.hpp 68include/opencv2/core/eigen.hpp
69include/opencv2/core/fast_math.hpp 69include/opencv2/core/fast_math.hpp
70include/opencv2/core/hal/hal.hpp 70include/opencv2/core/hal/hal.hpp
71include/opencv2/core/hal/interface.h 71include/opencv2/core/hal/interface.h
72include/opencv2/core/hal/intrin.hpp 72include/opencv2/core/hal/intrin.hpp
73include/opencv2/core/hal/intrin_cpp.hpp 73include/opencv2/core/hal/intrin_cpp.hpp
74include/opencv2/core/hal/intrin_neon.hpp 74include/opencv2/core/hal/intrin_neon.hpp
75include/opencv2/core/hal/intrin_sse.hpp 75include/opencv2/core/hal/intrin_sse.hpp
 76include/opencv2/core/hal/intrin_vsx.hpp
76include/opencv2/core/ippasync.hpp 77include/opencv2/core/ippasync.hpp
77include/opencv2/core/mat.hpp 78include/opencv2/core/mat.hpp
78include/opencv2/core/mat.inl.hpp 79include/opencv2/core/mat.inl.hpp
79include/opencv2/core/matx.hpp 80include/opencv2/core/matx.hpp
80include/opencv2/core/neon_utils.hpp 81include/opencv2/core/neon_utils.hpp
81include/opencv2/core/ocl.hpp 82include/opencv2/core/ocl.hpp
82include/opencv2/core/ocl_genbase.hpp 83include/opencv2/core/ocl_genbase.hpp
 84include/opencv2/core/opencl/ocl_defs.hpp
 85include/opencv2/core/opencl/opencl_info.hpp
 86include/opencv2/core/opencl/opencl_svm.hpp
 87include/opencv2/core/opencl/runtime/autogenerated/opencl_clamdblas.hpp
 88include/opencv2/core/opencl/runtime/autogenerated/opencl_clamdfft.hpp
 89include/opencv2/core/opencl/runtime/autogenerated/opencl_core.hpp
 90include/opencv2/core/opencl/runtime/autogenerated/opencl_core_wrappers.hpp
 91include/opencv2/core/opencl/runtime/autogenerated/opencl_gl.hpp
 92include/opencv2/core/opencl/runtime/autogenerated/opencl_gl_wrappers.hpp
 93include/opencv2/core/opencl/runtime/opencl_clamdblas.hpp
 94include/opencv2/core/opencl/runtime/opencl_clamdfft.hpp
 95include/opencv2/core/opencl/runtime/opencl_core.hpp
 96include/opencv2/core/opencl/runtime/opencl_core_wrappers.hpp
 97include/opencv2/core/opencl/runtime/opencl_gl.hpp
 98include/opencv2/core/opencl/runtime/opencl_gl_wrappers.hpp
 99include/opencv2/core/opencl/runtime/opencl_svm_20.hpp
 100include/opencv2/core/opencl/runtime/opencl_svm_definitions.hpp
 101include/opencv2/core/opencl/runtime/opencl_svm_hsa_extension.hpp
83include/opencv2/core/opengl.hpp 102include/opencv2/core/opengl.hpp
84include/opencv2/core/operations.hpp 103include/opencv2/core/operations.hpp
85include/opencv2/core/optim.hpp 104include/opencv2/core/optim.hpp
86include/opencv2/core/ovx.hpp 105include/opencv2/core/ovx.hpp
87include/opencv2/core/persistence.hpp 106include/opencv2/core/persistence.hpp
88include/opencv2/core/ptr.inl.hpp 107include/opencv2/core/ptr.inl.hpp
89include/opencv2/core/saturate.hpp 108include/opencv2/core/saturate.hpp
90include/opencv2/core/softfloat.hpp 109include/opencv2/core/softfloat.hpp
91include/opencv2/core/sse_utils.hpp 110include/opencv2/core/sse_utils.hpp
92include/opencv2/core/traits.hpp 111include/opencv2/core/traits.hpp
93include/opencv2/core/types.hpp 112include/opencv2/core/types.hpp
94include/opencv2/core/types_c.h 113include/opencv2/core/types_c.h
95include/opencv2/core/utility.hpp 114include/opencv2/core/utility.hpp
 115include/opencv2/core/utils/filesystem.hpp
 116include/opencv2/core/utils/logger.defines.hpp
96include/opencv2/core/utils/logger.hpp 117include/opencv2/core/utils/logger.hpp
97include/opencv2/core/utils/trace.hpp 118include/opencv2/core/utils/trace.hpp
98include/opencv2/core/va_intel.hpp 119include/opencv2/core/va_intel.hpp
99include/opencv2/core/version.hpp 120include/opencv2/core/version.hpp
 121include/opencv2/core/vsx_utils.hpp
100include/opencv2/core/wimage.hpp 122include/opencv2/core/wimage.hpp
101include/opencv2/cvconfig.h 123include/opencv2/cvconfig.h
102include/opencv2/dnn.hpp 124include/opencv2/dnn.hpp
103include/opencv2/dnn/all_layers.hpp 125include/opencv2/dnn/all_layers.hpp
104include/opencv2/dnn/dict.hpp 126include/opencv2/dnn/dict.hpp
105include/opencv2/dnn/dnn.hpp 127include/opencv2/dnn/dnn.hpp
106include/opencv2/dnn/dnn.inl.hpp 128include/opencv2/dnn/dnn.inl.hpp
107include/opencv2/dnn/layer.details.hpp 129include/opencv2/dnn/layer.details.hpp
108include/opencv2/dnn/layer.hpp 130include/opencv2/dnn/layer.hpp
109include/opencv2/dnn/shape_utils.hpp 131include/opencv2/dnn/shape_utils.hpp
110include/opencv2/features2d.hpp 132include/opencv2/features2d.hpp
111include/opencv2/features2d/features2d.hpp 133include/opencv2/features2d/features2d.hpp
 134include/opencv2/features2d/hal/interface.h
112include/opencv2/flann.hpp 135include/opencv2/flann.hpp
113include/opencv2/flann/all_indices.h 136include/opencv2/flann/all_indices.h
114include/opencv2/flann/allocator.h 137include/opencv2/flann/allocator.h
115include/opencv2/flann/any.h 138include/opencv2/flann/any.h
116include/opencv2/flann/autotuned_index.h 139include/opencv2/flann/autotuned_index.h
117include/opencv2/flann/composite_index.h 140include/opencv2/flann/composite_index.h
118include/opencv2/flann/config.h 141include/opencv2/flann/config.h
119include/opencv2/flann/defines.h 142include/opencv2/flann/defines.h
120include/opencv2/flann/dist.h 143include/opencv2/flann/dist.h
121include/opencv2/flann/dummy.h 144include/opencv2/flann/dummy.h
122include/opencv2/flann/dynamic_bitset.h 145include/opencv2/flann/dynamic_bitset.h
123include/opencv2/flann/flann.hpp 146include/opencv2/flann/flann.hpp
124include/opencv2/flann/flann_base.hpp 147include/opencv2/flann/flann_base.hpp
@@ -152,26 +175,27 @@ include/opencv2/highgui/highgui_c.h @@ -152,26 +175,27 @@ include/opencv2/highgui/highgui_c.h
152include/opencv2/imgcodecs.hpp 175include/opencv2/imgcodecs.hpp
153include/opencv2/imgcodecs/imgcodecs.hpp 176include/opencv2/imgcodecs/imgcodecs.hpp
154include/opencv2/imgcodecs/imgcodecs_c.h 177include/opencv2/imgcodecs/imgcodecs_c.h
155include/opencv2/imgcodecs/ios.h 178include/opencv2/imgcodecs/ios.h
156include/opencv2/imgproc.hpp 179include/opencv2/imgproc.hpp
157include/opencv2/imgproc/detail/distortion_model.hpp 180include/opencv2/imgproc/detail/distortion_model.hpp
158include/opencv2/imgproc/hal/hal.hpp 181include/opencv2/imgproc/hal/hal.hpp
159include/opencv2/imgproc/hal/interface.h 182include/opencv2/imgproc/hal/interface.h
160include/opencv2/imgproc/imgproc.hpp 183include/opencv2/imgproc/imgproc.hpp
161include/opencv2/imgproc/imgproc_c.h 184include/opencv2/imgproc/imgproc_c.h
162include/opencv2/imgproc/types_c.h 185include/opencv2/imgproc/types_c.h
163include/opencv2/ml.hpp 186include/opencv2/ml.hpp
164include/opencv2/ml/ml.hpp 187include/opencv2/ml/ml.hpp
 188include/opencv2/ml/ml.inl.hpp
165include/opencv2/objdetect.hpp 189include/opencv2/objdetect.hpp
166include/opencv2/objdetect/detection_based_tracker.hpp 190include/opencv2/objdetect/detection_based_tracker.hpp
167include/opencv2/objdetect/objdetect.hpp 191include/opencv2/objdetect/objdetect.hpp
168include/opencv2/objdetect/objdetect_c.h 192include/opencv2/objdetect/objdetect_c.h
169include/opencv2/opencv.hpp 193include/opencv2/opencv.hpp
170include/opencv2/opencv_modules.hpp 194include/opencv2/opencv_modules.hpp
171include/opencv2/photo.hpp 195include/opencv2/photo.hpp
172include/opencv2/photo/cuda.hpp 196include/opencv2/photo/cuda.hpp
173include/opencv2/photo/photo.hpp 197include/opencv2/photo/photo.hpp
174include/opencv2/photo/photo_c.h 198include/opencv2/photo/photo_c.h
175include/opencv2/shape.hpp 199include/opencv2/shape.hpp
176include/opencv2/shape/emdL1.hpp 200include/opencv2/shape/emdL1.hpp
177include/opencv2/shape/hist_cost.hpp 201include/opencv2/shape/hist_cost.hpp
@@ -209,75 +233,75 @@ include/opencv2/videostab/fast_marching. @@ -209,75 +233,75 @@ include/opencv2/videostab/fast_marching.
209include/opencv2/videostab/fast_marching_inl.hpp 233include/opencv2/videostab/fast_marching_inl.hpp
210include/opencv2/videostab/frame_source.hpp 234include/opencv2/videostab/frame_source.hpp
211include/opencv2/videostab/global_motion.hpp 235include/opencv2/videostab/global_motion.hpp
212include/opencv2/videostab/inpainting.hpp 236include/opencv2/videostab/inpainting.hpp
213include/opencv2/videostab/log.hpp 237include/opencv2/videostab/log.hpp
214include/opencv2/videostab/motion_core.hpp 238include/opencv2/videostab/motion_core.hpp
215include/opencv2/videostab/motion_stabilizing.hpp 239include/opencv2/videostab/motion_stabilizing.hpp
216include/opencv2/videostab/optical_flow.hpp 240include/opencv2/videostab/optical_flow.hpp
217include/opencv2/videostab/outlier_rejection.hpp 241include/opencv2/videostab/outlier_rejection.hpp
218include/opencv2/videostab/ring_buffer.hpp 242include/opencv2/videostab/ring_buffer.hpp
219include/opencv2/videostab/stabilizer.hpp 243include/opencv2/videostab/stabilizer.hpp
220include/opencv2/videostab/wobble_suppression.hpp 244include/opencv2/videostab/wobble_suppression.hpp
221lib/libopencv_calib3d.so 245lib/libopencv_calib3d.so
222lib/libopencv_calib3d.so.3.3 246lib/libopencv_calib3d.so.3.4
223lib/libopencv_calib3d.so.${PKGVERSION} 247lib/libopencv_calib3d.so.${PKGVERSION}
224lib/libopencv_core.so 248lib/libopencv_core.so
225lib/libopencv_core.so.3.3 249lib/libopencv_core.so.3.4
226lib/libopencv_core.so.${PKGVERSION} 250lib/libopencv_core.so.${PKGVERSION}
227lib/libopencv_dnn.so 251lib/libopencv_dnn.so
228lib/libopencv_dnn.so.3.3 252lib/libopencv_dnn.so.3.4
229lib/libopencv_dnn.so.${PKGVERSION} 253lib/libopencv_dnn.so.${PKGVERSION}
230lib/libopencv_features2d.so 254lib/libopencv_features2d.so
231lib/libopencv_features2d.so.3.3 255lib/libopencv_features2d.so.3.4
232lib/libopencv_features2d.so.${PKGVERSION} 256lib/libopencv_features2d.so.${PKGVERSION}
233lib/libopencv_flann.so 257lib/libopencv_flann.so
234lib/libopencv_flann.so.3.3 258lib/libopencv_flann.so.3.4
235lib/libopencv_flann.so.${PKGVERSION} 259lib/libopencv_flann.so.${PKGVERSION}
236lib/libopencv_highgui.so 260lib/libopencv_highgui.so
237lib/libopencv_highgui.so.3.3 261lib/libopencv_highgui.so.3.4
238lib/libopencv_highgui.so.${PKGVERSION} 262lib/libopencv_highgui.so.${PKGVERSION}
239lib/libopencv_imgcodecs.so 263lib/libopencv_imgcodecs.so
240lib/libopencv_imgcodecs.so.3.3 264lib/libopencv_imgcodecs.so.3.4
241lib/libopencv_imgcodecs.so.${PKGVERSION} 265lib/libopencv_imgcodecs.so.${PKGVERSION}
242lib/libopencv_imgproc.so 266lib/libopencv_imgproc.so
243lib/libopencv_imgproc.so.3.3 267lib/libopencv_imgproc.so.3.4
244lib/libopencv_imgproc.so.${PKGVERSION} 268lib/libopencv_imgproc.so.${PKGVERSION}
245lib/libopencv_ml.so 269lib/libopencv_ml.so
246lib/libopencv_ml.so.3.3 270lib/libopencv_ml.so.3.4
247lib/libopencv_ml.so.${PKGVERSION} 271lib/libopencv_ml.so.${PKGVERSION}
248lib/libopencv_objdetect.so 272lib/libopencv_objdetect.so
249lib/libopencv_objdetect.so.3.3 273lib/libopencv_objdetect.so.3.4
250lib/libopencv_objdetect.so.${PKGVERSION} 274lib/libopencv_objdetect.so.${PKGVERSION}
251lib/libopencv_photo.so 275lib/libopencv_photo.so
252lib/libopencv_photo.so.3.3 276lib/libopencv_photo.so.3.4
253lib/libopencv_photo.so.${PKGVERSION} 277lib/libopencv_photo.so.${PKGVERSION}
254lib/libopencv_shape.so 278lib/libopencv_shape.so
255lib/libopencv_shape.so.3.3 279lib/libopencv_shape.so.3.4
256lib/libopencv_shape.so.${PKGVERSION} 280lib/libopencv_shape.so.${PKGVERSION}
257lib/libopencv_stitching.so 281lib/libopencv_stitching.so
258lib/libopencv_stitching.so.3.3 282lib/libopencv_stitching.so.3.4
259lib/libopencv_stitching.so.${PKGVERSION} 283lib/libopencv_stitching.so.${PKGVERSION}
260lib/libopencv_superres.so 284lib/libopencv_superres.so
261lib/libopencv_superres.so.3.3 285lib/libopencv_superres.so.3.4
262lib/libopencv_superres.so.${PKGVERSION} 286lib/libopencv_superres.so.${PKGVERSION}
263lib/libopencv_video.so 287lib/libopencv_video.so
264lib/libopencv_video.so.3.3 288lib/libopencv_video.so.3.4
265lib/libopencv_video.so.${PKGVERSION} 289lib/libopencv_video.so.${PKGVERSION}
266lib/libopencv_videoio.so 290lib/libopencv_videoio.so
267lib/libopencv_videoio.so.3.3 291lib/libopencv_videoio.so.3.4
268lib/libopencv_videoio.so.${PKGVERSION} 292lib/libopencv_videoio.so.${PKGVERSION}
269lib/libopencv_videostab.so 293lib/libopencv_videostab.so
270lib/libopencv_videostab.so.3.3 294lib/libopencv_videostab.so.3.4
271lib/libopencv_videostab.so.${PKGVERSION} 295lib/libopencv_videostab.so.${PKGVERSION}
272lib/pkgconfig/opencv.pc 296lib/pkgconfig/opencv.pc
273${PYSITELIB}/cv2.so 297${PYSITELIB}/cv2.so
274share/OpenCV/OpenCVConfig-version.cmake 298share/OpenCV/OpenCVConfig-version.cmake
275share/OpenCV/OpenCVConfig.cmake 299share/OpenCV/OpenCVConfig.cmake
276share/OpenCV/OpenCVModules-release.cmake 300share/OpenCV/OpenCVModules-release.cmake
277share/OpenCV/OpenCVModules.cmake 301share/OpenCV/OpenCVModules.cmake
278share/OpenCV/haarcascades/haarcascade_eye.xml 302share/OpenCV/haarcascades/haarcascade_eye.xml
279share/OpenCV/haarcascades/haarcascade_eye_tree_eyeglasses.xml 303share/OpenCV/haarcascades/haarcascade_eye_tree_eyeglasses.xml
280share/OpenCV/haarcascades/haarcascade_frontalcatface.xml 304share/OpenCV/haarcascades/haarcascade_frontalcatface.xml
281share/OpenCV/haarcascades/haarcascade_frontalcatface_extended.xml 305share/OpenCV/haarcascades/haarcascade_frontalcatface_extended.xml
282share/OpenCV/haarcascades/haarcascade_frontalface_alt.xml 306share/OpenCV/haarcascades/haarcascade_frontalface_alt.xml
283share/OpenCV/haarcascades/haarcascade_frontalface_alt2.xml 307share/OpenCV/haarcascades/haarcascade_frontalface_alt2.xml
cvs diff -r1.38 -r1.39 pkgsrc/graphics/opencv/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/opencv/distinfo 2017/09/04 15:23:49 1.38
+++ pkgsrc/graphics/opencv/distinfo 2018/03/02 16:24:21 1.39
@@ -1,16 +1,15 @@ @@ -1,16 +1,15 @@
1$NetBSD: distinfo,v 1.38 2017/09/04 15:23:49 fhajny Exp $ 1$NetBSD: distinfo,v 1.39 2018/03/02 16:24:21 fhajny Exp $
2 2
3SHA1 (opencv-3.3.0.zip) = 7ca35eceb3caa2d96b846b682dbcdf1e6fa66904 3SHA1 (opencv-3.4.1.zip) = 1e2a04746eaeee520e58f81002c556c435ef0dce
4RMD160 (opencv-3.3.0.zip) = d2cbf32ff7f62c8064e0ba774baa56fa1b168206 4RMD160 (opencv-3.4.1.zip) = d9f6de36b3d43e0ec5ce7dcfe752a7529f1c4daa
5SHA512 (opencv-3.3.0.zip) = 14430c6225926e5118daccb57c7276d9f9160c90a034b2c73a09b73ac90ba7ebd3ae78cccffb4a10b58bb0e5e16ebd03bf617030fa74cc67d9d18366bf6b4951 5SHA512 (opencv-3.4.1.zip) = 23610b7f909963ed3d7df233932e8ca0ef0604683affcbdec099b9b991bd4c0af275ec808c874ea29a5e8fbd5f02ad284aa0749c99748e01a73845aa25ebc3b9
6Size (opencv-3.3.0.zip) = 84873317 bytes 6Size (opencv-3.4.1.zip) = 90982898 bytes
7SHA1 (patch-3rdparty_ippicv_ippicv.cmake) = 14ce5de382084793ace32f43c6dfaf01f7ffb390 7SHA1 (patch-3rdparty_ippicv_ippicv.cmake) = 14ce5de382084793ace32f43c6dfaf01f7ffb390
8SHA1 (patch-3rdparty_protobuf_src_google_protobuf_message__lite.cc) = f1b77384ea8110d2bf3a30ff3fe9f2fa39608caf 8SHA1 (patch-3rdparty_protobuf_src_google_protobuf_message__lite.cc) = f1b77384ea8110d2bf3a30ff3fe9f2fa39608caf
9SHA1 (patch-cmake_OpenCVDetectCXXCompiler.cmake) = 221b0551d0f29d7e79afe3da8a33b1b3a4f7bf20 9SHA1 (patch-cmake_OpenCVDetectCXXCompiler.cmake) = 221b0551d0f29d7e79afe3da8a33b1b3a4f7bf20
10SHA1 (patch-modules_core_include_opencv2_core_types_c.h) = 75444e65677be99af8167f9060419d7970a7adaa 10SHA1 (patch-modules_core_include_opencv2_core_types_c.h) = 75444e65677be99af8167f9060419d7970a7adaa
11SHA1 (patch-modules_core_src_downhill__simplex.cpp) = 1ad7c2fa126d15050b87785e8eec20dbe796b471 11SHA1 (patch-modules_core_src_downhill__simplex.cpp) = 1ad7c2fa126d15050b87785e8eec20dbe796b471
12SHA1 (patch-modules_core_src_parallel__pthreads.cpp) = d8070117286b36a23a6788fc834aacc52d5919d7 
13SHA1 (patch-modules_core_src_system.cpp) = 3b7ac545585a430d28c7077f360357079f127580 12SHA1 (patch-modules_core_src_system.cpp) = 3b7ac545585a430d28c7077f360357079f127580
14SHA1 (patch-modules_flann_include_opencv2_flann_defines.h) = ab848e67c4e03219670598ac2d21071a617a5c33 13SHA1 (patch-modules_flann_include_opencv2_flann_defines.h) = ab848e67c4e03219670598ac2d21071a617a5c33
15SHA1 (patch-modules_ts_src_ts.cpp) = b9a3992014b02dbd89d46375a2476385e91dc24c 14SHA1 (patch-modules_ts_src_ts.cpp) = b9a3992014b02dbd89d46375a2476385e91dc24c
16SHA1 (patch-modules_videoio_src_cap__v4l.cpp) = 96aac9380d94818a52afd51f2d4b3f774debd080 15SHA1 (patch-modules_videoio_src_cap__v4l.cpp) = 985d91d9a4c63f081c3fff495cc86d8d0a1c6aa4
File Deleted: pkgsrc/graphics/opencv/patches/Attic/patch-modules_core_src_parallel__pthreads.cpp
cvs diff -r1.3 -r1.4 pkgsrc/graphics/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp (expand / switch to unified diff)

--- pkgsrc/graphics/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp 2017/09/04 15:23:49 1.3
+++ pkgsrc/graphics/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp 2018/03/02 16:24:21 1.4
@@ -1,39 +1,41 @@ @@ -1,39 +1,41 @@
1$NetBSD: patch-modules_videoio_src_cap__v4l.cpp,v 1.3 2017/09/04 15:23:49 fhajny Exp $ 1$NetBSD: patch-modules_videoio_src_cap__v4l.cpp,v 1.4 2018/03/02 16:24:21 fhajny Exp $
2 2
3Conditionalize settings not available in NetBSD's v4l2 emulation. 3Conditionalize settings not available in NetBSD's v4l2 emulation.
4 4
5--- modules/videoio/src/cap_v4l.cpp.orig 2017-08-03 23:58:23.000000000 +0000 5--- modules/videoio/src/cap_v4l.cpp.orig 2018-02-23 08:38:33.000000000 +0000
6+++ modules/videoio/src/cap_v4l.cpp 6+++ modules/videoio/src/cap_v4l.cpp
7@@ -216,6 +216,7 @@ make & enjoy! 7@@ -216,6 +216,7 @@ make & enjoy!
8 #include <fcntl.h> 8 #include <fcntl.h>
9 #include <errno.h> 9 #include <errno.h>
10 #include <sys/ioctl.h> 10 #include <sys/ioctl.h>
11+#include <inttypes.h> 11+#include <inttypes.h>
12 #include <sys/types.h> 12 #include <sys/types.h>
13 #include <sys/mman.h> 13 #include <sys/mman.h>
14  14
15@@ -470,9 +471,13 @@ static int autosetup_capture_mode_v4l2(C 15@@ -466,13 +467,17 @@ static int autosetup_capture_mode_v4l2(C
 16 V4L2_PIX_FMT_YUYV,
16 V4L2_PIX_FMT_UYVY, 17 V4L2_PIX_FMT_UYVY,
17 V4L2_PIX_FMT_SN9C10X, 
18 V4L2_PIX_FMT_SBGGR8, 18 V4L2_PIX_FMT_SBGGR8,
19+#ifdef V4L2_PIX_FMT_SGBRG8 19+#ifdef V4L2_PIX_FMT_SGBRG8
20 V4L2_PIX_FMT_SGBRG8, 20 V4L2_PIX_FMT_SGBRG8,
21- V4L2_PIX_FMT_RGB24, 
22- V4L2_PIX_FMT_Y16 
23+#endif 21+#endif
24+ V4L2_PIX_FMT_RGB24 22 V4L2_PIX_FMT_SN9C10X,
 23 #ifdef HAVE_JPEG
 24 V4L2_PIX_FMT_MJPEG,
 25 V4L2_PIX_FMT_JPEG,
 26 #endif
25+#ifdef V4L2_PIX_FMT_Y16 27+#ifdef V4L2_PIX_FMT_Y16
26+ ,V4L2_PIX_FMT_Y16 28 V4L2_PIX_FMT_Y16
27+#endif 29+#endif
28 }; 30 };
29  31
30 for (size_t i = 0; i < sizeof(try_order) / sizeof(__u32); i++) { 32 for (size_t i = 0; i < sizeof(try_order) / sizeof(__u32); i++) {
31@@ -521,12 +526,16 @@ static void v4l2_control_range(CvCapture 33@@ -521,12 +526,16 @@ static void v4l2_control_range(CvCapture
32 case V4L2_CID_GAIN: 34 case V4L2_CID_GAIN:
33 cap->gain = range; 35 cap->gain = range;
34 break; 36 break;
35+#ifdef V4L2_CID_EXPOSURE_ABSOLUTE 37+#ifdef V4L2_CID_EXPOSURE_ABSOLUTE
36 case V4L2_CID_EXPOSURE_ABSOLUTE: 38 case V4L2_CID_EXPOSURE_ABSOLUTE:
37 cap->exposure = range; 39 cap->exposure = range;
38 break; 40 break;
39+#endif 41+#endif