CVS commit: pkgsrc/graphics

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/graphics
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Mon, 7 Jul 2025 05:15:26 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Jul  7 05:15:26 UTC 2025

Modified Files:
        pkgsrc/graphics/opencv: Makefile Makefile.common PLIST distinfo
        pkgsrc/graphics/opencv-contrib-face: Makefile PLIST distinfo
        pkgsrc/graphics/opencv-contrib-face/patches:
            patch-modules_videoio_src_cap__v4l.cpp
        pkgsrc/graphics/opencv/patches: patch-modules_videoio_src_cap__v4l.cpp
Added Files:
        pkgsrc/graphics/opencv-contrib-face/patches:
            patch-.._opencv__contrib-4.12.0_modules_face_CMakeLists.txt
Removed Files:
        pkgsrc/graphics/opencv-contrib-face/patches:
            patch-.._opencv__contrib-4.11.0_modules_face_CMakeLists.txt

Log Message:
opencv*: update to 4.12.0

Summer update for OpenCV 4.x

    Core Module:
        Added user-defined logger callback #27154
        Added reinterpret() method to cv::Mat #25394
        Fixed empty ND-array construction #27362
        Fixed bug with int64 support for FileStorage #26846
        Fixed cv::meanStdDev overflow for large images #26867
        Useed HAL for cv::mean function too #26895
        Vectorized cv::normalize / cv::norm #26885
        Enabled SIMD_SCALABLE for exp and sqrt #26886
        vectorized normDiff with universal intrinsics #27042
        Refactored normDiff in hal_rvv and extended with support of more data types #27115
        Further vectorized copyTo with mask #27145
        Fix POWN OpenCL implementation #27274
        Restored legacy universal intrinsics operators in a separate header #27327
        Improved solveCubuc accuracy: #27331, #27347
        Deprecated copyData Parameter in cv::UMat construction from std::vector and always copy data #27408

    Imgproc Module:
        Optimized and reduced memory consumption in cv::findContours #26690, #26834
        Fixed integer overflow in cv::HoughLinesProbabilistic with very large input images #26744
        Fixed several potential overflows in image warping #26765, #26776
        Improved robustness for ellipse fitting #26773
        Added cv::THRESH_DRYRUN flag to get adaptive threshold values without input thresholding #26836
        Fixed cv::getPerspectiveTransform for singular case #26926
        Optimized bayer2Gray with universal intrinsics #26868
        Added optional mask to cv::threshold #26842
        Accelerated cv::remap calculation with multi-threading, when cv::WARP_INVERSE_MAP is used #27108
        Reworked HSV color conversion tables initialization in OpenCL branch to fix possible data raise #27287
        Fixed bilateral filter's sigma color and sigma space issue #27309
        Impoved performance of medianblur #27299
        Added cv::getClosestEllipsePoints function to get the closest point on an ellipse #26299
        Corrected IPP implementation for cv::distanceTransform results with single thread #27432
        Fixed cv::matchTemplate with mask crash #26703
        Added diamond structuring element to morphology operations #27441, #27492
        Improved cv::intersectConvexConvex accuracy in corner cases #26974

    Calib3d module:
        Fixed inliers updating in homography estimation #26742
        Added cv::solvePnPRansac implementation for the fisheye camera model #26669
        Fixed different marker ordering with cv::findChessboardCornersSBWithMeta and cv::CALIB_CB_LARGER flag.
        Fixed logical mistake in FilterSpecklesImpl #26996
        Optimized undistort points for the fisheye camera model #26988
        Optimized new camera matrix estimation and some related functions #27001
        Added warning if projected axes are out of camera frame in cv::drawAxes function #27311
        Added image dimension check to avoid StereoSGBM non-determinism #27305
        Fixed bugs in SQPNP orthogonalization and simplified column vectors copying #27437

    DNN Module:
        Added TFLite StridedSllice (without strides but just Slice) and enable strides for TF importers #27273
        Added fusion handler of conv+eltwise in case of multi-output node (i.e. Split) #27326
        Added new ops import in TFLite parser: SUB, SQRT, DIV, NEG, SQUARED_DIFFERENCE, SUM #27307
        Fxied scalars and 1d tensors support in TFLite parser #27307
        Reduced mumber of NHWC<->NCHW conversions in TFLite parser #27307
        Added checks before getting latest pin in Net::Impl::getLatestLayerPin #27353
        Added OpenVINO NPU support #27363
        Added more operations to CANN backend #24756

    Objdetect module:
        Extend ArUcoDetector to run multiple dictionaries in an efficient manner #26934.
        Fixed rotated aruco marker board generation #26753
        Fixed incorrect Aruco marker detection near image edge #26968
        Fixed invalid vector access in QR de/encoder #26532
        Fix QR code encoder with auto version #27244
        Aded QRCode ECI encoding support #24426, #27486
        Made ChAruco board consistency check optional #26824

    Photo Module:
        Added 16-bit support to cv::fastNlMeansDenoising and updated tests #26831
        Local decolor pipeline optimization #27041
        Fixed Triangle Weights used by Debevec algorithm being non zero at extremes #27270
        Fixed NaNs in HDR Triangle Weights and Tonemapping and Update LDR Ground Truth in tutorial #27396

    VideoIO Module:
        Fixed invalid custom FFmpeg options handling provided with environment variable #26793
        Fixed default cv::CAP_PROP_ORIENTATION_ATUO behaviour #26800
        Improved camera opening performance when with DShow backed, if custom options are provided #26601
        Added zoom support into Android native camera capture #26837
        Fixed V4L frame size for non-BGR output #27193
        Added Orbbec Gemini 330 camera support #27230
        Fixed cv::VideoWriter failure on writing colorless images #27153
        Fixed Android setCameraIndex issue #27419

    Imgcodecs:
        Extended image I/O API with metadata support #27499
        Added in-memory animation encoding and decoding #27013
        Added hidden frame support for Animated PNG #27127
        Added GIF decode and encode for imgcodecs #25691, #26971, #26859, #26738, #26930, #27081, #27138, #27296
        Added animated WebP Support #25608, #27457
        Added GDAL multi-channel support #27458
        Fixed AVIF linkage on Windows #26762
        Significantly improved PNG and Animated PNG files handing #26849, #26739, #26748, #26782, #26832, #26835, #26848, #26851, #26854, #26915, #27040, #27087, #27297
        Added several fixes for libspng integration #27314
        Fixed memory leak in JpegXL decoder #26787
        Added support for cv::IMREAD_UNCHANGED and other ImreadFlags into JpegXL implementation #26788
        Implemented imdecode() for JpegXL to directly read from memory #26844
        Added lossless compression support for JpegXL #27384
        Fixed cv::imread() implementation for 16-bit png with libspng back-end #27113

    Highgui Module:
        displayOverlay doesn't disappear after timeout #27082
        Fix closing of windows when using the Qt backend #27170
        Fixed QT window resize regression #27282

    G-API module:
        Workaround for successfull append of OpenVINO Execution Provider: Moved creation of 'Ort::Env' before it #26983
        Adding AddRgbFeature(), and improving robustness in ComputeRgbDistance #26682
        Added MS Media Foundation availability check in G-API too #27355

    Video Module:
        Added trackers factory with pre-loaded dnn models #26875

    HAL:
        Extracted HAL implementations as dedicated folder #27252.
        Implemented new HAL for RISC-V RVV 1.0 platforms, see all changes by query
        Refactored OpenVX implementation as HAL #26903, #26911, #26907.
        Partially refactored Intel IPP integration as HAL #26880, #27125, #27128, #27194, #27213, #27346. Further IPP conversion will be continued in the next releases
        Fixed HALs dependency from thre cv namespace #26878
        Updated KleidiCV HAL for ARM to version 0.5
        Extended FastCV HAL for Qualcomm platforms #27217, #27216, #27184, #27182, #27033
        Added new HAL entries for cv::sum #27346, copyTo with mask #27162, cv::DFT and cv::DCT variations #26865, convert with scale #26804, cv::norm variations #26804, minMaxIdx with step support 
