CVS commit: pkgsrc/graphics/opencv

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/graphics/opencv
From: "Filip Hajny" <fhajny%netbsd.org@localhost>
Date: Fri, 2 Mar 2018 16:24:21 +0000

Module Name:    pkgsrc
Committed By:   fhajny
Date:           Fri Mar  2 16:24:21 UTC 2018

Modified Files:
        pkgsrc/graphics/opencv: Makefile PLIST distinfo
        pkgsrc/graphics/opencv/patches: patch-modules_videoio_src_cap__v4l.cpp
Removed Files:
        pkgsrc/graphics/opencv/patches:
            patch-modules_core_src_parallel__pthreads.cpp

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 pkgsrc/graphics/opencv/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/graphics/opencv/PLIST
cvs rdiff -u -r1.38 -r1.39 pkgsrc/graphics/opencv/distinfo
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/graphics/opencv/patches/patch-modules_core_src_parallel__pthreads.cpp
cvs rdiff -u -r1.3 -r1.4 \
    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.

Modified files:

Index: pkgsrc/graphics/opencv/Makefile
diff -u pkgsrc/graphics/opencv/Makefile:1.74 pkgsrc/graphics/opencv/Makefile:1.75
--- pkgsrc/graphics/opencv/Makefile:1.74        Mon Feb 26 08:19:28 2018
+++ pkgsrc/graphics/opencv/Makefile     Fri Mar  2 16:24:21 2018
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.74 2018/02/26 08:19:28 adam Exp $
+# $NetBSD: Makefile,v 1.75 2018/03/02 16:24:21 fhajny Exp $
 
-DISTNAME=      opencv-3.3.0
-PKGREVISION=   1
+DISTNAME=      opencv-3.4.1
 CATEGORIES=    graphics devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=opencv/}
 EXTRACT_SUFX=  .zip
@@ -34,6 +33,7 @@ CHECK_WRKREF_SKIP=    ${PREFIX}/lib/libopen
 CMAKE_ARGS+=           -DPYTHON_EXECUTABLE:FILEPATH=${PYTHONBIN}
 CMAKE_ARGS+=           -DZLIB_ROOT=${BUILDLINK_PREFIX.zlib}
 CMAKE_ARGS.SunOS+=     -DENABLE_PRECOMPILED_HEADERS=NO
+CMAKE_ARGS.SunOS+=     -DOPENCV_PYTHON_SKIP_LINKER_EXCLUDE_LIBS=YES
 CMAKE_ARGS+=           -DWITH_EIGEN=NO
 
 CONFIGURE_ENV+=                MACHINE_ARCH=${MACHINE_ARCH}

Index: pkgsrc/graphics/opencv/PLIST
diff -u pkgsrc/graphics/opencv/PLIST:1.18 pkgsrc/graphics/opencv/PLIST:1.19
--- pkgsrc/graphics/opencv/PLIST:1.18   Mon Sep  4 15:23:49 2017
+++ pkgsrc/graphics/opencv/PLIST        Fri Mar  2 16:24:21 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2017/09/04 15:23:49 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.19 2018/03/02 16:24:21 fhajny Exp $
 bin/opencv_annotation
 bin/opencv_createsamples
 bin/opencv_interactive-calibration
@@ -73,6 +73,7 @@ include/opencv2/core/hal/intrin.hpp
 include/opencv2/core/hal/intrin_cpp.hpp
 include/opencv2/core/hal/intrin_neon.hpp
 include/opencv2/core/hal/intrin_sse.hpp
+include/opencv2/core/hal/intrin_vsx.hpp
 include/opencv2/core/ippasync.hpp
 include/opencv2/core/mat.hpp
 include/opencv2/core/mat.inl.hpp
@@ -80,6 +81,24 @@ include/opencv2/core/matx.hpp
 include/opencv2/core/neon_utils.hpp
 include/opencv2/core/ocl.hpp
 include/opencv2/core/ocl_genbase.hpp
