pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

opencv-contrib-face: remove unneeded patches, fix installation

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Fri Feb 7 21:55:38 2025 +0100
Changeset:	a687115a29e5c20bdbd1de18010eba58713c7513

Modified Files:
	opencv-contrib-face/Makefile
	opencv-contrib-face/PLIST
	opencv-contrib-face/distinfo
	opencv-contrib-face/patches/patch-.._opencv__contrib-4.11.0_modules_face_CMakeLists.txt
Removed Files:
	opencv-contrib-face/TODO
	opencv-contrib-face/patches/patch-cmake_OpenCVDetectCXXCompiler.cmake
	opencv-contrib-face/patches/patch-cmake_OpenCVFindOpenEXR.cmake
	opencv-contrib-face/patches/patch-cmake_checks_lapack__check.cpp
	opencv-contrib-face/patches/patch-modules_core_include_opencv2_core_bindings__utils.hpp
	opencv-contrib-face/patches/patch-modules_core_include_opencv2_core_types_c.h
	opencv-contrib-face/patches/patch-modules_core_src_check.cpp
	opencv-contrib-face/patches/patch-modules_core_src_rand.cpp
	opencv-contrib-face/patches/patch-modules_core_src_system.cpp
	opencv-contrib-face/patches/patch-modules_dnn_src_layers_accum__layer.cpp
	opencv-contrib-face/patches/patch-modules_dnn_src_tensorflow_tf__importer.cpp
	opencv-contrib-face/patches/patch-modules_dnn_src_torch_torch__importer.cpp
	opencv-contrib-face/patches/patch-modules_dnn_test_test__precomp.hpp
	opencv-contrib-face/patches/patch-modules_ts_src_ts.cpp

Log Message:
opencv-contrib-face: remove unneeded patches, fix installation

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a687115a29e5c20bdbd1de18010eba58713c7513

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 opencv-contrib-face/Makefile                       |   6 +-
 opencv-contrib-face/PLIST                          | 271 ---------------------
 opencv-contrib-face/TODO                           |   2 -
 opencv-contrib-face/distinfo                       |  15 +-
 ...ncv__contrib-4.11.0_modules_face_CMakeLists.txt |   2 +
 .../patch-cmake_OpenCVDetectCXXCompiler.cmake      |  17 --
 .../patches/patch-cmake_OpenCVFindOpenEXR.cmake    |  21 --
 .../patches/patch-cmake_checks_lapack__check.cpp   |  20 --
 ...s_core_include_opencv2_core_bindings__utils.hpp |  12 -
 ...tch-modules_core_include_opencv2_core_types_c.h |  15 --
 .../patches/patch-modules_core_src_check.cpp       |  12 -
 .../patches/patch-modules_core_src_rand.cpp        |  19 --
 .../patches/patch-modules_core_src_system.cpp      |  12 -
 .../patch-modules_dnn_src_layers_accum__layer.cpp  |  14 --
 ...tch-modules_dnn_src_tensorflow_tf__importer.cpp |  12 -
 ...patch-modules_dnn_src_torch_torch__importer.cpp |  12 -
 .../patch-modules_dnn_test_test__precomp.hpp       |  20 --
 .../patches/patch-modules_ts_src_ts.cpp            |  33 ---
 18 files changed, 7 insertions(+), 508 deletions(-)

diffs:
diff --git a/opencv-contrib-face/Makefile b/opencv-contrib-face/Makefile
index 06d8c026c0..deadb1082d 100644
--- a/opencv-contrib-face/Makefile
+++ b/opencv-contrib-face/Makefile
@@ -1,5 +1,9 @@
 # $NetBSD: Makefile,v 1.25 2023/01/03 17:36:26 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
+
 .include "../../wip/opencv/Makefile.common"
 
 DISTNAME=	opencv_contrib-${OPENCV_VERSION}
@@ -13,8 +17,6 @@ DISTFILES=	${DEFAULT_DISTFILES} opencv-${PKGVERSION_NOREV}${EXTRACT_SUFX} opencv
 # 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
 
-INSTALL_DIRS=	build/modules/face build/modules/plot build/modules/tracking
-
 WRKSRC=		${WRKDIR}/opencv-${PKGVERSION_NOREV}
 
 post-extract:
diff --git a/opencv-contrib-face/PLIST b/opencv-contrib-face/PLIST
index ecbdc01562..df95158108 100644
--- a/opencv-contrib-face/PLIST
+++ b/opencv-contrib-face/PLIST
@@ -1,142 +1,4 @@
 @comment $NetBSD$