#26789, cv::calcHist #27332, cv::pyrUp #26958, more variations for cv::remap #27119

    Python, Java and JavaScript bindings:
        Added conditional inclusion support to header parser #27325, #27393, #27478
        Updated predefined_types.py #26826
        Added bindings for animations #26813
        Fix wrong python type hints for cv::imread #26890
        Replaced tostring() and fromstring() call in tests and samples for compatibility with modern Python #26932, #26949
        Replaced ndarray.ptp() with np.ptp() for NumPy 2.0 Compatibility #27133
        Extended Java bindings generation in DNN #27228, #27260, Features2d #27245
        Fixed std::vector<Point3f> handling in JS wrappers #27291
        Added cv::VideoCapture buffered stream constructor into Java #27284, #27421
        Extended bindings for cv::HoughLinesWithAccumulator #27377
        Fixed Kotlin 2.0 internal error for unsafe coercions #26354

    Platforms support:
        Fixed OpenBLAS detection on Linux #27029
        Fixed compatibility with CMake 4 #27192
        Fixed Android build with Vulkan support #26765
        Fixed VSX intrinsics (Power) implementation #26750, #26786
        Added CMake checks for getauxval and elf_aux_info for POWER architecture #26798
        Fixed build for openBSD #26803
        Added initial support for Nvidia Blackwell GPU arch in CUDA #26820
        Fixed cv namespace dependency in Carotene HAL #26878
        Fixed _DEBUG/NDEBUG handling across modules #26151
        Fixed build for QNX 7.0 #26985
        Switched to statically linked FastCV #26917, #27340 fixed build issues on Android #27345
        Forced C++17 Standard for CUDA targets when CUDA Toolkit >=12.8 #27112 #27142
        Fixed build for Windows ARM64EC #27416
        Fixed filesystem support under Cygwin environment #27484