+include/opencv2/core/opencl/ocl_defs.hpp
+include/opencv2/core/opencl/opencl_info.hpp
+include/opencv2/core/opencl/opencl_svm.hpp
+include/opencv2/core/opencl/runtime/autogenerated/opencl_clamdblas.hpp
+include/opencv2/core/opencl/runtime/autogenerated/opencl_clamdfft.hpp
+include/opencv2/core/opencl/runtime/autogenerated/opencl_core.hpp
+include/opencv2/core/opencl/runtime/autogenerated/opencl_core_wrappers.hpp
+include/opencv2/core/opencl/runtime/autogenerated/opencl_gl.hpp
+include/opencv2/core/opencl/runtime/autogenerated/opencl_gl_wrappers.hpp
+include/opencv2/core/opencl/runtime/opencl_clamdblas.hpp
+include/opencv2/core/opencl/runtime/opencl_clamdfft.hpp
+include/opencv2/core/opencl/runtime/opencl_core.hpp
+include/opencv2/core/opencl/runtime/opencl_core_wrappers.hpp
+include/opencv2/core/opencl/runtime/opencl_gl.hpp
+include/opencv2/core/opencl/runtime/opencl_gl_wrappers.hpp
+include/opencv2/core/opencl/runtime/opencl_svm_20.hpp
+include/opencv2/core/opencl/runtime/opencl_svm_definitions.hpp
+include/opencv2/core/opencl/runtime/opencl_svm_hsa_extension.hpp
 include/opencv2/core/opengl.hpp
 include/opencv2/core/operations.hpp
 include/opencv2/core/optim.hpp
@@ -93,10 +112,13 @@ 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/filesystem.hpp
+include/opencv2/core/utils/logger.defines.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/vsx_utils.hpp
 include/opencv2/core/wimage.hpp
 include/opencv2/cvconfig.h
 include/opencv2/dnn.hpp
@@ -109,6 +131,7 @@ include/opencv2/dnn/layer.hpp
 include/opencv2/dnn/shape_utils.hpp
 include/opencv2/features2d.hpp
 include/opencv2/features2d/features2d.hpp
+include/opencv2/features2d/hal/interface.h
 include/opencv2/flann.hpp
 include/opencv2/flann/all_indices.h
 include/opencv2/flann/allocator.h
@@ -162,6 +185,7 @@ include/opencv2/imgproc/imgproc_c.h
 include/opencv2/imgproc/types_c.h
 include/opencv2/ml.hpp
 include/opencv2/ml/ml.hpp
+include/opencv2/ml/ml.inl.hpp
 include/opencv2/objdetect.hpp
 include/opencv2/objdetect/detection_based_tracker.hpp
 include/opencv2/objdetect/objdetect.hpp
@@ -219,55 +243,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.3
+lib/libopencv_calib3d.so.3.4
 lib/libopencv_calib3d.so.${PKGVERSION}
 lib/libopencv_core.so
-lib/libopencv_core.so.3.3
+lib/libopencv_core.so.3.4
 lib/libopencv_core.so.${PKGVERSION}
 lib/libopencv_dnn.so
-lib/libopencv_dnn.so.3.3
+lib/libopencv_dnn.so.3.4
 lib/libopencv_dnn.so.${PKGVERSION}
 lib/libopencv_features2d.so
-lib/libopencv_features2d.so.3.3
+lib/libopencv_features2d.so.3.4
 lib/libopencv_features2d.so.${PKGVERSION}
 lib/libopencv_flann.so
-lib/libopencv_flann.so.3.3
+lib/libopencv_flann.so.3.4
 lib/libopencv_flann.so.${PKGVERSION}
 lib/libopencv_highgui.so
-lib/libopencv_highgui.so.3.3
+lib/libopencv_highgui.so.3.4
 lib/libopencv_highgui.so.${PKGVERSION}
 lib/libopencv_imgcodecs.so
-lib/libopencv_imgcodecs.so.3.3
+lib/libopencv_imgcodecs.so.3.4
 lib/libopencv_imgcodecs.so.${PKGVERSION}
 lib/libopencv_imgproc.so
-lib/libopencv_imgproc.so.3.3
+lib/libopencv_imgproc.so.3.4
 lib/libopencv_imgproc.so.${PKGVERSION}
 lib/libopencv_ml.so
-lib/libopencv_ml.so.3.3
+lib/libopencv_ml.so.3.4
 lib/libopencv_ml.so.${PKGVERSION}
 lib/libopencv_objdetect.so
-lib/libopencv_objdetect.so.3.3
+lib/libopencv_objdetect.so.3.4
 lib/libopencv_objdetect.so.${PKGVERSION}
 lib/libopencv_photo.so
-lib/libopencv_photo.so.3.3
+lib/libopencv_photo.so.3.4
 lib/libopencv_photo.so.${PKGVERSION}
 lib/libopencv_shape.so
-lib/libopencv_shape.so.3.3
+lib/libopencv_shape.so.3.4
 lib/libopencv_shape.so.${PKGVERSION}
 lib/libopencv_stitching.so
-lib/libopencv_stitching.so.3.3
+lib/libopencv_stitching.so.3.4
 lib/libopencv_stitching.so.${PKGVERSION}
 lib/libopencv_superres.so
