pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics opencv: updated to 3.4.6
details: https://anonhg.NetBSD.org/pkgsrc/rev/d33957ce9ced
branches: trunk
changeset: 322570:d33957ce9ced
user: adam <adam%pkgsrc.org@localhost>
date: Wed Apr 24 19:34:44 2019 +0000
description:
opencv: updated to 3.4.6
version:3.4.6
OpenCV 3.4.6 has been released. Bug fixes, optimizations and other enhancements are propagated into OpenCV 4.1.0.
version:3.4.5
OpenCV 3.4.5 has been released. Bug fixes, optimizations and other enhancements are propagated into OpenCV 4.0.1.
version:3.4.4
OpenCV 3.4.4 has been released. This is a mantenance release. New features are landed in OpenCV 4.0.
version:3.4.3
OpenCV 3.4.3 has been released, with further extended dnn module, documentation improvements, some other new functionality and bug fixes.
version:3.4.2
OpenCV 3.4.2 has been released, with further extended dnn module, documentation improvements, some other new functionality and bug fixes.
OpenCV 3.4.x development is switched from "master" to "3.4" branch. "master" branch is used for development of upcoming OpenCV 4.x releases.
Bugfixes / optimizations / small improvemets should go into "3.4" branch. We will merge changes from "3.4" into "master" regularly (weekly/bi-weekly).
diffstat:
graphics/opencv-contrib-face/Makefile | 67 +-
graphics/opencv-contrib-face/PLIST | 10 +-
graphics/opencv-contrib-face/distinfo | 23 +-
graphics/opencv/Makefile | 40 +-
graphics/opencv/Makefile.common | 41 +
graphics/opencv/PLIST | 50 +-
graphics/opencv/buildlink3.mk | 10 +-
graphics/opencv/distinfo | 15 +-
graphics/opencv/options.mk | 12 +-
graphics/opencv/patches/patch-CMakeLists.txt | 27 +
graphics/opencv/patches/patch-modules_highgui_src_window__cocoa.mm | 15 +
graphics/opencv/patches/patch-modules_python_src2_cv2.cpp | 15 -
graphics/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp | 248 +++++----
13 files changed, 334 insertions(+), 239 deletions(-)
diffs (truncated from 877 to 300 lines):
diff -r 6a4048c2b66c -r d33957ce9ced graphics/opencv-contrib-face/Makefile
--- a/graphics/opencv-contrib-face/Makefile Wed Apr 24 17:11:45 2019 +0000
+++ b/graphics/opencv-contrib-face/Makefile Wed Apr 24 19:34:44 2019 +0000
@@ -1,24 +1,15 @@
-# $NetBSD: Makefile,v 1.13 2018/03/02 16:26:21 fhajny Exp $
+# $NetBSD: Makefile,v 1.14 2019/04/24 19:34:45 adam Exp $
-DISTNAME= opencv_contrib-3.4.1
+.include "../../graphics/opencv/Makefile.common"
+
+DISTNAME= opencv_contrib-${OPENCV_VERSION}
PKGNAME= ${DISTNAME:S/_contrib/-contrib-face/}
-CATEGORIES= graphics devel
-MASTER_SITES= ${MASTER_SITE_GITHUB:=Itseez/}
-EXTRACT_SUFX= .zip
GITHUB_PROJECT= opencv_contrib
MAINTAINER= markd%NetBSD.org@localhost
-HOMEPAGE= https://github.com/opencv/opencv/wiki
COMMENT= OpenCV face recognition contributed module
-LICENSE= modified-bsd
-
-DISTFILES= ${DEFAULT_DISTFILES} opencv-${PKGVERSION_NOREV}.zip
-USE_CMAKE= yes
-USE_LANGUAGES= c c++11
-USE_LIBTOOL= yes
-USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake pkg-config
+DISTFILES= ${DEFAULT_DISTFILES} opencv-${PKGVERSION_NOREV}${EXTRACT_SUFX}
# This is ugly, but we shouldn't let optional code download
# at configure time. Especially when it needs to be patched
@@ -31,19 +22,10 @@
INSTALL_DIRS= build/modules/face build/modules/plot build/modules/tracking
-WRKSRC= ${WRKDIR}/opencv-${PKGVERSION_NOREV}/
-
-PATCHDIR= ${.CURDIR}/../../graphics/opencv/patches
-
-CMAKE_ARGS+= -D WITH_FFMPEG=OFF
-CMAKE_ARGS+= -D BUILD_DOCS=OFF
+WRKSRC= ${WRKDIR}/opencv-${PKGVERSION_NOREV}
-# jasper uses SIZE_MAX and friends in its headers.
-CXXFLAGS+= -D__STDC_LIMIT_MACROS
-
-CMAKE_ARGS+= -DZLIB_ROOT=${BUILDLINK_PREFIX.zlib}
-CMAKE_ARGS.SunOS+= -DENABLE_PRECOMPILED_HEADERS=NO
-CMAKE_ARGS+= -DWITH_EIGEN=NO
+CMAKE_ARGS+= -DBUILD_DOCS=OFF
+CMAKE_ARGS+= -DWITH_FFMPEG=OFF
CMAKE_ARGS+= -DOPENCV_EXTRA_MODULES_PATH=${WRKDIR}/${DISTNAME}/modules
CMAKE_ARGS+= -DBUILD_opencv_adas=OFF
@@ -53,7 +35,10 @@
CMAKE_ARGS+= -DBUILD_opencv_contrib_world=OFF
CMAKE_ARGS+= -DBUILD_opencv_cvv=OFF
CMAKE_ARGS+= -DBUILD_opencv_datasets=OFF
+CMAKE_ARGS+= -DBUILD_opencv_dnn_objdetect=OFF
CMAKE_ARGS+= -DBUILD_opencv_hdf=OFF
+CMAKE_ARGS+= -DBUILD_opencv_hfs=OFF
+CMAKE_ARGS+= -DBUILD_opencv_img_hash=OFF
CMAKE_ARGS+= -DBUILD_opencv_latentsvm=OFF
CMAKE_ARGS+= -DBUILD_opencv_line_descriptor=OFF
CMAKE_ARGS+= -DBUILD_opencv_matlab=OFF
@@ -68,40 +53,28 @@
CMAKE_ARGS+= -DBUILD_opencv_xobjdetect=OFF
CMAKE_ARGS+= -DBUILD_opencv_xphoto=OFF
+CMAKE_ARGS+= -DBUILD_opencv_dnn=OFF
CMAKE_ARGS+= -DBUILD_opencv_flann=OFF
-CMAKE_ARGS+= -DBUILD_opencv_videoio=OFF
CMAKE_ARGS+= -DBUILD_opencv_highgui=OFF
+CMAKE_ARGS+= -DBUILD_opencv_ml=OFF
+CMAKE_ARGS+= -DBUILD_opencv_python2=OFF
+CMAKE_ARGS+= -DBUILD_opencv_python3=OFF
+CMAKE_ARGS+= -DBUILD_opencv_stitching=OFF
CMAKE_ARGS+= -DBUILD_opencv_superres=OFF
CMAKE_ARGS+= -DBUILD_opencv_ts=OFF
-CMAKE_ARGS+= -DBUILD_opencv_features2d=OFF
-CMAKE_ARGS+= -DBUILD_opencv_calib3d=OFF
-CMAKE_ARGS+= -DBUILD_opencv_stitching=OFF
+CMAKE_ARGS+= -DBUILD_opencv_videoio=OFF
CMAKE_ARGS+= -DBUILD_opencv_videostab=OFF
-CMAKE_ARGS+= -DBUILD_opencv_python2=OFF
-# At least as of 3.4.1, these are dependencies of the 'face' module
+# At least as of 3.4.6, these are dependencies of the 'face' module
# and need to be built and installed ('photo' and 'video' are
# part of the main opencv package already
+#CMAKE_ARGS+= -DBUILD_opencv_calib3d=OFF
+#CMAKE_ARGS+= -DBUILD_opencv_features2d=OFF
#CMAKE_ARGS+= -DBUILD_opencv_photo=OFF
#CMAKE_ARGS+= -DBUILD_opencv_plot=OFF
#CMAKE_ARGS+= -DBUILD_opencv_tracking=OFF
#CMAKE_ARGS+= -DBUILD_opencv_video=OFF
-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"
BUILDLINK_API_DEPENDS.opencv+= opencv>=${PKGVERSION_NOREV}
.include "../../graphics/opencv/buildlink3.mk"
-.include "../../graphics/openexr/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/tiff/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 6a4048c2b66c -r d33957ce9ced graphics/opencv-contrib-face/PLIST
--- a/graphics/opencv-contrib-face/PLIST Wed Apr 24 17:11:45 2019 +0000
+++ b/graphics/opencv-contrib-face/PLIST Wed Apr 24 19:34:44 2019 +0000
@@ -1,11 +1,13 @@
-@comment $NetBSD: PLIST,v 1.5 2018/03/02 16:26:21 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.6 2019/04/24 19:34:45 adam Exp $
include/opencv2/face.hpp
include/opencv2/face/bif.hpp
include/opencv2/face/face_alignment.hpp
include/opencv2/face/facemark.hpp
include/opencv2/face/facemarkAAM.hpp
include/opencv2/face/facemarkLBF.hpp
+include/opencv2/face/facemark_train.hpp
include/opencv2/face/facerec.hpp
+include/opencv2/face/mace.hpp
include/opencv2/face/predict_collector.hpp
include/opencv2/plot.hpp
include/opencv2/tracking.hpp
@@ -17,11 +19,11 @@
include/opencv2/tracking/tracker.hpp
include/opencv2/tracking/tracking.hpp
lib/libopencv_face.so
+lib/libopencv_face.so.${PKGVERSION}
lib/libopencv_face.so.3.4
-lib/libopencv_face.so.${PKGVERSION}
lib/libopencv_plot.so
+lib/libopencv_plot.so.${PKGVERSION}
lib/libopencv_plot.so.3.4
-lib/libopencv_plot.so.${PKGVERSION}
lib/libopencv_tracking.so
+lib/libopencv_tracking.so.${PKGVERSION}
lib/libopencv_tracking.so.3.4
-lib/libopencv_tracking.so.${PKGVERSION}
diff -r 6a4048c2b66c -r d33957ce9ced graphics/opencv-contrib-face/distinfo
--- a/graphics/opencv-contrib-face/distinfo Wed Apr 24 17:11:45 2019 +0000
+++ b/graphics/opencv-contrib-face/distinfo Wed Apr 24 19:34:44 2019 +0000
@@ -1,20 +1,21 @@
-$NetBSD: distinfo,v 1.9 2018/10/25 07:08:33 leot Exp $
+$NetBSD: distinfo,v 1.10 2019/04/24 19:34:45 adam Exp $
-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 (opencv_contrib-3.4.1.zip) = 4190f17296b92d39235274c4305106387236d2cd
-RMD160 (opencv_contrib-3.4.1.zip) = 6581d0d190bdcf43de542e8f4c2a263ec1e741c3
-SHA512 (opencv_contrib-3.4.1.zip) = 2448cf22208a890d2ab48f75b05b2bed07efadca2ce4df24eacdefcd5b00fe80a0519edeaead017c340050e4563e9c6659666e16af8b6c19eafba04bd8a4360b
-Size (opencv_contrib-3.4.1.zip) = 58319978 bytes
+SHA1 (opencv-3.4.6.tar.gz) = c445fe9f0a07a95837d2f39c0637da71158129c5
+RMD160 (opencv-3.4.6.tar.gz) = 9fba797c535a7c4366cbf8018ee61ccd396b6c51
+SHA512 (opencv-3.4.6.tar.gz) = 86870788cbe36062b8fdb359d516714df887b0bb894d82bc65d33f7c5e8435371908cf21cee57137a60334187c74f4dabd358a20e9f13bbb36308acec51260cc
+Size (opencv-3.4.6.tar.gz) = 88174475 bytes
+SHA1 (opencv_contrib-3.4.6.tar.gz) = f87e11ac00550529853f19871429d062ef446c35
+RMD160 (opencv_contrib-3.4.6.tar.gz) = 2702fa3c9b17316441bc2a7b45d14641de680013
+SHA512 (opencv_contrib-3.4.6.tar.gz) = 27e9edeed2c995fcf2bd4a1f9226911f6bca2761d0ca615723eb851bb3fd5b46b7b55531db65d12593886e2484beb4ec7c8b2efaae2638c8427913cb9f3e0cb9
+Size (opencv_contrib-3.4.6.tar.gz) = 57262438 bytes
SHA1 (patch-3rdparty_ippicv_ippicv.cmake) = 14ce5de382084793ace32f43c6dfaf01f7ffb390
SHA1 (patch-3rdparty_protobuf_src_google_protobuf_message__lite.cc) = f1b77384ea8110d2bf3a30ff3fe9f2fa39608caf
+SHA1 (patch-CMakeLists.txt) = d7b434783aca4d0999c6d888eb8e160142a3aa1b
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_system.cpp) = 3b7ac545585a430d28c7077f360357079f127580
SHA1 (patch-modules_flann_include_opencv2_flann_defines.h) = ab848e67c4e03219670598ac2d21071a617a5c33
-SHA1 (patch-modules_python_src2_cv2.cpp) = f9280bfe8e5b7154ce1ef75bf9da8020a5c7c666
+SHA1 (patch-modules_highgui_src_window__cocoa.mm) = 03a35cdbb32f40f7a234c406ddf0e4991873ae37
SHA1 (patch-modules_ts_src_ts.cpp) = b9a3992014b02dbd89d46375a2476385e91dc24c
-SHA1 (patch-modules_videoio_src_cap__v4l.cpp) = 985d91d9a4c63f081c3fff495cc86d8d0a1c6aa4
+SHA1 (patch-modules_videoio_src_cap__v4l.cpp) = 20e572d04a15b08180ad7d6671ab3d124b73b748
diff -r 6a4048c2b66c -r d33957ce9ced graphics/opencv/Makefile
--- a/graphics/opencv/Makefile Wed Apr 24 17:11:45 2019 +0000
+++ b/graphics/opencv/Makefile Wed Apr 24 19:34:44 2019 +0000
@@ -1,20 +1,11 @@
-# $NetBSD: Makefile,v 1.81 2018/11/14 22:21:43 kleink Exp $
+# $NetBSD: Makefile,v 1.82 2019/04/24 19:34:44 adam Exp $
-DISTNAME= opencv-3.4.1
-PKGREVISION= 4
-CATEGORIES= graphics devel
-MASTER_SITES= ${MASTER_SITE_GITHUB:=opencv/}
-EXTRACT_SUFX= .zip
+.include "Makefile.common"
+
+DISTNAME= opencv-${OPENCV_VERSION}
MAINTAINER= anthony.mallet%laas.fr@localhost
-HOMEPAGE= https://opencv.org/
COMMENT= Library for computer vision problems
-LICENSE= modified-bsd
-
-USE_CMAKE= yes
-USE_LANGUAGES= c c++11
-USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake pkg-config
INSTALLATION_DIRS+= share/doc/opencv/papers
INSTALLATION_DIRS+= share/doc/opencv/ref/pics
@@ -31,23 +22,14 @@
.include "options.mk"
-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}
+TEST_TARGET= test
-# jasper uses SIZE_MAX and friends in its headers.
-CXXFLAGS+= -D__STDC_LIMIT_MACROS
+post-install:
+ ${RM} -r ${DESTDIR}${PREFIX}/share/licenses
-CONFIGURE_DIRS+= build
-CMAKE_ARG_PATH= ${WRKSRC}
+.include "../../mk/bsd.prefs.mk"
-pre-configure:
- ${MKDIR} -p ${WRKSRC}/build
-
+.include "../../devel/protobuf/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/jasper/buildlink3.mk"
.include "../../graphics/libwebp/buildlink3.mk"
@@ -56,6 +38,8 @@
.include "../../graphics/tiff/buildlink3.mk"
.include "../../lang/python/extension.mk"
.include "../../math/py-numpy/buildlink3.mk"
+.if ${OPSYS} != "Darwin"
+.include "../../x11/gtk3/buildlink3.mk"
+.endif
.include "../../mk/jpeg.buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 6a4048c2b66c -r d33957ce9ced graphics/opencv/Makefile.common
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/opencv/Makefile.common Wed Apr 24 19:34:44 2019 +0000
@@ -0,0 +1,41 @@
+# $NetBSD: Makefile.common,v 1.1 2019/04/24 19:34:44 adam Exp $
+# used by graphics/opencv/Makefile
+# used by graphics/opencv-contrib-face/Makefile
+
+OPENCV_VERSION= 3.4.6
+
+CATEGORIES= graphics devel
+MASTER_SITES= ${MASTER_SITE_GITHUB:=opencv/}
+
+HOMEPAGE= https://opencv.org/
+LICENSE= modified-bsd
+
+PATCHDIR= ${.CURDIR}/../../graphics/opencv/patches
+
+USE_CMAKE= yes
+USE_LANGUAGES= c c++11
+USE_PKGLOCALEDIR= yes
+USE_TOOLS+= gmake pkg-config
+
+CONFIGURE_DIRS+= build
+CMAKE_ARG_PATH= ${WRKSRC}
+
+CMAKE_ARGS+= -DBUILD_PROTOBUF=OFF
+CMAKE_ARGS+= -DCV_ENABLE_INTRINSICS=OFF # XXX: problematic
+CMAKE_ARGS+= -DOPENCV_GENERATE_SETUPVARS=OFF
+CMAKE_ARGS+= -DPROTOBUF_UPDATE_FILES=ON
+CMAKE_ARGS+= -DPYTHON_EXECUTABLE:FILEPATH=${PYTHONBIN}
+CMAKE_ARGS+= -DWITH_EIGEN=OFF
+CMAKE_ARGS+= -DZLIB_ROOT=${BUILDLINK_PREFIX.zlib}
+CMAKE_ARGS.SunOS+= -DENABLE_PRECOMPILED_HEADERS=OFF
+CMAKE_ARGS.SunOS+= -DOPENCV_PYTHON_SKIP_LINKER_EXCLUDE_LIBS=ON
+
+CONFIGURE_ENV+= MACHINE_ARCH=${MACHINE_ARCH}
+
+# jasper uses SIZE_MAX and friends in its headers.
+CXXFLAGS+= -D__STDC_LIMIT_MACROS
+
+pre-configure:
+ ${MKDIR} ${WRKSRC}/build
+
+.include "../../lang/python/pyversion.mk"
diff -r 6a4048c2b66c -r d33957ce9ced graphics/opencv/PLIST
--- a/graphics/opencv/PLIST Wed Apr 24 17:11:45 2019 +0000
Home |
Main Index |
Thread Index |
Old Index