To generate a diff of this commit:
cvs rdiff -u -r1.145 -r1.146 pkgsrc/graphics/opencv/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/graphics/opencv/Makefile.common
cvs rdiff -u -r1.26 -r1.27 pkgsrc/graphics/opencv/PLIST
cvs rdiff -u -r1.63 -r1.64 pkgsrc/graphics/opencv/distinfo
cvs rdiff -u -r1.48 -r1.49 pkgsrc/graphics/opencv-contrib-face/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/graphics/opencv-contrib-face/PLIST
cvs rdiff -u -r1.33 -r1.34 pkgsrc/graphics/opencv-contrib-face/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/graphics/opencv-contrib-face/patches/patch-.._opencv__contrib-4.11.0_modules_face_CMakeLists.txt
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/opencv-contrib-face/patches/patch-.._opencv__contrib-4.12.0_modules_face_CMakeLists.txt
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/graphics/opencv-contrib-face/patches/patch-modules_videoio_src_cap__v4l.cpp
cvs rdiff -u -r1.10 -r1.11 \
    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.145 pkgsrc/graphics/opencv/Makefile:1.146
--- pkgsrc/graphics/opencv/Makefile:1.145       Thu Jul  3 19:18:05 2025
+++ pkgsrc/graphics/opencv/Makefile     Mon Jul  7 05:15:26 2025
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.145 2025/07/03 19:18:05 wiz Exp $
+# $NetBSD: Makefile,v 1.146 2025/07/07 05:15:26 wiz Exp $
 
-PKGREVISION= 4
 .include "Makefile.common"
 
 DISTNAME=      opencv-${OPENCV_VERSION}

Index: pkgsrc/graphics/opencv/Makefile.common
diff -u pkgsrc/graphics/opencv/Makefile.common:1.24 pkgsrc/graphics/opencv/Makefile.common:1.25
--- pkgsrc/graphics/opencv/Makefile.common:1.24 Fri Feb  7 23:35:30 2025
+++ pkgsrc/graphics/opencv/Makefile.common      Mon Jul  7 05:15:26 2025
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.24 2025/02/07 23:35:30 adam Exp $
+# $NetBSD: Makefile.common,v 1.25 2025/07/07 05:15:26 wiz Exp $
 #
 # used by graphics/opencv/Makefile
 # used by graphics/opencv-contrib-face/Makefile
 
-OPENCV_VERSION=        4.11.0
+OPENCV_VERSION=        4.12.0
 
 CATEGORIES=    graphics devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=opencv/}

Index: pkgsrc/graphics/opencv/PLIST
diff -u pkgsrc/graphics/opencv/PLIST:1.26 pkgsrc/graphics/opencv/PLIST:1.27
--- pkgsrc/graphics/opencv/PLIST:1.26   Wed Feb 12 11:22:16 2025
+++ pkgsrc/graphics/opencv/PLIST        Mon Jul  7 05:15:26 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2025/02/12 11:22:16 wiz Exp $
+@comment $NetBSD: PLIST,v 1.27 2025/07/07 05:15:26 wiz Exp $
 bin/opencv_annotation
 bin/opencv_interactive-calibration
 bin/opencv_model_diagnostics
@@ -72,6 +72,7 @@ include/opencv4/opencv2/core/hal/intrin_
 include/opencv4/opencv2/core/hal/intrin_cpp.hpp
 include/opencv4/opencv2/core/hal/intrin_forward.hpp
 include/opencv4/opencv2/core/hal/intrin_lasx.hpp
+include/opencv4/opencv2/core/hal/intrin_legacy_ops.h
 include/opencv4/opencv2/core/hal/intrin_lsx.hpp
 include/opencv4/opencv2/core/hal/intrin_math.hpp
 include/opencv4/opencv2/core/hal/intrin_msa.hpp
@@ -260,46 +261,46 @@ lib/cmake/opencv4/OpenCVModules-release.
 lib/cmake/opencv4/OpenCVModules.cmake
 lib/libopencv_calib3d.so
 lib/libopencv_calib3d.so.${PKGVERSION}
-lib/libopencv_calib3d.so.411
+lib/libopencv_calib3d.so.412
 lib/libopencv_core.so
 lib/libopencv_core.so.${PKGVERSION}
-lib/libopencv_core.so.411
+lib/libopencv_core.so.412
 lib/libopencv_dnn.so
 lib/libopencv_dnn.so.${PKGVERSION}
-lib/libopencv_dnn.so.411
+lib/libopencv_dnn.so.412
 lib/libopencv_features2d.so
 lib/libopencv_features2d.so.${PKGVERSION}
-lib/libopencv_features2d.so.411
+lib/libopencv_features2d.so.412
 lib/libopencv_flann.so
 lib/libopencv_flann.so.${PKGVERSION}
-lib/libopencv_flann.so.411
+lib/libopencv_flann.so.412
 lib/libopencv_highgui.so
 lib/libopencv_highgui.so.${PKGVERSION}