-lib/libopencv_superres.so.3.3
+lib/libopencv_superres.so.3.4
 lib/libopencv_superres.so.${PKGVERSION}
 lib/libopencv_video.so
-lib/libopencv_video.so.3.3
+lib/libopencv_video.so.3.4
 lib/libopencv_video.so.${PKGVERSION}
 lib/libopencv_videoio.so
-lib/libopencv_videoio.so.3.3
+lib/libopencv_videoio.so.3.4
 lib/libopencv_videoio.so.${PKGVERSION}
 lib/libopencv_videostab.so
-lib/libopencv_videostab.so.3.3
+lib/libopencv_videostab.so.3.4
 lib/libopencv_videostab.so.${PKGVERSION}
 lib/pkgconfig/opencv.pc
 ${PYSITELIB}/cv2.so

Index: pkgsrc/graphics/opencv/distinfo
diff -u pkgsrc/graphics/opencv/distinfo:1.38 pkgsrc/graphics/opencv/distinfo:1.39
--- pkgsrc/graphics/opencv/distinfo:1.38        Mon Sep  4 15:23:49 2017
+++ pkgsrc/graphics/opencv/distinfo     Fri Mar  2 16:24:21 2018
@@ -1,16 +1,15 @@
-$NetBSD: distinfo,v 1.38 2017/09/04 15:23:49 fhajny Exp $
+$NetBSD: distinfo,v 1.39 2018/03/02 16:24:21 fhajny Exp $
 
-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-3.4.1.zip) = 1e2a04746eaeee520e58f81002c556c435ef0dce
+RMD160 (opencv-3.4.1.zip) = d9f6de36b3d43e0ec5ce7dcfe752a7529f1c4daa
+SHA512 (opencv-3.4.1.zip) = 23610b7f909963ed3d7df233932e8ca0ef0604683affcbdec099b9b991bd4c0af275ec808c874ea29a5e8fbd5f02ad284aa0749c99748e01a73845aa25ebc3b9
+Size (opencv-3.4.1.zip) = 90982898 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) = 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) = 96aac9380d94818a52afd51f2d4b3f774debd080
+SHA1 (patch-modules_videoio_src_cap__v4l.cpp) = 985d91d9a4c63f081c3fff495cc86d8d0a1c6aa4

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.3 pkgsrc/graphics/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp:1.4
--- pkgsrc/graphics/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp:1.3   Mon Sep  4 15:23:49 2017
+++ pkgsrc/graphics/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp       Fri Mar  2 16:24:21 2018
@@ -1,8 +1,8 @@
-$NetBSD: patch-modules_videoio_src_cap__v4l.cpp,v 1.3 2017/09/04 15:23:49 fhajny Exp $
+$NetBSD: patch-modules_videoio_src_cap__v4l.cpp,v 1.4 2018/03/02 16:24:21 fhajny Exp $
 
 Conditionalize settings not available in NetBSD's v4l2 emulation.
 
---- modules/videoio/src/cap_v4l.cpp.orig       2017-08-03 23:58:23.000000000 +0000
+--- modules/videoio/src/cap_v4l.cpp.orig       2018-02-23 08:38:33.000000000 +0000
 +++ modules/videoio/src/cap_v4l.cpp
 @@ -216,6 +216,7 @@ make & enjoy!
  #include <fcntl.h>
@@ -12,18 +12,20 @@ Conditionalize settings not available in
  #include <sys/types.h>
  #include <sys/mman.h>
  
-@@ -470,9 +471,13 @@ static int autosetup_capture_mode_v4l2(C
+@@ -466,13 +467,17 @@ static int autosetup_capture_mode_v4l2(C
+             V4L2_PIX_FMT_YUYV,
              V4L2_PIX_FMT_UYVY,
-             V4L2_PIX_FMT_SN9C10X,
              V4L2_PIX_FMT_SBGGR8,
 +#ifdef V4L2_PIX_FMT_SGBRG8
              V4L2_PIX_FMT_SGBRG8,
--            V4L2_PIX_FMT_RGB24,
--            V4L2_PIX_FMT_Y16
 +#endif
-+            V4L2_PIX_FMT_RGB24
+             V4L2_PIX_FMT_SN9C10X,
+ #ifdef HAVE_JPEG
+             V4L2_PIX_FMT_MJPEG,
+             V4L2_PIX_FMT_JPEG,
+ #endif
 +#ifdef V4L2_PIX_FMT_Y16
-+            ,V4L2_PIX_FMT_Y16
+             V4L2_PIX_FMT_Y16
 +#endif
      };

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index