pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
opencv, opencv-contrib-face: remove, used for updating pkgsrc
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Fri Feb 7 22:59:10 2025 +0100
Changeset: 6ba92722d5fb90322e8756dd2785ea52fe53b18a
Modified Files:
Makefile
Removed Files:
opencv-contrib-face/DESCR
opencv-contrib-face/Makefile
opencv-contrib-face/PLIST
opencv-contrib-face/buildlink3.mk
opencv-contrib-face/distinfo
opencv-contrib-face/patches/patch-.._opencv__contrib-4.11.0_modules_face_CMakeLists.txt
opencv-contrib-face/patches/patch-3rdparty_ippicv_ippicv.cmake
opencv-contrib-face/patches/patch-modules_core_src_downhill__simplex.cpp
opencv-contrib-face/patches/patch-modules_flann_include_opencv2_flann_defines.h
opencv-contrib-face/patches/patch-modules_imgproc_src_resize.cpp
opencv-contrib-face/patches/patch-modules_videoio_src_cap__v4l.cpp
opencv/DESCR
opencv/Makefile
opencv/Makefile.common
opencv/PLIST
opencv/buildlink3.mk
opencv/distinfo
opencv/options.mk
opencv/patches/patch-3rdparty_ippicv_ippicv.cmake
opencv/patches/patch-modules_core_src_downhill__simplex.cpp
opencv/patches/patch-modules_flann_include_opencv2_flann_defines.h
opencv/patches/patch-modules_imgproc_src_resize.cpp
opencv/patches/patch-modules_videoio_src_cap__v4l.cpp
Log Message:
opencv, opencv-contrib-face: remove, used for updating pkgsrc
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6ba92722d5fb90322e8756dd2785ea52fe53b18a
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 2 -
opencv-contrib-face/DESCR | 1 -
opencv-contrib-face/Makefile | 93 ------
opencv-contrib-face/PLIST | 31 --
opencv-contrib-face/buildlink3.mk | 15 -
opencv-contrib-face/distinfo | 17 -
...ncv__contrib-4.11.0_modules_face_CMakeLists.txt | 29 --
.../patches/patch-3rdparty_ippicv_ippicv.cmake | 12 -
.../patch-modules_core_src_downhill__simplex.cpp | 16 -
...h-modules_flann_include_opencv2_flann_defines.h | 16 -
.../patches/patch-modules_imgproc_src_resize.cpp | 24 --
.../patches/patch-modules_videoio_src_cap__v4l.cpp | 157 ---------
opencv/DESCR | 12 -
opencv/Makefile | 35 --
opencv/Makefile.common | 70 ----
opencv/PLIST | 364 ---------------------
opencv/buildlink3.mk | 31 --
opencv/distinfo | 10 -
opencv/options.mk | 41 ---
opencv/patches/patch-3rdparty_ippicv_ippicv.cmake | 12 -
.../patch-modules_core_src_downhill__simplex.cpp | 16 -
...h-modules_flann_include_opencv2_flann_defines.h | 16 -
.../patches/patch-modules_imgproc_src_resize.cpp | 24 --
.../patches/patch-modules_videoio_src_cap__v4l.cpp | 157 ---------
24 files changed, 1201 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index 3fa7054d10..b97f146caf 100644
--- a/Makefile
+++ b/Makefile
@@ -2696,8 +2696,6 @@ SUBDIR+= openbsd-input-usbtablet
SUBDIR+= openca
SUBDIR+= opencl-clhpp
SUBDIR+= opencl-headers
-SUBDIR+= opencv
-SUBDIR+= opencv-contrib-face
SUBDIR+= opendbx
SUBDIR+= opendchub
SUBDIR+= opendkim
diff --git a/opencv-contrib-face/DESCR b/opencv-contrib-face/DESCR
deleted file mode 100644
index 73e991fb92..0000000000
--- a/opencv-contrib-face/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-OpenCV face recognition contributed module.
diff --git a/opencv-contrib-face/Makefile b/opencv-contrib-face/Makefile
deleted file mode 100644
index 5de48e816b..0000000000
--- a/opencv-contrib-face/Makefile
+++ /dev/null
@@ -1,93 +0,0 @@
-# $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}
-PKGNAME= ${DISTNAME:S/_contrib/-contrib-face/}
-GITHUB_PROJECT= opencv_contrib
-
-MAINTAINER= markd%NetBSD.org@localhost
-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-4.11.0_face_landmark_model.dat= -https://raw.githubusercontent.com/opencv/opencv_3rdparty/8afa57abc8229d611c4937165d20e2a2d9fc5a12/face_landmark_model.dat
-
-WRKSRC= ${WRKDIR}/opencv-${PKGVERSION_NOREV}
-
-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
-CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_contrib_world=OFF
-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
-CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_ximgproc=OFF
-CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_xobjdetect=OFF
-CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_xphoto=OFF
-
-CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_dnn=OFF
-CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_highgui=OFF
-CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_ml=OFF
-CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_python2=OFF
-CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_python3=OFF
-CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_stitching=OFF
-CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_superres=OFF
-CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_ts=OFF
-CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_videoio=OFF
-CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_videostab=OFF
-
-# 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 "../../wip/opencv/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/opencv-contrib-face/PLIST b/opencv-contrib-face/PLIST
deleted file mode 100644
index df95158108..0000000000
--- a/opencv-contrib-face/PLIST
+++ /dev/null
@@ -1,31 +0,0 @@
-@comment $NetBSD$
-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.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
diff --git a/opencv-contrib-face/buildlink3.mk b/opencv-contrib-face/buildlink3.mk
deleted file mode 100644
index 43af59af09..0000000000
--- a/opencv-contrib-face/buildlink3.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.7 2023/01/03 17:36:26 wiz Exp $
-
-BUILDLINK_TREE+= opencv-contrib-face
-
-.if !defined(OPENCV_CONTRIB_FACE_BUILDLINK3_MK)
-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
-BUILDLINK_PKGSRCDIR.opencv-contrib-face?= ../../wip/opencv-contrib-face
-
-.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
deleted file mode 100644
index d02c207ec6..0000000000
--- a/opencv-contrib-face/distinfo
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: distinfo,v 1.26 2021/11/15 17:49:44 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
-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
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
deleted file mode 100644
index ff0f5d5aab..0000000000
--- a/opencv-contrib-face/patches/patch-.._opencv__contrib-4.11.0_modules_face_CMakeLists.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-$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
- )
- # 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-3rdparty_ippicv_ippicv.cmake b/opencv-contrib-face/patches/patch-3rdparty_ippicv_ippicv.cmake
deleted file mode 100644
index 84a271c481..0000000000
--- a/opencv-contrib-face/patches/patch-3rdparty_ippicv_ippicv.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-3rdparty_ippicv_ippicv.cmake,v 1.1 2017/09/04 15:23:49 fhajny 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
diff --git a/opencv-contrib-face/patches/patch-modules_core_src_downhill__simplex.cpp b/opencv-contrib-face/patches/patch-modules_core_src_downhill__simplex.cpp
deleted file mode 100644
index 8363598853..0000000000
--- a/opencv-contrib-face/patches/patch-modules_core_src_downhill__simplex.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-modules_core_src_downhill__simplex.cpp,v 1.1 2015/10/08 17:45:59 fhajny 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,
diff --git a/opencv-contrib-face/patches/patch-modules_flann_include_opencv2_flann_defines.h b/opencv-contrib-face/patches/patch-modules_flann_include_opencv2_flann_defines.h
deleted file mode 100644
index af6cf08a69..0000000000
--- a/opencv-contrib-face/patches/patch-modules_flann_include_opencv2_flann_defines.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-modules_flann_include_opencv2_flann_defines.h,v 1.1 2013/06/12 10:13:58 jperkin 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]))
diff --git a/opencv-contrib-face/patches/patch-modules_imgproc_src_resize.cpp b/opencv-contrib-face/patches/patch-modules_imgproc_src_resize.cpp
deleted file mode 100644
index e6923f72d3..0000000000
--- a/opencv-contrib-face/patches/patch-modules_imgproc_src_resize.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-modules_imgproc_src_resize.cpp,v 1.1 2020/08/08 22:40:59 joerg 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 <>
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
deleted file mode 100644
index 9aacd58289..0000000000
--- a/opencv-contrib-face/patches/patch-modules_videoio_src_cap__v4l.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-$NetBSD: patch-modules_videoio_src_cap__v4l.cpp,v 1.9 2021/10/16 07:16:29 adam 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:
diff --git a/opencv/DESCR b/opencv/DESCR
deleted file mode 100644
index f3eb010f00..0000000000
--- a/opencv/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-OpenCV means Intel(R) Open Source Computer Vision Library. It is a
-collection of C functions and a few C++ classes that implement many
-popular Image Processing and Computer Vision algorithms.
-
-OpenCV provides cross-platform middle-to-high level API that includes
-about 300 C functions and a few C++ classes. Also there are Python
-bindings to OpenCV. OpenCV has no strict dependencies on external
-libraries, though it can use some (such as libjpeg, ffmpeg, GTK+ etc.)
-
-OpenCV provides transparent interface to Intel(R) Integrated Performance
-Primitives (IPP). That is, it loads automatically IPP libraries optimized
-for specific processor at runtime, if they are available.
diff --git a/opencv/Makefile b/opencv/Makefile
deleted file mode 100644
index 62d3612240..0000000000
--- a/opencv/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $NetBSD: Makefile,v 1.111 2023/01/29 21:16:41 ryoon Exp $
-
-.include "Makefile.common"
-
-DISTNAME= opencv-${OPENCV_VERSION}
-
-MAINTAINER= anthony.mallet%laas.fr@localhost
-COMMENT= Library for computer vision problems
-
-PY_PATCHPLIST= yes
-REPLACE_PYTHON+= samples/python/*.py
-
-.include "options.mk"
-
-TEST_ENV+= LD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}/lib
-# For Darwin
-TEST_ENV+= DYLD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}/lib
-TEST_TARGET= test
-
-post-install:
- ${MV} ${DESTDIR}${PREFIX}/share/licenses/opencv4 ${DESTDIR}${PREFIX}/share/opencv4/licenses
-
-.include "../../devel/protobuf/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/libavif/buildlink3.mk"
-.include "../../graphics/libwebp/buildlink3.mk"
-.include "../../graphics/openexr/buildlink3.mk"
-BUILDLINK_API_DEPENDS.openjpeg+= openjpeg>=2.3.1
-.include "../../graphics/openjpeg/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/tiff/buildlink3.mk"
-.include "../../lang/python/extension.mk"
-.include "../../math/py-numpy/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/opencv/Makefile.common b/opencv/Makefile.common
deleted file mode 100644
index 5722d6f2cf..0000000000
--- a/opencv/Makefile.common
+++ /dev/null
@@ -1,70 +0,0 @@
-# $NetBSD: Makefile.common,v 1.16 2022/12/01 13:39:03 jperkin Exp $
-#
-# used by wip/opencv/Makefile
-# used by wip/opencv-contrib-face/Makefile
-#
-# DO NOT FORGET to regen wip/opencv-contrib-face/distinfo!
-
-OPENCV_VERSION= 4.11.0
-
-CATEGORIES= graphics devel
-MASTER_SITES= ${MASTER_SITE_GITHUB:=opencv/}
-
-HOMEPAGE= https://opencv.org/
-LICENSE= apache-2.0
-
-USE_LANGUAGES= c c++
-USE_CXX_FEATURES= c++17
-USE_TOOLS+= gmake pkg-config
-
-CHECK_PORTABILITY_SKIP+= platforms/ios/cmake/Toolchains/xcodebuild_wrapper.in
-CHECK_PORTABILITY_SKIP+= cmake/templates/xcode-*
-
-CMAKE_CONFIGURE_ARGS+= -DBUILD_JAVA=OFF
-CMAKE_CONFIGURE_ARGS+= -DBUILD_PROTOBUF=OFF
-CMAKE_CONFIGURE_ARGS+= -DCV_ENABLE_INTRINSICS=OFF # XXX: problematic
-CMAKE_CONFIGURE_ARGS+= -DENABLE_CCACHE=OFF
-CMAKE_CONFIGURE_ARGS+= -DOPENCV_GENERATE_SETUPVARS=OFF
-CMAKE_CONFIGURE_ARGS+= -DPROTOBUF_UPDATE_FILES=ON
-CMAKE_CONFIGURE_ARGS+= -DWITH_EIGEN=OFF
-CMAKE_CONFIGURE_ARGS+= -DZLIB_ROOT=${BUILDLINK_PREFIX.zlib}
-# needed by protobuf
-CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_STANDARD=17
-# doesn't build on NetBSD with libva-2.22.0
-CMAKE_CONFIGURE_ARGS+= -DWITH_VA=OFF
-#.include "../../multimedia/libva/buildlink3.mk"
-
-# lapack: disabled because it makes the build fail with
-# n file included from /scratch/wip/opencv/work/opencv-4.11.0/modules/core/src/hal_internal.cpp:50:
-# modules/core/src/hal_internal.cpp: In function 'int lapack_gemm_c(const fptype*, size_t, const fptype*, size_t, fptype, const fptype*, size_t, fptype, fptype*, size_t, int, int, int, int)':
-# modules/core/src/hal_internal.cpp:518:48: error: expected unqualified-id before '_Complex'
-# 518 | int ldsrc1 = (int)(src1_step / sizeof(std::complex<fptype>));
-# | ^~~~~~~
-## Pulled in via numpy, too, but we need to handle it explicitly
-## for LAPACK C API and CMake tests here.
-#BLAS_C_INTERFACE= yes
-#.include "../../mk/blas.buildlink3.mk"
-#CMAKE_CONFIGURE_ARGS+= -DWITH_LAPACK=ON
-#CMAKE_CONFIGURE_ARGS+= -DBLA_PREFER_PKGCONFIG=ON
-#CMAKE_CONFIGURE_ARGS+= -DBLA_PKGCONFIG_BLAS=${BLAS_PC}
-#CMAKE_CONFIGURE_ARGS+= -DBLA_PKGCONFIG_LAPACK=${LAPACK_PC}
-#CMAKE_CONFIGURE_ARGS+= -DBLA_PKGCONFIG_CBLAS=${CBLAS_PC}
-#CMAKE_CONFIGURE_ARGS+= -DBLA_PKGCONFIG_LAPACKE=${LAPACKE_PC}
-#CMAKE_CONFIGURE_ARGS+= -DOPENCV_SKIP_LAPACK_EXTERN_C=ON
-
-CMAKE_CONFIGURE_ARGS.SunOS+= -DENABLE_PRECOMPILED_HEADERS=OFF
-CMAKE_CONFIGURE_ARGS.SunOS+= -DOPENCV_PYTHON_SKIP_LINKER_EXCLUDE_LIBS=ON
-
-BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--as-needed
-BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--gc-sections
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${MACHINE_ARCH} == "i386"
-# Disable SSE/SSE2 to avoid build errors from missing _mm_pause.
-CMAKE_CONFIGURE_ARGS+= -DCPU_BASELINE=""
-.endif
-
-.include "../../mk/atomic64.mk"
-.include "../../lang/python/pyversion.mk"
-.include "../../devel/cmake/build.mk"
diff --git a/opencv/PLIST b/opencv/PLIST
deleted file mode 100644
index 8aa89aefee..0000000000
--- a/opencv/PLIST
+++ /dev/null
@@ -1,364 +0,0 @@
-@comment $NetBSD$
-bin/opencv_annotation
-bin/opencv_interactive-calibration
-bin/opencv_model_diagnostics
-bin/opencv_version
-bin/opencv_visualisation
-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/dnn.hpp
-include/opencv4/opencv2/dnn/all_layers.hpp
-include/opencv4/opencv2/dnn/dict.hpp
-include/opencv4/opencv2/dnn/dnn.hpp
-include/opencv4/opencv2/dnn/dnn.inl.hpp
-include/opencv4/opencv2/dnn/layer.details.hpp
-include/opencv4/opencv2/dnn/layer.hpp
-include/opencv4/opencv2/dnn/shape_utils.hpp
-include/opencv4/opencv2/dnn/utils/debug_utils.hpp
-include/opencv4/opencv2/dnn/utils/inference_engine.hpp
-include/opencv4/opencv2/dnn/version.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/highgui.hpp
-include/opencv4/opencv2/highgui/highgui.hpp
-include/opencv4/opencv2/highgui/highgui_c.h
-include/opencv4/opencv2/imgcodecs.hpp
-include/opencv4/opencv2/imgcodecs/imgcodecs.hpp
-include/opencv4/opencv2/imgcodecs/imgcodecs_c.h
-include/opencv4/opencv2/imgcodecs/ios.h
-include/opencv4/opencv2/imgcodecs/legacy/constants_c.h
-include/opencv4/opencv2/imgcodecs/macosx.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/ml.hpp
-include/opencv4/opencv2/ml/ml.hpp
-include/opencv4/opencv2/ml/ml.inl.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/stitching.hpp
-include/opencv4/opencv2/stitching/detail/autocalib.hpp
-include/opencv4/opencv2/stitching/detail/blenders.hpp
-include/opencv4/opencv2/stitching/detail/camera.hpp
-include/opencv4/opencv2/stitching/detail/exposure_compensate.hpp
-include/opencv4/opencv2/stitching/detail/matchers.hpp
-include/opencv4/opencv2/stitching/detail/motion_estimators.hpp
-include/opencv4/opencv2/stitching/detail/seam_finders.hpp
-include/opencv4/opencv2/stitching/detail/timelapsers.hpp
-include/opencv4/opencv2/stitching/detail/util.hpp
-include/opencv4/opencv2/stitching/detail/util_inl.hpp
-include/opencv4/opencv2/stitching/detail/warpers.hpp
-include/opencv4/opencv2/stitching/detail/warpers_inl.hpp
-include/opencv4/opencv2/stitching/warpers.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
-include/opencv4/opencv2/videoio.hpp
-include/opencv4/opencv2/videoio/legacy/constants_c.h
-include/opencv4/opencv2/videoio/registry.hpp
-include/opencv4/opencv2/videoio/videoio.hpp
-include/opencv4/opencv2/videoio/videoio_c.h
-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_dnn.so
-lib/libopencv_dnn.so.${PKGVERSION}
-lib/libopencv_dnn.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_highgui.so
-lib/libopencv_highgui.so.${PKGVERSION}
-lib/libopencv_highgui.so.411
-lib/libopencv_imgcodecs.so
-lib/libopencv_imgcodecs.so.${PKGVERSION}
-lib/libopencv_imgcodecs.so.411
-lib/libopencv_imgproc.so
-lib/libopencv_imgproc.so.${PKGVERSION}
-lib/libopencv_imgproc.so.411
-lib/libopencv_ml.so
-lib/libopencv_ml.so.${PKGVERSION}
-lib/libopencv_ml.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_stitching.so
-lib/libopencv_stitching.so.${PKGVERSION}
-lib/libopencv_stitching.so.411
-lib/libopencv_video.so
-lib/libopencv_video.so.${PKGVERSION}
-lib/libopencv_video.so.411
-lib/libopencv_videoio.so
-lib/libopencv_videoio.so.${PKGVERSION}
-lib/libopencv_videoio.so.411
-${PYSITELIB}/cv2/Error/__init__.pyi
-${PYSITELIB}/cv2/__init__.py
-${PYSITELIB}/cv2/__init__.pyi
-${PYSITELIB}/cv2/aruco/__init__.pyi
-${PYSITELIB}/cv2/barcode/__init__.pyi
-${PYSITELIB}/cv2/config-3.13.py
-${PYSITELIB}/cv2/config.py
-${PYSITELIB}/cv2/cuda/__init__.pyi
-${PYSITELIB}/cv2/detail/__init__.pyi
-${PYSITELIB}/cv2/dnn/__init__.pyi
-${PYSITELIB}/cv2/fisheye/__init__.pyi
-${PYSITELIB}/cv2/flann/__init__.pyi
-${PYSITELIB}/cv2/ipp/__init__.pyi
-${PYSITELIB}/cv2/load_config_py2.py
-${PYSITELIB}/cv2/load_config_py3.py
-${PYSITELIB}/cv2/mat_wrapper/__init__.py
-${PYSITELIB}/cv2/misc/__init__.py
-${PYSITELIB}/cv2/misc/version.py
-${PYSITELIB}/cv2/ml/__init__.pyi
-${PYSITELIB}/cv2/ocl/__init__.pyi
-${PYSITELIB}/cv2/ogl/__init__.pyi
-${PYSITELIB}/cv2/parallel/__init__.pyi
-${PYSITELIB}/cv2/py.typed
-${PYSITELIB}/cv2/python-3.13/cv2.so
-${PYSITELIB}/cv2/samples/__init__.pyi
-${PYSITELIB}/cv2/segmentation/__init__.pyi
-${PYSITELIB}/cv2/typing/__init__.py
-${PYSITELIB}/cv2/utils/__init__.py
-${PYSITELIB}/cv2/utils/__init__.pyi
-${PYSITELIB}/cv2/utils/fs/__init__.pyi
-${PYSITELIB}/cv2/utils/nested/__init__.pyi
-${PYSITELIB}/cv2/videoio_registry/__init__.pyi
-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/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/mscr-chi_table_LICENSE.txt
-share/opencv4/licenses/opencl-headers-LICENSE.txt
-share/opencv4/valgrind.supp
-share/opencv4/valgrind_3rdparty.supp
diff --git a/opencv/buildlink3.mk b/opencv/buildlink3.mk
deleted file mode 100644
index e031627065..0000000000
--- a/opencv/buildlink3.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.16 2023/01/03 17:36:26 wiz Exp $
-
-BUILDLINK_TREE+= opencv
-
-.if !defined(OPENCV_BUILDLINK3_MK)
-OPENCV_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.opencv+= opencv>=3.0.0
-BUILDLINK_ABI_DEPENDS.opencv+= opencv>=4
-BUILDLINK_PKGSRCDIR.opencv?= ../../wip/opencv
-
-BUILDLINK_INCDIRS.opencv+= include/opencv4
-
-pkgbase := opencv
-.include "../../mk/pkg-build-options.mk"
-
-.include "../../devel/protobuf/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/openjpeg/buildlink3.mk"
-.if ${PKG_BUILD_OPTIONS.opencv:Mjasper}
-. include "../../graphics/jasper/buildlink3.mk"
-.endif
-.include "../../graphics/libavif/buildlink3.mk"
-.include "../../graphics/libwebp/buildlink3.mk"
-.include "../../graphics/openexr/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/tiff/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-.endif # OPENCV_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -opencv
diff --git a/opencv/distinfo b/opencv/distinfo
deleted file mode 100644
index 19522f0f9c..0000000000
--- a/opencv/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.57 2021/10/26 10:46:34 nia 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
-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
diff --git a/opencv/options.mk b/opencv/options.mk
deleted file mode 100644
index 964ea167a3..0000000000
--- a/opencv/options.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-# $NetBSD: options.mk,v 1.13 2020/08/03 23:02:18 joerg Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.opencv
-PKG_SUPPORTED_OPTIONS= ffmpeg jasper
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} != "Darwin"
-PKG_SUPPORTED_OPTIONS+= gtk
-PKG_SUGGESTED_OPTIONS+= gtk
-.endif
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mffmpeg)
-CMAKE_CONFIGURE_ARGS+= -DWITH_FFMPEG=ON
-CMAKE_CONFIGURE_ARGS+= -DFFMPEG_INCLUDE_DIR=${PREFIX}/include/ffmpeg4
-CMAKE_CONFIGURE_ARGS+= -DFFMPEG_LIB_DIR=${PREFIX}/lib/ffmpeg4
-.include "../../multimedia/ffmpeg4/buildlink3.mk"
-.else
-CMAKE_CONFIGURE_ARGS+= -DWITH_FFMPEG=OFF
-.endif
-
-.if !empty(PKG_OPTIONS:Mjasper)
-CMAKE_CONFIGURE_ARGS+= -DWITH_JASPER=ON
-# jasper uses SIZE_MAX and friends in its headers.
-CXXFLAGS+= -D__STDC_LIMIT_MACROS
-.include "../../graphics/jasper/buildlink3.mk"
-.else
-CMAKE_CONFIGURE_ARGS+= -DWITH_JASPER=OFF
-.endif
-
-.if !empty(PKG_OPTIONS:Mgtk)
-CMAKE_CONFIGURE_ARGS+= -DWITH_GTK=ON
-.include "../../x11/gtk3/buildlink3.mk"
-.else
-CMAKE_CONFIGURE_ARGS+= -DWITH_GTK=OFF
-.endif
-
-# FIXME: should be option.mk'ed instead
-CMAKE_CONFIGURE_ARGS+= -DBUILD_DOCS=OFF
diff --git a/opencv/patches/patch-3rdparty_ippicv_ippicv.cmake b/opencv/patches/patch-3rdparty_ippicv_ippicv.cmake
deleted file mode 100644
index 84a271c481..0000000000
--- a/opencv/patches/patch-3rdparty_ippicv_ippicv.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-3rdparty_ippicv_ippicv.cmake,v 1.1 2017/09/04 15:23:49 fhajny 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
diff --git a/opencv/patches/patch-modules_core_src_downhill__simplex.cpp b/opencv/patches/patch-modules_core_src_downhill__simplex.cpp
deleted file mode 100644
index 8363598853..0000000000
--- a/opencv/patches/patch-modules_core_src_downhill__simplex.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-modules_core_src_downhill__simplex.cpp,v 1.1 2015/10/08 17:45:59 fhajny 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,
diff --git a/opencv/patches/patch-modules_flann_include_opencv2_flann_defines.h b/opencv/patches/patch-modules_flann_include_opencv2_flann_defines.h
deleted file mode 100644
index af6cf08a69..0000000000
--- a/opencv/patches/patch-modules_flann_include_opencv2_flann_defines.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-modules_flann_include_opencv2_flann_defines.h,v 1.1 2013/06/12 10:13:58 jperkin 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]))
diff --git a/opencv/patches/patch-modules_imgproc_src_resize.cpp b/opencv/patches/patch-modules_imgproc_src_resize.cpp
deleted file mode 100644
index e6923f72d3..0000000000
--- a/opencv/patches/patch-modules_imgproc_src_resize.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-modules_imgproc_src_resize.cpp,v 1.1 2020/08/08 22:40:59 joerg 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 <>
diff --git a/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp b/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp
deleted file mode 100644
index 9aacd58289..0000000000
--- a/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-$NetBSD: patch-modules_videoio_src_cap__v4l.cpp,v 1.9 2021/10/16 07:16:29 adam 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