-lib/libopencv_highgui.so.411
+lib/libopencv_highgui.so.412
 lib/libopencv_imgcodecs.so
 lib/libopencv_imgcodecs.so.${PKGVERSION}
-lib/libopencv_imgcodecs.so.411
+lib/libopencv_imgcodecs.so.412
 lib/libopencv_imgproc.so
 lib/libopencv_imgproc.so.${PKGVERSION}
-lib/libopencv_imgproc.so.411
+lib/libopencv_imgproc.so.412
 lib/libopencv_ml.so
 lib/libopencv_ml.so.${PKGVERSION}
-lib/libopencv_ml.so.411
+lib/libopencv_ml.so.412
 lib/libopencv_objdetect.so
 lib/libopencv_objdetect.so.${PKGVERSION}
-lib/libopencv_objdetect.so.411
+lib/libopencv_objdetect.so.412
 lib/libopencv_photo.so
 lib/libopencv_photo.so.${PKGVERSION}
-lib/libopencv_photo.so.411
+lib/libopencv_photo.so.412
 lib/libopencv_stitching.so
 lib/libopencv_stitching.so.${PKGVERSION}
-lib/libopencv_stitching.so.411
+lib/libopencv_stitching.so.412
 lib/libopencv_video.so
 lib/libopencv_video.so.${PKGVERSION}
-lib/libopencv_video.so.411
+lib/libopencv_video.so.412
 lib/libopencv_videoio.so
 lib/libopencv_videoio.so.${PKGVERSION}
-lib/libopencv_videoio.so.411
+lib/libopencv_videoio.so.412
 ${PYSITELIB}/cv2/Error/__init__.pyi
 ${PYSITELIB}/cv2/__init__.py
 ${PYSITELIB}/cv2/__init__.pyi
@@ -356,8 +357,8 @@ share/opencv4/lbpcascades/lbpcascade_pro
 share/opencv4/lbpcascades/lbpcascade_silverware.xml
 share/opencv4/licenses/SoftFloat-COPYING.txt
 share/opencv4/licenses/flatbuffers-LICENSE.txt
-share/opencv4/licenses/ittnotify-LICENSE.BSD
-share/opencv4/licenses/ittnotify-LICENSE.GPL
+share/opencv4/licenses/ittnotify-BSD-3-Clause.txt
+share/opencv4/licenses/ittnotify-GPL-2.0-only.txt
 share/opencv4/licenses/mscr-chi_table_LICENSE.txt
 share/opencv4/licenses/opencl-headers-LICENSE.txt
 share/opencv4/valgrind.supp

Index: pkgsrc/graphics/opencv/distinfo
diff -u pkgsrc/graphics/opencv/distinfo:1.63 pkgsrc/graphics/opencv/distinfo:1.64
--- pkgsrc/graphics/opencv/distinfo:1.63        Fri Feb  7 21:54:16 2025
+++ pkgsrc/graphics/opencv/distinfo     Mon Jul  7 05:15:26 2025
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.63 2025/02/07 21:54:16 wiz Exp $
+$NetBSD: distinfo,v 1.64 2025/07/07 05:15:26 wiz Exp $
 
-BLAKE2s (opencv-4.11.0.tar.gz) = 9d98eab1bed16a059e66f52c4ee90bc7dd20603a1bbef0e89a4f9da568f08fca
-SHA512 (opencv-4.11.0.tar.gz) = 3b6e0da8169449944715de9e66380977791069a1d8288534ec768eaa2fb68533821fd8e06eac925a26656baf42185258b13aa80579e1e9be3ebc18fcea66f24d
-Size (opencv-4.11.0.tar.gz) = 95051012 bytes
+BLAKE2s (opencv-4.12.0.tar.gz) = cffcaf5e2d1046489916cf89b204523503e2a77f56e4f40d3d1f0a99ec027916
+SHA512 (opencv-4.12.0.tar.gz) = 8ac63ddd61e22cc0eaeafee4f30ae6e1cab05fc4929e2cea29070203b9ca8dfead12cc0fd7c4a87b65c1e20ec6b9ab4865a1b83fad33d114fc0708fdf107c51b
+Size (opencv-4.12.0.tar.gz) = 95254890 bytes
 SHA1 (patch-3rdparty_ippicv_ippicv.cmake) = 14ce5de382084793ace32f43c6dfaf01f7ffb390
 SHA1 (patch-modules_core_src_downhill__simplex.cpp) = 1ad7c2fa126d15050b87785e8eec20dbe796b471
 SHA1 (patch-modules_flann_include_opencv2_flann_defines.h) = ab848e67c4e03219670598ac2d21071a617a5c33
 SHA1 (patch-modules_imgproc_src_resize.cpp) = e842d5960c4c00162a34f46cb45cf69d0e9f21ce
-SHA1 (patch-modules_videoio_src_cap__v4l.cpp) = f9ff94f46cdee1b9616ceb2982b4f5925c0bfb3f
+SHA1 (patch-modules_videoio_src_cap__v4l.cpp) = e77096629a6f0c137cf3707184ba40990b53f44d