-bin/opencv_version
-include/opencv4/opencv2/calib3d.hpp
-include/opencv4/opencv2/calib3d/calib3d.hpp
-include/opencv4/opencv2/calib3d/calib3d_c.h
-include/opencv4/opencv2/core.hpp
-include/opencv4/opencv2/core/affine.hpp
-include/opencv4/opencv2/core/async.hpp
-include/opencv4/opencv2/core/base.hpp
-include/opencv4/opencv2/core/bindings_utils.hpp
-include/opencv4/opencv2/core/bufferpool.hpp
-include/opencv4/opencv2/core/check.hpp
-include/opencv4/opencv2/core/core.hpp
-include/opencv4/opencv2/core/core_c.h
-include/opencv4/opencv2/core/cuda.hpp
-include/opencv4/opencv2/core/cuda.inl.hpp
-include/opencv4/opencv2/core/cuda/block.hpp
-include/opencv4/opencv2/core/cuda/border_interpolate.hpp
-include/opencv4/opencv2/core/cuda/color.hpp
-include/opencv4/opencv2/core/cuda/common.hpp
-include/opencv4/opencv2/core/cuda/datamov_utils.hpp
-include/opencv4/opencv2/core/cuda/detail/color_detail.hpp
-include/opencv4/opencv2/core/cuda/detail/reduce.hpp
-include/opencv4/opencv2/core/cuda/detail/reduce_key_val.hpp
-include/opencv4/opencv2/core/cuda/detail/transform_detail.hpp
-include/opencv4/opencv2/core/cuda/detail/type_traits_detail.hpp
-include/opencv4/opencv2/core/cuda/detail/vec_distance_detail.hpp
-include/opencv4/opencv2/core/cuda/dynamic_smem.hpp
-include/opencv4/opencv2/core/cuda/emulation.hpp
-include/opencv4/opencv2/core/cuda/filters.hpp
-include/opencv4/opencv2/core/cuda/funcattrib.hpp
-include/opencv4/opencv2/core/cuda/functional.hpp
-include/opencv4/opencv2/core/cuda/limits.hpp
-include/opencv4/opencv2/core/cuda/reduce.hpp
-include/opencv4/opencv2/core/cuda/saturate_cast.hpp
-include/opencv4/opencv2/core/cuda/scan.hpp
-include/opencv4/opencv2/core/cuda/simd_functions.hpp
-include/opencv4/opencv2/core/cuda/transform.hpp
-include/opencv4/opencv2/core/cuda/type_traits.hpp
-include/opencv4/opencv2/core/cuda/utility.hpp
-include/opencv4/opencv2/core/cuda/vec_distance.hpp
-include/opencv4/opencv2/core/cuda/vec_math.hpp
-include/opencv4/opencv2/core/cuda/vec_traits.hpp
-include/opencv4/opencv2/core/cuda/warp.hpp
-include/opencv4/opencv2/core/cuda/warp_reduce.hpp
-include/opencv4/opencv2/core/cuda/warp_shuffle.hpp
-include/opencv4/opencv2/core/cuda_stream_accessor.hpp
-include/opencv4/opencv2/core/cuda_types.hpp
-include/opencv4/opencv2/core/cv_cpu_dispatch.h
-include/opencv4/opencv2/core/cv_cpu_helper.h
-include/opencv4/opencv2/core/cvdef.h
-include/opencv4/opencv2/core/cvstd.hpp
-include/opencv4/opencv2/core/cvstd.inl.hpp
-include/opencv4/opencv2/core/cvstd_wrapper.hpp
-include/opencv4/opencv2/core/detail/async_promise.hpp
-include/opencv4/opencv2/core/detail/dispatch_helper.impl.hpp
-include/opencv4/opencv2/core/detail/exception_ptr.hpp
-include/opencv4/opencv2/core/directx.hpp
-include/opencv4/opencv2/core/dualquaternion.hpp
-include/opencv4/opencv2/core/dualquaternion.inl.hpp
-include/opencv4/opencv2/core/eigen.hpp
-include/opencv4/opencv2/core/fast_math.hpp
-include/opencv4/opencv2/core/hal/hal.hpp
-include/opencv4/opencv2/core/hal/interface.h
-include/opencv4/opencv2/core/hal/intrin.hpp
-include/opencv4/opencv2/core/hal/intrin_avx.hpp
-include/opencv4/opencv2/core/hal/intrin_avx512.hpp
-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_lsx.hpp
-include/opencv4/opencv2/core/hal/intrin_math.hpp
-include/opencv4/opencv2/core/hal/intrin_msa.hpp
-include/opencv4/opencv2/core/hal/intrin_neon.hpp
-include/opencv4/opencv2/core/hal/intrin_rvv071.hpp
-include/opencv4/opencv2/core/hal/intrin_rvv_scalable.hpp
-include/opencv4/opencv2/core/hal/intrin_sse.hpp
-include/opencv4/opencv2/core/hal/intrin_sse_em.hpp
-include/opencv4/opencv2/core/hal/intrin_vsx.hpp
-include/opencv4/opencv2/core/hal/intrin_wasm.hpp
-include/opencv4/opencv2/core/hal/msa_macros.h
-include/opencv4/opencv2/core/hal/simd_utils.impl.hpp
-include/opencv4/opencv2/core/mat.hpp
-include/opencv4/opencv2/core/mat.inl.hpp
-include/opencv4/opencv2/core/matx.hpp
-include/opencv4/opencv2/core/matx.inl.hpp
-include/opencv4/opencv2/core/neon_utils.hpp
-include/opencv4/opencv2/core/ocl.hpp
-include/opencv4/opencv2/core/ocl_genbase.hpp
-include/opencv4/opencv2/core/opencl/ocl_defs.hpp
-include/opencv4/opencv2/core/opencl/opencl_info.hpp
-include/opencv4/opencv2/core/opencl/opencl_svm.hpp
-include/opencv4/opencv2/core/opencl/runtime/autogenerated/opencl_clblas.hpp
-include/opencv4/opencv2/core/opencl/runtime/autogenerated/opencl_clfft.hpp
-include/opencv4/opencv2/core/opencl/runtime/autogenerated/opencl_core.hpp
-include/opencv4/opencv2/core/opencl/runtime/autogenerated/opencl_core_wrappers.hpp
-include/opencv4/opencv2/core/opencl/runtime/autogenerated/opencl_gl.hpp
-include/opencv4/opencv2/core/opencl/runtime/autogenerated/opencl_gl_wrappers.hpp
-include/opencv4/opencv2/core/opencl/runtime/opencl_clblas.hpp
-include/opencv4/opencv2/core/opencl/runtime/opencl_clfft.hpp
-include/opencv4/opencv2/core/opencl/runtime/opencl_core.hpp
-include/opencv4/opencv2/core/opencl/runtime/opencl_core_wrappers.hpp
-include/opencv4/opencv2/core/opencl/runtime/opencl_gl.hpp
-include/opencv4/opencv2/core/opencl/runtime/opencl_gl_wrappers.hpp
-include/opencv4/opencv2/core/opencl/runtime/opencl_svm_20.hpp
-include/opencv4/opencv2/core/opencl/runtime/opencl_svm_definitions.hpp
-include/opencv4/opencv2/core/opencl/runtime/opencl_svm_hsa_extension.hpp
-include/opencv4/opencv2/core/opengl.hpp
-include/opencv4/opencv2/core/operations.hpp
-include/opencv4/opencv2/core/optim.hpp
-include/opencv4/opencv2/core/ovx.hpp
-include/opencv4/opencv2/core/parallel/backend/parallel_for.openmp.hpp
-include/opencv4/opencv2/core/parallel/backend/parallel_for.tbb.hpp
-include/opencv4/opencv2/core/parallel/parallel_backend.hpp
-include/opencv4/opencv2/core/persistence.hpp
-include/opencv4/opencv2/core/quaternion.hpp
-include/opencv4/opencv2/core/quaternion.inl.hpp
-include/opencv4/opencv2/core/saturate.hpp
-include/opencv4/opencv2/core/simd_intrinsics.hpp
-include/opencv4/opencv2/core/softfloat.hpp
-include/opencv4/opencv2/core/sse_utils.hpp
-include/opencv4/opencv2/core/traits.hpp
-include/opencv4/opencv2/core/types.hpp
-include/opencv4/opencv2/core/types_c.h
-include/opencv4/opencv2/core/utility.hpp
-include/opencv4/opencv2/core/utils/allocator_stats.hpp
-include/opencv4/opencv2/core/utils/allocator_stats.impl.hpp
-include/opencv4/opencv2/core/utils/filesystem.hpp
-include/opencv4/opencv2/core/utils/fp_control_utils.hpp
-include/opencv4/opencv2/core/utils/instrumentation.hpp
-include/opencv4/opencv2/core/utils/logger.defines.hpp
-include/opencv4/opencv2/core/utils/logger.hpp
-include/opencv4/opencv2/core/utils/logtag.hpp
-include/opencv4/opencv2/core/utils/tls.hpp
-include/opencv4/opencv2/core/utils/trace.hpp
-include/opencv4/opencv2/core/va_intel.hpp
-include/opencv4/opencv2/core/version.hpp
-include/opencv4/opencv2/core/vsx_utils.hpp
-include/opencv4/opencv2/cvconfig.h
 include/opencv4/opencv2/face.hpp
 include/opencv4/opencv2/face/bif.hpp
 include/opencv4/opencv2/face/face_alignment.hpp
