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

opencv-contrib-face: update to 5.1.0.

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Fri Nov 6 15:23:22 2026 +0100
Changeset:	33eca60ce957a031888eb283265691b7bb4dbe4b

Modified Files:
	opencv-contrib-face/Makefile
	opencv-contrib-face/PLIST
	opencv-contrib-face/buildlink3.mk
	opencv-contrib-face/distinfo
	opencv-contrib-face/patches/patch-modules_videoio_src_cap__v4l.cpp
Removed Files:
	opencv-contrib-face/patches/patch-.._opencv__contrib-5.0.0_modules_face_CMakeLists.txt
	opencv-contrib-face/patches/patch-modules_core_src_hal__internal.cpp

Log Message:
opencv-contrib-face: update to 5.1.0.

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

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

diffstat:
 opencv-contrib-face/Makefile                       |  2 +-
 opencv-contrib-face/PLIST                          |  8 +++---
 opencv-contrib-face/buildlink3.mk                  |  4 +--
 opencv-contrib-face/distinfo                       | 22 ++++++++--------
 ...encv__contrib-5.0.0_modules_face_CMakeLists.txt | 29 ----------------------
 .../patch-modules_core_src_hal__internal.cpp       | 15 -----------
 .../patches/patch-modules_videoio_src_cap__v4l.cpp | 18 +++++++-------
 7 files changed, 26 insertions(+), 72 deletions(-)

diffs:
diff --git a/opencv-contrib-face/Makefile b/opencv-contrib-face/Makefile
index 96815abc98..c37603ea70 100644
--- a/opencv-contrib-face/Makefile
+++ b/opencv-contrib-face/Makefile
@@ -15,7 +15,7 @@ COMMENT=	OpenCV face recognition contributed module
 
 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-5.0.0_face_landmark_model.dat=	-https://raw.githubusercontent.com/opencv/opencv_3rdparty/8afa57abc8229d611c4937165d20e2a2d9fc5a12/face_landmark_model.dat
+SITES.opencv-5.1.0_face_landmark_model.dat=	-https://raw.githubusercontent.com/opencv/opencv_3rdparty/8afa57abc8229d611c4937165d20e2a2d9fc5a12/face_landmark_model.dat
 
 WRKSRC=		${WRKDIR}/opencv-${PKGVERSION_NOREV}
 
diff --git a/opencv-contrib-face/PLIST b/opencv-contrib-face/PLIST
index 7912fcd466..9027c03b65 100644
--- a/opencv-contrib-face/PLIST
+++ b/opencv-contrib-face/PLIST
@@ -24,16 +24,16 @@ include/opencv5/opencv2/xobjdetect.hpp
 include/opencv5/opencv2/xobjdetect/detection_based_tracker.hpp
 lib/libopencv_face.so
 lib/libopencv_face.so.${PKGVERSION}
-lib/libopencv_face.so.500
+lib/libopencv_face.so.501
 lib/libopencv_plot.so
 lib/libopencv_plot.so.${PKGVERSION}
-lib/libopencv_plot.so.500
+lib/libopencv_plot.so.501
 lib/libopencv_tracking.so
 lib/libopencv_tracking.so.${PKGVERSION}
-lib/libopencv_tracking.so.500
+lib/libopencv_tracking.so.501
 lib/libopencv_xobjdetect.so
 lib/libopencv_xobjdetect.so.${PKGVERSION}
-lib/libopencv_xobjdetect.so.500
+lib/libopencv_xobjdetect.so.501
 share/opencv5/haarcascades/haarcascade_eye.xml
 share/opencv5/haarcascades/haarcascade_eye_tree_eyeglasses.xml
 share/opencv5/haarcascades/haarcascade_frontalcatface.xml
diff --git a/opencv-contrib-face/buildlink3.mk b/opencv-contrib-face/buildlink3.mk
index d837850ec0..50394920a3 100644
--- a/opencv-contrib-face/buildlink3.mk
+++ b/opencv-contrib-face/buildlink3.mk
@@ -7,9 +7,9 @@ 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>=4.13.0nb4
-BUILDLINK_PKGSRCDIR.opencv-contrib-face?=	../../graphics/opencv-contrib-face
+BUILDLINK_PKGSRCDIR.opencv-contrib-face?=	../../wip/opencv-contrib-face
 
-.include "../../graphics/opencv/buildlink3.mk"
+.include "../../wip/opencv/buildlink3.mk"
 .endif	# OPENCV_CONTRIB_FACE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-opencv-contrib-face
diff --git a/opencv-contrib-face/distinfo b/opencv-contrib-face/distinfo
index 5baf973159..20d9293ee2 100644
--- a/opencv-contrib-face/distinfo
+++ b/opencv-contrib-face/distinfo
@@ -1,18 +1,16 @@
 $NetBSD: distinfo,v 1.35 2026/01/05 02:53:36 wiz Exp $
 
