pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/graphics/opencv-contrib-face
Module Name: pkgsrc
Committed By: wiz
Date: Fri Feb 7 21:57:08 UTC 2025
Modified Files:
pkgsrc/graphics/opencv-contrib-face: Makefile PLIST buildlink3.mk
distinfo
Added Files:
pkgsrc/graphics/opencv-contrib-face/patches:
patch-.._opencv__contrib-4.11.0_modules_face_CMakeLists.txt
patch-3rdparty_ippicv_ippicv.cmake
patch-modules_core_src_downhill__simplex.cpp
patch-modules_flann_include_opencv2_flann_defines.h
patch-modules_imgproc_src_resize.cpp
patch-modules_videoio_src_cap__v4l.cpp
Log Message:
opencv-contrib-face: update to 4.11.0.
To match opencv.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/graphics/opencv-contrib-face/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/graphics/opencv-contrib-face/PLIST
cvs rdiff -u -r1.22 -r1.23 pkgsrc/graphics/opencv-contrib-face/buildlink3.mk
cvs rdiff -u -r1.32 -r1.33 pkgsrc/graphics/opencv-contrib-face/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/graphics/opencv-contrib-face/patches/patch-.._opencv__contrib-4.11.0_modules_face_CMakeLists.txt \
pkgsrc/graphics/opencv-contrib-face/patches/patch-3rdparty_ippicv_ippicv.cmake \
pkgsrc/graphics/opencv-contrib-face/patches/patch-modules_core_src_downhill__simplex.cpp \
pkgsrc/graphics/opencv-contrib-face/patches/patch-modules_flann_include_opencv2_flann_defines.h \
pkgsrc/graphics/opencv-contrib-face/patches/patch-modules_imgproc_src_resize.cpp \
pkgsrc/graphics/opencv-contrib-face/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-contrib-face/Makefile
diff -u pkgsrc/graphics/opencv-contrib-face/Makefile:1.43 pkgsrc/graphics/opencv-contrib-face/Makefile:1.44
--- pkgsrc/graphics/opencv-contrib-face/Makefile:1.43 Thu Dec 26 23:57:21 2024
+++ pkgsrc/graphics/opencv-contrib-face/Makefile Fri Feb 7 21:57:08 2025
@@ -1,6 +1,9 @@
-# $NetBSD: Makefile,v 1.43 2024/12/26 23:57:21 adam Exp $
+# $NetBSD: Makefile,v 1.44 2025/02/07 21:57:08 wiz Exp $
+
+# can't use ninja because we only want to install parts of it
+CMAKE_GENERATOR= make
+INSTALL_DIRS= modules/face modules/plot modules/tracking
-PKGREVISION= 6
.include "../../graphics/opencv/Makefile.common"
DISTNAME= opencv_contrib-${OPENCV_VERSION}
@@ -10,18 +13,22 @@ GITHUB_PROJECT= opencv_contrib
MAINTAINER= markd%NetBSD.org@localhost
COMMENT= OpenCV face recognition contributed module
-DISTFILES= ${DEFAULT_DISTFILES} opencv-${PKGVERSION_NOREV}${EXTRACT_SUFX}
-
-INSTALL_DIRS= build/modules/face build/modules/plot build/modules/tracking
+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
WRKSRC= ${WRKDIR}/opencv-${PKGVERSION_NOREV}
-CMAKE_CONFIGURE_ARGS+= -DBUILD_DOCS=OFF
-CMAKE_CONFIGURE_ARGS+= -DWITH_FFMPEG=OFF
-CMAKE_CONFIGURE_ARGS+= -DWITH_JASPER=OFF
+post-extract:
+ ${CP} ${WRKDIR}/opencv-${PKGVERSION_NOREV}_face_landmark_model.dat ${WRKDIR}/opencv_contrib-${PKGVERSION_NOREV}/modules/face/face_landmark_model.dat
+
+CMAKE_CONFIGURE_ARGS+= -DBUILD_DOCS=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_FFMPEG=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_JASPER=OFF
CMAKE_CONFIGURE_ARGS+= -DOPENCV_EXTRA_MODULES_PATH=${WRKDIR}/${DISTNAME}/modules
CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_adas=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_aruco=OFF
CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_bgsegm=OFF
CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_bioinspired=OFF
CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_ccalib=OFF
@@ -29,16 +36,26 @@ CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_c
CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_cvv=OFF
CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_datasets=OFF
CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_dnn_objdetect=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_dpm=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_fuzzy=OFF
CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_hdf=OFF
CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_hfs=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_imgcodecs=OFF
CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_img_hash=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_intensity_transforms=OFF
CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_latentsvm=OFF
CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_line_descriptor=OFF
CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_matlab=OFF
CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_optflow=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_phase_unwrapping=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_rapid=OFF
CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_reg=OFF
CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_rgbd=OFF
CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_saliency=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_shape=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_signal=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_stereo=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_structured_light=OFF
CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_surface_matching=OFF
CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_text=OFF
CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_xfeatures2d=OFF
@@ -47,7 +64,6 @@ CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_x
CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_xphoto=OFF
CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_dnn=OFF
-CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_flann=OFF
CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_highgui=OFF
CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_ml=OFF
CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_python2=OFF
@@ -58,20 +74,19 @@ CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_t
CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_videoio=OFF
CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_videostab=OFF
-# 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_CONFIGURE_ARGS+= -DBUILD_opencv_calib3d=OFF
-#CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_features2d=OFF
-#CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_photo=OFF
-#CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_plot=OFF
-#CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_tracking=OFF
-#CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_video=OFF
-
-# XXX: INSTALL_DIRS currently do not work as desired in cmake/build.mk.
-USE_CMAKE= yes
-pre-configure:
- ${MKDIR} ${WRKSRC}/build
+# needed by face
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_objdetect=ON
+# needed by objdetect
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_calib3d=ON
+# needed by calib3d
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_features2d=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_flann=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_imgproc=ON
+# needed by flann and objdetect
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_core=ON
+
+# needed by tracking
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_video=ON
BUILDLINK_API_DEPENDS.opencv+= opencv>=${PKGVERSION_NOREV}
.include "../../graphics/opencv/buildlink3.mk"
Index: pkgsrc/graphics/opencv-contrib-face/PLIST
diff -u pkgsrc/graphics/opencv-contrib-face/PLIST:1.6 pkgsrc/graphics/opencv-contrib-face/PLIST:1.7
--- pkgsrc/graphics/opencv-contrib-face/PLIST:1.6 Wed Apr 24 19:34:45 2019
+++ pkgsrc/graphics/opencv-contrib-face/PLIST Fri Feb 7 21:57:08 2025
@@ -1,29 +1,31 @@
-@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
-include/opencv2/tracking/feature.hpp
-include/opencv2/tracking/kalman_filters.hpp
-include/opencv2/tracking/onlineBoosting.hpp
-include/opencv2/tracking/onlineMIL.hpp
-include/opencv2/tracking/tldDataset.hpp
-include/opencv2/tracking/tracker.hpp
-include/opencv2/tracking/tracking.hpp
+@comment $NetBSD: PLIST,v 1.7 2025/02/07 21:57:08 wiz Exp $
+include/opencv4/opencv2/face.hpp
+include/opencv4/opencv2/face/bif.hpp
+include/opencv4/opencv2/face/face_alignment.hpp
+include/opencv4/opencv2/face/facemark.hpp
+include/opencv4/opencv2/face/facemarkAAM.hpp
+include/opencv4/opencv2/face/facemarkLBF.hpp
+include/opencv4/opencv2/face/facemark_train.hpp
+include/opencv4/opencv2/face/facerec.hpp
+include/opencv4/opencv2/face/mace.hpp
+include/opencv4/opencv2/face/predict_collector.hpp
+include/opencv4/opencv2/plot.hpp
+include/opencv4/opencv2/tracking.hpp
+include/opencv4/opencv2/tracking/feature.hpp
+include/opencv4/opencv2/tracking/kalman_filters.hpp
+include/opencv4/opencv2/tracking/onlineBoosting.hpp
+include/opencv4/opencv2/tracking/tldDataset.hpp
+include/opencv4/opencv2/tracking/tracking.hpp
+include/opencv4/opencv2/tracking/tracking_by_matching.hpp
+include/opencv4/opencv2/tracking/tracking_internals.hpp
+include/opencv4/opencv2/tracking/tracking_legacy.hpp
+include/opencv4/opencv2/tracking/twist.hpp
lib/libopencv_face.so
lib/libopencv_face.so.${PKGVERSION}
-lib/libopencv_face.so.3.4
+lib/libopencv_face.so.411
lib/libopencv_plot.so
lib/libopencv_plot.so.${PKGVERSION}
-lib/libopencv_plot.so.3.4
+lib/libopencv_plot.so.411
lib/libopencv_tracking.so
lib/libopencv_tracking.so.${PKGVERSION}
-lib/libopencv_tracking.so.3.4
+lib/libopencv_tracking.so.411
Index: pkgsrc/graphics/opencv-contrib-face/buildlink3.mk
diff -u pkgsrc/graphics/opencv-contrib-face/buildlink3.mk:1.22 pkgsrc/graphics/opencv-contrib-face/buildlink3.mk:1.23
--- pkgsrc/graphics/opencv-contrib-face/buildlink3.mk:1.22 Thu Dec 26 23:57:21 2024
+++ pkgsrc/graphics/opencv-contrib-face/buildlink3.mk Fri Feb 7 21:57:08 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2024/12/26 23:57:21 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2025/02/07 21:57:08 wiz Exp $
BUILDLINK_TREE+= opencv-contrib-face
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= opencv-contrib-face
OPENCV_CONTRIB_FACE_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.opencv-contrib-face+= opencv-contrib-face>=3.0.0
-BUILDLINK_ABI_DEPENDS.opencv-contrib-face?= opencv-contrib-face>=3.4.20nb6
+BUILDLINK_ABI_DEPENDS.opencv-contrib-face?= opencv-contrib-face>=4
BUILDLINK_PKGSRCDIR.opencv-contrib-face?= ../../graphics/opencv-contrib-face
.include "../../graphics/opencv/buildlink3.mk"
Index: pkgsrc/graphics/opencv-contrib-face/distinfo
diff -u pkgsrc/graphics/opencv-contrib-face/distinfo:1.32 pkgsrc/graphics/opencv-contrib-face/distinfo:1.33
--- pkgsrc/graphics/opencv-contrib-face/distinfo:1.32 Thu Mar 14 06:29:52 2024
+++ pkgsrc/graphics/opencv-contrib-face/distinfo Fri Feb 7 21:57:08 2025
@@ -1,34 +1,17 @@
-$NetBSD: distinfo,v 1.32 2024/03/14 06:29:52 wiz Exp $
+$NetBSD: distinfo,v 1.33 2025/02/07 21:57:08 wiz Exp $
-BLAKE2s (opencv-3.4.20.tar.gz) = 2b69e87e4accd4da4d1a599e05fc206cd5644ddeb7f61c9800ddb625648e4ffe
-SHA512 (opencv-3.4.20.tar.gz) = 45b4447a5312acefffb9b11a6d4e8d8e98c62dcec902e4589d91bb32e7b5bc6e5c6407881a9edcca7d97df598e3f70925e458b2772d991d64ed2cc82701441f8
-Size (opencv-3.4.20.tar.gz) = 88348843 bytes
-BLAKE2s (opencv_contrib-3.4.20.tar.gz) = 94339e1afc668b1536ed1b95b4cb5fe540213c0e97082013cac39a9f5d636db2
-SHA512 (opencv_contrib-3.4.20.tar.gz) = bc60bbe0c64d6f2d0e0d35f1cde1d54ef43239549d1d0d4d8f6d6770e4a1c624cedd9d2abff6e198e95e547af02fac6813f3b45bfcd9c2bc2171744b0208de69
-Size (opencv_contrib-3.4.20.tar.gz) = 53793395 bytes
+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
SHA1 (patch-3rdparty_ippicv_ippicv.cmake) = 14ce5de382084793ace32f43c6dfaf01f7ffb390
-SHA1 (patch-3rdparty_protobuf_src_google_protobuf_message__lite.cc) = f1b77384ea8110d2bf3a30ff3fe9f2fa39608caf
-SHA1 (patch-CMakeLists.txt) = 86a524683091aad65dfaf719d56c5f76056596b6
-SHA1 (patch-apps_visualisation_opencv__visualisation.cpp) = b62c32172049c6369fd62a5c72325eef995fd1d0
-SHA1 (patch-cmake_OpenCVDetectCXXCompiler.cmake) = ac7deccedcc5071d3785c7827a06419713ba0529
-SHA1 (patch-cmake_OpenCVDetectPython.cmake) = 87a304f12f4069103670052dfbedadff2c6e9c05
-SHA1 (patch-cmake_OpenCVFindLAPACK.cmake) = c7e8db9351f103c7e2a248f047e448e7bf0ac5ad
-SHA1 (patch-cmake_OpenCVFindProtobuf.cmake) = 2c8cde9efeb3f8a633c5712682ea16adec2e5c38
-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_rand.cpp) = aa87ee5a538deb1a2ed3e89dd3dd4ee9b86ae0de
-SHA1 (patch-modules_core_src_system.cpp) = 3b7ac545585a430d28c7077f360357079f127580
-SHA1 (patch-modules_dnn_src_layers_accum__layer.cpp) = 20a12489f7e7fcbc90d47871f12ac500ab8ae6ed
-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_test__precomp.hpp) = 9bf15d32394f36b92e5fc5d57fd576b3860233ae
SHA1 (patch-modules_flann_include_opencv2_flann_defines.h) = ab848e67c4e03219670598ac2d21071a617a5c33
-SHA1 (patch-modules_imgcodecs_src_grfmt__exr.cpp) = 1a33d1b14e837b973b3ac2465d0b20fd6501e9bf
SHA1 (patch-modules_imgproc_src_resize.cpp) = e842d5960c4c00162a34f46cb45cf69d0e9f21ce
-SHA1 (patch-modules_objdetect_src_qrcode__encoder.cpp) = eeeb7ec8ff7def1a5c6f9e81045f6bf36226de39
-SHA1 (patch-modules_objdetect_test_test__qrcode__encode.cpp) = aa76e97a5e7e3688c7a9c424d8b7b10c5a6fcb11
-SHA1 (patch-modules_ts_src_ts.cpp) = b9a3992014b02dbd89d46375a2476385e91dc24c
-SHA1 (patch-modules_videoio_src_cap__v4l.cpp) = f80cc2f5b37e04378a2f25b2fa14e9b3206513c3
+SHA1 (patch-modules_videoio_src_cap__v4l.cpp) = f9ff94f46cdee1b9616ceb2982b4f5925c0bfb3f
Added files:
Index: pkgsrc/graphics/opencv-contrib-face/patches/patch-.._opencv__contrib-4.11.0_modules_face_CMakeLists.txt
diff -u /dev/null pkgsrc/graphics/opencv-contrib-face/patches/patch-.._opencv__contrib-4.11.0_modules_face_CMakeLists.txt:1.1
--- /dev/null Fri Feb 7 21:57:08 2025
+++ pkgsrc/graphics/opencv-contrib-face/patches/patch-.._opencv__contrib-4.11.0_modules_face_CMakeLists.txt Fri Feb 7 21:57:08 2025
@@ -0,0 +1,29 @@
+$NetBSD: patch-.._opencv__contrib-4.11.0_modules_face_CMakeLists.txt,v 1.1 2025/02/07 21:57:08 wiz Exp $
+
+Do not download files during build, let pkgsrc provide it.
+
+--- ../opencv_contrib-4.11.0/modules/face/CMakeLists.txt.orig 2025-02-07 17:04:23.284140051 +0000
++++ ../opencv_contrib-4.11.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()
Index: pkgsrc/graphics/opencv-contrib-face/patches/patch-3rdparty_ippicv_ippicv.cmake
diff -u /dev/null pkgsrc/graphics/opencv-contrib-face/patches/patch-3rdparty_ippicv_ippicv.cmake:1.1
--- /dev/null Fri Feb 7 21:57:08 2025
+++ pkgsrc/graphics/opencv-contrib-face/patches/patch-3rdparty_ippicv_ippicv.cmake Fri Feb 7 21:57:08 2025
@@ -0,0 +1,12 @@
+$NetBSD: patch-3rdparty_ippicv_ippicv.cmake,v 1.1 2025/02/07 21:57:08 wiz Exp $
+
+Do not download at build time.
+
+--- 3rdparty/ippicv/ippicv.cmake.orig 2017-08-03 23:58:23.000000000 +0000
++++ 3rdparty/ippicv/ippicv.cmake
+@@ -1,4 +1,5 @@
+ function(download_ippicv root_var)
++ return()
+ set(${root_var} "" PARENT_SCOPE)
+
+ # Commit SHA in the opencv_3rdparty repo
Index: pkgsrc/graphics/opencv-contrib-face/patches/patch-modules_core_src_downhill__simplex.cpp
diff -u /dev/null pkgsrc/graphics/opencv-contrib-face/patches/patch-modules_core_src_downhill__simplex.cpp:1.1
--- /dev/null Fri Feb 7 21:57:08 2025
+++ pkgsrc/graphics/opencv-contrib-face/patches/patch-modules_core_src_downhill__simplex.cpp Fri Feb 7 21:57:08 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-modules_core_src_downhill__simplex.cpp,v 1.1 2025/02/07 21:57:08 wiz Exp $
+
+Avoid DS conflict on SunOS.
+
+--- modules/core/src/downhill_simplex.cpp.orig 2015-06-03 17:21:34.000000000 +0000
++++ modules/core/src/downhill_simplex.cpp
+@@ -450,6 +450,9 @@ protected:
+ };
+
+
++#if defined(__sun)
++#undef DS
++#endif
+ // both minRange & minError are specified by termcrit.epsilon;
+ // In addition, user may specify the number of iterations that the algorithm does.
+ Ptr<DownhillSolver> DownhillSolver::create( const Ptr<MinProblemSolver::Function>& f,
Index: pkgsrc/graphics/opencv-contrib-face/patches/patch-modules_flann_include_opencv2_flann_defines.h
diff -u /dev/null pkgsrc/graphics/opencv-contrib-face/patches/patch-modules_flann_include_opencv2_flann_defines.h:1.1
--- /dev/null Fri Feb 7 21:57:08 2025
+++ pkgsrc/graphics/opencv-contrib-face/patches/patch-modules_flann_include_opencv2_flann_defines.h Fri Feb 7 21:57:08 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-modules_flann_include_opencv2_flann_defines.h,v 1.1 2025/02/07 21:57:08 wiz Exp $
+
+Avoid CS conflict on SunOS.
+
+--- modules/flann/include/opencv2/flann/defines.h.orig 2012-09-27 22:55:06.000000000 +0000
++++ modules/flann/include/opencv2/flann/defines.h
+@@ -71,6 +71,9 @@
+ #define FLANN_PLATFORM_32_BIT
+ #endif
+
++#ifdef __sun
++#undef CS
++#endif
+
+ #undef FLANN_ARRAY_LEN
+ #define FLANN_ARRAY_LEN(a) (sizeof(a)/sizeof(a[0]))
Index: pkgsrc/graphics/opencv-contrib-face/patches/patch-modules_imgproc_src_resize.cpp
diff -u /dev/null pkgsrc/graphics/opencv-contrib-face/patches/patch-modules_imgproc_src_resize.cpp:1.1
--- /dev/null Fri Feb 7 21:57:08 2025
+++ pkgsrc/graphics/opencv-contrib-face/patches/patch-modules_imgproc_src_resize.cpp Fri Feb 7 21:57:08 2025
@@ -0,0 +1,24 @@
+$NetBSD: patch-modules_imgproc_src_resize.cpp,v 1.1 2025/02/07 21:57:08 wiz Exp $
+
+On Illumos int8_t != ET, so be explicit about the cast to be used here.
+
+--- modules/imgproc/src/resize.cpp.orig 2020-08-08 22:04:15.259991576 +0000
++++ modules/imgproc/src/resize.cpp
+@@ -652,7 +652,7 @@ template <typename ET, typename FT>
+ void vlineSet(FT* src, ET* dst, int dst_width)
+ {
+ for (int i = 0; i < dst_width; i++)
+- dst[i] = src[i];
++ dst[i] = int8_t(src[i]);
+ }
+ template <>
+ void vlineSet<uint8_t, ufixedpoint16>(ufixedpoint16* src, uint8_t* dst, int dst_width)
+@@ -684,7 +684,7 @@ void vlineResize(FT* src, size_t src_ste
+ typename FT::WT res = src[i] * m[0];
+ for (int k = 1; k < n; k++)
+ res = res + src[i + k*src_step] * m[k];
+- dst[i] = res;
++ dst[i] = int8_t(res);
+ }
+ }
+ template <>
Index: pkgsrc/graphics/opencv-contrib-face/patches/patch-modules_videoio_src_cap__v4l.cpp
diff -u /dev/null pkgsrc/graphics/opencv-contrib-face/patches/patch-modules_videoio_src_cap__v4l.cpp:1.1
--- /dev/null Fri Feb 7 21:57:08 2025
+++ pkgsrc/graphics/opencv-contrib-face/patches/patch-modules_videoio_src_cap__v4l.cpp Fri Feb 7 21:57:08 2025
@@ -0,0 +1,157 @@
+$NetBSD: patch-modules_videoio_src_cap__v4l.cpp,v 1.1 2025/02/07 21:57:08 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
+@@ -215,6 +215,14 @@ make & enjoy!
+ #include <fcntl.h>
+ #include <errno.h>
+ #include <sys/ioctl.h>
++#include <inttypes.h>
++#include <stdint.h>
++#ifndef __u32
++#define __u32 uint32_t
++#endif
++#ifndef __s32
++#define __s32 int32_t
++#endif
+ #include <sys/types.h>
+ #include <sys/mman.h>
+
+@@ -241,24 +249,30 @@ typedef uint32_t __u32;
+ #endif
+
+ // https://github.com/opencv/opencv/issues/13335
++#ifdef V4L2_CID_CAMERA_CLASS_BASE
+ #ifndef V4L2_CID_ISO_SENSITIVITY
+ #define V4L2_CID_ISO_SENSITIVITY (V4L2_CID_CAMERA_CLASS_BASE+23)
+ #endif
++#endif
+
+ // https://github.com/opencv/opencv/issues/13929
++#ifdef V4L2_CID_MPEG_BASE
+ #ifndef V4L2_CID_MPEG_VIDEO_H264_VUI_EXT_SAR_HEIGHT
+ #define V4L2_CID_MPEG_VIDEO_H264_VUI_EXT_SAR_HEIGHT (V4L2_CID_MPEG_BASE+364)
+ #endif
+ #ifndef V4L2_CID_MPEG_VIDEO_H264_VUI_EXT_SAR_WIDTH
+ #define V4L2_CID_MPEG_VIDEO_H264_VUI_EXT_SAR_WIDTH (V4L2_CID_MPEG_BASE+365)
+ #endif
++#endif
+
+ #ifndef V4L2_CID_ROTATE
+ #define V4L2_CID_ROTATE (V4L2_CID_BASE+34)
+ #endif
++#ifdef V4L2_CID_CAMERA_CLASS_BASE
+ #ifndef V4L2_CID_IRIS_ABSOLUTE
+ #define V4L2_CID_IRIS_ABSOLUTE (V4L2_CID_CAMERA_CLASS_BASE+17)
+ #endif
++#endif
+
+ #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
+ case V4L2_PIX_FMT_RGB24:
+ cv::cvtColor(cv::Mat(imageSize, CV_8UC3, start), frame, COLOR_RGB2BGR);
+ return;
++#ifdef V4L2_PIX_FMT_Y16
+ 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
+ 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 -1;
+ case cv::CAP_PROP_FOURCC:
+ return -1;
++#ifdef V4L2_CID_MPEG_VIDEO_B_FRAMES
+ case cv::CAP_PROP_FRAME_COUNT:
+ return V4L2_CID_MPEG_VIDEO_B_FRAMES;
++#endif
+ case cv::CAP_PROP_FORMAT:
+ return -1;
+ case cv::CAP_PROP_MODE:
+@@ -1670,8 +1688,10 @@ static inline int capPropertyToV4L2(int
+ return V4L2_CID_HUE;
+ case cv::CAP_PROP_GAIN:
+ return V4L2_CID_GAIN;
++#ifdef V4L2_CID_EXPOSURE_ABSOLUTE
+ case cv::CAP_PROP_EXPOSURE:
+ return V4L2_CID_EXPOSURE_ABSOLUTE;
++#endif
+ 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
+ return -1;
+ case cv::CAP_PROP_SHARPNESS:
+ return V4L2_CID_SHARPNESS;
++#ifdef V4L2_CID_EXPOSURE_AUTO
+ case cv::CAP_PROP_AUTO_EXPOSURE:
+ return V4L2_CID_EXPOSURE_AUTO;
++#endif
+ case cv::CAP_PROP_GAMMA:
+ return V4L2_CID_GAMMA;
+ case cv::CAP_PROP_TEMPERATURE:
+@@ -1694,34 +1716,54 @@ static inline int capPropertyToV4L2(int
+ return -1;
+ case cv::CAP_PROP_WHITE_BALANCE_RED_V:
+ return V4L2_CID_RED_BALANCE;
++#ifdef V4L2_CID_ZOOM_ABSOLUTE
+ case cv::CAP_PROP_ZOOM:
+ return V4L2_CID_ZOOM_ABSOLUTE;
++#endif
++#ifdef V4L2_CID_FOCUS_ABSOLUTE
+ case cv::CAP_PROP_FOCUS:
+ return V4L2_CID_FOCUS_ABSOLUTE;
++#endif
+ case cv::CAP_PROP_GUID:
+ return -1;
++#ifdef V4L2_CID_ISO_SENSITIVITY
+ case cv::CAP_PROP_ISO_SPEED:
+ return V4L2_CID_ISO_SENSITIVITY;
++#endif
+ case cv::CAP_PROP_BACKLIGHT:
+ return V4L2_CID_BACKLIGHT_COMPENSATION;
++#ifdef V4L2_CID_PAN_ABSOLUTE
+ case cv::CAP_PROP_PAN:
+ return V4L2_CID_PAN_ABSOLUTE;
++#endif
++#ifdef V4L2_CID_TILT_ABSOLUTE
+ case cv::CAP_PROP_TILT:
+ return V4L2_CID_TILT_ABSOLUTE;
++#endif
++#ifdef V4L2_CID_ROTATE
+ case cv::CAP_PROP_ROLL:
+ return V4L2_CID_ROTATE;
++#endif
++#ifdef V4L2_CID_IRIS_ABSOLUTE
+ case cv::CAP_PROP_IRIS:
+ return V4L2_CID_IRIS_ABSOLUTE;
++#endif
+ case cv::CAP_PROP_SETTINGS:
+ return -1;
+ case cv::CAP_PROP_BUFFERSIZE:
+ return -1;
++#ifdef V4L2_CID_FOCUS_AUTO
+ case cv::CAP_PROP_AUTOFOCUS:
+ return V4L2_CID_FOCUS_AUTO;
++#endif
++#ifdef V4L2_CID_MPEG_VIDEO_H264_VUI_EXT_SAR_HEIGHT
+ case cv::CAP_PROP_SAR_NUM:
+ return V4L2_CID_MPEG_VIDEO_H264_VUI_EXT_SAR_HEIGHT;
++#endif
++#ifdef V4L2_CID_MPEG_VIDEO_H264_VUI_EXT_SAR_WIDTH
+ case cv::CAP_PROP_SAR_DEN:
+ return V4L2_CID_MPEG_VIDEO_H264_VUI_EXT_SAR_WIDTH;
++#endif
+ case CAP_PROP_AUTO_WB:
+ return V4L2_CID_AUTO_WHITE_BALANCE;
+ case CAP_PROP_WB_TEMPERATURE:
Home |
Main Index |
Thread Index |
Old Index