@@ -147,72 +9,6 @@ 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/features2d.hpp
-include/opencv4/opencv2/features2d/features2d.hpp
-include/opencv4/opencv2/features2d/hal/interface.h
-include/opencv4/opencv2/flann.hpp
-include/opencv4/opencv2/flann/all_indices.h
-include/opencv4/opencv2/flann/allocator.h
-include/opencv4/opencv2/flann/any.h
-include/opencv4/opencv2/flann/autotuned_index.h
-include/opencv4/opencv2/flann/composite_index.h
-include/opencv4/opencv2/flann/config.h
-include/opencv4/opencv2/flann/defines.h
-include/opencv4/opencv2/flann/dist.h
-include/opencv4/opencv2/flann/dummy.h
-include/opencv4/opencv2/flann/dynamic_bitset.h
-include/opencv4/opencv2/flann/flann.hpp
-include/opencv4/opencv2/flann/flann_base.hpp
-include/opencv4/opencv2/flann/general.h
-include/opencv4/opencv2/flann/ground_truth.h
-include/opencv4/opencv2/flann/heap.h
-include/opencv4/opencv2/flann/hierarchical_clustering_index.h
-include/opencv4/opencv2/flann/index_testing.h
-include/opencv4/opencv2/flann/kdtree_index.h
-include/opencv4/opencv2/flann/kdtree_single_index.h
-include/opencv4/opencv2/flann/kmeans_index.h
-include/opencv4/opencv2/flann/linear_index.h
-include/opencv4/opencv2/flann/logger.h
-include/opencv4/opencv2/flann/lsh_index.h
-include/opencv4/opencv2/flann/lsh_table.h
-include/opencv4/opencv2/flann/matrix.h
-include/opencv4/opencv2/flann/miniflann.hpp
-include/opencv4/opencv2/flann/nn_index.h
-include/opencv4/opencv2/flann/object_factory.h
-include/opencv4/opencv2/flann/params.h
-include/opencv4/opencv2/flann/random.h
-include/opencv4/opencv2/flann/result_set.h
-include/opencv4/opencv2/flann/sampling.h
-include/opencv4/opencv2/flann/saving.h
-include/opencv4/opencv2/flann/simplex_downhill.h
-include/opencv4/opencv2/flann/timer.h
-include/opencv4/opencv2/imgproc.hpp
-include/opencv4/opencv2/imgproc/bindings.hpp
-include/opencv4/opencv2/imgproc/detail/gcgraph.hpp
-include/opencv4/opencv2/imgproc/detail/legacy.hpp
-include/opencv4/opencv2/imgproc/hal/hal.hpp
-include/opencv4/opencv2/imgproc/hal/interface.h
-include/opencv4/opencv2/imgproc/imgproc.hpp
-include/opencv4/opencv2/imgproc/imgproc_c.h
-include/opencv4/opencv2/imgproc/segmentation.hpp
-include/opencv4/opencv2/imgproc/types_c.h
-include/opencv4/opencv2/intensity_transform.hpp
-include/opencv4/opencv2/objdetect.hpp
-include/opencv4/opencv2/objdetect/aruco_board.hpp
-include/opencv4/opencv2/objdetect/aruco_detector.hpp
-include/opencv4/opencv2/objdetect/aruco_dictionary.hpp
-include/opencv4/opencv2/objdetect/barcode.hpp
-include/opencv4/opencv2/objdetect/charuco_detector.hpp
-include/opencv4/opencv2/objdetect/detection_based_tracker.hpp
-include/opencv4/opencv2/objdetect/face.hpp
-include/opencv4/opencv2/objdetect/graphical_code_detector.hpp
-include/opencv4/opencv2/objdetect/objdetect.hpp
-include/opencv4/opencv2/opencv.hpp
-include/opencv4/opencv2/opencv_modules.hpp
-include/opencv4/opencv2/photo.hpp
-include/opencv4/opencv2/photo/cuda.hpp
-include/opencv4/opencv2/photo/legacy/constants_c.h
-include/opencv4/opencv2/photo/photo.hpp
 include/opencv4/opencv2/plot.hpp
 include/opencv4/opencv2/tracking.hpp
 include/opencv4/opencv2/tracking/feature.hpp