-BLAKE2s (opencv-5.0.0.tar.gz) = 42d24b05b62365d961781149deaa7726357ba39cdea6e87c0cb93ff7b8168c13
-SHA512 (opencv-5.0.0.tar.gz) = 37143de2ba76a9af351d6901358635b42b671b5fbe3ccc75d4d27133b0a6c6a0400564e6eaf228fc1705e25a2af09c8e2638039ca9af0ce9428da253dd31d3e0
-Size (opencv-5.0.0.tar.gz) = 81594270 bytes
-BLAKE2s (opencv-5.0.0_face_landmark_model.dat) = 27a36ff06273b7bf77d3a01742348482c129788e6baaa08c07d4d5b3803e57b0
-SHA512 (opencv-5.0.0_face_landmark_model.dat) = c16e60a6c4bb4de3ab39b876ae3c3f320ea56f69c93e9303bd2dff8760841dcd71be4161fff8bc71e8fe4fe8747fa8465d49d6bd8f5ebcdaea161f4bc2da7c93
-Size (opencv-5.0.0_face_landmark_model.dat) = 72368157 bytes
-BLAKE2s (opencv_contrib-5.0.0.tar.gz) = c0ff9f09c9a0aaab65cbd8a24757c32e096f2a2243a598703d837944c311b8be
-SHA512 (opencv_contrib-5.0.0.tar.gz) = 09841f4637f6a51a5e12a5516710e61a3cedd2622455366004cd9e35484a6d03cc9c12de52edae4072dc37af104d7fd9099201effee82c52dd40b8a58c51fdc5
-Size (opencv_contrib-5.0.0.tar.gz) = 72465981 bytes
-SHA1 (patch-.._opencv__contrib-5.0.0_modules_face_CMakeLists.txt) = 9b8ac02fefd731bec7ced79cd8707336e30fa988
+BLAKE2s (opencv-5.1.0.tar.gz) = bd9b62c96379df5a012d4078ad159e5122840d59c6c7dd6625d7e24c0827d6cf
+SHA512 (opencv-5.1.0.tar.gz) = e90c75b1ce8332639c853e14a59059ec9b89ffa1d5435ab59820f4fa2e12d30846592672af808817d542a91248b164f6d54eeb6331be52e48062113f24d4c835
+Size (opencv-5.1.0.tar.gz) = 83196865 bytes
+BLAKE2s (opencv-5.1.0_face_landmark_model.dat) = 27a36ff06273b7bf77d3a01742348482c129788e6baaa08c07d4d5b3803e57b0
+SHA512 (opencv-5.1.0_face_landmark_model.dat) = c16e60a6c4bb4de3ab39b876ae3c3f320ea56f69c93e9303bd2dff8760841dcd71be4161fff8bc71e8fe4fe8747fa8465d49d6bd8f5ebcdaea161f4bc2da7c93
+Size (opencv-5.1.0_face_landmark_model.dat) = 72368157 bytes
+BLAKE2s (opencv_contrib-5.1.0.tar.gz) = afa82bf883f39bbced500960f423964ed7e2c52d4dc5d4422b4f1eecb5e50fc9
+SHA512 (opencv_contrib-5.1.0.tar.gz) = f9d7327fdb17ff86243c2942c6365c27a6672218a8c8e7520ea1a9b6a47633f5d5fe6ab479ea8e6ec126cec981fc5725f77b9712f9f8ebc066f296b3d9f6f147
+Size (opencv_contrib-5.1.0.tar.gz) = 72475290 bytes
 SHA1 (patch-3rdparty_ippicv_ippicv.cmake) = 14ce5de382084793ace32f43c6dfaf01f7ffb390
 SHA1 (patch-modules_core_src_downhill__simplex.cpp) = 1ad7c2fa126d15050b87785e8eec20dbe796b471
-SHA1 (patch-modules_core_src_hal__internal.cpp) = 0f243428337a6e60a8f72cd579941099081d2ecd
 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) = 362fe667a8b5ee9d556036ef97121eb5ff503602