Index: pkgsrc/graphics/opencv-contrib-face/Makefile
diff -u pkgsrc/graphics/opencv-contrib-face/Makefile:1.48 pkgsrc/graphics/opencv-contrib-face/Makefile:1.49
--- pkgsrc/graphics/opencv-contrib-face/Makefile:1.48   Thu Jul  3 06:28:32 2025
+++ pkgsrc/graphics/opencv-contrib-face/Makefile        Mon Jul  7 05:15:26 2025
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.48 2025/07/03 06:28:32 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2025/07/07 05:15:26 wiz Exp $
 
 # can't use ninja because we only want to install parts of it
 CMAKE_GENERATORS_INCOMPATIBLE= ninja
 INSTALL_DIRS=          modules/face modules/plot modules/tracking
 
-PKGREVISION= 3
 .include "../../graphics/opencv/Makefile.common"
 
 DISTNAME=      opencv_contrib-${OPENCV_VERSION}
@@ -16,7 +15,7 @@ COMMENT=      OpenCV face recognition contrib
 
 DISTFILES=     ${DEFAULT_DISTFILES} opencv-${PKGVERSION_NOREV}${EXTRACT_SUFX} opencv-${PKGVERSION_NOREV}_face_landmark_model.dat
 # use the hash from modules/face/CMakeLists.txt
-SITES.opencv-4.11.0_face_landmark_model.dat=   -https://raw.githubusercontent.com/opencv/opencv_3rdparty/8afa57abc8229d611c4937165d20e2a2d9fc5a12/face_landmark_model.dat
+SITES.opencv-4.12.0_face_landmark_model.dat=   -https://raw.githubusercontent.com/opencv/opencv_3rdparty/8afa57abc8229d611c4937165d20e2a2d9fc5a12/face_landmark_model.dat
 
 WRKSRC=                ${WRKDIR}/opencv-${PKGVERSION_NOREV}
 

Index: pkgsrc/graphics/opencv-contrib-face/PLIST
diff -u pkgsrc/graphics/opencv-contrib-face/PLIST:1.7 pkgsrc/graphics/opencv-contrib-face/PLIST:1.8
--- pkgsrc/graphics/opencv-contrib-face/PLIST:1.7       Fri Feb  7 21:57:08 2025
+++ pkgsrc/graphics/opencv-contrib-face/PLIST   Mon Jul  7 05:15:26 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2025/02/07 21:57:08 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2025/07/07 05:15:26 wiz Exp $
 include/opencv4/opencv2/face.hpp
 include/opencv4/opencv2/face/bif.hpp
 include/opencv4/opencv2/face/face_alignment.hpp
@@ -22,10 +22,10 @@ include/opencv4/opencv2/tracking/trackin
 include/opencv4/opencv2/tracking/twist.hpp
 lib/libopencv_face.so
 lib/libopencv_face.so.${PKGVERSION}
-lib/libopencv_face.so.411
+lib/libopencv_face.so.412
 lib/libopencv_plot.so
 lib/libopencv_plot.so.${PKGVERSION}
-lib/libopencv_plot.so.411
+lib/libopencv_plot.so.412
 lib/libopencv_tracking.so
 lib/libopencv_tracking.so.${PKGVERSION}
-lib/libopencv_tracking.so.411
+lib/libopencv_tracking.so.412

Index: pkgsrc/graphics/opencv-contrib-face/distinfo
diff -u pkgsrc/graphics/opencv-contrib-face/distinfo:1.33 pkgsrc/graphics/opencv-contrib-face/distinfo:1.34
--- pkgsrc/graphics/opencv-contrib-face/distinfo:1.33   Fri Feb  7 21:57:08 2025
+++ pkgsrc/graphics/opencv-contrib-face/distinfo        Mon Jul  7 05:15:26 2025
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.33 2025/02/07 21:57:08 wiz Exp $
+$NetBSD: distinfo,v 1.34 2025/07/07 05:15:26 wiz Exp $
 
