pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/graphics
Module Name: pkgsrc
Committed By: adam
Date: Wed Oct 6 21:10:24 UTC 2021
Modified Files:
pkgsrc/graphics/opencv: Makefile Makefile.common buildlink3.mk distinfo
hacks.mk
pkgsrc/graphics/opencv-contrib-face: Makefile distinfo
pkgsrc/graphics/opencv/patches:
patch-modules_core_include_opencv2_core_bindings__utils.hpp
patch-modules_videoio_src_cap__v4l.cpp
Added Files:
pkgsrc/graphics/opencv/patches: patch-modules_core_src_parallel.cpp
patch-modules_dnn_src_caffe_caffe__io.cpp
Log Message:
opencv opencv-contrib-face: updated to 3.4.15
OpenCV 3.4.15 has been released. Bug fixes, optimizations and other enhancements are propagated into OpenCV 4.5.3.
Long-lived OpenCV 3.x release series is here since 2015. We are going to reduce support of 3.x branch in the future to move forward to OpenCV 5.0.
To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 pkgsrc/graphics/opencv/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/graphics/opencv/Makefile.common
cvs rdiff -u -r1.9 -r1.10 pkgsrc/graphics/opencv/buildlink3.mk
cvs rdiff -u -r1.51 -r1.52 pkgsrc/graphics/opencv/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/opencv/hacks.mk
cvs rdiff -u -r1.20 -r1.21 pkgsrc/graphics/opencv-contrib-face/Makefile \
pkgsrc/graphics/opencv-contrib-face/distinfo
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/graphics/opencv/patches/patch-modules_core_include_opencv2_core_bindings__utils.hpp
cvs rdiff -u -r0 -r1.1 \
pkgsrc/graphics/opencv/patches/patch-modules_core_src_parallel.cpp \
pkgsrc/graphics/opencv/patches/patch-modules_dnn_src_caffe_caffe__io.cpp
cvs rdiff -u -r1.7 -r1.8 \
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.98 pkgsrc/graphics/opencv/Makefile:1.99
--- pkgsrc/graphics/opencv/Makefile:1.98 Sun Aug 15 14:23:58 2021
+++ pkgsrc/graphics/opencv/Makefile Wed Oct 6 21:10:24 2021
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.98 2021/08/15 14:23:58 wiz Exp $
+# $NetBSD: Makefile,v 1.99 2021/10/06 21:10:24 adam Exp $
.include "Makefile.common"
DISTNAME= opencv-${OPENCV_VERSION}
-PKGREVISION= 9
MAINTAINER= anthony.mallet%laas.fr@localhost
COMMENT= Library for computer vision problems
Index: pkgsrc/graphics/opencv/Makefile.common
diff -u pkgsrc/graphics/opencv/Makefile.common:1.7 pkgsrc/graphics/opencv/Makefile.common:1.8
--- pkgsrc/graphics/opencv/Makefile.common:1.7 Fri Sep 10 12:09:27 2021
+++ pkgsrc/graphics/opencv/Makefile.common Wed Oct 6 21:10:24 2021
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.7 2021/09/10 12:09:27 nia Exp $
+# $NetBSD: Makefile.common,v 1.8 2021/10/06 21:10:24 adam Exp $
# used by graphics/opencv/Makefile
# used by graphics/opencv-contrib-face/Makefile
#
# DO NOT FORGET to regen graphics/opencv-contrib-face/distinfo!
-OPENCV_VERSION= 3.4.9
+OPENCV_VERSION= 3.4.15
CATEGORIES= graphics devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=opencv/}
Index: pkgsrc/graphics/opencv/buildlink3.mk
diff -u pkgsrc/graphics/opencv/buildlink3.mk:1.9 pkgsrc/graphics/opencv/buildlink3.mk:1.10
--- pkgsrc/graphics/opencv/buildlink3.mk:1.9 Sun Aug 15 14:23:58 2021
+++ pkgsrc/graphics/opencv/buildlink3.mk Wed Oct 6 21:10:24 2021
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2021/08/15 14:23:58 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2021/10/06 21:10:24 adam Exp $
BUILDLINK_TREE+= opencv
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= opencv
OPENCV_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.opencv+= opencv>=3.0.0
-BUILDLINK_ABI_DEPENDS.opencv?= opencv>=3.4.9nb9
+BUILDLINK_ABI_DEPENDS.opencv+= opencv>=3.4.9nb9
BUILDLINK_PKGSRCDIR.opencv?= ../../graphics/opencv
pkgbase := opencv
@@ -14,7 +14,7 @@ pkgbase := opencv
.include "../../devel/protobuf/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
-.if !empty(PKG_BUILD_OPTIONS.opencv:Mjasper)
+.if ${PKG_BUILD_OPTIONS.opencv:Mjasper}
. include "../../graphics/jasper/buildlink3.mk"
.endif
.include "../../graphics/libwebp/buildlink3.mk"
Index: pkgsrc/graphics/opencv/distinfo
diff -u pkgsrc/graphics/opencv/distinfo:1.51 pkgsrc/graphics/opencv/distinfo:1.52
--- pkgsrc/graphics/opencv/distinfo:1.51 Wed Sep 22 13:40:41 2021
+++ pkgsrc/graphics/opencv/distinfo Wed Oct 6 21:10:24 2021
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.51 2021/09/22 13:40:41 nia Exp $
+$NetBSD: distinfo,v 1.52 2021/10/06 21:10:24 adam Exp $
-SHA1 (opencv-3.4.9.tar.gz) = bcd0fafc9f1a240d92af9007c9f8098da601d7a5
-RMD160 (opencv-3.4.9.tar.gz) = 2ab36f669a70c876e739736e6b9daacabc5933fe
-SHA512 (opencv-3.4.9.tar.gz) = f445970ca39794fc5fbcaed8b506c6b332cbce911ed8487f490bca9a565c8ed3071816261a1803a8f4b43f58d66ca5eaab30be478c4b7ee973a6b6fc2b370869
-Size (opencv-3.4.9.tar.gz) = 87342965 bytes
+SHA1 (opencv-3.4.15.tar.gz) = 2baab7f24f48f2dd2f4c72d47195da00f2ad317a
+RMD160 (opencv-3.4.15.tar.gz) = e7f75f9f9f6102ab7b88d04be4e00a0148eb623c
+SHA512 (opencv-3.4.15.tar.gz) = 775149e56f0aa94d53eb024404866380d97ce423ef1c8343ee8f12c1377e454ae182b2528e86949b5f7250e551d464bd1a5de2e2d9f0d0e1dd3dc188a1db790d
+Size (opencv-3.4.15.tar.gz) = 87661484 bytes
SHA1 (patch-3rdparty_ippicv_ippicv.cmake) = 14ce5de382084793ace32f43c6dfaf01f7ffb390
SHA1 (patch-3rdparty_protobuf_src_google_protobuf_message__lite.cc) = f1b77384ea8110d2bf3a30ff3fe9f2fa39608caf
SHA1 (patch-CMakeLists.txt) = 029368ab14163640d1651f572810eb8eb0c043d9
@@ -12,14 +12,16 @@ SHA1 (patch-cmake_OpenCVDetectCXXCompile
SHA1 (patch-cmake_OpenCVDetectPython.cmake) = 4f3bfe574edf083ebc7e78d347355c58461b2c6b
SHA1 (patch-cmake_OpenCVFindOpenEXR.cmake) = 202d0fdc84464d563dead955d5299b42098d52a6
SHA1 (patch-cmake_checks_lapack__check.cpp) = dd25d34fff25e0d46651789cf5577391d7b48c81
-SHA1 (patch-modules_core_include_opencv2_core_bindings__utils.hpp) = 9018a6124fb840be5213450b1bbe353078b37029
+SHA1 (patch-modules_core_include_opencv2_core_bindings__utils.hpp) = 44a8602670141b2a3bc90c5e1c23a8e7f96a1d40
SHA1 (patch-modules_core_include_opencv2_core_opencl_opencl__info.hpp) = f0cff24b2a760086f54ab66536bdfee4f4f1a6d7
SHA1 (patch-modules_core_include_opencv2_core_types_c.h) = 75444e65677be99af8167f9060419d7970a7adaa
SHA1 (patch-modules_core_src_check.cpp) = c8dac4e0fb6fa4a0dca6a2794bd598ba114e78b6
SHA1 (patch-modules_core_src_downhill__simplex.cpp) = 1ad7c2fa126d15050b87785e8eec20dbe796b471
SHA1 (patch-modules_core_src_hal__internal.cpp) = 22beba5ee93fc468999479227d7ef07397848b22
+SHA1 (patch-modules_core_src_parallel.cpp) = 9974e53f3be96782025dae3c64d9f1535d9bf0fd
SHA1 (patch-modules_core_src_rand.cpp) = aa87ee5a538deb1a2ed3e89dd3dd4ee9b86ae0de
SHA1 (patch-modules_core_src_system.cpp) = 3b7ac545585a430d28c7077f360357079f127580
+SHA1 (patch-modules_dnn_src_caffe_caffe__io.cpp) = 705963fb3227174c414874a8dd28a9f1219be070
SHA1 (patch-modules_dnn_src_tensorflow_tf__importer.cpp) = 9b3628d91c2217c4b1ed77413efd4c0bf85758c4
SHA1 (patch-modules_dnn_src_torch_torch__importer.cpp) = 814a3cc929569b691d01e34252dbd185f31161c2
SHA1 (patch-modules_dnn_test__precomp.hpp) = 9bf15d32394f36b92e5fc5d57fd576b3860233ae
@@ -27,4 +29,4 @@ SHA1 (patch-modules_flann_include_opencv
SHA1 (patch-modules_imgcodecs_src_grfmt__exr.cpp) = 1a33d1b14e837b973b3ac2465d0b20fd6501e9bf
SHA1 (patch-modules_imgproc_src_resize.cpp) = e842d5960c4c00162a34f46cb45cf69d0e9f21ce
SHA1 (patch-modules_ts_src_ts.cpp) = b9a3992014b02dbd89d46375a2476385e91dc24c
-SHA1 (patch-modules_videoio_src_cap__v4l.cpp) = 275e72e3c146cf15845fbb7272b28e21f51d6fb4
+SHA1 (patch-modules_videoio_src_cap__v4l.cpp) = 847c9cf47c3fb71a2e05281544a03a5ed0d224a5
Index: pkgsrc/graphics/opencv/hacks.mk
diff -u pkgsrc/graphics/opencv/hacks.mk:1.2 pkgsrc/graphics/opencv/hacks.mk:1.3
--- pkgsrc/graphics/opencv/hacks.mk:1.2 Thu Jan 23 15:14:30 2014
+++ pkgsrc/graphics/opencv/hacks.mk Wed Oct 6 21:10:24 2021
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.2 2014/01/23 15:14:30 wiz Exp $
+# $NetBSD: hacks.mk,v 1.3 2021/10/06 21:10:24 adam Exp $
.if !defined(OPENCV_HACKS_MK)
OPENCV_HACKS_MK= defined
@@ -12,7 +12,7 @@ PKG_HACKS+= tree-pre
SUBST_CLASSES+= opt-hack
SUBST_STAGE.opt-hack= post-configure
SUBST_MESSAGE.opt-hack= Working around gcc-4.5.4 bug.
-SUBST_FILES.opt-hack= ${WRKSRC}/modules/calib3d/CMakeFiles/opencv_calib3d.dir/build.make
+SUBST_FILES.opt-hack= modules/calib3d/CMakeFiles/opencv_calib3d.dir/build.make
SUBST_SED.opt-hack= -e '/stereosgbm.cpp.o/s/-o /-fno-tree-pre -o /'
.endif
Index: pkgsrc/graphics/opencv-contrib-face/Makefile
diff -u pkgsrc/graphics/opencv-contrib-face/Makefile:1.20 pkgsrc/graphics/opencv-contrib-face/Makefile:1.21
--- pkgsrc/graphics/opencv-contrib-face/Makefile:1.20 Sun Aug 15 14:23:58 2021
+++ pkgsrc/graphics/opencv-contrib-face/Makefile Wed Oct 6 21:10:24 2021
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.20 2021/08/15 14:23:58 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2021/10/06 21:10:24 adam Exp $
-PKGREVISION= 2
.include "../../graphics/opencv/Makefile.common"
DISTNAME= opencv_contrib-${OPENCV_VERSION}
Index: pkgsrc/graphics/opencv-contrib-face/distinfo
diff -u pkgsrc/graphics/opencv-contrib-face/distinfo:1.20 pkgsrc/graphics/opencv-contrib-face/distinfo:1.21
--- pkgsrc/graphics/opencv-contrib-face/distinfo:1.20 Thu Sep 23 06:14:17 2021
+++ pkgsrc/graphics/opencv-contrib-face/distinfo Wed Oct 6 21:10:24 2021
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.20 2021/09/23 06:14:17 wiz Exp $
+$NetBSD: distinfo,v 1.21 2021/10/06 21:10:24 adam Exp $
-SHA1 (opencv-3.4.9.tar.gz) = bcd0fafc9f1a240d92af9007c9f8098da601d7a5
-RMD160 (opencv-3.4.9.tar.gz) = 2ab36f669a70c876e739736e6b9daacabc5933fe
-SHA512 (opencv-3.4.9.tar.gz) = f445970ca39794fc5fbcaed8b506c6b332cbce911ed8487f490bca9a565c8ed3071816261a1803a8f4b43f58d66ca5eaab30be478c4b7ee973a6b6fc2b370869
-Size (opencv-3.4.9.tar.gz) = 87342965 bytes
-SHA1 (opencv_contrib-3.4.9.tar.gz) = ff8529d40acc5619ee046bbdcbebc7cc06eca5a7
-RMD160 (opencv_contrib-3.4.9.tar.gz) = db0189ee28092423ca79104ead9388d27c986ec0
-SHA512 (opencv_contrib-3.4.9.tar.gz) = 3a15425b1dd920c1050463426ef0c4a02db17487414b5e82c3f1222f01f5850df49cbf39fd56ede055d4882c30663b068260e7cb3138fa6cf12d66804c7b9e48
-Size (opencv_contrib-3.4.9.tar.gz) = 56142721 bytes
+SHA1 (opencv-3.4.15.tar.gz) = 2baab7f24f48f2dd2f4c72d47195da00f2ad317a
+RMD160 (opencv-3.4.15.tar.gz) = e7f75f9f9f6102ab7b88d04be4e00a0148eb623c
+SHA512 (opencv-3.4.15.tar.gz) = 775149e56f0aa94d53eb024404866380d97ce423ef1c8343ee8f12c1377e454ae182b2528e86949b5f7250e551d464bd1a5de2e2d9f0d0e1dd3dc188a1db790d
+Size (opencv-3.4.15.tar.gz) = 87661484 bytes
+SHA1 (opencv_contrib-3.4.15.tar.gz) = 146e72f072e660809d3659e527c7b1e3c0c1daa9
+RMD160 (opencv_contrib-3.4.15.tar.gz) = 39940294ebf80accb32698acd2417c988049e464
+SHA512 (opencv_contrib-3.4.15.tar.gz) = 639f5f869d68014fcc5041f5fe890c98635610d8b26c9964721e2fbe74ce8a12aef8f305364ff024fe0086bf2e7252c4fdd00a5de08854fdcd285c0f4916125a
+Size (opencv_contrib-3.4.15.tar.gz) = 55214581 bytes
SHA1 (patch-3rdparty_ippicv_ippicv.cmake) = 14ce5de382084793ace32f43c6dfaf01f7ffb390
SHA1 (patch-3rdparty_protobuf_src_google_protobuf_message__lite.cc) = f1b77384ea8110d2bf3a30ff3fe9f2fa39608caf
SHA1 (patch-CMakeLists.txt) = 029368ab14163640d1651f572810eb8eb0c043d9
@@ -16,14 +16,16 @@ SHA1 (patch-cmake_OpenCVDetectCXXCompile
SHA1 (patch-cmake_OpenCVDetectPython.cmake) = 4f3bfe574edf083ebc7e78d347355c58461b2c6b
SHA1 (patch-cmake_OpenCVFindOpenEXR.cmake) = 202d0fdc84464d563dead955d5299b42098d52a6
SHA1 (patch-cmake_checks_lapack__check.cpp) = dd25d34fff25e0d46651789cf5577391d7b48c81
-SHA1 (patch-modules_core_include_opencv2_core_bindings__utils.hpp) = 9018a6124fb840be5213450b1bbe353078b37029
+SHA1 (patch-modules_core_include_opencv2_core_bindings__utils.hpp) = 44a8602670141b2a3bc90c5e1c23a8e7f96a1d40
SHA1 (patch-modules_core_include_opencv2_core_opencl_opencl__info.hpp) = f0cff24b2a760086f54ab66536bdfee4f4f1a6d7
SHA1 (patch-modules_core_include_opencv2_core_types_c.h) = 75444e65677be99af8167f9060419d7970a7adaa
SHA1 (patch-modules_core_src_check.cpp) = c8dac4e0fb6fa4a0dca6a2794bd598ba114e78b6
SHA1 (patch-modules_core_src_downhill__simplex.cpp) = 1ad7c2fa126d15050b87785e8eec20dbe796b471
SHA1 (patch-modules_core_src_hal__internal.cpp) = 22beba5ee93fc468999479227d7ef07397848b22
+SHA1 (patch-modules_core_src_parallel.cpp) = 9974e53f3be96782025dae3c64d9f1535d9bf0fd
SHA1 (patch-modules_core_src_rand.cpp) = aa87ee5a538deb1a2ed3e89dd3dd4ee9b86ae0de
SHA1 (patch-modules_core_src_system.cpp) = 3b7ac545585a430d28c7077f360357079f127580
+SHA1 (patch-modules_dnn_src_caffe_caffe__io.cpp) = 705963fb3227174c414874a8dd28a9f1219be070
SHA1 (patch-modules_dnn_src_tensorflow_tf__importer.cpp) = 9b3628d91c2217c4b1ed77413efd4c0bf85758c4
SHA1 (patch-modules_dnn_src_torch_torch__importer.cpp) = 814a3cc929569b691d01e34252dbd185f31161c2
SHA1 (patch-modules_dnn_test__precomp.hpp) = 9bf15d32394f36b92e5fc5d57fd576b3860233ae
@@ -31,4 +33,4 @@ SHA1 (patch-modules_flann_include_opencv
SHA1 (patch-modules_imgcodecs_src_grfmt__exr.cpp) = 1a33d1b14e837b973b3ac2465d0b20fd6501e9bf
SHA1 (patch-modules_imgproc_src_resize.cpp) = e842d5960c4c00162a34f46cb45cf69d0e9f21ce
SHA1 (patch-modules_ts_src_ts.cpp) = b9a3992014b02dbd89d46375a2476385e91dc24c
-SHA1 (patch-modules_videoio_src_cap__v4l.cpp) = 275e72e3c146cf15845fbb7272b28e21f51d6fb4
+SHA1 (patch-modules_videoio_src_cap__v4l.cpp) = 847c9cf47c3fb71a2e05281544a03a5ed0d224a5
Index: pkgsrc/graphics/opencv/patches/patch-modules_core_include_opencv2_core_bindings__utils.hpp
diff -u pkgsrc/graphics/opencv/patches/patch-modules_core_include_opencv2_core_bindings__utils.hpp:1.1 pkgsrc/graphics/opencv/patches/patch-modules_core_include_opencv2_core_bindings__utils.hpp:1.2
--- pkgsrc/graphics/opencv/patches/patch-modules_core_include_opencv2_core_bindings__utils.hpp:1.1 Sat Apr 18 22:01:33 2020
+++ pkgsrc/graphics/opencv/patches/patch-modules_core_include_opencv2_core_bindings__utils.hpp Wed Oct 6 21:10:24 2021
@@ -1,6 +1,6 @@
-$NetBSD: patch-modules_core_include_opencv2_core_bindings__utils.hpp,v 1.1 2020/04/18 22:01:33 joerg Exp $
+$NetBSD: patch-modules_core_include_opencv2_core_bindings__utils.hpp,v 1.2 2021/10/06 21:10:24 adam Exp $
---- modules/core/include/opencv2/core/bindings_utils.hpp.orig 2020-04-18 02:33:26.310026773 +0000
+--- modules/core/include/opencv2/core/bindings_utils.hpp.orig 2021-07-04 21:10:13.000000000 +0000
+++ modules/core/include/opencv2/core/bindings_utils.hpp
@@ -5,6 +5,7 @@
#ifndef OPENCV_CORE_BINDINGS_UTILS_HPP
@@ -9,4 +9,4 @@ $NetBSD: patch-modules_core_include_open
+#include <sstream>
#include <opencv2/core/async.hpp>
#include <opencv2/core/detail/async_promise.hpp>
-
+ #include <opencv2/core/utils/logger.hpp>
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.7 pkgsrc/graphics/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp:1.8
--- pkgsrc/graphics/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp:1.7 Mon Aug 24 07:08:03 2020
+++ pkgsrc/graphics/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp Wed Oct 6 21:10:24 2021
@@ -1,11 +1,11 @@
-$NetBSD: patch-modules_videoio_src_cap__v4l.cpp,v 1.7 2020/08/24 07:08:03 tnn Exp $
+$NetBSD: patch-modules_videoio_src_cap__v4l.cpp,v 1.8 2021/10/06 21:10:24 adam Exp $
Conditionalize settings not available in NetBSD's v4l2 emulation.
Avoid non-standard integer types.
---- modules/videoio/src/cap_v4l.cpp.orig 2019-12-19 15:16:47.000000000 +0000
+--- modules/videoio/src/cap_v4l.cpp.orig 2021-07-04 21:10:13.000000000 +0000
+++ modules/videoio/src/cap_v4l.cpp
-@@ -218,6 +218,14 @@ make & enjoy!
+@@ -215,6 +215,14 @@ make & enjoy!
#include <fcntl.h>
#include <errno.h>
#include <sys/ioctl.h>
@@ -20,7 +20,7 @@ Avoid non-standard integer types.
#include <sys/types.h>
#include <sys/mman.h>
-@@ -239,24 +247,30 @@ make & enjoy!
+@@ -236,24 +244,30 @@ make & enjoy!
#endif
// https://github.com/opencv/opencv/issues/13335
@@ -51,7 +51,7 @@ Avoid non-standard integer types.
#ifndef V4L2_PIX_FMT_Y10
#define V4L2_PIX_FMT_Y10 v4l2_fourcc('Y', '1', '0', ' ')
-@@ -554,13 +568,17 @@ bool CvCaptureCAM_V4L::autosetup_capture
+@@ -555,7 +569,9 @@ bool CvCaptureCAM_V4L::autosetup_capture
V4L2_PIX_FMT_NV12,
V4L2_PIX_FMT_NV21,
V4L2_PIX_FMT_SBGGR8,
@@ -61,15 +61,7 @@ Avoid non-standard integer types.
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,
-+#endif
- V4L2_PIX_FMT_Y10,
- V4L2_PIX_FMT_GREY,
- };
-@@ -616,9 +634,13 @@ bool CvCaptureCAM_V4L::convertableToRgb(
+@@ -618,9 +634,13 @@ bool CvCaptureCAM_V4L::convertableToRgb(
case V4L2_PIX_FMT_UYVY:
case V4L2_PIX_FMT_SBGGR8:
case V4L2_PIX_FMT_SN9C10X:
@@ -83,17 +75,17 @@ Avoid non-standard integer types.
case V4L2_PIX_FMT_Y10:
case V4L2_PIX_FMT_GREY:
case V4L2_PIX_FMT_BGR24:
-@@ -653,7 +675,9 @@ void CvCaptureCAM_V4L::v4l2_create_frame
+@@ -655,7 +675,9 @@ void CvCaptureCAM_V4L::v4l2_create_frame
channels = 1;
size.height = size.height * 3 / 2; // "1.5" channels
break;
+#ifdef V4L2_PIX_FMT_Y16
case V4L2_PIX_FMT_Y16:
+#endif
+ case V4L2_PIX_FMT_Y12:
case V4L2_PIX_FMT_Y10:
depth = IPL_DEPTH_16U;
- /* fallthru */
-@@ -1528,11 +1552,13 @@ void CvCaptureCAM_V4L::convertToRgb(cons
+@@ -1532,11 +1554,13 @@ void CvCaptureCAM_V4L::convertToRgb(cons
(unsigned char*)buffers[MAX_V4L_BUFFERS].start,
(unsigned char*)frame.imageData);
return;
@@ -107,7 +99,7 @@ Avoid non-standard integer types.
default:
break;
}
-@@ -1571,6 +1597,7 @@ void CvCaptureCAM_V4L::convertToRgb(cons
+@@ -1575,6 +1599,7 @@ void CvCaptureCAM_V4L::convertToRgb(cons
case V4L2_PIX_FMT_RGB24:
cv::cvtColor(cv::Mat(imageSize, CV_8UC3, currentBuffer.start), destination, COLOR_RGB2BGR);
return;
@@ -115,7 +107,7 @@ Avoid non-standard integer types.
case V4L2_PIX_FMT_Y16:
{
cv::Mat temp(imageSize, CV_8UC1, buffers[MAX_V4L_BUFFERS].start);
-@@ -1585,6 +1612,7 @@ void CvCaptureCAM_V4L::convertToRgb(cons
+@@ -1596,6 +1621,7 @@ void CvCaptureCAM_V4L::convertToRgb(cons
cv::cvtColor(temp, destination, COLOR_GRAY2BGR);
return;
}
@@ -123,7 +115,7 @@ Avoid non-standard integer types.
case V4L2_PIX_FMT_GREY:
cv::cvtColor(cv::Mat(imageSize, CV_8UC1, currentBuffer.start), destination, COLOR_GRAY2BGR);
break;
-@@ -1697,8 +1725,10 @@ static inline int capPropertyToV4L2(int
+@@ -1708,8 +1734,10 @@ static inline int capPropertyToV4L2(int
return -1;
case cv::CAP_PROP_FOURCC:
return -1;
@@ -134,7 +126,7 @@ Avoid non-standard integer types.
case cv::CAP_PROP_FORMAT:
return -1;
case cv::CAP_PROP_MODE:
-@@ -1713,8 +1743,10 @@ static inline int capPropertyToV4L2(int
+@@ -1724,8 +1752,10 @@ static inline int capPropertyToV4L2(int
return V4L2_CID_HUE;
case cv::CAP_PROP_GAIN:
return V4L2_CID_GAIN;
@@ -145,7 +137,7 @@ Avoid non-standard integer types.
case cv::CAP_PROP_CONVERT_RGB:
return -1;
case cv::CAP_PROP_WHITE_BALANCE_BLUE_U:
-@@ -1725,8 +1757,10 @@ static inline int capPropertyToV4L2(int
+@@ -1736,8 +1766,10 @@ static inline int capPropertyToV4L2(int
return -1;
case cv::CAP_PROP_SHARPNESS:
return V4L2_CID_SHARPNESS;
@@ -156,7 +148,7 @@ Avoid non-standard integer types.
case cv::CAP_PROP_GAMMA:
return V4L2_CID_GAMMA;
case cv::CAP_PROP_TEMPERATURE:
-@@ -1737,34 +1771,54 @@ static inline int capPropertyToV4L2(int
+@@ -1748,34 +1780,54 @@ static inline int capPropertyToV4L2(int
return -1;
case cv::CAP_PROP_WHITE_BALANCE_RED_V:
return V4L2_CID_RED_BALANCE;
Added files:
Index: pkgsrc/graphics/opencv/patches/patch-modules_core_src_parallel.cpp
diff -u /dev/null pkgsrc/graphics/opencv/patches/patch-modules_core_src_parallel.cpp:1.1
--- /dev/null Wed Oct 6 21:10:24 2021
+++ pkgsrc/graphics/opencv/patches/patch-modules_core_src_parallel.cpp Wed Oct 6 21:10:24 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-modules_core_src_parallel.cpp,v 1.1 2021/10/06 21:10:24 adam Exp $
+
+NetBSD support.
+
+--- modules/core/src/parallel.cpp.orig 2021-10-06 20:27:21.320272155 +0000
++++ modules/core/src/parallel.cpp
+@@ -55,7 +55,7 @@
+
+ #if defined __linux__ || defined __APPLE__ || defined __GLIBC__ \
+ || defined __HAIKU__ || defined __EMSCRIPTEN__ || defined __FreeBSD__ \
+- || defined __OpenBSD__
++ || defined __OpenBSD__ || defined __NetBSD__
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <sys/types.h>
Index: pkgsrc/graphics/opencv/patches/patch-modules_dnn_src_caffe_caffe__io.cpp
diff -u /dev/null pkgsrc/graphics/opencv/patches/patch-modules_dnn_src_caffe_caffe__io.cpp:1.1
--- /dev/null Wed Oct 6 21:10:24 2021
+++ pkgsrc/graphics/opencv/patches/patch-modules_dnn_src_caffe_caffe__io.cpp Wed Oct 6 21:10:24 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-modules_dnn_src_caffe_caffe__io.cpp,v 1.1 2021/10/06 21:10:24 adam Exp $
+
+Avoid deprecated version of profobuf's SetTotalBytesLimit().
+
+--- modules/dnn/src/caffe/caffe_io.cpp.orig 2021-10-06 19:52:42.000000000 +0000
++++ modules/dnn/src/caffe/caffe_io.cpp
+@@ -1111,7 +1111,7 @@ static const int kProtoReadBytesLimit =
+
+ bool ReadProtoFromBinary(ZeroCopyInputStream* input, Message *proto) {
+ CodedInputStream coded_input(input);
+- coded_input.SetTotalBytesLimit(kProtoReadBytesLimit, 536870912);
++ coded_input.SetTotalBytesLimit(kProtoReadBytesLimit);
+
+ return proto->ParseFromCodedStream(&coded_input);
+ }
Home |
Main Index |
Thread Index |
Old Index