pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics/opencv Update opencv to 3.2
details: https://anonhg.NetBSD.org/pkgsrc/rev/16dc272ccc78
branches: trunk
changeset: 359727:16dc272ccc78
user: prlw1 <prlw1%pkgsrc.org@localhost>
date: Thu Mar 16 21:59:13 2017 +0000
description:
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)
diffstat:
graphics/opencv/Makefile | 12 +-
graphics/opencv/PLIST | 40 ++-
graphics/opencv/distinfo | 19 +-
graphics/opencv/patches/patch-apps_annotation_CMakeLists.txt | 15 -
graphics/opencv/patches/patch-apps_createsamples_CMakeLists.txt | 15 -
graphics/opencv/patches/patch-apps_traincascade_CMakeLists.txt | 15 -
graphics/opencv/patches/patch-cmake_OpenCVModule.cmake | 15 -
graphics/opencv/patches/patch-cmake_OpenCVPCHSupport.cmake | 15 -
graphics/opencv/patches/patch-modules_java_CMakeLists.txt | 15 -
graphics/opencv/patches/patch-modules_objdetect_include_opencv_objdetect_detection__based__tracker.hpp | 13 -
graphics/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp | 96 ++++++++-
11 files changed, 120 insertions(+), 150 deletions(-)
diffs (truncated from 443 to 300 lines):
diff -r 0ab02e372777 -r 16dc272ccc78 graphics/opencv/Makefile
--- a/graphics/opencv/Makefile Thu Mar 16 21:08:35 2017 +0000
+++ b/graphics/opencv/Makefile Thu Mar 16 21:59:13 2017 +0000
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.69 2017/02/28 15:20:06 ryoon Exp $
+# $NetBSD: Makefile,v 1.70 2017/03/16 21:59:13 prlw1 Exp $
-DISTNAME= opencv-3.1.0
-PKGREVISION= 6
+DISTNAME= opencv-3.2.0
CATEGORIES= graphics devel
-MASTER_SITES= ${MASTER_SITE_GITHUB:=Itseez/}
+MASTER_SITES= ${MASTER_SITE_GITHUB:=opencv/}
EXTRACT_SUFX= .zip
MAINTAINER= anthony.mallet%laas.fr@localhost
-HOMEPAGE= http://code.opencv.org/projects/OpenCV/wiki/WikiStart
+HOMEPAGE= http://opencv.org/
COMMENT= Library for computer vision problems
LICENSE= modified-bsd
@@ -20,7 +19,8 @@
INSTALLATION_DIRS+= share/doc/opencv/ref/pics
INSTALLATION_DIRS+= share/OpenCV/haarcascades
-PKGCONFIG_OVERRIDE+= opencv.pc.cmake.in
+PKGCONFIG_OVERRIDE+= unix-install/opencv.pc
+PKGCONFIG_OVERRIDE_STAGE= post-configure
PY_PATCHPLIST= yes
REPLACE_PYTHON+= samples/python/*.py
diff -r 0ab02e372777 -r 16dc272ccc78 graphics/opencv/PLIST
--- a/graphics/opencv/PLIST Thu Mar 16 21:08:35 2017 +0000
+++ b/graphics/opencv/PLIST Thu Mar 16 21:59:13 2017 +0000
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.16 2016/02/21 14:10:46 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.17 2017/03/16 21:59:13 prlw1 Exp $
bin/opencv_annotation
bin/opencv_createsamples
bin/opencv_traincascade
+bin/opencv_version
+bin/opencv_visualisation
include/opencv/cv.h
include/opencv/cv.hpp
include/opencv/cvaux.h
@@ -78,6 +80,7 @@
include/opencv2/core/opengl.hpp
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
@@ -140,6 +143,8 @@
include/opencv2/imgcodecs/ios.h
include/opencv2/imgproc.hpp
include/opencv2/imgproc/detail/distortion_model.hpp
+include/opencv2/imgproc/hal/hal.hpp
+include/opencv2/imgproc/hal/interface.h
include/opencv2/imgproc/imgproc.hpp
include/opencv2/imgproc/imgproc_c.h
include/opencv2/imgproc/types_c.h
@@ -202,53 +207,52 @@
include/opencv2/videostab/stabilizer.hpp
include/opencv2/videostab/wobble_suppression.hpp
lib/libopencv_calib3d.so
-lib/libopencv_calib3d.so.3.1
+lib/libopencv_calib3d.so.3.2
lib/libopencv_calib3d.so.${PKGVERSION}
lib/libopencv_core.so
-lib/libopencv_core.so.3.1
+lib/libopencv_core.so.3.2
lib/libopencv_core.so.${PKGVERSION}
lib/libopencv_features2d.so
-lib/libopencv_features2d.so.3.1
+lib/libopencv_features2d.so.3.2
lib/libopencv_features2d.so.${PKGVERSION}
lib/libopencv_flann.so
-lib/libopencv_flann.so.3.1
+lib/libopencv_flann.so.3.2
lib/libopencv_flann.so.${PKGVERSION}
lib/libopencv_highgui.so
-lib/libopencv_highgui.so.3.1
+lib/libopencv_highgui.so.3.2
lib/libopencv_highgui.so.${PKGVERSION}
lib/libopencv_imgcodecs.so
-lib/libopencv_imgcodecs.so.3.1
+lib/libopencv_imgcodecs.so.3.2
lib/libopencv_imgcodecs.so.${PKGVERSION}
lib/libopencv_imgproc.so
-lib/libopencv_imgproc.so.3.1
+lib/libopencv_imgproc.so.3.2
lib/libopencv_imgproc.so.${PKGVERSION}
lib/libopencv_ml.so
-lib/libopencv_ml.so.3.1
+lib/libopencv_ml.so.3.2
lib/libopencv_ml.so.${PKGVERSION}
lib/libopencv_objdetect.so
-lib/libopencv_objdetect.so.3.1
+lib/libopencv_objdetect.so.3.2
lib/libopencv_objdetect.so.${PKGVERSION}
lib/libopencv_photo.so
-lib/libopencv_photo.so.3.1
+lib/libopencv_photo.so.3.2
lib/libopencv_photo.so.${PKGVERSION}
lib/libopencv_shape.so
-lib/libopencv_shape.so.3.1
+lib/libopencv_shape.so.3.2
lib/libopencv_shape.so.${PKGVERSION}
lib/libopencv_stitching.so
-lib/libopencv_stitching.so.3.1
+lib/libopencv_stitching.so.3.2
lib/libopencv_stitching.so.${PKGVERSION}
lib/libopencv_superres.so
-lib/libopencv_superres.so.3.1
+lib/libopencv_superres.so.3.2
lib/libopencv_superres.so.${PKGVERSION}
-lib/libopencv_ts.a
lib/libopencv_video.so
-lib/libopencv_video.so.3.1
+lib/libopencv_video.so.3.2
lib/libopencv_video.so.${PKGVERSION}
lib/libopencv_videoio.so
-lib/libopencv_videoio.so.3.1
+lib/libopencv_videoio.so.3.2
lib/libopencv_videoio.so.${PKGVERSION}
lib/libopencv_videostab.so
-lib/libopencv_videostab.so.3.1
+lib/libopencv_videostab.so.3.2
lib/libopencv_videostab.so.${PKGVERSION}
lib/pkgconfig/opencv.pc
${PYSITELIB}/cv2.so
diff -r 0ab02e372777 -r 16dc272ccc78 graphics/opencv/distinfo
--- a/graphics/opencv/distinfo Thu Mar 16 21:08:35 2017 +0000
+++ b/graphics/opencv/distinfo Thu Mar 16 21:59:13 2017 +0000
@@ -1,22 +1,15 @@
-$NetBSD: distinfo,v 1.36 2016/07/16 03:49:56 markd Exp $
+$NetBSD: distinfo,v 1.37 2017/03/16 21:59:13 prlw1 Exp $
-SHA1 (opencv-3.1.0.zip) = 8c932b68fe2e1575e88dde759ab1ed1d53d6f41b
-RMD160 (opencv-3.1.0.zip) = d7a811c67cfb16243470822150760252d5770165
-SHA512 (opencv-3.1.0.zip) = b4915e8838fce8ba9e1af8b11e46678624435e9a41592e645413dfdc830993eaa017d337fe4c212a49f096421a6317a1892546087fbc3cfdab554522336c0f1a
-Size (opencv-3.1.0.zip) = 79186131 bytes
+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 (patch-apps_annotation_CMakeLists.txt) = 4c3a00b0dfef5e978b10ba966f68d050a06208fe
-SHA1 (patch-apps_createsamples_CMakeLists.txt) = 2d60ecc0e1674cde4414e91e837c24fa464d42aa
-SHA1 (patch-apps_traincascade_CMakeLists.txt) = 7114cc4c2057e12dc8e47bc61334cb8e175987eb
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_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) = f8f786f97a9b8c047180b79e399b83f71735f91e
+SHA1 (patch-modules_videoio_src_cap__v4l.cpp) = 96f33b2b209776ff8f38127c611d49413b308123
diff -r 0ab02e372777 -r 16dc272ccc78 graphics/opencv/patches/patch-apps_annotation_CMakeLists.txt
--- a/graphics/opencv/patches/patch-apps_annotation_CMakeLists.txt Thu Mar 16 21:08:35 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-apps_annotation_CMakeLists.txt,v 1.1 2016/02/08 02:04:18 dbj Exp $
-
-Fix library id handling on Darwin
-
---- apps/annotation/CMakeLists.txt.orig 2015-06-03 17:21:34.000000000 +0000
-+++ apps/annotation/CMakeLists.txt
-@@ -21,7 +21,7 @@ set_target_properties(${the_target} PROP
- DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
- ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
- RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
-- INSTALL_NAME_DIR lib
-+ INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/${OPENCV_LIB_INSTALL_PATH}
- OUTPUT_NAME "opencv_annotation")
-
- if(ENABLE_SOLUTION_FOLDERS)
diff -r 0ab02e372777 -r 16dc272ccc78 graphics/opencv/patches/patch-apps_createsamples_CMakeLists.txt
--- a/graphics/opencv/patches/patch-apps_createsamples_CMakeLists.txt Thu Mar 16 21:08:35 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-apps_createsamples_CMakeLists.txt,v 1.1 2016/02/08 02:04:18 dbj Exp $
-
-Fix library id handling on Darwin
-
---- apps/createsamples/CMakeLists.txt.orig 2015-06-03 17:21:34.000000000 +0000
-+++ apps/createsamples/CMakeLists.txt
-@@ -23,7 +23,7 @@ set_target_properties(${the_target} PROP
- DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
- ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
- RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
-- INSTALL_NAME_DIR lib
-+ INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/${OPENCV_LIB_INSTALL_PATH}
- OUTPUT_NAME "opencv_createsamples")
-
- if(ENABLE_SOLUTION_FOLDERS)
diff -r 0ab02e372777 -r 16dc272ccc78 graphics/opencv/patches/patch-apps_traincascade_CMakeLists.txt
--- a/graphics/opencv/patches/patch-apps_traincascade_CMakeLists.txt Thu Mar 16 21:08:35 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-apps_traincascade_CMakeLists.txt,v 1.1 2016/02/08 02:04:18 dbj Exp $
-
-Fix library id handling on Darwin
-
---- apps/traincascade/CMakeLists.txt.orig 2015-06-03 17:21:34.000000000 +0000
-+++ apps/traincascade/CMakeLists.txt
-@@ -23,7 +23,7 @@ set_target_properties(${the_target} PROP
- DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
- ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
- RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
-- INSTALL_NAME_DIR lib
-+ INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/${OPENCV_LIB_INSTALL_PATH}
- OUTPUT_NAME "opencv_traincascade")
-
- if(ENABLE_SOLUTION_FOLDERS)
diff -r 0ab02e372777 -r 16dc272ccc78 graphics/opencv/patches/patch-cmake_OpenCVModule.cmake
--- a/graphics/opencv/patches/patch-cmake_OpenCVModule.cmake Thu Mar 16 21:08:35 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-cmake_OpenCVModule.cmake,v 1.2 2016/02/21 14:10:46 fhajny Exp $
-
-Fix library id handling on Darwin
-
---- cmake/OpenCVModule.cmake.orig 2015-12-18 15:02:16.000000000 +0000
-+++ cmake/OpenCVModule.cmake
-@@ -834,7 +834,7 @@ macro(_ocv_create_module)
- COMPILE_PDB_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
- LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
- RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
-- INSTALL_NAME_DIR lib
-+ INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/${OPENCV_LIB_INSTALL_PATH}
- )
-
- # For dynamic link numbering convenions
diff -r 0ab02e372777 -r 16dc272ccc78 graphics/opencv/patches/patch-cmake_OpenCVPCHSupport.cmake
--- a/graphics/opencv/patches/patch-cmake_OpenCVPCHSupport.cmake Thu Mar 16 21:08:35 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-cmake_OpenCVPCHSupport.cmake,v 1.1 2016/07/16 03:49:57 markd Exp $
-
-gcc6 trips up ".../cstdlib:75:25: fatal error: stdlib.h: No such file or directory" because of -isystem
-
---- cmake/OpenCVPCHSupport.cmake.orig 2015-12-18 15:02:16.000000000 +0000
-+++ cmake/OpenCVPCHSupport.cmake
-@@ -19,7 +19,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
- ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
- OUTPUT_VARIABLE gcc_compiler_version)
- #MESSAGE("GCC Version: ${gcc_compiler_version}")
-- IF(gcc_compiler_version VERSION_GREATER "4.2.-1")
-+ IF(gcc_compiler_version VERSION_GREATER "4.2.-1" AND gcc_compiler_version VERSION_LESS "6.0.0")
- SET(PCHSupport_FOUND TRUE)
- ENDIF()
-
diff -r 0ab02e372777 -r 16dc272ccc78 graphics/opencv/patches/patch-modules_java_CMakeLists.txt
--- a/graphics/opencv/patches/patch-modules_java_CMakeLists.txt Thu Mar 16 21:08:35 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-modules_java_CMakeLists.txt,v 1.1 2016/02/08 02:04:18 dbj Exp $
-
-Fix library id handling on Darwin
-
---- modules/java/CMakeLists.txt.orig 2015-06-03 17:21:34.000000000 +0000
-+++ modules/java/CMakeLists.txt
-@@ -363,7 +363,7 @@ set_target_properties(${the_module} PROP
- ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
- LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
- RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
-- INSTALL_NAME_DIR ${OPENCV_LIB_INSTALL_PATH}
-+ INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/${OPENCV_LIB_INSTALL_PATH}
- LINK_INTERFACE_LIBRARIES ""
- )
-
diff -r 0ab02e372777 -r 16dc272ccc78 graphics/opencv/patches/patch-modules_objdetect_include_opencv_objdetect_detection__based__tracker.hpp
--- a/graphics/opencv/patches/patch-modules_objdetect_include_opencv_objdetect_detection__based__tracker.hpp Thu Mar 16 21:08:35 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-modules_objdetect_include_opencv_objdetect_detection__based__tracker.hpp,v 1.2 2016/02/21 14:10:46 fhajny Exp $
-
---- modules/objdetect/include/opencv2/objdetect/detection_based_tracker.hpp.orig 2015-12-18 15:02:16.000000000 +0000
-+++ modules/objdetect/include/opencv2/objdetect/detection_based_tracker.hpp
-@@ -46,7 +46,7 @@
-
- // After this condition removal update blacklist for bindings: modules/python/common.cmake
- #if defined(__linux__) || defined(LINUX) || defined(__APPLE__) || defined(__ANDROID__) || \
-- (defined(__cplusplus) && __cplusplus > 201103L) || (defined(_MSC_VER) && _MSC_VER >= 1700)
-+ (defined(__cplusplus) && __cplusplus >= 201103L) || (defined(_MSC_VER) && _MSC_VER >= 1700)
-
- #include <vector>
-
diff -r 0ab02e372777 -r 16dc272ccc78 graphics/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp
--- a/graphics/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp Thu Mar 16 21:08:35 2017 +0000
+++ b/graphics/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp Thu Mar 16 21:59:13 2017 +0000
@@ -1,6 +1,8 @@
-$NetBSD: patch-modules_videoio_src_cap__v4l.cpp,v 1.1 2016/03/01 20:14:24 joerg Exp $
Home |
Main Index |
Thread Index |
Old Index