Thu Mar 16 21:59:13 2017 UTC ()
Update opencv to 3.2

Many Darwin library handling patches removed because of commit 912592de4ce
  Remove "INSTALL_NAME_DIR lib" target property

Full changelog at

https://github.com/opencv/opencv/wiki/ChangeLog

Highlights:

     * Results from 11 GSoC 2016 projects have been submitted to the
       library, 9 of them have been integrated already, 2 still pending
       (the numbers below are the id's of the Pull Requests in opencv or
       opencv_contrib repository):
          + Ambroise Moreau (Delia Passalacqua) - sinusoidal patterns for
            structured light and phase unwrapping module (711)
          + Alexander Bokov (Maksim Shabunin) - DIS optical flow
            (excellent dense optical flow algorithm that is both
            significantly better and significantly faster than Farneback's
            algorithm - our baseline), and learning-based color constancy
            algorithms implementation (689, 708, 722, 736, 745, 747)
          + Tyan Vladimir (Antonella Cascitelli) - CNN based tracking
            algorithm (GOTURN) (718, 899)
          + Vladislav Samsonov (Ethan Rublee) - PCAFlow and Global Patch
            Collider algorithms implementation (710, 752)
          + Jo o Cartucho (Vincent Rabaud) - Multi-language OpenCV
            Tutorials in Python, C++ and Java (7041)
          + Jiri Horner (Bo Li) - New camera model and parallel processing
            for stitching pipeline (6933)
          + Vitaliy Lyudvichenko (Anatoly Baksheev) - Optimizations and
            improvements of dnn module (707, 750)
          + Iric Wu (Vadim Pisarevsky) - Base64 and JSON support for file
            storage (6697, 6949, 7088). Use names like
            `"myfilestorage.xml?base64"` when writing file storage to
            store big chunks of numerical data in base64-encoded form.
          + Edgar Riba (Manuele Tamburrano, Stefano Fabri) - tiny_dnn
            improvements and integration (720: pending)
          + Yida Wang (Manuele Tamburrano, Stefano Fabri) - Quantization
            and semantic saliency detection with tiny_dnn
          + Anguelos Nicolaou (Lluis Gomez) - Word-spotting CNN based
            algorithm (761: pending)


(prlw1)
diff -r1.69 -r1.70 pkgsrc/graphics/opencv/Makefile
diff -r1.16 -r1.17 pkgsrc/graphics/opencv/PLIST
diff -r1.36 -r1.37 pkgsrc/graphics/opencv/distinfo
diff -r1.1 -r0 pkgsrc/graphics/opencv/patches/patch-apps_annotation_CMakeLists.txt
diff -r1.1 -r0 pkgsrc/graphics/opencv/patches/patch-apps_createsamples_CMakeLists.txt
diff -r1.1 -r0 pkgsrc/graphics/opencv/patches/patch-apps_traincascade_CMakeLists.txt
diff -r1.1 -r0 pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVPCHSupport.cmake
diff -r1.1 -r0 pkgsrc/graphics/opencv/patches/patch-modules_java_CMakeLists.txt
diff -r1.2 -r0 pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVModule.cmake
diff -r1.2 -r0 pkgsrc/graphics/opencv/patches/patch-modules_objdetect_include_opencv_objdetect_detection__based__tracker.hpp
diff -r1.1 -r1.2 pkgsrc/graphics/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp
cvs diff -r1.69 -r1.70 pkgsrc/graphics/opencv/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/opencv/Makefile 2017/02/28 15:20:06 1.69
+++ pkgsrc/graphics/opencv/Makefile 2017/03/16 21:59:13 1.70
@@ -1,36 +1,36 @@ @@ -1,36 +1,36 @@
1# $NetBSD: Makefile,v 1.69 2017/02/28 15:20:06 ryoon Exp $ 1# $NetBSD: Makefile,v 1.70 2017/03/16 21:59:13 prlw1 Exp $
2 2
3DISTNAME= opencv-3.1.0 3DISTNAME= opencv-3.2.0
4PKGREVISION= 6 
5CATEGORIES= graphics devel 4CATEGORIES= graphics devel
6MASTER_SITES= ${MASTER_SITE_GITHUB:=Itseez/} 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= http://code.opencv.org/projects/OpenCV/wiki/WikiStart 9HOMEPAGE= http://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++ 14USE_LANGUAGES= c c++
16USE_PKGLOCALEDIR= yes 15USE_PKGLOCALEDIR= yes
17USE_TOOLS+= gmake pkg-config 16USE_TOOLS+= gmake pkg-config
18 17
19INSTALLATION_DIRS+= share/doc/opencv/papers 18INSTALLATION_DIRS+= share/doc/opencv/papers
20INSTALLATION_DIRS+= share/doc/opencv/ref/pics 19INSTALLATION_DIRS+= share/doc/opencv/ref/pics
21INSTALLATION_DIRS+= share/OpenCV/haarcascades 20INSTALLATION_DIRS+= share/OpenCV/haarcascades
22 21
23PKGCONFIG_OVERRIDE+= opencv.pc.cmake.in 22PKGCONFIG_OVERRIDE+= unix-install/opencv.pc
 23PKGCONFIG_OVERRIDE_STAGE= post-configure