@@ -224,79 +20,12 @@ 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
-include/opencv4/opencv2/video.hpp
-include/opencv4/opencv2/video/background_segm.hpp
-include/opencv4/opencv2/video/detail/tracking.detail.hpp
-include/opencv4/opencv2/video/legacy/constants_c.h
-include/opencv4/opencv2/video/tracking.hpp
-include/opencv4/opencv2/video/video.hpp
-lib/cmake/opencv4/OpenCVConfig-version.cmake
-lib/cmake/opencv4/OpenCVConfig.cmake
-lib/cmake/opencv4/OpenCVModules-release.cmake
-lib/cmake/opencv4/OpenCVModules.cmake
-lib/libopencv_calib3d.so
-lib/libopencv_calib3d.so.${PKGVERSION}
-lib/libopencv_calib3d.so.411
-lib/libopencv_core.so
-lib/libopencv_core.so.${PKGVERSION}
-lib/libopencv_core.so.411
 lib/libopencv_face.so
 lib/libopencv_face.so.${PKGVERSION}
 lib/libopencv_face.so.411
-lib/libopencv_features2d.so
-lib/libopencv_features2d.so.${PKGVERSION}
-lib/libopencv_features2d.so.411
-lib/libopencv_flann.so
-lib/libopencv_flann.so.${PKGVERSION}
-lib/libopencv_flann.so.411
-lib/libopencv_imgproc.so
-lib/libopencv_imgproc.so.${PKGVERSION}
-lib/libopencv_imgproc.so.411
-lib/libopencv_intensity_transform.so
-lib/libopencv_intensity_transform.so.${PKGVERSION}
-lib/libopencv_intensity_transform.so.411
-lib/libopencv_objdetect.so
-lib/libopencv_objdetect.so.${PKGVERSION}
-lib/libopencv_objdetect.so.411
-lib/libopencv_photo.so
-lib/libopencv_photo.so.${PKGVERSION}
-lib/libopencv_photo.so.411
 lib/libopencv_plot.so
 lib/libopencv_plot.so.${PKGVERSION}
 lib/libopencv_plot.so.411
 lib/libopencv_tracking.so
 lib/libopencv_tracking.so.${PKGVERSION}
 lib/libopencv_tracking.so.411