-BLAKE2s (opencv-4.11.0.tar.gz) = 9d98eab1bed16a059e66f52c4ee90bc7dd20603a1bbef0e89a4f9da568f08fca
-SHA512 (opencv-4.11.0.tar.gz) = 3b6e0da8169449944715de9e66380977791069a1d8288534ec768eaa2fb68533821fd8e06eac925a26656baf42185258b13aa80579e1e9be3ebc18fcea66f24d
-Size (opencv-4.11.0.tar.gz) = 95051012 bytes
-BLAKE2s (opencv-4.11.0_face_landmark_model.dat) = 27a36ff06273b7bf77d3a01742348482c129788e6baaa08c07d4d5b3803e57b0
-SHA512 (opencv-4.11.0_face_landmark_model.dat) = c16e60a6c4bb4de3ab39b876ae3c3f320ea56f69c93e9303bd2dff8760841dcd71be4161fff8bc71e8fe4fe8747fa8465d49d6bd8f5ebcdaea161f4bc2da7c93
-Size (opencv-4.11.0_face_landmark_model.dat) = 72368157 bytes
-BLAKE2s (opencv_contrib-4.11.0.tar.gz) = a3a5a86bbab7230e21f5f050091e78a789f8b5999409f2db44abb393c35c24fb
-SHA512 (opencv_contrib-4.11.0.tar.gz) = a5ebb6810a3b5e40858b7fd533f9eb7b3d475dfda843a489bc5168e72c5eaad0a7a23629aace1f43e1b62d9c24e5e1923d841059c297728fac464e00759886c2
-Size (opencv_contrib-4.11.0.tar.gz) = 55450097 bytes
-SHA1 (patch-.._opencv__contrib-4.11.0_modules_face_CMakeLists.txt) = bb29d053c0e050c53029b4443822dea978de181e
+BLAKE2s (opencv-4.12.0.tar.gz) = cffcaf5e2d1046489916cf89b204523503e2a77f56e4f40d3d1f0a99ec027916
+SHA512 (opencv-4.12.0.tar.gz) = 8ac63ddd61e22cc0eaeafee4f30ae6e1cab05fc4929e2cea29070203b9ca8dfead12cc0fd7c4a87b65c1e20ec6b9ab4865a1b83fad33d114fc0708fdf107c51b
+Size (opencv-4.12.0.tar.gz) = 95254890 bytes
+BLAKE2s (opencv-4.12.0_face_landmark_model.dat) = 27a36ff06273b7bf77d3a01742348482c129788e6baaa08c07d4d5b3803e57b0
+SHA512 (opencv-4.12.0_face_landmark_model.dat) = c16e60a6c4bb4de3ab39b876ae3c3f320ea56f69c93e9303bd2dff8760841dcd71be4161fff8bc71e8fe4fe8747fa8465d49d6bd8f5ebcdaea161f4bc2da7c93
+Size (opencv-4.12.0_face_landmark_model.dat) = 72368157 bytes
+BLAKE2s (opencv_contrib-4.12.0.tar.gz) = a1926bd07f50ca85db842b39758e9e0431b2bf53fb2aad1acfd937ceb56f4ea2
+SHA512 (opencv_contrib-4.12.0.tar.gz) = 574121ca57328671741413df91fbf600cc04bb9a9beeacfb7bc20c15b2b4e8c9e031df30aafbcc34f82d85edfb098e5d008a744f4e6d833d6e47537a042045c6
+Size (opencv_contrib-4.12.0.tar.gz) = 55475555 bytes
+SHA1 (patch-.._opencv__contrib-4.12.0_modules_face_CMakeLists.txt) = cda0ce30069e2545ccf95c0c1d566a82749c8ffb
 SHA1 (patch-3rdparty_ippicv_ippicv.cmake) = 14ce5de382084793ace32f43c6dfaf01f7ffb390
 SHA1 (patch-modules_core_src_downhill__simplex.cpp) = 1ad7c2fa126d15050b87785e8eec20dbe796b471
 SHA1 (patch-modules_flann_include_opencv2_flann_defines.h) = ab848e67c4e03219670598ac2d21071a617a5c33
 SHA1 (patch-modules_imgproc_src_resize.cpp) = e842d5960c4c00162a34f46cb45cf69d0e9f21ce
-SHA1 (patch-modules_videoio_src_cap__v4l.cpp) = f9ff94f46cdee1b9616ceb2982b4f5925c0bfb3f
+SHA1 (patch-modules_videoio_src_cap__v4l.cpp) = e77096629a6f0c137cf3707184ba40990b53f44d

Index: pkgsrc/graphics/opencv-contrib-face/patches/patch-modules_videoio_src_cap__v4l.cpp
diff -u pkgsrc/graphics/opencv-contrib-face/patches/patch-modules_videoio_src_cap__v4l.cpp:1.1 pkgsrc/graphics/opencv-contrib-face/patches/patch-modules_videoio_src_cap__v4l.cpp:1.2
--- pkgsrc/graphics/opencv-contrib-face/patches/patch-modules_videoio_src_cap__v4l.cpp:1.1      Fri Feb  7 21:57:08 2025
+++ pkgsrc/graphics/opencv-contrib-face/patches/patch-modules_videoio_src_cap__v4l.cpp  Mon Jul  7 05:15:26 2025
@@ -1,9 +1,9 @@
-$NetBSD: patch-modules_videoio_src_cap__v4l.cpp,v 1.1 2025/02/07 21:57:08 wiz Exp $
+$NetBSD: patch-modules_videoio_src_cap__v4l.cpp,v 1.2 2025/07/07 05:15:26 wiz Exp $
 
 Conditionalize settings not available in NetBSD's v4l2 emulation.
 Avoid non-standard integer types.
 
---- modules/videoio/src/cap_v4l.cpp.orig       2025-01-08 12:47:46.000000000 +0000
+--- modules/videoio/src/cap_v4l.cpp.orig       2025-07-02 07:54:13.000000000 +0000
 +++ modules/videoio/src/cap_v4l.cpp
 @@ -215,6 +215,14 @@ make & enjoy!
  #include <fcntl.h>
