pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics Update graphics/opencv to 3.3.0.
details: https://anonhg.NetBSD.org/pkgsrc/rev/5d5ee2cc91b0
branches: trunk
changeset: 367642:5d5ee2cc91b0
user: fhajny <fhajny%pkgsrc.org@localhost>
date: Mon Sep 04 15:23:49 2017 +0000
description:
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
diffstat:
graphics/opencv-contrib-face/Makefile | 21 +++-
graphics/opencv-contrib-face/PLIST | 4 +-
graphics/opencv-contrib-face/distinfo | 32 ++---
graphics/opencv/Makefile | 12 +-
graphics/opencv/PLIST | 58 ++++++---
graphics/opencv/distinfo | 17 +-
graphics/opencv/patches/patch-3rdparty_ippicv_downloader.cmake | 12 --
graphics/opencv/patches/patch-3rdparty_ippicv_ippicv.cmake | 12 ++
graphics/opencv/patches/patch-3rdparty_protobuf_src_google_protobuf_message__lite.cc | 14 ++
graphics/opencv/patches/patch-modules_core_src_parallel__pthreads.cpp | 8 +-
graphics/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp | 24 ++--
11 files changed, 132 insertions(+), 82 deletions(-)
diffs (truncated from 466 to 300 lines):
diff -r 64a9251c39d5 -r 5d5ee2cc91b0 graphics/opencv-contrib-face/Makefile
--- a/graphics/opencv-contrib-face/Makefile Mon Sep 04 15:08:51 2017 +0000
+++ b/graphics/opencv-contrib-face/Makefile Mon Sep 04 15:23:49 2017 +0000
@@ -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_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 @@
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"
diff -r 64a9251c39d5 -r 5d5ee2cc91b0 graphics/opencv-contrib-face/PLIST
--- a/graphics/opencv-contrib-face/PLIST Mon Sep 04 15:08:51 2017 +0000
+++ b/graphics/opencv-contrib-face/PLIST Mon Sep 04 15:23:49 2017 +0000
@@ -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}
diff -r 64a9251c39d5 -r 5d5ee2cc91b0 graphics/opencv-contrib-face/distinfo
--- a/graphics/opencv-contrib-face/distinfo Mon Sep 04 15:08:51 2017 +0000
+++ b/graphics/opencv-contrib-face/distinfo Mon Sep 04 15:23:49 2017 +0000
@@ -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
diff -r 64a9251c39d5 -r 5d5ee2cc91b0 graphics/opencv/Makefile
--- a/graphics/opencv/Makefile Mon Sep 04 15:08:51 2017 +0000
+++ b/graphics/opencv/Makefile Mon Sep 04 15:23:49 2017 +0000
@@ -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/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 @@
# 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"
diff -r 64a9251c39d5 -r 5d5ee2cc91b0 graphics/opencv/PLIST
--- a/graphics/opencv/PLIST Mon Sep 04 15:08:51 2017 +0000
+++ b/graphics/opencv/PLIST Mon Sep 04 15:23:49 2017 +0000
@@ -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_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/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/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_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
diff -r 64a9251c39d5 -r 5d5ee2cc91b0 graphics/opencv/distinfo
--- a/graphics/opencv/distinfo Mon Sep 04 15:08:51 2017 +0000
+++ b/graphics/opencv/distinfo Mon Sep 04 15:23:49 2017 +0000
@@ -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
diff -r 64a9251c39d5 -r 5d5ee2cc91b0 graphics/opencv/patches/patch-3rdparty_ippicv_downloader.cmake
--- a/graphics/opencv/patches/patch-3rdparty_ippicv_downloader.cmake Mon Sep 04 15:08:51 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
Home |
Main Index |
Thread Index |
Old Index