-lib/libopencv_video.so
-lib/libopencv_video.so.${PKGVERSION}
-lib/libopencv_video.so.411
-share/licenses/opencv4/SoftFloat-COPYING.txt
-share/licenses/opencv4/flatbuffers-LICENSE.txt
-share/licenses/opencv4/ittnotify-LICENSE.BSD
-share/licenses/opencv4/ittnotify-LICENSE.GPL
-share/licenses/opencv4/mscr-chi_table_LICENSE.txt
-share/licenses/opencv4/opencl-headers-LICENSE.txt
-share/opencv4/haarcascades/haarcascade_eye.xml
-share/opencv4/haarcascades/haarcascade_eye_tree_eyeglasses.xml
-share/opencv4/haarcascades/haarcascade_frontalcatface.xml
-share/opencv4/haarcascades/haarcascade_frontalcatface_extended.xml
-share/opencv4/haarcascades/haarcascade_frontalface_alt.xml
-share/opencv4/haarcascades/haarcascade_frontalface_alt2.xml
-share/opencv4/haarcascades/haarcascade_frontalface_alt_tree.xml
-share/opencv4/haarcascades/haarcascade_frontalface_default.xml
-share/opencv4/haarcascades/haarcascade_fullbody.xml
-share/opencv4/haarcascades/haarcascade_lefteye_2splits.xml
-share/opencv4/haarcascades/haarcascade_license_plate_rus_16stages.xml
-share/opencv4/haarcascades/haarcascade_lowerbody.xml
-share/opencv4/haarcascades/haarcascade_profileface.xml
-share/opencv4/haarcascades/haarcascade_righteye_2splits.xml
-share/opencv4/haarcascades/haarcascade_russian_plate_number.xml
-share/opencv4/haarcascades/haarcascade_smile.xml
-share/opencv4/haarcascades/haarcascade_upperbody.xml
-share/opencv4/lbpcascades/lbpcascade_frontalcatface.xml
-share/opencv4/lbpcascades/lbpcascade_frontalface.xml
-share/opencv4/lbpcascades/lbpcascade_frontalface_improved.xml
-share/opencv4/lbpcascades/lbpcascade_profileface.xml
-share/opencv4/lbpcascades/lbpcascade_silverware.xml
-share/opencv4/valgrind.supp
-share/opencv4/valgrind_3rdparty.supp
diff --git a/opencv-contrib-face/TODO b/opencv-contrib-face/TODO
deleted file mode 100644
index ad520ebf35..0000000000
--- a/opencv-contrib-face/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-- packages, but installs too many files, so can't be installed because it conflicts with opencv
-- duplicates complete patchset of opencv because it needs one additional one for opencv-contrib
diff --git a/opencv-contrib-face/distinfo b/opencv-contrib-face/distinfo
index 1df9655677..d02c207ec6 100644
--- a/opencv-contrib-face/distinfo
+++ b/opencv-contrib-face/distinfo
@@ -9,22 +9,9 @@ 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) = d9e2f142d9314bcf93bf7bab8dc36f4b9305bee0
+SHA1 (patch-.._opencv__contrib-4.11.0_modules_face_CMakeLists.txt) = bb29d053c0e050c53029b4443822dea978de181e
 SHA1 (patch-3rdparty_ippicv_ippicv.cmake) = 14ce5de382084793ace32f43c6dfaf01f7ffb390
-SHA1 (patch-cmake_OpenCVDetectCXXCompiler.cmake) = ac7deccedcc5071d3785c7827a06419713ba0529
-SHA1 (patch-cmake_OpenCVFindOpenEXR.cmake) = 2e3835545ef7b3c174dffc618fea32d6eac792c4
-SHA1 (patch-cmake_checks_lapack__check.cpp) = dd25d34fff25e0d46651789cf5577391d7b48c81
-SHA1 (patch-modules_core_include_opencv2_core_bindings__utils.hpp) = 44a8602670141b2a3bc90c5e1c23a8e7f96a1d40
-SHA1 (patch-modules_core_include_opencv2_core_types_c.h) = 75444e65677be99af8167f9060419d7970a7adaa
-SHA1 (patch-modules_core_src_check.cpp) = ca1c947097c450d31d23e8eceecd66c2697c2efd
 SHA1 (patch-modules_core_src_downhill__simplex.cpp) = 1ad7c2fa126d15050b87785e8eec20dbe796b471
-SHA1 (patch-modules_core_src_rand.cpp) = 0ff4f01eaee2ee67536d8721b37506daf2231f10
-SHA1 (patch-modules_core_src_system.cpp) = 972533f71b024ac852af321d2e030f67dc960eed
-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) = 4b431d57407411fdfff1836ffa600bb2b2418400
 SHA1 (patch-modules_flann_include_opencv2_flann_defines.h) = ab848e67c4e03219670598ac2d21071a617a5c33
 SHA1 (patch-modules_imgproc_src_resize.cpp) = e842d5960c4c00162a34f46cb45cf69d0e9f21ce
-SHA1 (patch-modules_ts_src_ts.cpp) = b9a3992014b02dbd89d46375a2476385e91dc24c
 SHA1 (patch-modules_videoio_src_cap__v4l.cpp) = f9ff94f46cdee1b9616ceb2982b4f5925c0bfb3f