@@ -51,7 +51,7 @@ Avoid non-standard integer types.
  
  #ifndef v4l2_fourcc_be
  #define v4l2_fourcc_be(a, b, c, d) (v4l2_fourcc(a, b, c, d) | (1U << 31))
-@@ -1471,6 +1485,7 @@ void CvCaptureCAM_V4L::convertToRgb(cons
+@@ -1467,6 +1481,7 @@ void CvCaptureCAM_V4L::convertToRgb(cons
      case V4L2_PIX_FMT_RGB24:
          cv::cvtColor(cv::Mat(imageSize, CV_8UC3, start), frame, COLOR_RGB2BGR);
          return;
@@ -59,15 +59,15 @@ Avoid non-standard integer types.
      case V4L2_PIX_FMT_Y16:
      {
          // https://www.kernel.org/doc/html/v4.10/media/uapi/v4l/pixfmt-y16.html
-@@ -1535,6 +1550,7 @@ void CvCaptureCAM_V4L::convertToRgb(cons
+@@ -1531,6 +1546,7 @@ void CvCaptureCAM_V4L::convertToRgb(cons
          cv::cvtColor(cv::Mat(imageSize, CV_8UC1, start), frame, COLOR_BayerGB2BGR);
          return;
      }
 +#endif
      case V4L2_PIX_FMT_GREY:
          cv::cvtColor(cv::Mat(imageSize, CV_8UC1, start), frame, COLOR_GRAY2BGR);
-         break;
-@@ -1654,8 +1670,10 @@ static inline int capPropertyToV4L2(int 
+         return;
+@@ -1650,8 +1666,10 @@ static inline int capPropertyToV4L2(int 
          return -1;
      case cv::CAP_PROP_FOURCC:
          return -1;
@@ -78,7 +78,7 @@ Avoid non-standard integer types.
      case cv::CAP_PROP_FORMAT:
          return -1;
      case cv::CAP_PROP_MODE:
-@@ -1670,8 +1688,10 @@ static inline int capPropertyToV4L2(int 
+@@ -1666,8 +1684,10 @@ static inline int capPropertyToV4L2(int 
          return V4L2_CID_HUE;
      case cv::CAP_PROP_GAIN:
          return V4L2_CID_GAIN;
@@ -89,7 +89,7 @@ Avoid non-standard integer types.
      case cv::CAP_PROP_CONVERT_RGB:
          return -1;
      case cv::CAP_PROP_WHITE_BALANCE_BLUE_U:
-@@ -1682,8 +1702,10 @@ static inline int capPropertyToV4L2(int 
+@@ -1678,8 +1698,10 @@ static inline int capPropertyToV4L2(int 
          return -1;
      case cv::CAP_PROP_SHARPNESS:
          return V4L2_CID_SHARPNESS;
@@ -100,7 +100,7 @@ Avoid non-standard integer types.
      case cv::CAP_PROP_GAMMA:
          return V4L2_CID_GAMMA;
      case cv::CAP_PROP_TEMPERATURE:
-@@ -1694,34 +1716,54 @@ static inline int capPropertyToV4L2(int 
+@@ -1690,34 +1712,54 @@ static inline int capPropertyToV4L2(int 
          return -1;
      case cv::CAP_PROP_WHITE_BALANCE_RED_V:
          return V4L2_CID_RED_BALANCE;

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.10 pkgsrc/graphics/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp:1.11
--- pkgsrc/graphics/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp:1.10  Fri Feb  7 21:54:17 2025
+++ pkgsrc/graphics/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp       Mon Jul  7 05:15:26 2025
@@ -1,9 +1,9 @@
-$NetBSD: patch-modules_videoio_src_cap__v4l.cpp,v 1.10 2025/02/07 21:54:17 wiz Exp $
+$NetBSD: patch-modules_videoio_src_cap__v4l.cpp,v 1.11 2025/07/07 05:15:26 wiz Exp $
 
 Conditionalize settings not available in NetBSD's v4l2 emulation.
 Avoid non-standard integer types.
 
---- modules/videoio/src/cap_v4l.cpp.orig       2025-01-08 12:47:46.000000000 +0000
+--- modules/videoio/src/cap_v4l.cpp.orig       2025-07-02 07:54:13.000000000 +0000
 +++ modules/videoio/src/cap_v4l.cpp
 @@ -215,6 +215,14 @@ make & enjoy!
  #include <fcntl.h>
@@ -51,7 +51,7 @@ Avoid non-standard integer types.
  
  #ifndef v4l2_fourcc_be
  #define v4l2_fourcc_be(a, b, c, d) (v4l2_fourcc(a, b, c, d) | (1U << 31))
-@@ -1471,6 +1485,7 @@ void CvCaptureCAM_V4L::convertToRgb(cons
+@@ -1467,6 +1481,7 @@ void CvCaptureCAM_V4L::convertToRgb(cons
      case V4L2_PIX_FMT_RGB24:
          cv::cvtColor(cv::Mat(imageSize, CV_8UC3, start), frame, COLOR_RGB2BGR);
          return;
@@ -59,15 +59,15 @@ Avoid non-standard integer types.
      case V4L2_PIX_FMT_Y16:
      {
          // https://www.kernel.org/doc/html/v4.10/media/uapi/v4l/pixfmt-y16.html
-@@ -1535,6 +1550,7 @@ void CvCaptureCAM_V4L::convertToRgb(cons
+@@ -1531,6 +1546,7 @@ void CvCaptureCAM_V4L::convertToRgb(cons
          cv::cvtColor(cv::Mat(imageSize, CV_8UC1, start), frame, COLOR_BayerGB2BGR);
          return;
      }
 +#endif
      case V4L2_PIX_FMT_GREY:
          cv::cvtColor(cv::Mat(imageSize, CV_8UC1, start), frame, COLOR_GRAY2BGR);
-         break;
-@@ -1654,8 +1670,10 @@ static inline int capPropertyToV4L2(int 
+         return;
+@@ -1650,8 +1666,10 @@ static inline int capPropertyToV4L2(int 
          return -1;
      case cv::CAP_PROP_FOURCC:
          return -1;
@@ -78,7 +78,7 @@ Avoid non-standard integer types.
      case cv::CAP_PROP_FORMAT:
          return -1;
      case cv::CAP_PROP_MODE:
-@@ -1670,8 +1688,10 @@ static inline int capPropertyToV4L2(int 
+@@ -1666,8 +1684,10 @@ static inline int capPropertyToV4L2(int 
          return V4L2_CID_HUE;
      case cv::CAP_PROP_GAIN:
          return V4L2_CID_GAIN;
@@ -89,7 +89,7 @@ Avoid non-standard integer types.
      case cv::CAP_PROP_CONVERT_RGB:
          return -1;
      case cv::CAP_PROP_WHITE_BALANCE_BLUE_U:
-@@ -1682,8 +1702,10 @@ static inline int capPropertyToV4L2(int 
+@@ -1678,8 +1698,10 @@ static inline int capPropertyToV4L2(int 
          return -1;
      case cv::CAP_PROP_SHARPNESS:
          return V4L2_CID_SHARPNESS;
@@ -100,7 +100,7 @@ Avoid non-standard integer types.
      case cv::CAP_PROP_GAMMA:
          return V4L2_CID_GAMMA;
      case cv::CAP_PROP_TEMPERATURE:
-@@ -1694,34 +1716,54 @@ static inline int capPropertyToV4L2(int 
+@@ -1690,34 +1712,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-contrib-face/patches/patch-.._opencv__contrib-4.12.0_modules_face_CMakeLists.txt
diff -u /dev/null pkgsrc/graphics/opencv-contrib-face/patches/patch-.._opencv__contrib-4.12.0_modules_face_CMakeLists.txt:1.1
--- /dev/null   Mon Jul  7 05:15:26 2025
+++ pkgsrc/graphics/opencv-contrib-face/patches/patch-.._opencv__contrib-4.12.0_modules_face_CMakeLists.txt     Mon Jul  7 05:15:26 2025
@@ -0,0 +1,29 @@
+$NetBSD: patch-.._opencv__contrib-4.12.0_modules_face_CMakeLists.txt,v 1.1 2025/07/07 05:15:26 wiz Exp $
+
+Do not download files during build, let pkgsrc provide it.
+
+--- ../opencv_contrib-4.12.0/modules/face/CMakeLists.txt.orig  2025-02-07 17:04:23.284140051 +0000
++++ ../opencv_contrib-4.12.0/modules/face/CMakeLists.txt
+@@ -8,20 +8,6 @@ ocv_define_module(face opencv_core
+ )
+ # NOTE: objdetect module is needed for one of the samples
+ 
+-set(__commit_hash "8afa57abc8229d611c4937165d20e2a2d9fc5a12")
+-set(__file_hash "7505c44ca4eb54b4ab1e4777cb96ac05")
+-ocv_download(
+-    FILENAME face_landmark_model.dat
+-    HASH ${__file_hash}
+-    URL
+-      "${OPENCV_FACE_ALIGNMENT_URL}"
+-      "$ENV{OPENCV_FACE_ALIGNMENT_URL}"
+-      "https://raw.githubusercontent.com/opencv/opencv_3rdparty/${__commit_hash}/";
+-    DESTINATION_DIR "${CMAKE_BINARY_DIR}/${OPENCV_TEST_DATA_INSTALL_PATH}/cv/face/"
+-    ID "data"
+-    RELATIVE_URL
+-    STATUS res
++file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/face_landmark_model.dat
++        DESTINATION ${CMAKE_BINARY_DIR}/${OPENCV_TEST_DATA_INSTALL_PATH}/cv/face/input.txt
+ )
+-if(NOT res)
+-  message(WARNING "Face: Can't get model file for face alignment.")
+-endif()

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

Home | Main Index | Thread Index | Old Index