24 24
25PY_PATCHPLIST= yes 25PY_PATCHPLIST= yes
26REPLACE_PYTHON+= samples/python/*.py 26REPLACE_PYTHON+= samples/python/*.py
27 27
28# includes configure output and paths to gmake etc. 28# includes configure output and paths to gmake etc.
29CHECK_WRKREF_SKIP= ${PREFIX}/lib/libopencv_core.* 29CHECK_WRKREF_SKIP= ${PREFIX}/lib/libopencv_core.*
30 30
31.include "options.mk" 31.include "options.mk"
32 32
33.include "../../mk/compiler.mk" 33.include "../../mk/compiler.mk"
34.if !empty(PKGSRC_COMPILER:Mclang) 34.if !empty(PKGSRC_COMPILER:Mclang)
35CXXFLAGS+= -std=c++11 35CXXFLAGS+= -std=c++11
36.endif 36.endif
cvs diff -r1.16 -r1.17 pkgsrc/graphics/opencv/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/opencv/PLIST 2016/02/21 14:10:46 1.16
+++ pkgsrc/graphics/opencv/PLIST 2017/03/16 21:59:13 1.17
@@ -1,17 +1,19 @@ @@ -1,17 +1,19 @@
1@comment $NetBSD: PLIST,v 1.16 2016/02/21 14:10:46 fhajny Exp $ 1@comment $NetBSD: PLIST,v 1.17 2017/03/16 21:59:13 prlw1 Exp $
2bin/opencv_annotation 2bin/opencv_annotation
3bin/opencv_createsamples 3bin/opencv_createsamples
4bin/opencv_traincascade 4bin/opencv_traincascade
 5bin/opencv_version
 6bin/opencv_visualisation
5include/opencv/cv.h 7include/opencv/cv.h
6include/opencv/cv.hpp 8include/opencv/cv.hpp
7include/opencv/cvaux.h 9include/opencv/cvaux.h
8include/opencv/cvaux.hpp 10include/opencv/cvaux.hpp
9include/opencv/cvwimage.h 11include/opencv/cvwimage.h
10include/opencv/cxcore.h 12include/opencv/cxcore.h
11include/opencv/cxcore.hpp 13include/opencv/cxcore.hpp
12include/opencv/cxeigen.hpp 14include/opencv/cxeigen.hpp
13include/opencv/cxmisc.h 15include/opencv/cxmisc.h
14include/opencv/highgui.h 16include/opencv/highgui.h
15include/opencv/ml.h 17include/opencv/ml.h
16include/opencv2/calib3d.hpp 18include/opencv2/calib3d.hpp
17include/opencv2/calib3d/calib3d.hpp 19include/opencv2/calib3d/calib3d.hpp
@@ -68,26 +70,27 @@ include/opencv2/core/hal/intrin.hpp @@ -68,26 +70,27 @@ include/opencv2/core/hal/intrin.hpp
68include/opencv2/core/hal/intrin_cpp.hpp 70include/opencv2/core/hal/intrin_cpp.hpp
69include/opencv2/core/hal/intrin_neon.hpp 71include/opencv2/core/hal/intrin_neon.hpp
70include/opencv2/core/hal/intrin_sse.hpp 72include/opencv2/core/hal/intrin_sse.hpp
71include/opencv2/core/ippasync.hpp 73include/opencv2/core/ippasync.hpp
72include/opencv2/core/mat.hpp 74include/opencv2/core/mat.hpp
73include/opencv2/core/mat.inl.hpp 75include/opencv2/core/mat.inl.hpp
74include/opencv2/core/matx.hpp 76include/opencv2/core/matx.hpp
75include/opencv2/core/neon_utils.hpp 77include/opencv2/core/neon_utils.hpp
76include/opencv2/core/ocl.hpp 78include/opencv2/core/ocl.hpp
77include/opencv2/core/ocl_genbase.hpp 79include/opencv2/core/ocl_genbase.hpp
78include/opencv2/core/opengl.hpp 80include/opencv2/core/opengl.hpp
79include/opencv2/core/operations.hpp 81include/opencv2/core/operations.hpp
80include/opencv2/core/optim.hpp 82include/opencv2/core/optim.hpp
 83include/opencv2/core/ovx.hpp
81include/opencv2/core/persistence.hpp 84include/opencv2/core/persistence.hpp
82include/opencv2/core/private.cuda.hpp 85include/opencv2/core/private.cuda.hpp
83include/opencv2/core/private.hpp 86include/opencv2/core/private.hpp
84include/opencv2/core/ptr.inl.hpp 87include/opencv2/core/ptr.inl.hpp
85include/opencv2/core/saturate.hpp 88include/opencv2/core/saturate.hpp
86include/opencv2/core/sse_utils.hpp 89include/opencv2/core/sse_utils.hpp
87include/opencv2/core/traits.hpp 90include/opencv2/core/traits.hpp
88include/opencv2/core/types.hpp 91include/opencv2/core/types.hpp
89include/opencv2/core/types_c.h 92include/opencv2/core/types_c.h
90include/opencv2/core/utility.hpp 93include/opencv2/core/utility.hpp
91include/opencv2/core/va_intel.hpp 94include/opencv2/core/va_intel.hpp
92include/opencv2/core/version.hpp 95include/opencv2/core/version.hpp
93include/opencv2/core/wimage.hpp 96include/opencv2/core/wimage.hpp
@@ -130,26 +133,28 @@ include/opencv2/flann/result_set.h @@ -130,26 +133,28 @@ include/opencv2/flann/result_set.h
130include/opencv2/flann/sampling.h 133include/opencv2/flann/sampling.h
131include/opencv2/flann/saving.h 134include/opencv2/flann/saving.h
132include/opencv2/flann/simplex_downhill.h 135include/opencv2/flann/simplex_downhill.h
133include/opencv2/flann/timer.h 136include/opencv2/flann/timer.h
134include/opencv2/highgui.hpp 137include/opencv2/highgui.hpp
135include/opencv2/highgui/highgui.hpp 138include/opencv2/highgui/highgui.hpp
136include/opencv2/highgui/highgui_c.h 139include/opencv2/highgui/highgui_c.h
137include/opencv2/imgcodecs.hpp 140include/opencv2/imgcodecs.hpp
138include/opencv2/imgcodecs/imgcodecs.hpp 141include/opencv2/imgcodecs/imgcodecs.hpp
139include/opencv2/imgcodecs/imgcodecs_c.h 142include/opencv2/imgcodecs/imgcodecs_c.h
140include/opencv2/imgcodecs/ios.h 143include/opencv2/imgcodecs/ios.h
141include/opencv2/imgproc.hpp 144include/opencv2/imgproc.hpp
142include/opencv2/imgproc/detail/distortion_model.hpp 145include/opencv2/imgproc/detail/distortion_model.hpp
 146include/opencv2/imgproc/hal/hal.hpp
 147include/opencv2/imgproc/hal/interface.h
143include/opencv2/imgproc/imgproc.hpp 148include/opencv2/imgproc/imgproc.hpp
144include/opencv2/imgproc/imgproc_c.h 149include/opencv2/imgproc/imgproc_c.h
145include/opencv2/imgproc/types_c.h 150include/opencv2/imgproc/types_c.h
146include/opencv2/ml.hpp 151include/opencv2/ml.hpp
147include/opencv2/ml/ml.hpp 152include/opencv2/ml/ml.hpp
148include/opencv2/objdetect.hpp 153include/opencv2/objdetect.hpp
149include/opencv2/objdetect/detection_based_tracker.hpp 154include/opencv2/objdetect/detection_based_tracker.hpp
150include/opencv2/objdetect/objdetect.hpp 155include/opencv2/objdetect/objdetect.hpp
151include/opencv2/objdetect/objdetect_c.h 156include/opencv2/objdetect/objdetect_c.h
152include/opencv2/opencv.hpp 157include/opencv2/opencv.hpp
153include/opencv2/opencv_modules.hpp 158include/opencv2/opencv_modules.hpp
154include/opencv2/photo.hpp 159include/opencv2/photo.hpp
155include/opencv2/photo/cuda.hpp 160include/opencv2/photo/cuda.hpp
@@ -192,73 +197,72 @@ include/opencv2/videostab/fast_marching. @@ -192,73 +197,72 @@ include/opencv2/videostab/fast_marching.
192include/opencv2/videostab/fast_marching_inl.hpp 197include/opencv2/videostab/fast_marching_inl.hpp
193include/opencv2/videostab/frame_source.hpp 198include/opencv2/videostab/frame_source.hpp
194include/opencv2/videostab/global_motion.hpp 199include/opencv2/videostab/global_motion.hpp
195include/opencv2/videostab/inpainting.hpp 200include/opencv2/videostab/inpainting.hpp
196include/opencv2/videostab/log.hpp 201include/opencv2/videostab/log.hpp
197include/opencv2/videostab/motion_core.hpp 202include/opencv2/videostab/motion_core.hpp
198include/opencv2/videostab/motion_stabilizing.hpp 203include/opencv2/videostab/motion_stabilizing.hpp
199include/opencv2/videostab/optical_flow.hpp 204include/opencv2/videostab/optical_flow.hpp
200include/opencv2/videostab/outlier_rejection.hpp 205include/opencv2/videostab/outlier_rejection.hpp
201include/opencv2/videostab/ring_buffer.hpp 206include/opencv2/videostab/ring_buffer.hpp
202include/opencv2/videostab/stabilizer.hpp 207include/opencv2/videostab/stabilizer.hpp
203include/opencv2/videostab/wobble_suppression.hpp 208include/opencv2/videostab/wobble_suppression.hpp
204lib/libopencv_calib3d.so 209lib/libopencv_calib3d.so
205lib/libopencv_calib3d.so.3.1 210lib/libopencv_calib3d.so.3.2
206lib/libopencv_calib3d.so.${PKGVERSION} 211lib/libopencv_calib3d.so.${PKGVERSION}
207lib/libopencv_core.so 212lib/libopencv_core.so
208lib/libopencv_core.so.3.1 213lib/libopencv_core.so.3.2
209lib/libopencv_core.so.${PKGVERSION} 214lib/libopencv_core.so.${PKGVERSION}
210lib/libopencv_features2d.so 215lib/libopencv_features2d.so
211lib/libopencv_features2d.so.3.1 216lib/libopencv_features2d.so.3.2
212lib/libopencv_features2d.so.${PKGVERSION} 217lib/libopencv_features2d.so.${PKGVERSION}
213lib/libopencv_flann.so 218lib/libopencv_flann.so
214lib/libopencv_flann.so.3.1 219lib/libopencv_flann.so.3.2
215lib/libopencv_flann.so.${PKGVERSION} 220lib/libopencv_flann.so.${PKGVERSION}
216lib/libopencv_highgui.so 221lib/libopencv_highgui.so
217lib/libopencv_highgui.so.3.1 222lib/libopencv_highgui.so.3.2
218lib/libopencv_highgui.so.${PKGVERSION} 223lib/libopencv_highgui.so.${PKGVERSION}
219lib/libopencv_imgcodecs.so 224lib/libopencv_imgcodecs.so
220lib/libopencv_imgcodecs.so.3.1 225lib/libopencv_imgcodecs.so.3.2
221lib/libopencv_imgcodecs.so.${PKGVERSION} 226lib/libopencv_imgcodecs.so.${PKGVERSION}
222lib/libopencv_imgproc.so 227lib/libopencv_imgproc.so
223lib/libopencv_imgproc.so.3.1 228lib/libopencv_imgproc.so.3.2
224lib/libopencv_imgproc.so.${PKGVERSION} 229lib/libopencv_imgproc.so.${PKGVERSION}
225lib/libopencv_ml.so 230lib/libopencv_ml.so
226lib/libopencv_ml.so.3.1 231lib/libopencv_ml.so.3.2
227lib/libopencv_ml.so.${PKGVERSION} 232lib/libopencv_ml.so.${PKGVERSION}
228lib/libopencv_objdetect.so 233lib/libopencv_objdetect.so
229lib/libopencv_objdetect.so.3.1 234lib/libopencv_objdetect.so.3.2
230lib/libopencv_objdetect.so.${PKGVERSION} 235lib/libopencv_objdetect.so.${PKGVERSION}
231lib/libopencv_photo.so 236lib/libopencv_photo.so
232lib/libopencv_photo.so.3.1 237lib/libopencv_photo.so.3.2
233lib/libopencv_photo.so.${PKGVERSION} 238lib/libopencv_photo.so.${PKGVERSION}
234lib/libopencv_shape.so 239lib/libopencv_shape.so
235lib/libopencv_shape.so.3.1 240lib/libopencv_shape.so.3.2
236lib/libopencv_shape.so.${PKGVERSION} 241lib/libopencv_shape.so.${PKGVERSION}
237lib/libopencv_stitching.so 242lib/libopencv_stitching.so
238lib/libopencv_stitching.so.3.1 243lib/libopencv_stitching.so.3.2
239lib/libopencv_stitching.so.${PKGVERSION} 244lib/libopencv_stitching.so.${PKGVERSION}
240lib/libopencv_superres.so 245lib/libopencv_superres.so
241lib/libopencv_superres.so.3.1 246lib/libopencv_superres.so.3.2
242lib/libopencv_superres.so.${PKGVERSION} 247lib/libopencv_superres.so.${PKGVERSION}
243lib/libopencv_ts.a 
244lib/libopencv_video.so 248lib/libopencv_video.so
245lib/libopencv_video.so.3.1 249lib/libopencv_video.so.3.2
246lib/libopencv_video.so.${PKGVERSION} 250lib/libopencv_video.so.${PKGVERSION}
247lib/libopencv_videoio.so 251lib/libopencv_videoio.so
248lib/libopencv_videoio.so.3.1 252lib/libopencv_videoio.so.3.2
249lib/libopencv_videoio.so.${PKGVERSION} 253lib/libopencv_videoio.so.${PKGVERSION}
250lib/libopencv_videostab.so 254lib/libopencv_videostab.so
251lib/libopencv_videostab.so.3.1 255lib/libopencv_videostab.so.3.2
252lib/libopencv_videostab.so.${PKGVERSION} 256lib/libopencv_videostab.so.${PKGVERSION}
253lib/pkgconfig/opencv.pc 257lib/pkgconfig/opencv.pc
254${PYSITELIB}/cv2.so 258${PYSITELIB}/cv2.so
255share/OpenCV/OpenCVConfig-version.cmake 259share/OpenCV/OpenCVConfig-version.cmake
256share/OpenCV/OpenCVConfig.cmake 260share/OpenCV/OpenCVConfig.cmake
257share/OpenCV/OpenCVModules-release.cmake 261share/OpenCV/OpenCVModules-release.cmake
258share/OpenCV/OpenCVModules.cmake 262share/OpenCV/OpenCVModules.cmake
259share/OpenCV/haarcascades/haarcascade_eye.xml 263share/OpenCV/haarcascades/haarcascade_eye.xml
260share/OpenCV/haarcascades/haarcascade_eye_tree_eyeglasses.xml 264share/OpenCV/haarcascades/haarcascade_eye_tree_eyeglasses.xml
261share/OpenCV/haarcascades/haarcascade_frontalcatface.xml 265share/OpenCV/haarcascades/haarcascade_frontalcatface.xml
262share/OpenCV/haarcascades/haarcascade_frontalcatface_extended.xml 266share/OpenCV/haarcascades/haarcascade_frontalcatface_extended.xml
263share/OpenCV/haarcascades/haarcascade_frontalface_alt.xml 267share/OpenCV/haarcascades/haarcascade_frontalface_alt.xml
264share/OpenCV/haarcascades/haarcascade_frontalface_alt2.xml 268share/OpenCV/haarcascades/haarcascade_frontalface_alt2.xml
cvs diff -r1.36 -r1.37 pkgsrc/graphics/opencv/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/opencv/distinfo 2016/07/16 03:49:56 1.36
+++ pkgsrc/graphics/opencv/distinfo 2017/03/16 21:59:13 1.37
@@ -1,22 +1,15 @@ @@ -1,22 +1,15 @@
1$NetBSD: distinfo,v 1.36 2016/07/16 03:49:56 markd Exp $ 1$NetBSD: distinfo,v 1.37 2017/03/16 21:59:13 prlw1 Exp $
2 2
3SHA1 (opencv-3.1.0.zip) = 8c932b68fe2e1575e88dde759ab1ed1d53d6f41b 3SHA1 (opencv-3.2.0.zip) = 7a7d2eb8cf617f58d610d856e531f3d92b89bc42
4RMD160 (opencv-3.1.0.zip) = d7a811c67cfb16243470822150760252d5770165 4RMD160 (opencv-3.2.0.zip) = 09da1443a5ef3de036b11bf0d1f384da36d459d9
5SHA512 (opencv-3.1.0.zip) = b4915e8838fce8ba9e1af8b11e46678624435e9a41592e645413dfdc830993eaa017d337fe4c212a49f096421a6317a1892546087fbc3cfdab554522336c0f1a 5SHA512 (opencv-3.2.0.zip) = c6418d2a7654fe9d50611e756778df4c6736f2de76b85773efbf490bb475dd95ec1041fe57a87163ce11a7db44430cd378c8416af3319f979ced92532bf5ebb5
6Size (opencv-3.1.0.zip) = 79186131 bytes 6Size (opencv-3.2.0.zip) = 82033498 bytes
7SHA1 (patch-3rdparty_ippicv_downloader.cmake) = a0b7c1b52f9ec4f35ff3f846785fbbfec1eeac51 7SHA1 (patch-3rdparty_ippicv_downloader.cmake) = a0b7c1b52f9ec4f35ff3f846785fbbfec1eeac51
8SHA1 (patch-apps_annotation_CMakeLists.txt) = 4c3a00b0dfef5e978b10ba966f68d050a06208fe 
9SHA1 (patch-apps_createsamples_CMakeLists.txt) = 2d60ecc0e1674cde4414e91e837c24fa464d42aa 
10SHA1 (patch-apps_traincascade_CMakeLists.txt) = 7114cc4c2057e12dc8e47bc61334cb8e175987eb 
11SHA1 (patch-cmake_OpenCVDetectCXXCompiler.cmake) = 221b0551d0f29d7e79afe3da8a33b1b3a4f7bf20 8SHA1 (patch-cmake_OpenCVDetectCXXCompiler.cmake) = 221b0551d0f29d7e79afe3da8a33b1b3a4f7bf20
12SHA1 (patch-cmake_OpenCVModule.cmake) = 7667f19f3e9c6ff757d92a6a49e7c3430c6c080d 
13SHA1 (patch-cmake_OpenCVPCHSupport.cmake) = 237fa2d000c402c55dfdbec3e27c89cffdfde8b1 
14SHA1 (patch-modules_core_include_opencv2_core_types_c.h) = 75444e65677be99af8167f9060419d7970a7adaa 9SHA1 (patch-modules_core_include_opencv2_core_types_c.h) = 75444e65677be99af8167f9060419d7970a7adaa
15SHA1 (patch-modules_core_src_downhill__simplex.cpp) = 1ad7c2fa126d15050b87785e8eec20dbe796b471 10SHA1 (patch-modules_core_src_downhill__simplex.cpp) = 1ad7c2fa126d15050b87785e8eec20dbe796b471
16SHA1 (patch-modules_core_src_parallel__pthreads.cpp) = c64ef8872c120db0ab92582496235858eec9bf92 11SHA1 (patch-modules_core_src_parallel__pthreads.cpp) = c64ef8872c120db0ab92582496235858eec9bf92
17SHA1 (patch-modules_core_src_system.cpp) = 3b7ac545585a430d28c7077f360357079f127580 12SHA1 (patch-modules_core_src_system.cpp) = 3b7ac545585a430d28c7077f360357079f127580
18SHA1 (patch-modules_flann_include_opencv2_flann_defines.h) = ab848e67c4e03219670598ac2d21071a617a5c33 13SHA1 (patch-modules_flann_include_opencv2_flann_defines.h) = ab848e67c4e03219670598ac2d21071a617a5c33
19SHA1 (patch-modules_java_CMakeLists.txt) = 020a8d2048d927e5d3819867df0d889bb516d8b4 
20SHA1 (patch-modules_objdetect_include_opencv_objdetect_detection__based__tracker.hpp) = 83575857156321ae07f3fb03d1b3c61b804b3832 
21SHA1 (patch-modules_ts_src_ts.cpp) = b9a3992014b02dbd89d46375a2476385e91dc24c 14SHA1 (patch-modules_ts_src_ts.cpp) = b9a3992014b02dbd89d46375a2476385e91dc24c
22SHA1 (patch-modules_videoio_src_cap__v4l.cpp) = f8f786f97a9b8c047180b79e399b83f71735f91e 15SHA1 (patch-modules_videoio_src_cap__v4l.cpp) = 96f33b2b209776ff8f38127c611d49413b308123
File Deleted: pkgsrc/graphics/opencv/patches/Attic/patch-apps_annotation_CMakeLists.txt
File Deleted: pkgsrc/graphics/opencv/patches/Attic/patch-apps_createsamples_CMakeLists.txt
File Deleted: pkgsrc/graphics/opencv/patches/Attic/patch-apps_traincascade_CMakeLists.txt
File Deleted: pkgsrc/graphics/opencv/patches/Attic/patch-cmake_OpenCVPCHSupport.cmake
File Deleted: pkgsrc/graphics/opencv/patches/Attic/patch-modules_java_CMakeLists.txt
File Deleted: pkgsrc/graphics/opencv/patches/Attic/patch-cmake_OpenCVModule.cmake
File Deleted: pkgsrc/graphics/opencv/patches/Attic/patch-modules_objdetect_include_opencv_objdetect_detection__based__tracker.hpp
cvs diff -r1.1 -r1.2 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 2016/03/01 20:14:24 1.1
+++ pkgsrc/graphics/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp 2017/03/16 21:59:13 1.2
@@ -1,74 +1,150 @@ @@ -1,74 +1,150 @@
1$NetBSD: patch-modules_videoio_src_cap__v4l.cpp,v 1.1 2016/03/01 20:14:24 joerg Exp $ 1$NetBSD: patch-modules_videoio_src_cap__v4l.cpp,v 1.2 2017/03/16 21:59:13 prlw1 Exp $
2 2
3--- modules/videoio/src/cap_v4l.cpp.orig 2015-12-18 15:02:16.000000000 +0000 3Conditionalize settings not available in NetBSD's v4l2 emulation.
 4
 5--- modules/videoio/src/cap_v4l.cpp.orig 2016-12-23 12:54:44.000000000 +0000
4+++ modules/videoio/src/cap_v4l.cpp 6+++ modules/videoio/src/cap_v4l.cpp
5@@ -216,6 +216,7 @@ make & enjoy! 7@@ -216,6 +216,7 @@ make & enjoy!
6 #include <fcntl.h> 8 #include <fcntl.h>
7 #include <errno.h> 9 #include <errno.h>
8 #include <sys/ioctl.h> 10 #include <sys/ioctl.h>
9+#include <inttypes.h> 11+#include <inttypes.h>
10 #include <sys/types.h> 12 #include <sys/types.h>
11 #include <sys/mman.h> 13 #include <sys/mman.h>
12  14
13@@ -462,7 +463,9 @@ static int autosetup_capture_mode_v4l2(C 15@@ -469,9 +470,13 @@ static int autosetup_capture_mode_v4l2(C
14 V4L2_PIX_FMT_UYVY, 16 V4L2_PIX_FMT_UYVY,
15 V4L2_PIX_FMT_SN9C10X, 17 V4L2_PIX_FMT_SN9C10X,
16 V4L2_PIX_FMT_SBGGR8, 18 V4L2_PIX_FMT_SBGGR8,
17+#ifdef V4L2_PIX_FMT_SGBRG8 19+#ifdef V4L2_PIX_FMT_SGBRG8
18 V4L2_PIX_FMT_SGBRG8, 20 V4L2_PIX_FMT_SGBRG8,
 21- V4L2_PIX_FMT_RGB24,
 22- V4L2_PIX_FMT_Y16
 23+#endif
 24+ V4L2_PIX_FMT_RGB24
 25+#ifdef V4L2_PIX_FMT_Y16
 26+ ,V4L2_PIX_FMT_Y16
19+#endif 27+#endif
20 V4L2_PIX_FMT_RGB24 
21 }; 28 };
22  29
23@@ -515,9 +518,11 @@ static void v4l2_control_range(CvCapture 30 for (size_t i = 0; i < sizeof(try_order) / sizeof(__u32); i++) {
24 case V4L2_CID_EXPOSURE: 31@@ -520,12 +525,16 @@ static void v4l2_control_range(CvCapture
 32 case V4L2_CID_GAIN:
 33 cap->gain = range;
 34 break;
 35+#ifdef V4L2_CID_EXPOSURE_ABSOLUTE
 36 case V4L2_CID_EXPOSURE_ABSOLUTE:
25 cap->exposure = range; 37 cap->exposure = range;
26 break; 38 break;
 39+#endif
27+#ifdef V4L2_CID_FOCUS_ABSOLUTE 40+#ifdef V4L2_CID_FOCUS_ABSOLUTE
28 case V4L2_CID_FOCUS_ABSOLUTE: 41 case V4L2_CID_FOCUS_ABSOLUTE:
29 cap->focus = range; 42 cap->focus = range;
30 break; 43 break;
31+#endif 44+#endif
32 } 45 }
33 } 46 }
34  47
35@@ -539,7 +544,9 @@ static void v4l2_scan_controls(CvCapture 48@@ -547,7 +556,9 @@ static void v4l2_scan_controls(CvCapture
36 break; 49 break;
37 } 50 }
38  51
39+#ifdef V4L2_CID_FOCUS_ABSOLUTE 52+#ifdef V4L2_CID_FOCUS_ABSOLUTE
40 v4l2_control_range(capture, V4L2_CID_FOCUS_ABSOLUTE); 53 v4l2_control_range(capture, V4L2_CID_FOCUS_ABSOLUTE);
41+#endif 54+#endif
42 } 55 }
43  56
44 static int v4l2_set_fps(CvCaptureCAM_V4L* capture) { 57 static int v4l2_set_fps(CvCaptureCAM_V4L* capture) {
45@@ -1523,12 +1530,14 @@ static IplImage* icvRetrieveFrameCAM_V4L 58@@ -563,8 +574,10 @@ static int v4l2_num_channels(__u32 palet
 59 case V4L2_PIX_FMT_YVU420:
 60 case V4L2_PIX_FMT_MJPEG:
 61 case V4L2_PIX_FMT_JPEG:
 62+#ifdef V4L2_PIX_FMT_Y16
 63 case V4L2_PIX_FMT_Y16:
 64 return 1;
 65+#endif
 66 case V4L2_PIX_FMT_YUYV:
 67 case V4L2_PIX_FMT_UYVY:
 68 return 2;
 69@@ -592,11 +605,13 @@ static void v4l2_create_frame(CvCaptureC
 70 case V4L2_PIX_FMT_YVU420:
 71 size.height = size.height * 3 / 2; // "1.5" channels
 72 break;
 73+#ifdef V4L2_PIX_FMT_Y16
 74 case V4L2_PIX_FMT_Y16:
 75 if(!capture->convert_rgb){
 76 depth = IPL_DEPTH_16U;
 77 }
 78 break;
 79+#endif
 80 }
 81 }
 82
 83@@ -1555,18 +1570,21 @@ static IplImage* icvRetrieveFrameCAM_V4L
46 (unsigned char*)capture->frame.imageData); 84 (unsigned char*)capture->frame.imageData);
47 break; 85 break;
48  86
49+#ifdef V4L2_PIX_FMT_SGBRG8 87+#ifdef V4L2_PIX_FMT_SGBRG8
50 case V4L2_PIX_FMT_SGBRG8: 88 case V4L2_PIX_FMT_SGBRG8:
51 sgbrg2rgb24(capture->form.fmt.pix.width, 89 sgbrg2rgb24(capture->form.fmt.pix.width,
52 capture->form.fmt.pix.height, 90 capture->form.fmt.pix.height,
53 (unsigned char*)capture->buffers[(capture->bufferIndex+1) % capture->req.count].start, 91 (unsigned char*)capture->buffers[(capture->bufferIndex+1) % capture->req.count].start,
54 (unsigned char*)capture->frame.imageData); 92 (unsigned char*)capture->frame.imageData);
55 break; 93 break;
56+#endif 94+#endif
57 case V4L2_PIX_FMT_RGB24: 95 case V4L2_PIX_FMT_RGB24:
58 rgb24_to_rgb24(capture->form.fmt.pix.width, 96 rgb24_to_rgb24(capture->form.fmt.pix.width,
59 capture->form.fmt.pix.height, 97 capture->form.fmt.pix.height,
60@@ -1554,10 +1563,14 @@ static inline __u32 capPropertyToV4L2(in 98 (unsigned char*)capture->buffers[(capture->bufferIndex+1) % capture->req.count].start,
 99 (unsigned char*)capture->frame.imageData);
 100 break;
 101+#ifdef V4L2_PIX_FMT_Y16
 102 case V4L2_PIX_FMT_Y16:
 103 if(capture->convert_rgb){
 104 y16_to_rgb24(capture->form.fmt.pix.width,
 105@@ -1579,6 +1597,7 @@ static IplImage* icvRetrieveFrameCAM_V4L
 106 capture->frame.imageSize);
 107 }
 108 break;
 109+#endif
 110 }
 111
 112 return(&capture->frame);
 113@@ -1596,14 +1615,22 @@ static inline __u32 capPropertyToV4L2(in
 114 return V4L2_CID_HUE;
 115 case CV_CAP_PROP_GAIN:
61 return V4L2_CID_GAIN; 116 return V4L2_CID_GAIN;
 117+#ifdef V4L2_CID_EXPOSURE_AUTO
 118 case CV_CAP_PROP_AUTO_EXPOSURE:
 119 return V4L2_CID_EXPOSURE_AUTO;
 120+#endif
 121+#ifdef V4L2_CID_EXPOSURE_ABSOLUTE
62 case CV_CAP_PROP_EXPOSURE: 122 case CV_CAP_PROP_EXPOSURE:
63 return V4L2_CID_EXPOSURE; 123 return V4L2_CID_EXPOSURE_ABSOLUTE;
 124+#endif
64+#ifdef V4L2_CID_FOCUS_AUTO 125+#ifdef V4L2_CID_FOCUS_AUTO
65 case CV_CAP_PROP_AUTOFOCUS: 126 case CV_CAP_PROP_AUTOFOCUS:
66 return V4L2_CID_FOCUS_AUTO; 127 return V4L2_CID_FOCUS_AUTO;
67+#endif 128+#endif
68+#ifdef V4L2_CID_FOCUS_ABSOLUTE 129+#ifdef V4L2_CID_FOCUS_ABSOLUTE
69 case CV_CAP_PROP_FOCUS: 130 case CV_CAP_PROP_FOCUS:
70 return V4L2_CID_FOCUS_ABSOLUTE; 131 return V4L2_CID_FOCUS_ABSOLUTE;
71+#endif 132+#endif
72 default: 133 default:
73 return -1; 134 return -1;
74 } 135 }
 136@@ -1749,12 +1776,14 @@ static bool icvSetControl (CvCaptureCAM_
 137 return false;
 138 }
 139
 140+#if defined(V4L2_CID_EXPOSURE_AUTO) && defined(V4L2_EXPOSURE_MANUAL) && defined(V4L2_CID_EXPOSURE_ABSOLUTE)
 141 if(control.id == V4L2_CID_EXPOSURE_AUTO && control.value == V4L2_EXPOSURE_MANUAL) {
 142 // update the control range for expose after disabling autoexposure
 143 // as it is not read correctly at startup
 144 // TODO check this again as it might be fixed with Linux 4.5
 145 v4l2_control_range(capture, V4L2_CID_EXPOSURE_ABSOLUTE);
 146 }
 147+#endif
 148
 149 /* all was OK */
 150 return true;