diff --git a/opencv-contrib-face/patches/patch-.._opencv__contrib-4.11.0_modules_face_CMakeLists.txt b/opencv-contrib-face/patches/patch-.._opencv__contrib-4.11.0_modules_face_CMakeLists.txt
index e21888a631..ff0f5d5aab 100644
--- a/opencv-contrib-face/patches/patch-.._opencv__contrib-4.11.0_modules_face_CMakeLists.txt
+++ b/opencv-contrib-face/patches/patch-.._opencv__contrib-4.11.0_modules_face_CMakeLists.txt
@@ -1,5 +1,7 @@
 $NetBSD$
 
+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
diff --git a/opencv-contrib-face/patches/patch-cmake_OpenCVDetectCXXCompiler.cmake b/opencv-contrib-face/patches/patch-cmake_OpenCVDetectCXXCompiler.cmake
deleted file mode 100644
index 85d967a7a6..0000000000
--- a/opencv-contrib-face/patches/patch-cmake_OpenCVDetectCXXCompiler.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-cmake_OpenCVDetectCXXCompiler.cmake,v 1.2 2020/02/13 09:23:46 adam Exp $
-
-Rely on pkgsrc to set architeture, see CONFIGURE_ENV.
-
---- cmake/OpenCVDetectCXXCompiler.cmake.orig	2019-12-19 15:16:47.000000000 +0000
-+++ cmake/OpenCVDetectCXXCompiler.cmake
-@@ -84,6 +84,10 @@ endif()
- message(STATUS "Detected processor: ${CMAKE_SYSTEM_PROCESSOR}")
- if(OPENCV_SKIP_SYSTEM_PROCESSOR_DETECTION)
-   # custom setup: required variables are passed through cache / CMake's command-line
-+elseif("$ENV{MACHINE_ARCH}" MATCHES "x86_64")
-+  set(X86_64 1)
-+elseif("$ENV{MACHINE_ARCH}" MATCHES "i386")
-+  set(X86 1)
- elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*")
-   set(X86_64 1)
- elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i686.*|i386.*|x86.*")
diff --git a/opencv-contrib-face/patches/patch-cmake_OpenCVFindOpenEXR.cmake b/opencv-contrib-face/patches/patch-cmake_OpenCVFindOpenEXR.cmake
deleted file mode 100644
index 76515c0fab..0000000000
--- a/opencv-contrib-face/patches/patch-cmake_OpenCVFindOpenEXR.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-cmake_OpenCVFindOpenEXR.cmake,v 1.1 2021/07/08 21:27:39 markd Exp $
-
-openexr3
-
---- cmake/OpenCVFindOpenEXR.cmake.orig	2022-12-28 14:31:52.000000000 +0000
-+++ cmake/OpenCVFindOpenEXR.cmake
-@@ -25,6 +25,14 @@ if(NOT OPENCV_SKIP_OPENEXR_FIND_PACKAGE)
-   endif()
- endif()
- 
-+find_package(OpenEXR 3.0 CONFIG QUIET)
-+if(TARGET OpenEXR::OpenEXR)
-+    SET(OPENEXR_FOUND TRUE)
-+    SET(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
-+    SET(OPENEXR_VERSION ${OpenEXR_VERSION})
-+    return()
-+endif()
-+
- SET(OPENEXR_LIBRARIES "")
- SET(OPENEXR_LIBSEARCH_SUFFIXES "")
- file(TO_CMAKE_PATH "$ENV{ProgramFiles}" ProgramFiles_ENV_PATH)
diff --git a/opencv-contrib-face/patches/patch-cmake_checks_lapack__check.cpp b/opencv-contrib-face/patches/patch-cmake_checks_lapack__check.cpp
deleted file mode 100644
index 2a0568b2e5..0000000000
--- a/opencv-contrib-face/patches/patch-cmake_checks_lapack__check.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-cmake_checks_lapack__check.cpp,v 1.1 2021/09/22 13:40:41 nia Exp $
-
-https://bugs.gentoo.org/800539
-https://github.com/opencv/opencv/issues/19846
-
---- cmake/checks/lapack_check.cpp.orig	2019-12-19 15:16:47.000000000 +0000
-+++ cmake/checks/lapack_check.cpp
-@@ -2,9 +2,9 @@
- #include "opencv_lapack.h"
- 
- static char* check_fn1 = (char*)sgesv_;
--static char* check_fn2 = (char*)sposv_;
--static char* check_fn3 = (char*)spotrf_;
--static char* check_fn4 = (char*)sgesdd_;
-+static char* check_fn2 = (char*)LAPACK_sposv_;
-+static char* check_fn3 = (char*)LAPACK_spotrf_;
-+static char* check_fn4 = (char*)LAPACK_sgesdd_;
- 
- int main(int argc, char* argv[])
- {
diff --git a/opencv-contrib-face/patches/patch-modules_core_include_opencv2_core_bindings__utils.hpp b/opencv-contrib-face/patches/patch-modules_core_include_opencv2_core_bindings__utils.hpp
deleted file mode 100644
index 8c34f6f9b1..0000000000
--- a/opencv-contrib-face/patches/patch-modules_core_include_opencv2_core_bindings__utils.hpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$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	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
- #define OPENCV_CORE_BINDINGS_UTILS_HPP
- 
-+#include <sstream>
- #include <opencv2/core/async.hpp>
- #include <opencv2/core/detail/async_promise.hpp>
- #include <opencv2/core/utils/logger.hpp>
diff --git a/opencv-contrib-face/patches/patch-modules_core_include_opencv2_core_types_c.h b/opencv-contrib-face/patches/patch-modules_core_include_opencv2_core_types_c.h
deleted file mode 100644
index 6b5a47374b..0000000000
--- a/opencv-contrib-face/patches/patch-modules_core_include_opencv2_core_types_c.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-modules_core_include_opencv2_core_types_c.h,v 1.2 2015/10/08 17:45:59 fhajny Exp $
-
-Define 'depth' as unsigned int, or IPL_DEPTH_SIGN=0x8000000 won't fit in int.
-
---- modules/core/include/opencv2/core/types_c.h.orig	2015-06-03 17:21:34.000000000 +0000
-+++ modules/core/include/opencv2/core/types_c.h
-@@ -303,7 +303,7 @@ _IplImage
-     int  ID;                /**< version (=0)*/
-     int  nChannels;         /**< Most of OpenCV functions support 1,2,3 or 4 channels */
-     int  alphaChannel;      /**< Ignored by OpenCV */
--    int  depth;             /**< Pixel depth in bits: IPL_DEPTH_8U, IPL_DEPTH_8S, IPL_DEPTH_16S,
-+    unsigned int  depth;             /**< Pixel depth in bits: IPL_DEPTH_8U, IPL_DEPTH_8S, IPL_DEPTH_16S,
-                                IPL_DEPTH_32S, IPL_DEPTH_32F and IPL_DEPTH_64F are supported.  */
-     char colorModel[4];     /**< Ignored by OpenCV */
-     char channelSeq[4];     /**< ditto */
diff --git a/opencv-contrib-face/patches/patch-modules_core_src_check.cpp b/opencv-contrib-face/patches/patch-modules_core_src_check.cpp
deleted file mode 100644
index 08d30784e2..0000000000
--- a/opencv-contrib-face/patches/patch-modules_core_src_check.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-modules_core_src_check.cpp,v 1.1 2020/04/18 22:01:33 joerg Exp $
-
---- modules/core/src/check.cpp.orig	2025-01-08 12:47:46.000000000 +0000
-+++ modules/core/src/check.cpp
-@@ -3,6 +3,7 @@
- // of this distribution and at http://opencv.org/license.html.
- 
- #include "precomp.hpp"
-+#include <sstream>
- 
- #include <sstream>
- 
diff --git a/opencv-contrib-face/patches/patch-modules_core_src_rand.cpp b/opencv-contrib-face/patches/patch-modules_core_src_rand.cpp
deleted file mode 100644
index ee919e9abb..0000000000
--- a/opencv-contrib-face/patches/patch-modules_core_src_rand.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-modules_core_src_rand.cpp,v 1.1 2020/09/09 11:50:50 nia Exp $
-
-Include arm_neon.h before attempting to use intrinsics.
-
-This is seemingly fixed in newer releases.
-
---- modules/core/src/rand.cpp.orig	2022-12-28 14:31:52.000000000 +0000
-+++ modules/core/src/rand.cpp
-@@ -48,6 +48,10 @@
- 
- #include "precomp.hpp"
- 
-+#if defined __ARM_NEON && defined __aarch64__
-+    #include "arm_neon.h"
-+#endif
-+
- namespace cv
- {
- 
diff --git a/opencv-contrib-face/patches/patch-modules_core_src_system.cpp b/opencv-contrib-face/patches/patch-modules_core_src_system.cpp
deleted file mode 100644
index 83730ded74..0000000000
--- a/opencv-contrib-face/patches/patch-modules_core_src_system.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-modules_core_src_system.cpp,v 1.1 2013/04/29 21:31:12 joerg Exp $
-
---- modules/core/src/system.cpp.orig	2022-12-28 14:31:52.000000000 +0000
-+++ modules/core/src/system.cpp
-@@ -243,6 +243,7 @@ std::wstring GetTempFileNameWinRT(std::w
- #endif
- #include <sys/time.h>
- #include <time.h>
-+#include <unistd.h>
- 
- #if defined __MACH__ && defined __APPLE__
- #include <mach/mach.h>
diff --git a/opencv-contrib-face/patches/patch-modules_dnn_src_layers_accum__layer.cpp b/opencv-contrib-face/patches/patch-modules_dnn_src_layers_accum__layer.cpp
deleted file mode 100644
index 7a488a825b..0000000000
--- a/opencv-contrib-face/patches/patch-modules_dnn_src_layers_accum__layer.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-modules_dnn_src_layers_accum__layer.cpp,v 1.1 2021/10/21 16:25:07 jperkin Exp $
-
-Explicitly use std::ceil.
-
---- modules/dnn/src/layers/accum_layer.cpp.orig	2021-10-08 18:31:56.000000000 +0000
-+++ modules/dnn/src/layers/accum_layer.cpp
-@@ -8,6 +8,7 @@
- #include "../precomp.hpp"
- #include "layers_common.hpp"
- 
-+using std::ceil;
- 
- namespace cv { namespace dnn {
- 
diff --git a/opencv-contrib-face/patches/patch-modules_dnn_src_tensorflow_tf__importer.cpp b/opencv-contrib-face/patches/patch-modules_dnn_src_tensorflow_tf__importer.cpp
deleted file mode 100644
index 1c1344e564..0000000000
--- a/opencv-contrib-face/patches/patch-modules_dnn_src_tensorflow_tf__importer.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-modules_dnn_src_tensorflow_tf__importer.cpp,v 1.1 2020/04/18 22:01:34 joerg Exp $
-
---- modules/dnn/src/tensorflow/tf_importer.cpp.orig	2020-04-18 02:43:16.265690888 +0000
-+++ modules/dnn/src/tensorflow/tf_importer.cpp
-@@ -14,6 +14,7 @@ Implementation of Tensorflow models pars
- #ifdef HAVE_PROTOBUF
- #include "tf_io.hpp"
- 
-+#include <sstream>
- #include <iostream>
- #include <fstream>
- #include <algorithm>
diff --git a/opencv-contrib-face/patches/patch-modules_dnn_src_torch_torch__importer.cpp b/opencv-contrib-face/patches/patch-modules_dnn_src_torch_torch__importer.cpp
deleted file mode 100644
index 0c4162c01f..0000000000
--- a/opencv-contrib-face/patches/patch-modules_dnn_src_torch_torch__importer.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-modules_dnn_src_torch_torch__importer.cpp,v 1.1 2020/04/18 22:01:34 joerg Exp $
-
---- modules/dnn/src/torch/torch_importer.cpp.orig	2020-04-18 02:45:10.074752904 +0000
-+++ modules/dnn/src/torch/torch_importer.cpp
-@@ -46,6 +46,7 @@
- #include <algorithm>
- #include <iostream>
- #include <fstream>
-+#include <sstream>
- 
- #include "THDiskFile.h"
- 
diff --git a/opencv-contrib-face/patches/patch-modules_dnn_test_test__precomp.hpp b/opencv-contrib-face/patches/patch-modules_dnn_test_test__precomp.hpp
deleted file mode 100644
index 8532e60488..0000000000
--- a/opencv-contrib-face/patches/patch-modules_dnn_test_test__precomp.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-modules_dnn_test__precomp.hpp,v 1.1 2019/04/29 03:23:53 mef Exp $
-
-adhoc patch to build 3.4.6
-
-[ 30%] Built target opencv_core
-/export/WRKOBJDIR/graphics/opencv/work/opencv-3.4.6/build/modules/dnn/test_precomp.hpp:50:10: fatal error: test/test_common.hpp: No such file or directory
- #include "test/test_common.hpp"
-          ^~~~~~~~~~~~~~~~~~~~~~
-compilation terminated.
-
---- modules/dnn/test/test_precomp.hpp.orig	2025-01-08 12:47:46.000000000 +0000
-+++ modules/dnn/test/test_precomp.hpp
-@@ -48,6 +48,6 @@
- #include "opencv2/core/utils/configuration.private.hpp"
- 
- #include "opencv2/dnn.hpp"
--#include "test_common.hpp"
-+#include "../test/test_common.hpp"
- 
- #endif
diff --git a/opencv-contrib-face/patches/patch-modules_ts_src_ts.cpp b/opencv-contrib-face/patches/patch-modules_ts_src_ts.cpp
deleted file mode 100644
index c9d3832d3f..0000000000
--- a/opencv-contrib-face/patches/patch-modules_ts_src_ts.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-modules_ts_src_ts.cpp,v 1.3 2015/10/08 17:45:59 fhajny Exp $
-
-Avoid std::foo conflict.
-
---- modules/ts/src/ts.cpp.orig	2015-06-03 17:21:34.000000000 +0000
-+++ modules/ts/src/ts.cpp
-@@ -235,7 +235,7 @@ void BaseTest::safe_run( int start_from
-         }
-         catch (const TS::FailureCode& fc)
-         {
--            std::string errorStr = TS::str_from_code(fc);
-+            ::std::string errorStr = TS::str_from_code(fc);
-             ts->printf(TS::LOG, "General failure:\n\t%s (%d)\n", errorStr.c_str(), fc);
- 
-             ts->set_failed_test_info( fc );
-@@ -558,7 +558,7 @@ void TS::vprintf( int streams, const cha
-     for( int i = 0; i < MAX_IDX; i++ )
-         if( (streams & (1 << i)) )
-         {
--            output_buf[i] += std::string(str);
-+            output_buf[i] += ::std::string(str);
-             // in the new GTest-based framework we do not use
-             // any output files (except for the automatically generated xml report).
-             // if a test fails, all the buffers are printed, so we do not want to duplicate the information and
-@@ -613,7 +613,7 @@ void smoothBorder(Mat& img, const Scalar
-     Scalar s;
-     uchar *p = NULL;
-     int n = 100/delta;
--    int nR = std::min(n, (img.rows+1)/2), nC = std::min(n, (img.cols+1)/2);
-+    int nR = ::std::min(n, (img.rows+1)/2), nC = ::std::min(n, (img.cols+1)/2);
- 
-     int r, c, i;
-     for(r=0; r<nR; r++)
Home | Main Index | Thread Index | Old Index