+SHA1 (patch-modules_videoio_src_cap__v4l.cpp) = 9cfd97c1eb8acff674223bba7f96824d25b15125
diff --git a/opencv-contrib-face/patches/patch-.._opencv__contrib-5.0.0_modules_face_CMakeLists.txt b/opencv-contrib-face/patches/patch-.._opencv__contrib-5.0.0_modules_face_CMakeLists.txt
deleted file mode 100644
index 852bcc2a13..0000000000
--- a/opencv-contrib-face/patches/patch-.._opencv__contrib-5.0.0_modules_face_CMakeLists.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-.._opencv__contrib-4.13.0_modules_face_CMakeLists.txt,v 1.1 2026/01/05 02:54:19 wiz Exp $
-
-Do not download files during build, let pkgsrc provide it.
-
---- ../opencv_contrib-5.0.0/modules/face/CMakeLists.txt.orig	2025-02-07 17:04:23.284140051 +0000
-+++ ../opencv_contrib-5.0.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()
diff --git a/opencv-contrib-face/patches/patch-modules_core_src_hal__internal.cpp b/opencv-contrib-face/patches/patch-modules_core_src_hal__internal.cpp
deleted file mode 100644
index f533ac206c..0000000000
--- a/opencv-contrib-face/patches/patch-modules_core_src_hal__internal.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Remove complex.h to fix build.
-https://github.com/opencv/opencv/pull/29455
-
---- modules/core/src/hal_internal.cpp.orig	2026-06-05 18:50:05.000000000 +0000
-+++ modules/core/src/hal_internal.cpp
-@@ -47,7 +47,6 @@
- 
- #ifdef HAVE_LAPACK
- 
--#include <complex.h>
- #include "opencv_lapack.h"
- 
- #include <cmath>
diff --git a/opencv-contrib-face/patches/patch-modules_videoio_src_cap__v4l.cpp b/opencv-contrib-face/patches/patch-modules_videoio_src_cap__v4l.cpp
index 2dcc83011b..21b344f8a2 100644
--- a/opencv-contrib-face/patches/patch-modules_videoio_src_cap__v4l.cpp
+++ b/opencv-contrib-face/patches/patch-modules_videoio_src_cap__v4l.cpp
@@ -3,11 +3,11 @@ $NetBSD: patch-modules_videoio_src_cap__v4l.cpp,v 1.11 2025/07/07 05:15:26 wiz E
 Conditionalize settings not available in NetBSD's v4l2 emulation.
 Avoid non-standard integer types.
 
---- modules/videoio/src/cap_v4l.cpp.orig	2026-06-05 18:50:05.000000000 +0000
+--- modules/videoio/src/cap_v4l.cpp.orig	2026-11-05 11:18:05.000000000 +0000
 +++ modules/videoio/src/cap_v4l.cpp
-@@ -215,6 +215,14 @@ make & enjoy!
- #include <fcntl.h>
+@@ -216,6 +216,14 @@ make & enjoy!
  #include <errno.h>
+ #include <dirent.h>
  #include <sys/ioctl.h>
 +#include <inttypes.h>
 +#include <stdint.h>
@@ -20,7 +20,7 @@ Avoid non-standard integer types.
  #include <sys/types.h>
  #include <sys/mman.h>
  
-@@ -241,24 +249,30 @@ typedef uint32_t __u32;
+@@ -242,24 +250,30 @@ typedef uint32_t __u32;
  #endif
  
  // https://github.com/opencv/opencv/issues/13335
@@ -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))
-@@ -1467,6 +1481,7 @@ void CvCaptureCAM_V4L::convertToRgb(const Buffer &curr
+@@ -1468,6 +1482,7 @@ void CvCaptureCAM_V4L::convertToRgb(const Buffer &curr
      case V4L2_PIX_FMT_RGB24:
          cv::cvtColor(cv::Mat(imageSize, CV_8UC3, start), frame, COLOR_RGB2BGR);
          return;
@@ -59,7 +59,7 @@ Avoid non-standard integer types.
      case V4L2_PIX_FMT_Y16:
      {
          // https://www.kernel.org/doc/html/v4.10/media/uapi/v4l/pixfmt-y16.html
-@@ -1531,6 +1546,7 @@ void CvCaptureCAM_V4L::convertToRgb(const Buffer &curr
+@@ -1532,6 +1547,7 @@ void CvCaptureCAM_V4L::convertToRgb(const Buffer &curr
          cv::cvtColor(cv::Mat(imageSize, CV_8UC1, start), frame, COLOR_BayerGB2BGR);
          return;
      }
@@ -67,7 +67,7 @@ Avoid non-standard integer types.
      case V4L2_PIX_FMT_GREY:
          cv::cvtColor(cv::Mat(imageSize, CV_8UC1, start), frame, COLOR_GRAY2BGR);
          return;
-@@ -1650,8 +1666,10 @@ static inline int capPropertyToV4L2(int prop)
+@@ -1651,8 +1667,10 @@ static inline int capPropertyToV4L2(int prop)
          return CAP_PROP_UNKNOWN;
      case cv::CAP_PROP_FOURCC:
          return CAP_PROP_UNKNOWN;
@@ -78,7 +78,7 @@ Avoid non-standard integer types.
      case cv::CAP_PROP_FORMAT:
          return CAP_PROP_UNKNOWN;
      case cv::CAP_PROP_MODE:
-@@ -1666,8 +1684,10 @@ static inline int capPropertyToV4L2(int prop)
+@@ -1667,8 +1685,10 @@ static inline int capPropertyToV4L2(int prop)
          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 CAP_PROP_UNKNOWN;
      case cv::CAP_PROP_WHITE_BALANCE_BLUE_U:
-@@ -1678,8 +1698,10 @@ static inline int capPropertyToV4L2(int prop)
+@@ -1679,8 +1699,10 @@ static inline int capPropertyToV4L2(int prop)
          return CAP_PROP_UNKNOWN;
      case cv::CAP_PROP_SHARPNESS:
          return V4L2_CID_SHARPNESS;
Home | Main Index | Thread Index | Old Index