[PR PATCH] opencv upgrade to 4.11

Github messages for voidlinux
 help / color / mirror / Atom feed

* [PR PATCH] opencv upgrade to 4.11
@ 2025-04-12 17:30 BeefcakeTheMighty
  2025-04-12 17:32 ` [PR REVIEW] " classabbyamp
                   ` (15 more replies)
  0 siblings, 16 replies; 17+ messages in thread
From: BeefcakeTheMighty @ 2025-04-12 17:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1116 bytes --]

There is a new pull request by BeefcakeTheMighty against master on the void-packages repository

https://github.com/BeefcakeTheMighty/void-packages btm_opencv
https://github.com/void-linux/void-packages/pull/55041

opencv upgrade to 4.11
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: YES

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)




A patch file from https://github.com/void-linux/void-packages/pull/55041.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-btm_opencv-55041.patch --]
[-- Type: text/x-diff, Size: 8427 bytes --]

From e302a4896dbca0f1b25c0e4ad59a3028824c58cd Mon Sep 17 00:00:00 2001
From: wbailey <wilsonrandallbailey@gmail.com>
Date: Sat, 12 Apr 2025 05:09:51 -0500
Subject: [PATCH] opencv: update to 4.11.0.

---
 common/shlibs                           | 104 ++++++++++++------------
 srcpkgs/opencv/patches/python3.12.patch |  23 ------
 srcpkgs/opencv/template                 |  10 +--
 3 files changed, 57 insertions(+), 80 deletions(-)
 delete mode 100644 srcpkgs/opencv/patches/python3.12.patch

diff --git a/common/shlibs b/common/shlibs
index 7a9666a23ed309..7fc7cea6fd4204 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2192,58 +2192,58 @@ libcapstone.so.5 capstone-5.0.1_1
 libhavege.so.2 libhaveged-1.9.11_1
 libnih.so.1 libnih-1.0.3_1
 libnih-dbus.so.1 libnih-1.0.3_1
-libopencv_quality.so.407 libopencv-4.7.0_1
-libopencv_reg.so.407 libopencv-4.7.0_1
-libopencv_surface_matching.so.407 libopencv-4.7.0_1
-libopencv_xphoto.so.407 libopencv-4.7.0_1
-libopencv_freetype.so.407 libopencv-4.7.0_1
-libopencv_fuzzy.so.407 libopencv-4.7.0_1
-libopencv_hfs.so.407 libopencv-4.7.0_1
-libopencv_img_hash.so.407 libopencv-4.7.0_1
-libopencv_line_descriptor.so.407 libopencv-4.7.0_1
-libopencv_saliency.so.407 libopencv-4.7.0_1
-libopencv_structured_light.so.407 libopencv-4.7.0_1
-libopencv_aruco.so.407 libopencv-4.7.0_1
-libopencv_bgsegm.so.407 libopencv-4.4.7_1
-libopencv_bioinspired.so.407 libopencv-4.7.0_1
-libopencv_ccalib.so.407 libopencv-4.4.7_1
-libopencv_face.so.407 libopencv-4.7.0_1
-libopencv_tracking.so.407 libopencv-4.7.0_1
-libopencv_xfeatures2d.so.407 libopencv-4.7.0_1
-libopencv_optflow.so.407 libopencv-4.4.7_1
-libopencv_ximgproc.so.407 libopencv-4.7.0_1
-libopencv_plot.so.407 libopencv-4.7.0_1
-libopencv_text.so.407 libopencv-4.7.0_1
-libopencv_ml.so.407 libopencv-4.4.7_1
-libopencv_objdetect.so.407 libopencv-4.7.0_1
-libopencv_dnn.so.407 libopencv-4.7.0_1
-libopencv_shape.so.407 libopencv-4.7.0_1
-libopencv_stitching.so.407 libopencv-4.7.0_1
-libopencv_photo.so.407 libopencv-4.7.0_1
-libopencv_video.so.407 libopencv-4.7.0_1
-libopencv_calib3d.so.407 libopencv-4.7.0_1
-libopencv_features2d.so.407 libopencv-4.7.0_1
-libopencv_flann.so.407 libopencv-4.7.0_1
-libopencv_highgui.so.407 libopencv-4.7.0_1
-libopencv_videoio.so.407 libopencv-4.7.0_1
-libopencv_imgcodecs.so.407 libopencv-4.7.0_1
-libopencv_imgproc.so.407 libopencv-4.7.0_1
-libopencv_core.so.407 libopencv-4.7.0_1
-libopencv_superres.so.407 libopencv-4.7.0_1
-libopencv_videostab.so.407 libopencv-4.7.0_1
-libopencv_gapi.so.407 libopencv-4.7.0_1
-libopencv_xobjdetect.so.407 libopencv-4.7.0_1
-libopencv_datasets.so.407 libopencv-4.7.0_1
-libopencv_dnn_objdetect.so.407 libopencv-4.7.0_1
-libopencv_dnn_superres.so.407 libopencv-4.7.0_1
-libopencv_dpm.so.407 libopencv-4.7.0_1
-libopencv_phase_unwrapping.so.407 libopencv-4.7.0_1
-libopencv_stereo.so.407 libopencv-4.7.0_1
-libopencv_rapid.so.407 libopencv-4.7.0_1
-libopencv_intensity_transform.so.407 libopencv-4.7.0_1
-libopencv_alphamat.so.407 libopencv-4.7.0_1
-libopencv_barcode.so.407 libopencv-4.7.0_1
-libopencv_mcc.so.407 libopencv-4.7.0_1
+libopencv_quality.so.411 libopencv-4.11.0_1
+libopencv_reg.so.411 libopencv-4.11.0_1
+libopencv_surface_matching.so.411 libopencv-4.11.0_1
+libopencv_xphoto.so.411 libopencv-4.11.0_1
+libopencv_freetype.so.411 libopencv-4.11.0_1
+libopencv_fuzzy.so.411 libopencv-4.11.0_1
+libopencv_hfs.so.411 libopencv-4.11.0_1
+libopencv_img_hash.so.411 libopencv-4.11.0_1
+libopencv_line_descriptor.so.411 libopencv-4.11.0_1
+libopencv_saliency.so.411 libopencv-4.11.0_1
+libopencv_structured_light.so.411 libopencv-4.11.0_1
+libopencv_aruco.so.411 libopencv-4.11.0_1
+libopencv_bgsegm.so.411 libopencv-4.11.0_1
+libopencv_bioinspired.so.411 libopencv-4.11.0_1
+libopencv_ccalib.so.411 libopencv-4.11.0_1
+libopencv_face.so.411 libopencv-4.11.0_1
+libopencv_tracking.so.411 libopencv-4.11.0_1
+libopencv_xfeatures2d.so.411 libopencv-4.11.0_1
+libopencv_optflow.so.411 libopencv-4.4.7_1
+libopencv_ximgproc.so.411 libopencv-4.11.0_1
+libopencv_plot.so.411 libopencv-4.11.0_1
+libopencv_text.so.411 libopencv-4.11.0_1
+libopencv_ml.so.411 libopencv-4.4.7_1
+libopencv_objdetect.so.411 libopencv-4.11.0_1
+libopencv_dnn.so.411 libopencv-4.11.0_1
+libopencv_shape.so.411 libopencv-4.11.0_1
+libopencv_stitching.so.411 libopencv-4.11.0_1
+libopencv_photo.so.411 libopencv-4.11.0_1
+libopencv_video.so.411 libopencv-4.11.0_1
+libopencv_calib3d.so.411 libopencv-4.11.0_1
+libopencv_features2d.so.411 libopencv-4.11.0_1
+libopencv_flann.so.411 libopencv-4.11.0_1
+libopencv_highgui.so.411 libopencv-4.11.0_1
+libopencv_videoio.so.411 libopencv-4.11.0_1
+libopencv_imgcodecs.so.411 libopencv-4.11.0_1
+libopencv_imgproc.so.411 libopencv-4.11.0_1
+libopencv_core.so.411 libopencv-4.11.0_1
+libopencv_superres.so.411 libopencv-4.11.0_1
+libopencv_videostab.so.411 libopencv-4.11.0_1
+libopencv_gapi.so.411 libopencv-4.11.0_1
+libopencv_xobjdetect.so.411 libopencv-4.11.0_1
+libopencv_datasets.so.411 libopencv-4.11.0_1
+libopencv_dnn_objdetect.so.411 libopencv-4.11.0_1
+libopencv_dnn_superres.so.411 libopencv-4.11.0_1
+libopencv_dpm.so.411 libopencv-4.11.0_1
+libopencv_phase_unwrapping.so.411 libopencv-4.11.0_1
+libopencv_stereo.so.411 libopencv-4.11.0_1
+libopencv_rapid.so.411 libopencv-4.11.0_1
+libopencv_intensity_transform.so.411 libopencv-4.11.0_1
+libopencv_alphamat.so.411 libopencv-4.11.0_1
+libopencv_barcode.so.411 libopencv-4.11.0_1
+libopencv_mcc.so.411 libopencv-4.11.0_1
 libuniconf.so.4.6 wvstreams-4.6.1_20
 libwvbase.so.4.6 wvstreams-4.6.1_20
 libwvutils.so.4.6 wvstreams-4.6.1_20
diff --git a/srcpkgs/opencv/patches/python3.12.patch b/srcpkgs/opencv/patches/python3.12.patch
deleted file mode 100644
index 71d0d55565b3a7..00000000000000
--- a/srcpkgs/opencv/patches/python3.12.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 00ca8f455e6a5588d905e3a0b268f18ee3fda5dd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
-Date: Sun, 1 Oct 2023 16:12:25 +0100
-Subject: [PATCH] `numpy.distutils` is removed in numpy 1.26 on Python 3.12.
-
-so we don't use numpy.distutils to get includes dirs of python-numpy
----
- cmake/OpenCVDetectPython.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/OpenCVDetectPython.cmake b/cmake/OpenCVDetectPython.cmake
-index 88a434185622..d4098ce8e60d 100644
---- a/cmake/OpenCVDetectPython.cmake
-+++ b/cmake/OpenCVDetectPython.cmake
-@@ -216,7 +216,7 @@ if(NOT ${found})
-           message(STATUS "  PYTHON3_NUMPY_INCLUDE_DIRS")
-         else()
-           # Attempt to discover the NumPy include directory. If this succeeds, then build python API with NumPy
--          execute_process(COMMAND "${_executable}" -c "import os; os.environ['DISTUTILS_USE_SDK']='1'; import numpy.distutils; print(os.pathsep.join(numpy.distutils.misc_util.get_numpy_include_dirs()))"
-+          execute_process(COMMAND "${_executable}" -c "import numpy; print(numpy.get_include())"
-                           RESULT_VARIABLE _numpy_process
-                           OUTPUT_VARIABLE _numpy_include_dirs
-                           OUTPUT_STRIP_TRAILING_WHITESPACE)
diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 66c110edd20847..f4caee7bf6fa99 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
-version=4.7.0
-revision=4
+version=4.11.0
+revision=1
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake
@@ -19,13 +19,13 @@ makedepends="ffmpeg6-devel libpng-devel libjpeg-turbo-devel tiff-devel
  python3-numpy python3-devel"
 short_desc="Computer vision and machine learning software library"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
+license="Apache-2.0"
 homepage="https://opencv.org"
 changelog="https://github.com/opencv/opencv/wiki/ChangeLog"
 distfiles="https://github.com/opencv/opencv/archive/${version}.tar.gz
  https://github.com/opencv/opencv_contrib/archive/${version}.tar.gz>contrib.tar.gz"
-checksum="8df0079cdbe179748a18d44731af62a245a45ebf5085223dc03133954c662973
- 42df840cf9055e59d0e22c249cfb19f04743e1bdad113d31b1573d3934d62584"
+checksum="9a7c11f924eff5f8d8070e297b322ee68b9227e003fd600d4b8122198091665f
+ 2dfc5957201de2aa785064711125af6abb2e80a64e2dc246aca4119b19687041"
 patch_args="-Np1 -d ${build_wrksrc}"
 # tests hang indenfinitely, even with test data included
 make_check=no

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR REVIEW] opencv upgrade to 4.11
  2025-04-12 17:30 [PR PATCH] opencv upgrade to 4.11 BeefcakeTheMighty
@ 2025-04-12 17:32 ` classabbyamp
  2025-04-12 17:32 ` classabbyamp
                   ` (14 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: classabbyamp @ 2025-04-12 17:32 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 245 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/55041#discussion_r2040704424

Comment:
all packages that use these libraries must be rebuild. use `xrevshlib opencv` to find a list

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR REVIEW] opencv upgrade to 4.11
  2025-04-12 17:30 [PR PATCH] opencv upgrade to 4.11 BeefcakeTheMighty
  2025-04-12 17:32 ` [PR REVIEW] " classabbyamp
@ 2025-04-12 17:32 ` classabbyamp
  2025-04-12 17:42 ` BeefcakeTheMighty
                   ` (13 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: classabbyamp @ 2025-04-12 17:32 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 241 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/55041#discussion_r2040704475

Comment:
```suggestion
changelog="https://github.com/opencv/opencv/wiki/OpenCV-Change-Logs"
```

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR REVIEW] opencv upgrade to 4.11
  2025-04-12 17:30 [PR PATCH] opencv upgrade to 4.11 BeefcakeTheMighty
  2025-04-12 17:32 ` [PR REVIEW] " classabbyamp
  2025-04-12 17:32 ` classabbyamp
@ 2025-04-12 17:42 ` BeefcakeTheMighty
  2025-04-12 17:44 ` classabbyamp
                   ` (12 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: BeefcakeTheMighty @ 2025-04-12 17:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 331 bytes --]

New review comment by BeefcakeTheMighty on void-packages repository

https://github.com/void-linux/void-packages/pull/55041#discussion_r2040707141

Comment:
I'm sorry - this is my first time trying to contribute. Are you saying that I'll need to submit updates and pull requests for all the packages listed by `xrevshlib opencv`? 

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR REVIEW] opencv upgrade to 4.11
  2025-04-12 17:30 [PR PATCH] opencv upgrade to 4.11 BeefcakeTheMighty
                   ` (2 preceding siblings ...)
  2025-04-12 17:42 ` BeefcakeTheMighty
@ 2025-04-12 17:44 ` classabbyamp
  2025-04-12 17:45 ` BeefcakeTheMighty
                   ` (11 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: classabbyamp @ 2025-04-12 17:44 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 301 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/55041#discussion_r2040707439

Comment:
add a commit for each package, incrementing the revision. you could automate it with `xrevshlib opencv | xargs xrevbump "rebuild for opencv-4.11.0"`

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR REVIEW] opencv upgrade to 4.11
  2025-04-12 17:30 [PR PATCH] opencv upgrade to 4.11 BeefcakeTheMighty
                   ` (3 preceding siblings ...)
  2025-04-12 17:44 ` classabbyamp
@ 2025-04-12 17:45 ` BeefcakeTheMighty
  2025-04-12 23:07 ` [PR PATCH] [Updated] " BeefcakeTheMighty
                   ` (10 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: BeefcakeTheMighty @ 2025-04-12 17:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 177 bytes --]

New review comment by BeefcakeTheMighty on void-packages repository

https://github.com/void-linux/void-packages/pull/55041#discussion_r2040707662

Comment:
Awesome! Thank you!

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] opencv upgrade to 4.11
  2025-04-12 17:30 [PR PATCH] opencv upgrade to 4.11 BeefcakeTheMighty
                   ` (4 preceding siblings ...)
  2025-04-12 17:45 ` BeefcakeTheMighty
@ 2025-04-12 23:07 ` BeefcakeTheMighty
  2025-04-12 23:45 ` BeefcakeTheMighty
                   ` (9 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: BeefcakeTheMighty @ 2025-04-12 23:07 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1121 bytes --]

There is an updated pull request by BeefcakeTheMighty against master on the void-packages repository

https://github.com/BeefcakeTheMighty/void-packages btm_opencv
https://github.com/void-linux/void-packages/pull/55041

opencv upgrade to 4.11
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: YES

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)




A patch file from https://github.com/void-linux/void-packages/pull/55041.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-btm_opencv-55041.patch --]
[-- Type: text/x-diff, Size: 35784 bytes --]

From e302a4896dbca0f1b25c0e4ad59a3028824c58cd Mon Sep 17 00:00:00 2001
From: wbailey <wilsonrandallbailey@gmail.com>
Date: Sat, 12 Apr 2025 05:09:51 -0500
Subject: [PATCH 01/13] opencv: update to 4.11.0.

---
 common/shlibs                           | 104 ++++++++++++------------
 srcpkgs/opencv/patches/python3.12.patch |  23 ------
 srcpkgs/opencv/template                 |  10 +--
 3 files changed, 57 insertions(+), 80 deletions(-)
 delete mode 100644 srcpkgs/opencv/patches/python3.12.patch

diff --git a/common/shlibs b/common/shlibs
index 7a9666a23ed309..7fc7cea6fd4204 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2192,58 +2192,58 @@ libcapstone.so.5 capstone-5.0.1_1
 libhavege.so.2 libhaveged-1.9.11_1
 libnih.so.1 libnih-1.0.3_1
 libnih-dbus.so.1 libnih-1.0.3_1
-libopencv_quality.so.407 libopencv-4.7.0_1
-libopencv_reg.so.407 libopencv-4.7.0_1
-libopencv_surface_matching.so.407 libopencv-4.7.0_1
-libopencv_xphoto.so.407 libopencv-4.7.0_1
-libopencv_freetype.so.407 libopencv-4.7.0_1
-libopencv_fuzzy.so.407 libopencv-4.7.0_1
-libopencv_hfs.so.407 libopencv-4.7.0_1
-libopencv_img_hash.so.407 libopencv-4.7.0_1
-libopencv_line_descriptor.so.407 libopencv-4.7.0_1
-libopencv_saliency.so.407 libopencv-4.7.0_1
-libopencv_structured_light.so.407 libopencv-4.7.0_1
-libopencv_aruco.so.407 libopencv-4.7.0_1
-libopencv_bgsegm.so.407 libopencv-4.4.7_1
-libopencv_bioinspired.so.407 libopencv-4.7.0_1
-libopencv_ccalib.so.407 libopencv-4.4.7_1
-libopencv_face.so.407 libopencv-4.7.0_1
-libopencv_tracking.so.407 libopencv-4.7.0_1
-libopencv_xfeatures2d.so.407 libopencv-4.7.0_1
-libopencv_optflow.so.407 libopencv-4.4.7_1
-libopencv_ximgproc.so.407 libopencv-4.7.0_1
-libopencv_plot.so.407 libopencv-4.7.0_1
-libopencv_text.so.407 libopencv-4.7.0_1
-libopencv_ml.so.407 libopencv-4.4.7_1
-libopencv_objdetect.so.407 libopencv-4.7.0_1
-libopencv_dnn.so.407 libopencv-4.7.0_1
-libopencv_shape.so.407 libopencv-4.7.0_1
-libopencv_stitching.so.407 libopencv-4.7.0_1
-libopencv_photo.so.407 libopencv-4.7.0_1
-libopencv_video.so.407 libopencv-4.7.0_1
-libopencv_calib3d.so.407 libopencv-4.7.0_1
-libopencv_features2d.so.407 libopencv-4.7.0_1
-libopencv_flann.so.407 libopencv-4.7.0_1
-libopencv_highgui.so.407 libopencv-4.7.0_1
-libopencv_videoio.so.407 libopencv-4.7.0_1
-libopencv_imgcodecs.so.407 libopencv-4.7.0_1
-libopencv_imgproc.so.407 libopencv-4.7.0_1
-libopencv_core.so.407 libopencv-4.7.0_1
-libopencv_superres.so.407 libopencv-4.7.0_1
-libopencv_videostab.so.407 libopencv-4.7.0_1
-libopencv_gapi.so.407 libopencv-4.7.0_1
-libopencv_xobjdetect.so.407 libopencv-4.7.0_1
-libopencv_datasets.so.407 libopencv-4.7.0_1
-libopencv_dnn_objdetect.so.407 libopencv-4.7.0_1
-libopencv_dnn_superres.so.407 libopencv-4.7.0_1
-libopencv_dpm.so.407 libopencv-4.7.0_1
-libopencv_phase_unwrapping.so.407 libopencv-4.7.0_1
-libopencv_stereo.so.407 libopencv-4.7.0_1
-libopencv_rapid.so.407 libopencv-4.7.0_1
-libopencv_intensity_transform.so.407 libopencv-4.7.0_1
-libopencv_alphamat.so.407 libopencv-4.7.0_1
-libopencv_barcode.so.407 libopencv-4.7.0_1
-libopencv_mcc.so.407 libopencv-4.7.0_1
+libopencv_quality.so.411 libopencv-4.11.0_1
+libopencv_reg.so.411 libopencv-4.11.0_1
+libopencv_surface_matching.so.411 libopencv-4.11.0_1
+libopencv_xphoto.so.411 libopencv-4.11.0_1
+libopencv_freetype.so.411 libopencv-4.11.0_1
+libopencv_fuzzy.so.411 libopencv-4.11.0_1
+libopencv_hfs.so.411 libopencv-4.11.0_1
+libopencv_img_hash.so.411 libopencv-4.11.0_1
+libopencv_line_descriptor.so.411 libopencv-4.11.0_1
+libopencv_saliency.so.411 libopencv-4.11.0_1
+libopencv_structured_light.so.411 libopencv-4.11.0_1
+libopencv_aruco.so.411 libopencv-4.11.0_1
+libopencv_bgsegm.so.411 libopencv-4.11.0_1
+libopencv_bioinspired.so.411 libopencv-4.11.0_1
+libopencv_ccalib.so.411 libopencv-4.11.0_1
+libopencv_face.so.411 libopencv-4.11.0_1
+libopencv_tracking.so.411 libopencv-4.11.0_1
+libopencv_xfeatures2d.so.411 libopencv-4.11.0_1
+libopencv_optflow.so.411 libopencv-4.4.7_1
+libopencv_ximgproc.so.411 libopencv-4.11.0_1
+libopencv_plot.so.411 libopencv-4.11.0_1
+libopencv_text.so.411 libopencv-4.11.0_1
+libopencv_ml.so.411 libopencv-4.4.7_1
+libopencv_objdetect.so.411 libopencv-4.11.0_1
+libopencv_dnn.so.411 libopencv-4.11.0_1
+libopencv_shape.so.411 libopencv-4.11.0_1
+libopencv_stitching.so.411 libopencv-4.11.0_1
+libopencv_photo.so.411 libopencv-4.11.0_1
+libopencv_video.so.411 libopencv-4.11.0_1
+libopencv_calib3d.so.411 libopencv-4.11.0_1
+libopencv_features2d.so.411 libopencv-4.11.0_1
+libopencv_flann.so.411 libopencv-4.11.0_1
+libopencv_highgui.so.411 libopencv-4.11.0_1
+libopencv_videoio.so.411 libopencv-4.11.0_1
+libopencv_imgcodecs.so.411 libopencv-4.11.0_1
+libopencv_imgproc.so.411 libopencv-4.11.0_1
+libopencv_core.so.411 libopencv-4.11.0_1
+libopencv_superres.so.411 libopencv-4.11.0_1
+libopencv_videostab.so.411 libopencv-4.11.0_1
+libopencv_gapi.so.411 libopencv-4.11.0_1
+libopencv_xobjdetect.so.411 libopencv-4.11.0_1
+libopencv_datasets.so.411 libopencv-4.11.0_1
+libopencv_dnn_objdetect.so.411 libopencv-4.11.0_1
+libopencv_dnn_superres.so.411 libopencv-4.11.0_1
+libopencv_dpm.so.411 libopencv-4.11.0_1
+libopencv_phase_unwrapping.so.411 libopencv-4.11.0_1
+libopencv_stereo.so.411 libopencv-4.11.0_1
+libopencv_rapid.so.411 libopencv-4.11.0_1
+libopencv_intensity_transform.so.411 libopencv-4.11.0_1
+libopencv_alphamat.so.411 libopencv-4.11.0_1
+libopencv_barcode.so.411 libopencv-4.11.0_1
+libopencv_mcc.so.411 libopencv-4.11.0_1
 libuniconf.so.4.6 wvstreams-4.6.1_20
 libwvbase.so.4.6 wvstreams-4.6.1_20
 libwvutils.so.4.6 wvstreams-4.6.1_20
diff --git a/srcpkgs/opencv/patches/python3.12.patch b/srcpkgs/opencv/patches/python3.12.patch
deleted file mode 100644
index 71d0d55565b3a7..00000000000000
--- a/srcpkgs/opencv/patches/python3.12.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 00ca8f455e6a5588d905e3a0b268f18ee3fda5dd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
-Date: Sun, 1 Oct 2023 16:12:25 +0100
-Subject: [PATCH] `numpy.distutils` is removed in numpy 1.26 on Python 3.12.
-
-so we don't use numpy.distutils to get includes dirs of python-numpy
----
- cmake/OpenCVDetectPython.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/OpenCVDetectPython.cmake b/cmake/OpenCVDetectPython.cmake
-index 88a434185622..d4098ce8e60d 100644
---- a/cmake/OpenCVDetectPython.cmake
-+++ b/cmake/OpenCVDetectPython.cmake
-@@ -216,7 +216,7 @@ if(NOT ${found})
-           message(STATUS "  PYTHON3_NUMPY_INCLUDE_DIRS")
-         else()
-           # Attempt to discover the NumPy include directory. If this succeeds, then build python API with NumPy
--          execute_process(COMMAND "${_executable}" -c "import os; os.environ['DISTUTILS_USE_SDK']='1'; import numpy.distutils; print(os.pathsep.join(numpy.distutils.misc_util.get_numpy_include_dirs()))"
-+          execute_process(COMMAND "${_executable}" -c "import numpy; print(numpy.get_include())"
-                           RESULT_VARIABLE _numpy_process
-                           OUTPUT_VARIABLE _numpy_include_dirs
-                           OUTPUT_STRIP_TRAILING_WHITESPACE)
diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 66c110edd20847..f4caee7bf6fa99 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
-version=4.7.0
-revision=4
+version=4.11.0
+revision=1
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake
@@ -19,13 +19,13 @@ makedepends="ffmpeg6-devel libpng-devel libjpeg-turbo-devel tiff-devel
  python3-numpy python3-devel"
 short_desc="Computer vision and machine learning software library"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
+license="Apache-2.0"
 homepage="https://opencv.org"
 changelog="https://github.com/opencv/opencv/wiki/ChangeLog"
 distfiles="https://github.com/opencv/opencv/archive/${version}.tar.gz
  https://github.com/opencv/opencv_contrib/archive/${version}.tar.gz>contrib.tar.gz"
-checksum="8df0079cdbe179748a18d44731af62a245a45ebf5085223dc03133954c662973
- 42df840cf9055e59d0e22c249cfb19f04743e1bdad113d31b1573d3934d62584"
+checksum="9a7c11f924eff5f8d8070e297b322ee68b9227e003fd600d4b8122198091665f
+ 2dfc5957201de2aa785064711125af6abb2e80a64e2dc246aca4119b19687041"
 patch_args="-Np1 -d ${build_wrksrc}"
 # tests hang indenfinitely, even with test data included
 make_check=no

From 8f92a19bc2389cc6b8d100c5bd82cb7a90796eef Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 2 Dec 2024 14:03:53 +0100
Subject: [PATCH 02/13] nfs-utils: update to 2.8.3

---
 srcpkgs/nfs-utils/files/nfsdcld/run           |   6 +
 .../patches/musl-fix_long_unsigned_int.patch  |  44 ++++----
 .../patches/musl-svcgssd-sysconf.patch        | 103 ------------------
 ...s-utils-2.7.1-define_macros_for_musl.patch |  38 -------
 srcpkgs/nfs-utils/template                    |   7 +-
 5 files changed, 32 insertions(+), 166 deletions(-)
 create mode 100644 srcpkgs/nfs-utils/files/nfsdcld/run
 delete mode 100644 srcpkgs/nfs-utils/patches/musl-svcgssd-sysconf.patch
 delete mode 100644 srcpkgs/nfs-utils/patches/nfs-utils-2.7.1-define_macros_for_musl.patch

diff --git a/srcpkgs/nfs-utils/files/nfsdcld/run b/srcpkgs/nfs-utils/files/nfsdcld/run
new file mode 100644
index 00000000000000..c6cf1ca474758d
--- /dev/null
+++ b/srcpkgs/nfs-utils/files/nfsdcld/run
@@ -0,0 +1,6 @@
+#!/bin/sh
+exec 2>&1
+
+[ -r ./conf ] && . ./conf
+
+exec nfsdcld ${OPTS:- --foreground}
diff --git a/srcpkgs/nfs-utils/patches/musl-fix_long_unsigned_int.patch b/srcpkgs/nfs-utils/patches/musl-fix_long_unsigned_int.patch
index 28dc1da9a34368..87900cb543c43a 100644
--- a/srcpkgs/nfs-utils/patches/musl-fix_long_unsigned_int.patch
+++ b/srcpkgs/nfs-utils/patches/musl-fix_long_unsigned_int.patch
@@ -1,5 +1,5 @@
---- a/utils/gssd/gssd.c	2024-08-20 14:30:33.000000000 +0200
-+++ b/utils/gssd/gssd.c	2024-09-08 13:01:06.098924979 +0200
+--- a/utils/gssd/gssd.c	2025-03-29 16:21:54.000000000 +0100
++++ b/utils/gssd/gssd.c	2025-03-31 22:19:59.859489111 +0200
 @@ -65,6 +65,7 @@
  #include <dirent.h>
  #include <netdb.h>
@@ -50,8 +50,8 @@
  			break;
  		}
  	}
---- a/utils/gssd/gssd_proc.c	2024-08-20 14:30:33.000000000 +0200
-+++ b/utils/gssd/gssd_proc.c	2024-09-08 13:19:02.841249423 +0200
+--- a/utils/gssd/gssd_proc.c	2025-03-29 16:21:54.000000000 +0100
++++ b/utils/gssd/gssd_proc.c	2025-03-31 22:26:32.351326749 +0200
 @@ -73,6 +73,7 @@
  #ifdef HAVE_TIRPC_GSS_SECCREATE
  #include <rpc/rpcsec_gss.h>
@@ -111,7 +111,7 @@
  #ifdef HAVE_TIRPC_GSS_SECCREATE
  	memset(&req, 0, sizeof(req));
  	req.my_cred = sec.cred;
-@@ -553,8 +554,8 @@
+@@ -567,8 +568,8 @@
  	int		err, resp = -1;
  	pthread_t tid = pthread_self();
  
@@ -122,7 +122,7 @@
  
  	*chg_err = change_identity(uid);
  	if (*chg_err) {
-@@ -602,8 +603,8 @@
+@@ -616,8 +617,8 @@
  	int	success = 0;
  	pthread_t tid = pthread_self();
  
@@ -133,7 +133,7 @@
  
  	do {
  		gssd_refresh_krb5_machine_credential(clp->servername,
-@@ -943,8 +944,8 @@
+@@ -957,8 +958,8 @@
  		free(tinfo);
  		return ret;
  	}
@@ -144,7 +144,7 @@
  
  	tinfo->tid = th;
  	pthread_mutex_lock(&active_thread_list_lock);
-@@ -1008,7 +1009,7 @@
+@@ -1022,7 +1023,7 @@
  	}
  	lbuf[lbuflen-1] = 0;
  
@@ -153,8 +153,8 @@
  		 lbuf, clp->relpath);
  
  	for (p = strtok(lbuf, " "); p; p = strtok(NULL, " ")) {
---- a/utils/gssd/krb5_util.c	2024-08-20 14:30:33.000000000 +0200
-+++ b/utils/gssd/krb5_util.c	2024-09-08 13:25:58.884113095 +0200
+--- a/utils/gssd/krb5_util.c	2025-03-29 16:21:54.000000000 +0100
++++ b/utils/gssd/krb5_util.c	2025-03-31 22:25:50.008589085 +0200
 @@ -123,6 +123,7 @@
  
  #include <sys/types.h>
@@ -163,7 +163,7 @@
  
  #include "nfslib.h"
  #include "gssd.h"
-@@ -426,8 +427,8 @@
+@@ -420,8 +421,8 @@
  	now += 300;
  	pthread_mutex_lock(&ple_lock);
  	if (ple->ccname && ple->endtime > now && !nocache && !force_renew) {
@@ -174,18 +174,18 @@
  		code = 0;
  		pthread_mutex_unlock(&ple_lock);
  		goto out;
-@@ -527,8 +528,8 @@
- 	}
+@@ -478,8 +479,8 @@
+ 	pthread_mutex_unlock(&ple_lock);
  
  	code = 0;
--	printerr(2, "%s(0x%lx): principal '%s' ccache:'%s'\n", 
--		__func__, tid, pname, cc_name);
+-	printerr(2, "%s(0x%lx): principal '%s' ccache:'%s'\n",
+-		__func__, tid, pname, ple->ccname);
 +	printerr(2, "%s(0x%" PRIxPTR "): principal '%s' ccache:'%s'\n",
-+		__func__, (uintptr_t)tid, pname, cc_name);
++		__func__, (uintptr_t)tid, pname, ple->ccname);
    out:
- #ifdef HAVE_KRB5_GET_INIT_CREDS_OPT_SET_ADDRESSLESS
- 	if (init_opts)
-@@ -667,8 +668,8 @@
+ 	if (opts)
+ 		krb5_get_init_creds_opt_free(context, opts);
+@@ -614,8 +615,8 @@
  	/* Get full target hostname */
  	retval = getaddrinfo(inhost, NULL, &hints, &addrs);
  	if (retval) {
@@ -196,7 +196,7 @@
  		goto out;
  	}
  	strncpy(outhost, addrs->ai_canonname, outhostlen);
-@@ -677,8 +678,8 @@
+@@ -624,8 +625,8 @@
  	    *c = tolower(*c);
  
  	if (get_verbosity() && strcmp(inhost, outhost))
@@ -207,12 +207,12 @@
  
  	retval = 0;
  out:
-@@ -1021,7 +1022,7 @@
+@@ -968,7 +969,7 @@
  					tried_upper = 1;
  				}
  			} else {
 -				printerr(2, "find_keytab_entry(0x%lx): Success getting keytab entry for '%s'\n",tid, spn);
-+				printerr(2, "find_keytab_entry(0x%" PRIxPTR "): Success getting keytab entry for '%s'\n", (uintptr_t)tid, spn);
++				printerr(2, "find_keytab_entry(0x%" PRIxPTR "): Success getting keytab entry for '%s'\n",(uintptr_t)tid, spn);
  				retval = 0;
  				goto out;
  			}
diff --git a/srcpkgs/nfs-utils/patches/musl-svcgssd-sysconf.patch b/srcpkgs/nfs-utils/patches/musl-svcgssd-sysconf.patch
deleted file mode 100644
index aab0e9612bf23a..00000000000000
--- a/srcpkgs/nfs-utils/patches/musl-svcgssd-sysconf.patch
+++ /dev/null
@@ -1,103 +0,0 @@
---- a/support/nfsidmap/libnfsidmap.c
-+++ b/support/nfsidmap/libnfsidmap.c
-@@ -430,11 +430,17 @@
- 
- 	nobody_user = conf_get_str("Mapping", "Nobody-User");
- 	if (nobody_user) {
--		size_t buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
-+		long scbuflen = sysconf(_SC_GETPW_R_SIZE_MAX);
-+		size_t buflen = 1024; /*value on my gentoo glibc system that has _SC_GETPW_R_SIZE_MAX*/
- 		struct passwd *buf;
- 		struct passwd *pw = NULL;
- 		int err;
- 
-+		/*sysconf can return -1 when _SC_GETPW_R_SIZE_MAX is not defined, like on musl systems, if cast to size_t this will lead
-+		  to an integer overflow, which leads to a buffer overflow and crashes svcgssd */
-+		if (scbuflen > 0)
-+			buflen = (size_t)scbuflen;
-+
- 		buf = malloc(sizeof(*buf) + buflen);
- 		if (buf) {
- 			err = getpwnam_r(nobody_user, buf, ((char *)buf) + sizeof(*buf), buflen, &pw);
-@@ -451,10 +457,16 @@
- 
- 	nobody_group = conf_get_str("Mapping", "Nobody-Group");
- 	if (nobody_group) {
--		size_t buflen = sysconf(_SC_GETGR_R_SIZE_MAX);
-+		long scbuflen = sysconf(_SC_GETGR_R_SIZE_MAX);
-+		size_t buflen = 1024; /*value on my gentoo glibc system that has _SC_GETGR_R_SIZE_MAX*/
- 		struct group *buf;
- 		struct group *gr = NULL;
- 		int err;
-+
-+		/*sysconf can return -1 when _SC_GETGR_R_SIZE_MAX is not defined, like on musl systems, if cast to size_t this will lead
-+		  to an integer overflow, which leads to a buffer overflow and crashes svcgssd */
-+		if (scbuflen > 0)
-+			buflen = (size_t)scbuflen;
- 
- 		buf = malloc(sizeof(*buf) + buflen);
- 		if (buf) {
---- a/support/nfsidmap/static.c
-+++ b/support/nfsidmap/static.c
-@@ -98,10 +98,14 @@
- {
- 	struct passwd *pw;
- 	struct pwbuf *buf;
--	size_t buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
-+	long scbuflen = sysconf(_SC_GETPW_R_SIZE_MAX);
-+	size_t buflen = 1024;
- 	char *localname;
- 	int err;
- 
-+	if (scbuflen > 0)
-+		buflen = (size_t)scbuflen;
-+
- 	buf = malloc(sizeof(*buf) + buflen);
- 	if (!buf) {
- 		err = ENOMEM;
-@@ -149,9 +153,13 @@
- {
- 	struct group *gr;
- 	struct grbuf *buf;
--	size_t buflen = sysconf(_SC_GETGR_R_SIZE_MAX);
-+	long scbuflen = sysconf(_SC_GETGR_R_SIZE_MAX);
-+	size_t buflen = 1024;
- 	char *localgroup;
- 	int err;
-+
-+	if (scbuflen > 0)
-+		buflen = (size_t)scbuflen;
- 
- 	buf = malloc(sizeof(*buf) + buflen);
- 	if (!buf) {
---- a/support/nfsidmap/nss.c
-+++ b/support/nfsidmap/nss.c
-@@ -91,9 +91,13 @@
- 	struct passwd *pw = NULL;
- 	struct passwd pwbuf;
- 	char *buf;
--	size_t buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
-+	long scbuflen = sysconf(_SC_GETPW_R_SIZE_MAX);
-+	size_t buflen = 1024;
- 	int err = -ENOMEM;
- 
-+	if (scbuflen > 0)
-+		buflen = (size_t)scbuflen;
-+
- 	buf = malloc(buflen);
- 	if (!buf)
- 		goto out;
-@@ -119,8 +123,12 @@
- 	struct group *gr = NULL;
- 	struct group grbuf;
- 	char *buf;
--	size_t buflen = sysconf(_SC_GETGR_R_SIZE_MAX);
-+	long scbuflen = sysconf(_SC_GETGR_R_SIZE_MAX);
-+	size_t buflen = 1024;
- 	int err;
-+
-+	if (scbuflen > 0)
-+		buflen = (size_t)scbuflen;
- 
- 	if (domain == NULL)
- 		domain = get_default_domain();
diff --git a/srcpkgs/nfs-utils/patches/nfs-utils-2.7.1-define_macros_for_musl.patch b/srcpkgs/nfs-utils/patches/nfs-utils-2.7.1-define_macros_for_musl.patch
deleted file mode 100644
index df4c2db84341de..00000000000000
--- a/srcpkgs/nfs-utils/patches/nfs-utils-2.7.1-define_macros_for_musl.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/support/junction/path.c b/support/junction/path.c
-index 13a14386..dd0f59a0 100644
---- a/support/junction/path.c
-+++ b/support/junction/path.c
-@@ -23,6 +23,12 @@
-  *	http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
-  */
- 
-+/* For musl */
-+#ifndef _GNU_SOURCE
-+#define _GNU_SOURCE
-+#endif
-+#include <limits.h>
-+
- #include <sys/types.h>
- #include <sys/stat.h>
- 
-diff --git a/support/include/junction.h b/support/include/junction.h
-index 7257d80b..d127dd55 100644
---- a/support/include/junction.h
-+++ b/support/include/junction.h
-@@ -26,6 +26,16 @@ 
- #ifndef _NFS_JUNCTION_H_
- #define _NFS_JUNCTION_H_
- 
-+/* For musl, refered to glibc's sys/cdefs.h */
-+#ifndef __attribute_malloc__
-+#define __attribute_malloc__ __attribute__((__malloc__))
-+#endif
-+
-+/* For musl, refered to glibc's sys/stat.h */
-+#ifndef ALLPERMS
-+#define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)/* 07777 */
-+#endif
-+
- #include <stdint.h>
- 
- /*
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 60da30200b697b..77901c2b707f41 100644
--- a/srcpkgs/nfs-utils/template
+++ b/srcpkgs/nfs-utils/template
@@ -1,6 +1,6 @@
 # Template file for 'nfs-utils'
 pkgname=nfs-utils
-version=2.7.1
+version=2.8.3
 revision=1
 build_style=gnu-configure
 configure_args="--with-statduser=nobody --enable-gss --enable-nfsv4
@@ -13,14 +13,14 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.linux-nfs.org/"
 distfiles="${KERNEL_SITE}/utils/${pkgname}/${version}/${pkgname}-${version}.tar.xz"
-checksum=885c948a84a58bca4148f459588f9a7369dbb40dcc466f04e455c6b10fd0aa48
+checksum=11e7c5847a8423a72931c865bd9296e7fd56ff270a795a849183900961711725
 replaces="rpcgen>=0"
 
 hostmakedepends="pkg-config libtirpc-devel rpcsvc-proto mit-krb5-devel"
 makedepends="libblkid-devel libmount-devel libtirpc-devel
  keyutils-devel libevent-devel mit-krb5-devel
  device-mapper-devel libcap-devel sqlite-devel
- libxml2-devel"
+ libxml2-devel libnl3-devel"
 depends="rpcbind"
 python_version=3
 conf_files="/etc/exports"
@@ -53,6 +53,7 @@ post_install() {
 	vsv rpcsvcgssd
 	vsv statd
 	vsv nfs-server
+	vsv nfsdcld
 	# replacement scripts
 	rm -rf ${DESTDIR}/usr/bin/start-statd
 	vbin ${FILESDIR}/start-statd

From a699bdbfbd806b7c9878804adcc20a5b98338327 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 11 Dec 2024 14:23:55 +0100
Subject: [PATCH 03/13] libtirpc: update to 1.3.6

---
 srcpkgs/libtirpc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtirpc/template b/srcpkgs/libtirpc/template
index 88e331d0623942..298de5fb83c367 100644
--- a/srcpkgs/libtirpc/template
+++ b/srcpkgs/libtirpc/template
@@ -1,6 +1,6 @@
 # Template file for 'libtirpc'
 pkgname=libtirpc
-version=1.3.5
+version=1.3.6
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config mit-krb5-devel"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://sourceforge.net/projects/libtirpc/"
 changelog="http://git.linux-nfs.org/?p=steved/libtirpc.git;a=shortlog"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=9b31370e5a38d3391bf37edfa22498e28fe2142467ae6be7a17c9068ec0bf12f
+checksum=bbd26a8f0df5690a62a47f6aa30f797f3ef8d02560d1bc449a83066b5a1d3508
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" musl-legacy-compat" ;;

From c95b5d72ee1570ac782ef32f312245c2eaa75e21 Mon Sep 17 00:00:00 2001
From: wbailey <wilsonrandallbailey@gmail.com>
Date: Sat, 12 Apr 2025 05:09:51 -0500
Subject: [PATCH 04/13] opencv: update to 4.11.0.

---
 common/shlibs                           | 104 ++++++++++++------------
 srcpkgs/opencv/patches/python3.12.patch |  23 ------
 srcpkgs/opencv/template                 |  10 +--
 3 files changed, 57 insertions(+), 80 deletions(-)
 delete mode 100644 srcpkgs/opencv/patches/python3.12.patch

diff --git a/common/shlibs b/common/shlibs
index 7a9666a23ed309..7fc7cea6fd4204 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2192,58 +2192,58 @@ libcapstone.so.5 capstone-5.0.1_1
 libhavege.so.2 libhaveged-1.9.11_1
 libnih.so.1 libnih-1.0.3_1
 libnih-dbus.so.1 libnih-1.0.3_1
-libopencv_quality.so.407 libopencv-4.7.0_1
-libopencv_reg.so.407 libopencv-4.7.0_1
-libopencv_surface_matching.so.407 libopencv-4.7.0_1
-libopencv_xphoto.so.407 libopencv-4.7.0_1
-libopencv_freetype.so.407 libopencv-4.7.0_1
-libopencv_fuzzy.so.407 libopencv-4.7.0_1
-libopencv_hfs.so.407 libopencv-4.7.0_1
-libopencv_img_hash.so.407 libopencv-4.7.0_1
-libopencv_line_descriptor.so.407 libopencv-4.7.0_1
-libopencv_saliency.so.407 libopencv-4.7.0_1
-libopencv_structured_light.so.407 libopencv-4.7.0_1
-libopencv_aruco.so.407 libopencv-4.7.0_1
-libopencv_bgsegm.so.407 libopencv-4.4.7_1
-libopencv_bioinspired.so.407 libopencv-4.7.0_1
-libopencv_ccalib.so.407 libopencv-4.4.7_1
-libopencv_face.so.407 libopencv-4.7.0_1
-libopencv_tracking.so.407 libopencv-4.7.0_1
-libopencv_xfeatures2d.so.407 libopencv-4.7.0_1
-libopencv_optflow.so.407 libopencv-4.4.7_1
-libopencv_ximgproc.so.407 libopencv-4.7.0_1
-libopencv_plot.so.407 libopencv-4.7.0_1
-libopencv_text.so.407 libopencv-4.7.0_1
-libopencv_ml.so.407 libopencv-4.4.7_1
-libopencv_objdetect.so.407 libopencv-4.7.0_1
-libopencv_dnn.so.407 libopencv-4.7.0_1
-libopencv_shape.so.407 libopencv-4.7.0_1
-libopencv_stitching.so.407 libopencv-4.7.0_1
-libopencv_photo.so.407 libopencv-4.7.0_1
-libopencv_video.so.407 libopencv-4.7.0_1
-libopencv_calib3d.so.407 libopencv-4.7.0_1
-libopencv_features2d.so.407 libopencv-4.7.0_1
-libopencv_flann.so.407 libopencv-4.7.0_1
-libopencv_highgui.so.407 libopencv-4.7.0_1
-libopencv_videoio.so.407 libopencv-4.7.0_1
-libopencv_imgcodecs.so.407 libopencv-4.7.0_1
-libopencv_imgproc.so.407 libopencv-4.7.0_1
-libopencv_core.so.407 libopencv-4.7.0_1
-libopencv_superres.so.407 libopencv-4.7.0_1
-libopencv_videostab.so.407 libopencv-4.7.0_1
-libopencv_gapi.so.407 libopencv-4.7.0_1
-libopencv_xobjdetect.so.407 libopencv-4.7.0_1
-libopencv_datasets.so.407 libopencv-4.7.0_1
-libopencv_dnn_objdetect.so.407 libopencv-4.7.0_1
-libopencv_dnn_superres.so.407 libopencv-4.7.0_1
-libopencv_dpm.so.407 libopencv-4.7.0_1
-libopencv_phase_unwrapping.so.407 libopencv-4.7.0_1
-libopencv_stereo.so.407 libopencv-4.7.0_1
-libopencv_rapid.so.407 libopencv-4.7.0_1
-libopencv_intensity_transform.so.407 libopencv-4.7.0_1
-libopencv_alphamat.so.407 libopencv-4.7.0_1
-libopencv_barcode.so.407 libopencv-4.7.0_1
-libopencv_mcc.so.407 libopencv-4.7.0_1
+libopencv_quality.so.411 libopencv-4.11.0_1
+libopencv_reg.so.411 libopencv-4.11.0_1
+libopencv_surface_matching.so.411 libopencv-4.11.0_1
+libopencv_xphoto.so.411 libopencv-4.11.0_1
+libopencv_freetype.so.411 libopencv-4.11.0_1
+libopencv_fuzzy.so.411 libopencv-4.11.0_1
+libopencv_hfs.so.411 libopencv-4.11.0_1
+libopencv_img_hash.so.411 libopencv-4.11.0_1
+libopencv_line_descriptor.so.411 libopencv-4.11.0_1
+libopencv_saliency.so.411 libopencv-4.11.0_1
+libopencv_structured_light.so.411 libopencv-4.11.0_1
+libopencv_aruco.so.411 libopencv-4.11.0_1
+libopencv_bgsegm.so.411 libopencv-4.11.0_1
+libopencv_bioinspired.so.411 libopencv-4.11.0_1
+libopencv_ccalib.so.411 libopencv-4.11.0_1
+libopencv_face.so.411 libopencv-4.11.0_1
+libopencv_tracking.so.411 libopencv-4.11.0_1
+libopencv_xfeatures2d.so.411 libopencv-4.11.0_1
+libopencv_optflow.so.411 libopencv-4.4.7_1
+libopencv_ximgproc.so.411 libopencv-4.11.0_1
+libopencv_plot.so.411 libopencv-4.11.0_1
+libopencv_text.so.411 libopencv-4.11.0_1
+libopencv_ml.so.411 libopencv-4.4.7_1
+libopencv_objdetect.so.411 libopencv-4.11.0_1
+libopencv_dnn.so.411 libopencv-4.11.0_1
+libopencv_shape.so.411 libopencv-4.11.0_1
+libopencv_stitching.so.411 libopencv-4.11.0_1
+libopencv_photo.so.411 libopencv-4.11.0_1
+libopencv_video.so.411 libopencv-4.11.0_1
+libopencv_calib3d.so.411 libopencv-4.11.0_1
+libopencv_features2d.so.411 libopencv-4.11.0_1
+libopencv_flann.so.411 libopencv-4.11.0_1
+libopencv_highgui.so.411 libopencv-4.11.0_1
+libopencv_videoio.so.411 libopencv-4.11.0_1
+libopencv_imgcodecs.so.411 libopencv-4.11.0_1
+libopencv_imgproc.so.411 libopencv-4.11.0_1
+libopencv_core.so.411 libopencv-4.11.0_1
+libopencv_superres.so.411 libopencv-4.11.0_1
+libopencv_videostab.so.411 libopencv-4.11.0_1
+libopencv_gapi.so.411 libopencv-4.11.0_1
+libopencv_xobjdetect.so.411 libopencv-4.11.0_1
+libopencv_datasets.so.411 libopencv-4.11.0_1
+libopencv_dnn_objdetect.so.411 libopencv-4.11.0_1
+libopencv_dnn_superres.so.411 libopencv-4.11.0_1
+libopencv_dpm.so.411 libopencv-4.11.0_1
+libopencv_phase_unwrapping.so.411 libopencv-4.11.0_1
+libopencv_stereo.so.411 libopencv-4.11.0_1
+libopencv_rapid.so.411 libopencv-4.11.0_1
+libopencv_intensity_transform.so.411 libopencv-4.11.0_1
+libopencv_alphamat.so.411 libopencv-4.11.0_1
+libopencv_barcode.so.411 libopencv-4.11.0_1
+libopencv_mcc.so.411 libopencv-4.11.0_1
 libuniconf.so.4.6 wvstreams-4.6.1_20
 libwvbase.so.4.6 wvstreams-4.6.1_20
 libwvutils.so.4.6 wvstreams-4.6.1_20
diff --git a/srcpkgs/opencv/patches/python3.12.patch b/srcpkgs/opencv/patches/python3.12.patch
deleted file mode 100644
index 71d0d55565b3a7..00000000000000
--- a/srcpkgs/opencv/patches/python3.12.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 00ca8f455e6a5588d905e3a0b268f18ee3fda5dd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
-Date: Sun, 1 Oct 2023 16:12:25 +0100
-Subject: [PATCH] `numpy.distutils` is removed in numpy 1.26 on Python 3.12.
-
-so we don't use numpy.distutils to get includes dirs of python-numpy
----
- cmake/OpenCVDetectPython.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/OpenCVDetectPython.cmake b/cmake/OpenCVDetectPython.cmake
-index 88a434185622..d4098ce8e60d 100644
---- a/cmake/OpenCVDetectPython.cmake
-+++ b/cmake/OpenCVDetectPython.cmake
-@@ -216,7 +216,7 @@ if(NOT ${found})
-           message(STATUS "  PYTHON3_NUMPY_INCLUDE_DIRS")
-         else()
-           # Attempt to discover the NumPy include directory. If this succeeds, then build python API with NumPy
--          execute_process(COMMAND "${_executable}" -c "import os; os.environ['DISTUTILS_USE_SDK']='1'; import numpy.distutils; print(os.pathsep.join(numpy.distutils.misc_util.get_numpy_include_dirs()))"
-+          execute_process(COMMAND "${_executable}" -c "import numpy; print(numpy.get_include())"
-                           RESULT_VARIABLE _numpy_process
-                           OUTPUT_VARIABLE _numpy_include_dirs
-                           OUTPUT_STRIP_TRAILING_WHITESPACE)
diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 66c110edd20847..f4caee7bf6fa99 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
-version=4.7.0
-revision=4
+version=4.11.0
+revision=1
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake
@@ -19,13 +19,13 @@ makedepends="ffmpeg6-devel libpng-devel libjpeg-turbo-devel tiff-devel
  python3-numpy python3-devel"
 short_desc="Computer vision and machine learning software library"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
+license="Apache-2.0"
 homepage="https://opencv.org"
 changelog="https://github.com/opencv/opencv/wiki/ChangeLog"
 distfiles="https://github.com/opencv/opencv/archive/${version}.tar.gz
  https://github.com/opencv/opencv_contrib/archive/${version}.tar.gz>contrib.tar.gz"
-checksum="8df0079cdbe179748a18d44731af62a245a45ebf5085223dc03133954c662973
- 42df840cf9055e59d0e22c249cfb19f04743e1bdad113d31b1573d3934d62584"
+checksum="9a7c11f924eff5f8d8070e297b322ee68b9227e003fd600d4b8122198091665f
+ 2dfc5957201de2aa785064711125af6abb2e80a64e2dc246aca4119b19687041"
 patch_args="-Np1 -d ${build_wrksrc}"
 # tests hang indenfinitely, even with test data included
 make_check=no

From 13220545d78dd7f5d0375be68830212a2f1c362a Mon Sep 17 00:00:00 2001
From: wbailey <wilsonrandallbailey@gmail.com>
Date: Sat, 12 Apr 2025 12:47:16 -0500
Subject: [PATCH 05/13] actiona: rebuild for opencv-4.11.0

---
 srcpkgs/actiona/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/actiona/template b/srcpkgs/actiona/template
index 0d899311e6df75..6d049fd0290f3f 100644
--- a/srcpkgs/actiona/template
+++ b/srcpkgs/actiona/template
@@ -1,7 +1,7 @@
 # Template file for 'actiona'
 pkgname=actiona
 version=3.10.1
-revision=3
+revision=4
 build_style=qmake
 configure_args="PKGCONFIG_OPENCV=opencv4"
 hostmakedepends="pkg-config qt5-plugin-mysql qt5-qmake qt5-host-tools"

From cad4db38affd14de583fc6df1ad135fba02d7b11 Mon Sep 17 00:00:00 2001
From: wbailey <wilsonrandallbailey@gmail.com>
Date: Sat, 12 Apr 2025 12:47:16 -0500
Subject: [PATCH 06/13] digikam: rebuild for opencv-4.11.0

---
 srcpkgs/digikam/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/digikam/template b/srcpkgs/digikam/template
index 68208cb1f36a93..b33fe6e7626643 100644
--- a/srcpkgs/digikam/template
+++ b/srcpkgs/digikam/template
@@ -1,7 +1,7 @@
 # Template file for 'digikam'
 pkgname=digikam
 version=8.5.0
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
  -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DBUILD_WITH_QT6=ON

From e6387dc2951f5b446cf2b7a30635596c0ec7ba1e Mon Sep 17 00:00:00 2001
From: wbailey <wilsonrandallbailey@gmail.com>
Date: Sat, 12 Apr 2025 12:47:17 -0500
Subject: [PATCH 07/13] gmic: rebuild for opencv-4.11.0

---
 srcpkgs/gmic/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index 865423400048b9..49476d8cf8f325 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,7 +1,7 @@
 # Template file for 'gmic'
 pkgname=gmic
 version=3.5.3
-revision=1
+revision=2
 _zart_hash=d014169343f835381ad232ee11e077326561c9eb
 build_wrksrc="src"
 build_style=gnu-makefile

From e1d4ce53524db9b31667753c2ddb567aabf433c5 Mon Sep 17 00:00:00 2001
From: wbailey <wilsonrandallbailey@gmail.com>
Date: Sat, 12 Apr 2025 12:47:17 -0500
Subject: [PATCH 08/13] mlt7: rebuild for opencv-4.11.0

---
 srcpkgs/mlt7/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mlt7/template b/srcpkgs/mlt7/template
index 5f4621296f1ea0..ffdeb80498562c 100644
--- a/srcpkgs/mlt7/template
+++ b/srcpkgs/mlt7/template
@@ -1,7 +1,7 @@
 # Template file for 'mlt7'
 pkgname=mlt7
 version=7.30.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DSWIG_PYTHON=ON -DMOD_QT6=ON"
 hostmakedepends="doxygen pkg-config ladspa-sdk swig python3 which

From 80bb77f17f6ae18ca7face1317e86f81308d9486 Mon Sep 17 00:00:00 2001
From: wbailey <wilsonrandallbailey@gmail.com>
Date: Sat, 12 Apr 2025 12:47:18 -0500
Subject: [PATCH 09/13] nomacs: rebuild for opencv-4.11.0

---
 srcpkgs/nomacs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nomacs/template b/srcpkgs/nomacs/template
index 83cb5c63b50b7c..18954205aad6fb 100644
--- a/srcpkgs/nomacs/template
+++ b/srcpkgs/nomacs/template
@@ -1,7 +1,7 @@
 # Template file for 'nomacs'
 pkgname=nomacs
 version=3.17.2287
-revision=4
+revision=5
 _plugins_ver=3.17.2285
 build_wrksrc=ImageLounge
 build_style=cmake

From 48fa448cf42c7a2c4bcffb9a27a01db7b5087599 Mon Sep 17 00:00:00 2001
From: wbailey <wilsonrandallbailey@gmail.com>
Date: Sat, 12 Apr 2025 12:47:18 -0500
Subject: [PATCH 10/13] opentoonz: rebuild for opencv-4.11.0

---
 srcpkgs/opentoonz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opentoonz/template b/srcpkgs/opentoonz/template
index a61690905a53c4..4fbc62280f0df1 100644
--- a/srcpkgs/opentoonz/template
+++ b/srcpkgs/opentoonz/template
@@ -1,7 +1,7 @@
 # Template file for 'opentoonz'
 pkgname=opentoonz
 version=1.7.1
-revision=2
+revision=3
 build_wrksrc="toonz/sources"
 build_style=cmake
 make_cmd=make

From 0d0fe54cd1b89b0633599cf1a46a747a436fadef Mon Sep 17 00:00:00 2001
From: wbailey <wilsonrandallbailey@gmail.com>
Date: Sat, 12 Apr 2025 12:47:19 -0500
Subject: [PATCH 11/13] siril: rebuild for opencv-4.11.0

---
 srcpkgs/siril/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/siril/template b/srcpkgs/siril/template
index f167dd3704500c..55aaa5a72fa7ab 100644
--- a/srcpkgs/siril/template
+++ b/srcpkgs/siril/template
@@ -1,7 +1,7 @@
 # Template file for 'siril'
 pkgname=siril
 version=0.9.12
-revision=13
+revision=14
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool autoconf automake gettext-devel"
 makedepends="fftw-devel libconfig-devel libopencv-devel libffms2-devel

From 0069f4be8f7b885edd2e9235dec48f8916605a93 Mon Sep 17 00:00:00 2001
From: wbailey <wilsonrandallbailey@gmail.com>
Date: Sat, 12 Apr 2025 12:47:19 -0500
Subject: [PATCH 12/13] spectacle: rebuild for opencv-4.11.0

---
 srcpkgs/spectacle/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index 97b47d4611e959..368c1b378cdd66 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -2,7 +2,7 @@
 pkgname=spectacle
 reverts="24.12.1_1 24.12.0_1 24.08.1_2 24.08.1_1 24.08.0_1 24.05.0_4 24.05.0_3 24.05.0_2 24.05.0_2 24.05.0_2 24.05.0_1 24.02.2_1 23.08.5_1 23.08.4_1 23.08.3_1 23.08.2_1 23.08.0_1 23.04.2_1 23.04.0_1 22.12.1_1 22.08.2_1 22.08.1_1 22.04.3_1 22.04.1_1 21.12.3_1 21.12.2_1 21.12.1_1 21.12.0_1 21.08.3_1 21.08.2_1 21.08.1_1 21.08.0_1 21.04.3_1 21.04.2_1 21.04.1_1 21.04.0_1 20.12.3_1 20.12.2_1 20.12.1_1 20.12.0_1 20.08.3_1 20.08.2_1 20.08.1_1 20.08.0_1 20.04.3_1 20.04.2_1 20.04.2_1 20.04.1_1 20.04.0_1"
 version=6.3.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules qt6-tools qt6-base qt6-wayland-tools

From 9a2e58cfe1caf3329ad5b26d510d79f9ecd430c0 Mon Sep 17 00:00:00 2001
From: wbailey <wilsonrandallbailey@gmail.com>
Date: Sat, 12 Apr 2025 12:47:19 -0500
Subject: [PATCH 13/13] waifu2x-converter-cpp: rebuild for opencv-4.11.0

---
 srcpkgs/waifu2x-converter-cpp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/waifu2x-converter-cpp/template b/srcpkgs/waifu2x-converter-cpp/template
index 9bd76a982d4496..4b33ba1ed30f43 100644
--- a/srcpkgs/waifu2x-converter-cpp/template
+++ b/srcpkgs/waifu2x-converter-cpp/template
@@ -1,7 +1,7 @@
 # Template file for 'waifu2x-converter-cpp'
 pkgname=waifu2x-converter-cpp
 version=5.3.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DINSTALL_MODELS=ON"
 hostmakedepends="pkg-config"

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] opencv upgrade to 4.11
  2025-04-12 17:30 [PR PATCH] opencv upgrade to 4.11 BeefcakeTheMighty
                   ` (5 preceding siblings ...)
  2025-04-12 23:07 ` [PR PATCH] [Updated] " BeefcakeTheMighty
@ 2025-04-12 23:45 ` BeefcakeTheMighty
  2025-04-13  5:25 ` BeefcakeTheMighty
                   ` (8 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: BeefcakeTheMighty @ 2025-04-12 23:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1121 bytes --]

There is an updated pull request by BeefcakeTheMighty against master on the void-packages repository

https://github.com/BeefcakeTheMighty/void-packages btm_opencv
https://github.com/void-linux/void-packages/pull/55041

opencv upgrade to 4.11
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: YES

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)




A patch file from https://github.com/void-linux/void-packages/pull/55041.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-btm_opencv-55041.patch --]
[-- Type: text/x-diff, Size: 36902 bytes --]

From e302a4896dbca0f1b25c0e4ad59a3028824c58cd Mon Sep 17 00:00:00 2001
From: wbailey <wilsonrandallbailey@gmail.com>
Date: Sat, 12 Apr 2025 05:09:51 -0500
Subject: [PATCH 01/14] opencv: update to 4.11.0.

---
 common/shlibs                           | 104 ++++++++++++------------
 srcpkgs/opencv/patches/python3.12.patch |  23 ------
 srcpkgs/opencv/template                 |  10 +--
 3 files changed, 57 insertions(+), 80 deletions(-)
 delete mode 100644 srcpkgs/opencv/patches/python3.12.patch

diff --git a/common/shlibs b/common/shlibs
index 7a9666a23ed309..7fc7cea6fd4204 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2192,58 +2192,58 @@ libcapstone.so.5 capstone-5.0.1_1
 libhavege.so.2 libhaveged-1.9.11_1
 libnih.so.1 libnih-1.0.3_1
 libnih-dbus.so.1 libnih-1.0.3_1
-libopencv_quality.so.407 libopencv-4.7.0_1
-libopencv_reg.so.407 libopencv-4.7.0_1
-libopencv_surface_matching.so.407 libopencv-4.7.0_1
-libopencv_xphoto.so.407 libopencv-4.7.0_1
-libopencv_freetype.so.407 libopencv-4.7.0_1
-libopencv_fuzzy.so.407 libopencv-4.7.0_1
-libopencv_hfs.so.407 libopencv-4.7.0_1
-libopencv_img_hash.so.407 libopencv-4.7.0_1
-libopencv_line_descriptor.so.407 libopencv-4.7.0_1
-libopencv_saliency.so.407 libopencv-4.7.0_1
-libopencv_structured_light.so.407 libopencv-4.7.0_1
-libopencv_aruco.so.407 libopencv-4.7.0_1
-libopencv_bgsegm.so.407 libopencv-4.4.7_1
-libopencv_bioinspired.so.407 libopencv-4.7.0_1
-libopencv_ccalib.so.407 libopencv-4.4.7_1
-libopencv_face.so.407 libopencv-4.7.0_1
-libopencv_tracking.so.407 libopencv-4.7.0_1
-libopencv_xfeatures2d.so.407 libopencv-4.7.0_1
-libopencv_optflow.so.407 libopencv-4.4.7_1
-libopencv_ximgproc.so.407 libopencv-4.7.0_1
-libopencv_plot.so.407 libopencv-4.7.0_1
-libopencv_text.so.407 libopencv-4.7.0_1
-libopencv_ml.so.407 libopencv-4.4.7_1
-libopencv_objdetect.so.407 libopencv-4.7.0_1
-libopencv_dnn.so.407 libopencv-4.7.0_1
-libopencv_shape.so.407 libopencv-4.7.0_1
-libopencv_stitching.so.407 libopencv-4.7.0_1
-libopencv_photo.so.407 libopencv-4.7.0_1
-libopencv_video.so.407 libopencv-4.7.0_1
-libopencv_calib3d.so.407 libopencv-4.7.0_1
-libopencv_features2d.so.407 libopencv-4.7.0_1
-libopencv_flann.so.407 libopencv-4.7.0_1
-libopencv_highgui.so.407 libopencv-4.7.0_1
-libopencv_videoio.so.407 libopencv-4.7.0_1
-libopencv_imgcodecs.so.407 libopencv-4.7.0_1
-libopencv_imgproc.so.407 libopencv-4.7.0_1
-libopencv_core.so.407 libopencv-4.7.0_1
-libopencv_superres.so.407 libopencv-4.7.0_1
-libopencv_videostab.so.407 libopencv-4.7.0_1
-libopencv_gapi.so.407 libopencv-4.7.0_1
-libopencv_xobjdetect.so.407 libopencv-4.7.0_1
-libopencv_datasets.so.407 libopencv-4.7.0_1
-libopencv_dnn_objdetect.so.407 libopencv-4.7.0_1
-libopencv_dnn_superres.so.407 libopencv-4.7.0_1
-libopencv_dpm.so.407 libopencv-4.7.0_1
-libopencv_phase_unwrapping.so.407 libopencv-4.7.0_1
-libopencv_stereo.so.407 libopencv-4.7.0_1
-libopencv_rapid.so.407 libopencv-4.7.0_1
-libopencv_intensity_transform.so.407 libopencv-4.7.0_1
-libopencv_alphamat.so.407 libopencv-4.7.0_1
-libopencv_barcode.so.407 libopencv-4.7.0_1
-libopencv_mcc.so.407 libopencv-4.7.0_1
+libopencv_quality.so.411 libopencv-4.11.0_1
+libopencv_reg.so.411 libopencv-4.11.0_1
+libopencv_surface_matching.so.411 libopencv-4.11.0_1
+libopencv_xphoto.so.411 libopencv-4.11.0_1
+libopencv_freetype.so.411 libopencv-4.11.0_1
+libopencv_fuzzy.so.411 libopencv-4.11.0_1
+libopencv_hfs.so.411 libopencv-4.11.0_1
+libopencv_img_hash.so.411 libopencv-4.11.0_1
+libopencv_line_descriptor.so.411 libopencv-4.11.0_1
+libopencv_saliency.so.411 libopencv-4.11.0_1
+libopencv_structured_light.so.411 libopencv-4.11.0_1
+libopencv_aruco.so.411 libopencv-4.11.0_1
+libopencv_bgsegm.so.411 libopencv-4.11.0_1
+libopencv_bioinspired.so.411 libopencv-4.11.0_1
+libopencv_ccalib.so.411 libopencv-4.11.0_1
+libopencv_face.so.411 libopencv-4.11.0_1
+libopencv_tracking.so.411 libopencv-4.11.0_1
+libopencv_xfeatures2d.so.411 libopencv-4.11.0_1
+libopencv_optflow.so.411 libopencv-4.4.7_1
+libopencv_ximgproc.so.411 libopencv-4.11.0_1
+libopencv_plot.so.411 libopencv-4.11.0_1
+libopencv_text.so.411 libopencv-4.11.0_1
+libopencv_ml.so.411 libopencv-4.4.7_1
+libopencv_objdetect.so.411 libopencv-4.11.0_1
+libopencv_dnn.so.411 libopencv-4.11.0_1
+libopencv_shape.so.411 libopencv-4.11.0_1
+libopencv_stitching.so.411 libopencv-4.11.0_1
+libopencv_photo.so.411 libopencv-4.11.0_1
+libopencv_video.so.411 libopencv-4.11.0_1
+libopencv_calib3d.so.411 libopencv-4.11.0_1
+libopencv_features2d.so.411 libopencv-4.11.0_1
+libopencv_flann.so.411 libopencv-4.11.0_1
+libopencv_highgui.so.411 libopencv-4.11.0_1
+libopencv_videoio.so.411 libopencv-4.11.0_1
+libopencv_imgcodecs.so.411 libopencv-4.11.0_1
+libopencv_imgproc.so.411 libopencv-4.11.0_1
+libopencv_core.so.411 libopencv-4.11.0_1
+libopencv_superres.so.411 libopencv-4.11.0_1
+libopencv_videostab.so.411 libopencv-4.11.0_1
+libopencv_gapi.so.411 libopencv-4.11.0_1
+libopencv_xobjdetect.so.411 libopencv-4.11.0_1
+libopencv_datasets.so.411 libopencv-4.11.0_1
+libopencv_dnn_objdetect.so.411 libopencv-4.11.0_1
+libopencv_dnn_superres.so.411 libopencv-4.11.0_1
+libopencv_dpm.so.411 libopencv-4.11.0_1
+libopencv_phase_unwrapping.so.411 libopencv-4.11.0_1
+libopencv_stereo.so.411 libopencv-4.11.0_1
+libopencv_rapid.so.411 libopencv-4.11.0_1
+libopencv_intensity_transform.so.411 libopencv-4.11.0_1
+libopencv_alphamat.so.411 libopencv-4.11.0_1
+libopencv_barcode.so.411 libopencv-4.11.0_1
+libopencv_mcc.so.411 libopencv-4.11.0_1
 libuniconf.so.4.6 wvstreams-4.6.1_20
 libwvbase.so.4.6 wvstreams-4.6.1_20
 libwvutils.so.4.6 wvstreams-4.6.1_20
diff --git a/srcpkgs/opencv/patches/python3.12.patch b/srcpkgs/opencv/patches/python3.12.patch
deleted file mode 100644
index 71d0d55565b3a7..00000000000000
--- a/srcpkgs/opencv/patches/python3.12.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 00ca8f455e6a5588d905e3a0b268f18ee3fda5dd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
-Date: Sun, 1 Oct 2023 16:12:25 +0100
-Subject: [PATCH] `numpy.distutils` is removed in numpy 1.26 on Python 3.12.
-
-so we don't use numpy.distutils to get includes dirs of python-numpy
----
- cmake/OpenCVDetectPython.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/OpenCVDetectPython.cmake b/cmake/OpenCVDetectPython.cmake
-index 88a434185622..d4098ce8e60d 100644
---- a/cmake/OpenCVDetectPython.cmake
-+++ b/cmake/OpenCVDetectPython.cmake
-@@ -216,7 +216,7 @@ if(NOT ${found})
-           message(STATUS "  PYTHON3_NUMPY_INCLUDE_DIRS")
-         else()
-           # Attempt to discover the NumPy include directory. If this succeeds, then build python API with NumPy
--          execute_process(COMMAND "${_executable}" -c "import os; os.environ['DISTUTILS_USE_SDK']='1'; import numpy.distutils; print(os.pathsep.join(numpy.distutils.misc_util.get_numpy_include_dirs()))"
-+          execute_process(COMMAND "${_executable}" -c "import numpy; print(numpy.get_include())"
-                           RESULT_VARIABLE _numpy_process
-                           OUTPUT_VARIABLE _numpy_include_dirs
-                           OUTPUT_STRIP_TRAILING_WHITESPACE)
diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 66c110edd20847..f4caee7bf6fa99 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
-version=4.7.0
-revision=4
+version=4.11.0
+revision=1
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake
@@ -19,13 +19,13 @@ makedepends="ffmpeg6-devel libpng-devel libjpeg-turbo-devel tiff-devel
  python3-numpy python3-devel"
 short_desc="Computer vision and machine learning software library"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
+license="Apache-2.0"
 homepage="https://opencv.org"
 changelog="https://github.com/opencv/opencv/wiki/ChangeLog"
 distfiles="https://github.com/opencv/opencv/archive/${version}.tar.gz
  https://github.com/opencv/opencv_contrib/archive/${version}.tar.gz>contrib.tar.gz"
-checksum="8df0079cdbe179748a18d44731af62a245a45ebf5085223dc03133954c662973
- 42df840cf9055e59d0e22c249cfb19f04743e1bdad113d31b1573d3934d62584"
+checksum="9a7c11f924eff5f8d8070e297b322ee68b9227e003fd600d4b8122198091665f
+ 2dfc5957201de2aa785064711125af6abb2e80a64e2dc246aca4119b19687041"
 patch_args="-Np1 -d ${build_wrksrc}"
 # tests hang indenfinitely, even with test data included
 make_check=no

From 8f92a19bc2389cc6b8d100c5bd82cb7a90796eef Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 2 Dec 2024 14:03:53 +0100
Subject: [PATCH 02/14] nfs-utils: update to 2.8.3

---
 srcpkgs/nfs-utils/files/nfsdcld/run           |   6 +
 .../patches/musl-fix_long_unsigned_int.patch  |  44 ++++----
 .../patches/musl-svcgssd-sysconf.patch        | 103 ------------------
 ...s-utils-2.7.1-define_macros_for_musl.patch |  38 -------
 srcpkgs/nfs-utils/template                    |   7 +-
 5 files changed, 32 insertions(+), 166 deletions(-)
 create mode 100644 srcpkgs/nfs-utils/files/nfsdcld/run
 delete mode 100644 srcpkgs/nfs-utils/patches/musl-svcgssd-sysconf.patch
 delete mode 100644 srcpkgs/nfs-utils/patches/nfs-utils-2.7.1-define_macros_for_musl.patch

diff --git a/srcpkgs/nfs-utils/files/nfsdcld/run b/srcpkgs/nfs-utils/files/nfsdcld/run
new file mode 100644
index 00000000000000..c6cf1ca474758d
--- /dev/null
+++ b/srcpkgs/nfs-utils/files/nfsdcld/run
@@ -0,0 +1,6 @@
+#!/bin/sh
+exec 2>&1
+
+[ -r ./conf ] && . ./conf
+
+exec nfsdcld ${OPTS:- --foreground}
diff --git a/srcpkgs/nfs-utils/patches/musl-fix_long_unsigned_int.patch b/srcpkgs/nfs-utils/patches/musl-fix_long_unsigned_int.patch
index 28dc1da9a34368..87900cb543c43a 100644
--- a/srcpkgs/nfs-utils/patches/musl-fix_long_unsigned_int.patch
+++ b/srcpkgs/nfs-utils/patches/musl-fix_long_unsigned_int.patch
@@ -1,5 +1,5 @@
---- a/utils/gssd/gssd.c	2024-08-20 14:30:33.000000000 +0200
-+++ b/utils/gssd/gssd.c	2024-09-08 13:01:06.098924979 +0200
+--- a/utils/gssd/gssd.c	2025-03-29 16:21:54.000000000 +0100
++++ b/utils/gssd/gssd.c	2025-03-31 22:19:59.859489111 +0200
 @@ -65,6 +65,7 @@
  #include <dirent.h>
  #include <netdb.h>
@@ -50,8 +50,8 @@
  			break;
  		}
  	}
---- a/utils/gssd/gssd_proc.c	2024-08-20 14:30:33.000000000 +0200
-+++ b/utils/gssd/gssd_proc.c	2024-09-08 13:19:02.841249423 +0200
+--- a/utils/gssd/gssd_proc.c	2025-03-29 16:21:54.000000000 +0100
++++ b/utils/gssd/gssd_proc.c	2025-03-31 22:26:32.351326749 +0200
 @@ -73,6 +73,7 @@
  #ifdef HAVE_TIRPC_GSS_SECCREATE
  #include <rpc/rpcsec_gss.h>
@@ -111,7 +111,7 @@
  #ifdef HAVE_TIRPC_GSS_SECCREATE
  	memset(&req, 0, sizeof(req));
  	req.my_cred = sec.cred;
-@@ -553,8 +554,8 @@
+@@ -567,8 +568,8 @@
  	int		err, resp = -1;
  	pthread_t tid = pthread_self();
  
@@ -122,7 +122,7 @@
  
  	*chg_err = change_identity(uid);
  	if (*chg_err) {
-@@ -602,8 +603,8 @@
+@@ -616,8 +617,8 @@
  	int	success = 0;
  	pthread_t tid = pthread_self();
  
@@ -133,7 +133,7 @@
  
  	do {
  		gssd_refresh_krb5_machine_credential(clp->servername,
-@@ -943,8 +944,8 @@
+@@ -957,8 +958,8 @@
  		free(tinfo);
  		return ret;
  	}
@@ -144,7 +144,7 @@
  
  	tinfo->tid = th;
  	pthread_mutex_lock(&active_thread_list_lock);
-@@ -1008,7 +1009,7 @@
+@@ -1022,7 +1023,7 @@
  	}
  	lbuf[lbuflen-1] = 0;
  
@@ -153,8 +153,8 @@
  		 lbuf, clp->relpath);
  
  	for (p = strtok(lbuf, " "); p; p = strtok(NULL, " ")) {
---- a/utils/gssd/krb5_util.c	2024-08-20 14:30:33.000000000 +0200
-+++ b/utils/gssd/krb5_util.c	2024-09-08 13:25:58.884113095 +0200
+--- a/utils/gssd/krb5_util.c	2025-03-29 16:21:54.000000000 +0100
++++ b/utils/gssd/krb5_util.c	2025-03-31 22:25:50.008589085 +0200
 @@ -123,6 +123,7 @@
  
  #include <sys/types.h>
@@ -163,7 +163,7 @@
  
  #include "nfslib.h"
  #include "gssd.h"
-@@ -426,8 +427,8 @@
+@@ -420,8 +421,8 @@
  	now += 300;
  	pthread_mutex_lock(&ple_lock);
  	if (ple->ccname && ple->endtime > now && !nocache && !force_renew) {
@@ -174,18 +174,18 @@
  		code = 0;
  		pthread_mutex_unlock(&ple_lock);
  		goto out;
-@@ -527,8 +528,8 @@
- 	}
+@@ -478,8 +479,8 @@
+ 	pthread_mutex_unlock(&ple_lock);
  
  	code = 0;
--	printerr(2, "%s(0x%lx): principal '%s' ccache:'%s'\n", 
--		__func__, tid, pname, cc_name);
+-	printerr(2, "%s(0x%lx): principal '%s' ccache:'%s'\n",
+-		__func__, tid, pname, ple->ccname);
 +	printerr(2, "%s(0x%" PRIxPTR "): principal '%s' ccache:'%s'\n",
-+		__func__, (uintptr_t)tid, pname, cc_name);
++		__func__, (uintptr_t)tid, pname, ple->ccname);
    out:
- #ifdef HAVE_KRB5_GET_INIT_CREDS_OPT_SET_ADDRESSLESS
- 	if (init_opts)
-@@ -667,8 +668,8 @@
+ 	if (opts)
+ 		krb5_get_init_creds_opt_free(context, opts);
+@@ -614,8 +615,8 @@
  	/* Get full target hostname */
  	retval = getaddrinfo(inhost, NULL, &hints, &addrs);
  	if (retval) {
@@ -196,7 +196,7 @@
  		goto out;
  	}
  	strncpy(outhost, addrs->ai_canonname, outhostlen);
-@@ -677,8 +678,8 @@
+@@ -624,8 +625,8 @@
  	    *c = tolower(*c);
  
  	if (get_verbosity() && strcmp(inhost, outhost))
@@ -207,12 +207,12 @@
  
  	retval = 0;
  out:
-@@ -1021,7 +1022,7 @@
+@@ -968,7 +969,7 @@
  					tried_upper = 1;
  				}
  			} else {
 -				printerr(2, "find_keytab_entry(0x%lx): Success getting keytab entry for '%s'\n",tid, spn);
-+				printerr(2, "find_keytab_entry(0x%" PRIxPTR "): Success getting keytab entry for '%s'\n", (uintptr_t)tid, spn);
++				printerr(2, "find_keytab_entry(0x%" PRIxPTR "): Success getting keytab entry for '%s'\n",(uintptr_t)tid, spn);
  				retval = 0;
  				goto out;
  			}
diff --git a/srcpkgs/nfs-utils/patches/musl-svcgssd-sysconf.patch b/srcpkgs/nfs-utils/patches/musl-svcgssd-sysconf.patch
deleted file mode 100644
index aab0e9612bf23a..00000000000000
--- a/srcpkgs/nfs-utils/patches/musl-svcgssd-sysconf.patch
+++ /dev/null
@@ -1,103 +0,0 @@
---- a/support/nfsidmap/libnfsidmap.c
-+++ b/support/nfsidmap/libnfsidmap.c
-@@ -430,11 +430,17 @@
- 
- 	nobody_user = conf_get_str("Mapping", "Nobody-User");
- 	if (nobody_user) {
--		size_t buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
-+		long scbuflen = sysconf(_SC_GETPW_R_SIZE_MAX);
-+		size_t buflen = 1024; /*value on my gentoo glibc system that has _SC_GETPW_R_SIZE_MAX*/
- 		struct passwd *buf;
- 		struct passwd *pw = NULL;
- 		int err;
- 
-+		/*sysconf can return -1 when _SC_GETPW_R_SIZE_MAX is not defined, like on musl systems, if cast to size_t this will lead
-+		  to an integer overflow, which leads to a buffer overflow and crashes svcgssd */
-+		if (scbuflen > 0)
-+			buflen = (size_t)scbuflen;
-+
- 		buf = malloc(sizeof(*buf) + buflen);
- 		if (buf) {
- 			err = getpwnam_r(nobody_user, buf, ((char *)buf) + sizeof(*buf), buflen, &pw);
-@@ -451,10 +457,16 @@
- 
- 	nobody_group = conf_get_str("Mapping", "Nobody-Group");
- 	if (nobody_group) {
--		size_t buflen = sysconf(_SC_GETGR_R_SIZE_MAX);
-+		long scbuflen = sysconf(_SC_GETGR_R_SIZE_MAX);
-+		size_t buflen = 1024; /*value on my gentoo glibc system that has _SC_GETGR_R_SIZE_MAX*/
- 		struct group *buf;
- 		struct group *gr = NULL;
- 		int err;
-+
-+		/*sysconf can return -1 when _SC_GETGR_R_SIZE_MAX is not defined, like on musl systems, if cast to size_t this will lead
-+		  to an integer overflow, which leads to a buffer overflow and crashes svcgssd */
-+		if (scbuflen > 0)
-+			buflen = (size_t)scbuflen;
- 
- 		buf = malloc(sizeof(*buf) + buflen);
- 		if (buf) {
---- a/support/nfsidmap/static.c
-+++ b/support/nfsidmap/static.c
-@@ -98,10 +98,14 @@
- {
- 	struct passwd *pw;
- 	struct pwbuf *buf;
--	size_t buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
-+	long scbuflen = sysconf(_SC_GETPW_R_SIZE_MAX);
-+	size_t buflen = 1024;
- 	char *localname;
- 	int err;
- 
-+	if (scbuflen > 0)
-+		buflen = (size_t)scbuflen;
-+
- 	buf = malloc(sizeof(*buf) + buflen);
- 	if (!buf) {
- 		err = ENOMEM;
-@@ -149,9 +153,13 @@
- {
- 	struct group *gr;
- 	struct grbuf *buf;
--	size_t buflen = sysconf(_SC_GETGR_R_SIZE_MAX);
-+	long scbuflen = sysconf(_SC_GETGR_R_SIZE_MAX);
-+	size_t buflen = 1024;
- 	char *localgroup;
- 	int err;
-+
-+	if (scbuflen > 0)
-+		buflen = (size_t)scbuflen;
- 
- 	buf = malloc(sizeof(*buf) + buflen);
- 	if (!buf) {
---- a/support/nfsidmap/nss.c
-+++ b/support/nfsidmap/nss.c
-@@ -91,9 +91,13 @@
- 	struct passwd *pw = NULL;
- 	struct passwd pwbuf;
- 	char *buf;
--	size_t buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
-+	long scbuflen = sysconf(_SC_GETPW_R_SIZE_MAX);
-+	size_t buflen = 1024;
- 	int err = -ENOMEM;
- 
-+	if (scbuflen > 0)
-+		buflen = (size_t)scbuflen;
-+
- 	buf = malloc(buflen);
- 	if (!buf)
- 		goto out;
-@@ -119,8 +123,12 @@
- 	struct group *gr = NULL;
- 	struct group grbuf;
- 	char *buf;
--	size_t buflen = sysconf(_SC_GETGR_R_SIZE_MAX);
-+	long scbuflen = sysconf(_SC_GETGR_R_SIZE_MAX);
-+	size_t buflen = 1024;
- 	int err;
-+
-+	if (scbuflen > 0)
-+		buflen = (size_t)scbuflen;
- 
- 	if (domain == NULL)
- 		domain = get_default_domain();
diff --git a/srcpkgs/nfs-utils/patches/nfs-utils-2.7.1-define_macros_for_musl.patch b/srcpkgs/nfs-utils/patches/nfs-utils-2.7.1-define_macros_for_musl.patch
deleted file mode 100644
index df4c2db84341de..00000000000000
--- a/srcpkgs/nfs-utils/patches/nfs-utils-2.7.1-define_macros_for_musl.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/support/junction/path.c b/support/junction/path.c
-index 13a14386..dd0f59a0 100644
---- a/support/junction/path.c
-+++ b/support/junction/path.c
-@@ -23,6 +23,12 @@
-  *	http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
-  */
- 
-+/* For musl */
-+#ifndef _GNU_SOURCE
-+#define _GNU_SOURCE
-+#endif
-+#include <limits.h>
-+
- #include <sys/types.h>
- #include <sys/stat.h>
- 
-diff --git a/support/include/junction.h b/support/include/junction.h
-index 7257d80b..d127dd55 100644
---- a/support/include/junction.h
-+++ b/support/include/junction.h
-@@ -26,6 +26,16 @@ 
- #ifndef _NFS_JUNCTION_H_
- #define _NFS_JUNCTION_H_
- 
-+/* For musl, refered to glibc's sys/cdefs.h */
-+#ifndef __attribute_malloc__
-+#define __attribute_malloc__ __attribute__((__malloc__))
-+#endif
-+
-+/* For musl, refered to glibc's sys/stat.h */
-+#ifndef ALLPERMS
-+#define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)/* 07777 */
-+#endif
-+
- #include <stdint.h>
- 
- /*
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 60da30200b697b..77901c2b707f41 100644
--- a/srcpkgs/nfs-utils/template
+++ b/srcpkgs/nfs-utils/template
@@ -1,6 +1,6 @@
 # Template file for 'nfs-utils'
 pkgname=nfs-utils
-version=2.7.1
+version=2.8.3
 revision=1
 build_style=gnu-configure
 configure_args="--with-statduser=nobody --enable-gss --enable-nfsv4
@@ -13,14 +13,14 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.linux-nfs.org/"
 distfiles="${KERNEL_SITE}/utils/${pkgname}/${version}/${pkgname}-${version}.tar.xz"
-checksum=885c948a84a58bca4148f459588f9a7369dbb40dcc466f04e455c6b10fd0aa48
+checksum=11e7c5847a8423a72931c865bd9296e7fd56ff270a795a849183900961711725
 replaces="rpcgen>=0"
 
 hostmakedepends="pkg-config libtirpc-devel rpcsvc-proto mit-krb5-devel"
 makedepends="libblkid-devel libmount-devel libtirpc-devel
  keyutils-devel libevent-devel mit-krb5-devel
  device-mapper-devel libcap-devel sqlite-devel
- libxml2-devel"
+ libxml2-devel libnl3-devel"
 depends="rpcbind"
 python_version=3
 conf_files="/etc/exports"
@@ -53,6 +53,7 @@ post_install() {
 	vsv rpcsvcgssd
 	vsv statd
 	vsv nfs-server
+	vsv nfsdcld
 	# replacement scripts
 	rm -rf ${DESTDIR}/usr/bin/start-statd
 	vbin ${FILESDIR}/start-statd

From a699bdbfbd806b7c9878804adcc20a5b98338327 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 11 Dec 2024 14:23:55 +0100
Subject: [PATCH 03/14] libtirpc: update to 1.3.6

---
 srcpkgs/libtirpc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtirpc/template b/srcpkgs/libtirpc/template
index 88e331d0623942..298de5fb83c367 100644
--- a/srcpkgs/libtirpc/template
+++ b/srcpkgs/libtirpc/template
@@ -1,6 +1,6 @@
 # Template file for 'libtirpc'
 pkgname=libtirpc
-version=1.3.5
+version=1.3.6
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config mit-krb5-devel"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://sourceforge.net/projects/libtirpc/"
 changelog="http://git.linux-nfs.org/?p=steved/libtirpc.git;a=shortlog"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=9b31370e5a38d3391bf37edfa22498e28fe2142467ae6be7a17c9068ec0bf12f
+checksum=bbd26a8f0df5690a62a47f6aa30f797f3ef8d02560d1bc449a83066b5a1d3508
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" musl-legacy-compat" ;;

From c95b5d72ee1570ac782ef32f312245c2eaa75e21 Mon Sep 17 00:00:00 2001
From: wbailey <wilsonrandallbailey@gmail.com>
Date: Sat, 12 Apr 2025 05:09:51 -0500
Subject: [PATCH 04/14] opencv: update to 4.11.0.

---
 common/shlibs                           | 104 ++++++++++++------------
 srcpkgs/opencv/patches/python3.12.patch |  23 ------
 srcpkgs/opencv/template                 |  10 +--
 3 files changed, 57 insertions(+), 80 deletions(-)
 delete mode 100644 srcpkgs/opencv/patches/python3.12.patch

diff --git a/common/shlibs b/common/shlibs
index 7a9666a23ed309..7fc7cea6fd4204 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2192,58 +2192,58 @@ libcapstone.so.5 capstone-5.0.1_1
 libhavege.so.2 libhaveged-1.9.11_1
 libnih.so.1 libnih-1.0.3_1
 libnih-dbus.so.1 libnih-1.0.3_1
-libopencv_quality.so.407 libopencv-4.7.0_1
-libopencv_reg.so.407 libopencv-4.7.0_1
-libopencv_surface_matching.so.407 libopencv-4.7.0_1
-libopencv_xphoto.so.407 libopencv-4.7.0_1
-libopencv_freetype.so.407 libopencv-4.7.0_1
-libopencv_fuzzy.so.407 libopencv-4.7.0_1
-libopencv_hfs.so.407 libopencv-4.7.0_1
-libopencv_img_hash.so.407 libopencv-4.7.0_1
-libopencv_line_descriptor.so.407 libopencv-4.7.0_1
-libopencv_saliency.so.407 libopencv-4.7.0_1
-libopencv_structured_light.so.407 libopencv-4.7.0_1
-libopencv_aruco.so.407 libopencv-4.7.0_1
-libopencv_bgsegm.so.407 libopencv-4.4.7_1
-libopencv_bioinspired.so.407 libopencv-4.7.0_1
-libopencv_ccalib.so.407 libopencv-4.4.7_1
-libopencv_face.so.407 libopencv-4.7.0_1
-libopencv_tracking.so.407 libopencv-4.7.0_1
-libopencv_xfeatures2d.so.407 libopencv-4.7.0_1
-libopencv_optflow.so.407 libopencv-4.4.7_1
-libopencv_ximgproc.so.407 libopencv-4.7.0_1
-libopencv_plot.so.407 libopencv-4.7.0_1
-libopencv_text.so.407 libopencv-4.7.0_1
-libopencv_ml.so.407 libopencv-4.4.7_1
-libopencv_objdetect.so.407 libopencv-4.7.0_1
-libopencv_dnn.so.407 libopencv-4.7.0_1
-libopencv_shape.so.407 libopencv-4.7.0_1
-libopencv_stitching.so.407 libopencv-4.7.0_1
-libopencv_photo.so.407 libopencv-4.7.0_1
-libopencv_video.so.407 libopencv-4.7.0_1
-libopencv_calib3d.so.407 libopencv-4.7.0_1
-libopencv_features2d.so.407 libopencv-4.7.0_1
-libopencv_flann.so.407 libopencv-4.7.0_1
-libopencv_highgui.so.407 libopencv-4.7.0_1
-libopencv_videoio.so.407 libopencv-4.7.0_1
-libopencv_imgcodecs.so.407 libopencv-4.7.0_1
-libopencv_imgproc.so.407 libopencv-4.7.0_1
-libopencv_core.so.407 libopencv-4.7.0_1
-libopencv_superres.so.407 libopencv-4.7.0_1
-libopencv_videostab.so.407 libopencv-4.7.0_1
-libopencv_gapi.so.407 libopencv-4.7.0_1
-libopencv_xobjdetect.so.407 libopencv-4.7.0_1
-libopencv_datasets.so.407 libopencv-4.7.0_1
-libopencv_dnn_objdetect.so.407 libopencv-4.7.0_1
-libopencv_dnn_superres.so.407 libopencv-4.7.0_1
-libopencv_dpm.so.407 libopencv-4.7.0_1
-libopencv_phase_unwrapping.so.407 libopencv-4.7.0_1
-libopencv_stereo.so.407 libopencv-4.7.0_1
-libopencv_rapid.so.407 libopencv-4.7.0_1
-libopencv_intensity_transform.so.407 libopencv-4.7.0_1
-libopencv_alphamat.so.407 libopencv-4.7.0_1
-libopencv_barcode.so.407 libopencv-4.7.0_1
-libopencv_mcc.so.407 libopencv-4.7.0_1
+libopencv_quality.so.411 libopencv-4.11.0_1
+libopencv_reg.so.411 libopencv-4.11.0_1
+libopencv_surface_matching.so.411 libopencv-4.11.0_1
+libopencv_xphoto.so.411 libopencv-4.11.0_1
+libopencv_freetype.so.411 libopencv-4.11.0_1
+libopencv_fuzzy.so.411 libopencv-4.11.0_1
+libopencv_hfs.so.411 libopencv-4.11.0_1
+libopencv_img_hash.so.411 libopencv-4.11.0_1
+libopencv_line_descriptor.so.411 libopencv-4.11.0_1
+libopencv_saliency.so.411 libopencv-4.11.0_1
+libopencv_structured_light.so.411 libopencv-4.11.0_1
+libopencv_aruco.so.411 libopencv-4.11.0_1
+libopencv_bgsegm.so.411 libopencv-4.11.0_1
+libopencv_bioinspired.so.411 libopencv-4.11.0_1
+libopencv_ccalib.so.411 libopencv-4.11.0_1
+libopencv_face.so.411 libopencv-4.11.0_1
+libopencv_tracking.so.411 libopencv-4.11.0_1
+libopencv_xfeatures2d.so.411 libopencv-4.11.0_1
+libopencv_optflow.so.411 libopencv-4.4.7_1
+libopencv_ximgproc.so.411 libopencv-4.11.0_1
+libopencv_plot.so.411 libopencv-4.11.0_1
+libopencv_text.so.411 libopencv-4.11.0_1
+libopencv_ml.so.411 libopencv-4.4.7_1
+libopencv_objdetect.so.411 libopencv-4.11.0_1
+libopencv_dnn.so.411 libopencv-4.11.0_1
+libopencv_shape.so.411 libopencv-4.11.0_1
+libopencv_stitching.so.411 libopencv-4.11.0_1
+libopencv_photo.so.411 libopencv-4.11.0_1
+libopencv_video.so.411 libopencv-4.11.0_1
+libopencv_calib3d.so.411 libopencv-4.11.0_1
+libopencv_features2d.so.411 libopencv-4.11.0_1
+libopencv_flann.so.411 libopencv-4.11.0_1
+libopencv_highgui.so.411 libopencv-4.11.0_1
+libopencv_videoio.so.411 libopencv-4.11.0_1
+libopencv_imgcodecs.so.411 libopencv-4.11.0_1
+libopencv_imgproc.so.411 libopencv-4.11.0_1
+libopencv_core.so.411 libopencv-4.11.0_1
+libopencv_superres.so.411 libopencv-4.11.0_1
+libopencv_videostab.so.411 libopencv-4.11.0_1
+libopencv_gapi.so.411 libopencv-4.11.0_1
+libopencv_xobjdetect.so.411 libopencv-4.11.0_1
+libopencv_datasets.so.411 libopencv-4.11.0_1
+libopencv_dnn_objdetect.so.411 libopencv-4.11.0_1
+libopencv_dnn_superres.so.411 libopencv-4.11.0_1
+libopencv_dpm.so.411 libopencv-4.11.0_1
+libopencv_phase_unwrapping.so.411 libopencv-4.11.0_1
+libopencv_stereo.so.411 libopencv-4.11.0_1
+libopencv_rapid.so.411 libopencv-4.11.0_1
+libopencv_intensity_transform.so.411 libopencv-4.11.0_1
+libopencv_alphamat.so.411 libopencv-4.11.0_1
+libopencv_barcode.so.411 libopencv-4.11.0_1
+libopencv_mcc.so.411 libopencv-4.11.0_1
 libuniconf.so.4.6 wvstreams-4.6.1_20
 libwvbase.so.4.6 wvstreams-4.6.1_20
 libwvutils.so.4.6 wvstreams-4.6.1_20
diff --git a/srcpkgs/opencv/patches/python3.12.patch b/srcpkgs/opencv/patches/python3.12.patch
deleted file mode 100644
index 71d0d55565b3a7..00000000000000
--- a/srcpkgs/opencv/patches/python3.12.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 00ca8f455e6a5588d905e3a0b268f18ee3fda5dd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
-Date: Sun, 1 Oct 2023 16:12:25 +0100
-Subject: [PATCH] `numpy.distutils` is removed in numpy 1.26 on Python 3.12.
-
-so we don't use numpy.distutils to get includes dirs of python-numpy
----
- cmake/OpenCVDetectPython.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/OpenCVDetectPython.cmake b/cmake/OpenCVDetectPython.cmake
-index 88a434185622..d4098ce8e60d 100644
---- a/cmake/OpenCVDetectPython.cmake
-+++ b/cmake/OpenCVDetectPython.cmake
-@@ -216,7 +216,7 @@ if(NOT ${found})
-           message(STATUS "  PYTHON3_NUMPY_INCLUDE_DIRS")
-         else()
-           # Attempt to discover the NumPy include directory. If this succeeds, then build python API with NumPy
--          execute_process(COMMAND "${_executable}" -c "import os; os.environ['DISTUTILS_USE_SDK']='1'; import numpy.distutils; print(os.pathsep.join(numpy.distutils.misc_util.get_numpy_include_dirs()))"
-+          execute_process(COMMAND "${_executable}" -c "import numpy; print(numpy.get_include())"
-                           RESULT_VARIABLE _numpy_process
-                           OUTPUT_VARIABLE _numpy_include_dirs
-                           OUTPUT_STRIP_TRAILING_WHITESPACE)
diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 66c110edd20847..f4caee7bf6fa99 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
-version=4.7.0
-revision=4
+version=4.11.0
+revision=1
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake
@@ -19,13 +19,13 @@ makedepends="ffmpeg6-devel libpng-devel libjpeg-turbo-devel tiff-devel
  python3-numpy python3-devel"
 short_desc="Computer vision and machine learning software library"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
+license="Apache-2.0"
 homepage="https://opencv.org"
 changelog="https://github.com/opencv/opencv/wiki/ChangeLog"
 distfiles="https://github.com/opencv/opencv/archive/${version}.tar.gz
  https://github.com/opencv/opencv_contrib/archive/${version}.tar.gz>contrib.tar.gz"
-checksum="8df0079cdbe179748a18d44731af62a245a45ebf5085223dc03133954c662973
- 42df840cf9055e59d0e22c249cfb19f04743e1bdad113d31b1573d3934d62584"
+checksum="9a7c11f924eff5f8d8070e297b322ee68b9227e003fd600d4b8122198091665f
+ 2dfc5957201de2aa785064711125af6abb2e80a64e2dc246aca4119b19687041"
 patch_args="-Np1 -d ${build_wrksrc}"
 # tests hang indenfinitely, even with test data included
 make_check=no

From 13220545d78dd7f5d0375be68830212a2f1c362a Mon Sep 17 00:00:00 2001
From: wbailey <wilsonrandallbailey@gmail.com>
Date: Sat, 12 Apr 2025 12:47:16 -0500
Subject: [PATCH 05/14] actiona: rebuild for opencv-4.11.0

---
 srcpkgs/actiona/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/actiona/template b/srcpkgs/actiona/template
index 0d899311e6df75..6d049fd0290f3f 100644
--- a/srcpkgs/actiona/template
+++ b/srcpkgs/actiona/template
@@ -1,7 +1,7 @@
 # Template file for 'actiona'
 pkgname=actiona
 version=3.10.1
-revision=3
+revision=4
 build_style=qmake
 configure_args="PKGCONFIG_OPENCV=opencv4"
 hostmakedepends="pkg-config qt5-plugin-mysql qt5-qmake qt5-host-tools"

From cad4db38affd14de583fc6df1ad135fba02d7b11 Mon Sep 17 00:00:00 2001
From: wbailey <wilsonrandallbailey@gmail.com>
Date: Sat, 12 Apr 2025 12:47:16 -0500
Subject: [PATCH 06/14] digikam: rebuild for opencv-4.11.0

---
 srcpkgs/digikam/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/digikam/template b/srcpkgs/digikam/template
index 68208cb1f36a93..b33fe6e7626643 100644
--- a/srcpkgs/digikam/template
+++ b/srcpkgs/digikam/template
@@ -1,7 +1,7 @@
 # Template file for 'digikam'
 pkgname=digikam
 version=8.5.0
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
  -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DBUILD_WITH_QT6=ON

From e6387dc2951f5b446cf2b7a30635596c0ec7ba1e Mon Sep 17 00:00:00 2001
From: wbailey <wilsonrandallbailey@gmail.com>
Date: Sat, 12 Apr 2025 12:47:17 -0500
Subject: [PATCH 07/14] gmic: rebuild for opencv-4.11.0

---
 srcpkgs/gmic/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index 865423400048b9..49476d8cf8f325 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,7 +1,7 @@
 # Template file for 'gmic'
 pkgname=gmic
 version=3.5.3
-revision=1
+revision=2
 _zart_hash=d014169343f835381ad232ee11e077326561c9eb
 build_wrksrc="src"
 build_style=gnu-makefile

From e1d4ce53524db9b31667753c2ddb567aabf433c5 Mon Sep 17 00:00:00 2001
From: wbailey <wilsonrandallbailey@gmail.com>
Date: Sat, 12 Apr 2025 12:47:17 -0500
Subject: [PATCH 08/14] mlt7: rebuild for opencv-4.11.0

---
 srcpkgs/mlt7/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mlt7/template b/srcpkgs/mlt7/template
index 5f4621296f1ea0..ffdeb80498562c 100644
--- a/srcpkgs/mlt7/template
+++ b/srcpkgs/mlt7/template
@@ -1,7 +1,7 @@
 # Template file for 'mlt7'
 pkgname=mlt7
 version=7.30.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DSWIG_PYTHON=ON -DMOD_QT6=ON"
 hostmakedepends="doxygen pkg-config ladspa-sdk swig python3 which

From 80bb77f17f6ae18ca7face1317e86f81308d9486 Mon Sep 17 00:00:00 2001
From: wbailey <wilsonrandallbailey@gmail.com>
Date: Sat, 12 Apr 2025 12:47:18 -0500
Subject: [PATCH 09/14] nomacs: rebuild for opencv-4.11.0

---
 srcpkgs/nomacs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nomacs/template b/srcpkgs/nomacs/template
index 83cb5c63b50b7c..18954205aad6fb 100644
--- a/srcpkgs/nomacs/template
+++ b/srcpkgs/nomacs/template
@@ -1,7 +1,7 @@
 # Template file for 'nomacs'
 pkgname=nomacs
 version=3.17.2287
-revision=4
+revision=5
 _plugins_ver=3.17.2285
 build_wrksrc=ImageLounge
 build_style=cmake

From 48fa448cf42c7a2c4bcffb9a27a01db7b5087599 Mon Sep 17 00:00:00 2001
From: wbailey <wilsonrandallbailey@gmail.com>
Date: Sat, 12 Apr 2025 12:47:18 -0500
Subject: [PATCH 10/14] opentoonz: rebuild for opencv-4.11.0

---
 srcpkgs/opentoonz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opentoonz/template b/srcpkgs/opentoonz/template
index a61690905a53c4..4fbc62280f0df1 100644
--- a/srcpkgs/opentoonz/template
+++ b/srcpkgs/opentoonz/template
@@ -1,7 +1,7 @@
 # Template file for 'opentoonz'
 pkgname=opentoonz
 version=1.7.1
-revision=2
+revision=3
 build_wrksrc="toonz/sources"
 build_style=cmake
 make_cmd=make

From 0d0fe54cd1b89b0633599cf1a46a747a436fadef Mon Sep 17 00:00:00 2001
From: wbailey <wilsonrandallbailey@gmail.com>
Date: Sat, 12 Apr 2025 12:47:19 -0500
Subject: [PATCH 11/14] siril: rebuild for opencv-4.11.0

---
 srcpkgs/siril/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/siril/template b/srcpkgs/siril/template
index f167dd3704500c..55aaa5a72fa7ab 100644
--- a/srcpkgs/siril/template
+++ b/srcpkgs/siril/template
@@ -1,7 +1,7 @@
 # Template file for 'siril'
 pkgname=siril
 version=0.9.12
-revision=13
+revision=14
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool autoconf automake gettext-devel"
 makedepends="fftw-devel libconfig-devel libopencv-devel libffms2-devel

From 0069f4be8f7b885edd2e9235dec48f8916605a93 Mon Sep 17 00:00:00 2001
From: wbailey <wilsonrandallbailey@gmail.com>
Date: Sat, 12 Apr 2025 12:47:19 -0500
Subject: [PATCH 12/14] spectacle: rebuild for opencv-4.11.0

---
 srcpkgs/spectacle/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index 97b47d4611e959..368c1b378cdd66 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -2,7 +2,7 @@
 pkgname=spectacle
 reverts="24.12.1_1 24.12.0_1 24.08.1_2 24.08.1_1 24.08.0_1 24.05.0_4 24.05.0_3 24.05.0_2 24.05.0_2 24.05.0_2 24.05.0_1 24.02.2_1 23.08.5_1 23.08.4_1 23.08.3_1 23.08.2_1 23.08.0_1 23.04.2_1 23.04.0_1 22.12.1_1 22.08.2_1 22.08.1_1 22.04.3_1 22.04.1_1 21.12.3_1 21.12.2_1 21.12.1_1 21.12.0_1 21.08.3_1 21.08.2_1 21.08.1_1 21.08.0_1 21.04.3_1 21.04.2_1 21.04.1_1 21.04.0_1 20.12.3_1 20.12.2_1 20.12.1_1 20.12.0_1 20.08.3_1 20.08.2_1 20.08.1_1 20.08.0_1 20.04.3_1 20.04.2_1 20.04.2_1 20.04.1_1 20.04.0_1"
 version=6.3.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules qt6-tools qt6-base qt6-wayland-tools

From 9a2e58cfe1caf3329ad5b26d510d79f9ecd430c0 Mon Sep 17 00:00:00 2001
From: wbailey <wilsonrandallbailey@gmail.com>
Date: Sat, 12 Apr 2025 12:47:19 -0500
Subject: [PATCH 13/14] waifu2x-converter-cpp: rebuild for opencv-4.11.0

---
 srcpkgs/waifu2x-converter-cpp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/waifu2x-converter-cpp/template b/srcpkgs/waifu2x-converter-cpp/template
index 9bd76a982d4496..4b33ba1ed30f43 100644
--- a/srcpkgs/waifu2x-converter-cpp/template
+++ b/srcpkgs/waifu2x-converter-cpp/template
@@ -1,7 +1,7 @@
 # Template file for 'waifu2x-converter-cpp'
 pkgname=waifu2x-converter-cpp
 version=5.3.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DINSTALL_MODELS=ON"
 hostmakedepends="pkg-config"

From 392c32d9c81f3957cb9ce5a0a2368356b2eb70e1 Mon Sep 17 00:00:00 2001
From: BeefcakeTheMighty <61915386+BeefcakeTheMighty@users.noreply.github.com>
Date: Sat, 12 Apr 2025 18:45:30 -0500
Subject: [PATCH 14/14] Update srcpkgs/opencv/template

Co-authored-by: classabbyamp <5366828+classabbyamp@users.noreply.github.com>
---
 srcpkgs/opencv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index f4caee7bf6fa99..7258c2de8f93a5 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -21,7 +21,7 @@ short_desc="Computer vision and machine learning software library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://opencv.org"
-changelog="https://github.com/opencv/opencv/wiki/ChangeLog"
+changelog="https://github.com/opencv/opencv/wiki/OpenCV-Change-Logs"
 distfiles="https://github.com/opencv/opencv/archive/${version}.tar.gz
  https://github.com/opencv/opencv_contrib/archive/${version}.tar.gz>contrib.tar.gz"
 checksum="9a7c11f924eff5f8d8070e297b322ee68b9227e003fd600d4b8122198091665f

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] opencv upgrade to 4.11
  2025-04-12 17:30 [PR PATCH] opencv upgrade to 4.11 BeefcakeTheMighty
                   ` (6 preceding siblings ...)
  2025-04-12 23:45 ` BeefcakeTheMighty
@ 2025-04-13  5:25 ` BeefcakeTheMighty
  2025-04-21  5:30 ` BeefcakeTheMighty
                   ` (7 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: BeefcakeTheMighty @ 2025-04-13  5:25 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1118 bytes --]

There is an updated pull request by BeefcakeTheMighty against master on the void-packages repository

https://github.com/BeefcakeTheMighty/void-packages btm_opencv
https://github.com/void-linux/void-packages/pull/55041

opencv upgrade to 4.11
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: YES

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64)




A patch file from https://github.com/void-linux/void-packages/pull/55041.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-btm_opencv-55041.patch --]
[-- Type: text/x-diff, Size: 23659 bytes --]

From e302a4896dbca0f1b25c0e4ad59a3028824c58cd Mon Sep 17 00:00:00 2001
From: wbailey <wilsonrandallbailey@gmail.com>
Date: Sat, 12 Apr 2025 05:09:51 -0500
Subject: [PATCH 01/11] opencv: update to 4.11.0.

---
 common/shlibs                           | 104 ++++++++++++------------
 srcpkgs/opencv/patches/python3.12.patch |  23 ------
 srcpkgs/opencv/template                 |  10 +--
 3 files changed, 57 insertions(+), 80 deletions(-)
 delete mode 100644 srcpkgs/opencv/patches/python3.12.patch

diff --git a/common/shlibs b/common/shlibs
index 7a9666a23ed309..7fc7cea6fd4204 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2192,58 +2192,58 @@ libcapstone.so.5 capstone-5.0.1_1
 libhavege.so.2 libhaveged-1.9.11_1
 libnih.so.1 libnih-1.0.3_1
 libnih-dbus.so.1 libnih-1.0.3_1
-libopencv_quality.so.407 libopencv-4.7.0_1
-libopencv_reg.so.407 libopencv-4.7.0_1
-libopencv_surface_matching.so.407 libopencv-4.7.0_1
-libopencv_xphoto.so.407 libopencv-4.7.0_1
-libopencv_freetype.so.407 libopencv-4.7.0_1
-libopencv_fuzzy.so.407 libopencv-4.7.0_1
-libopencv_hfs.so.407 libopencv-4.7.0_1
-libopencv_img_hash.so.407 libopencv-4.7.0_1
-libopencv_line_descriptor.so.407 libopencv-4.7.0_1
-libopencv_saliency.so.407 libopencv-4.7.0_1
-libopencv_structured_light.so.407 libopencv-4.7.0_1
-libopencv_aruco.so.407 libopencv-4.7.0_1
-libopencv_bgsegm.so.407 libopencv-4.4.7_1
-libopencv_bioinspired.so.407 libopencv-4.7.0_1
-libopencv_ccalib.so.407 libopencv-4.4.7_1
-libopencv_face.so.407 libopencv-4.7.0_1
-libopencv_tracking.so.407 libopencv-4.7.0_1
-libopencv_xfeatures2d.so.407 libopencv-4.7.0_1
-libopencv_optflow.so.407 libopencv-4.4.7_1
-libopencv_ximgproc.so.407 libopencv-4.7.0_1
-libopencv_plot.so.407 libopencv-4.7.0_1
-libopencv_text.so.407 libopencv-4.7.0_1
-libopencv_ml.so.407 libopencv-4.4.7_1
-libopencv_objdetect.so.407 libopencv-4.7.0_1
-libopencv_dnn.so.407 libopencv-4.7.0_1
-libopencv_shape.so.407 libopencv-4.7.0_1
-libopencv_stitching.so.407 libopencv-4.7.0_1
-libopencv_photo.so.407 libopencv-4.7.0_1
-libopencv_video.so.407 libopencv-4.7.0_1
-libopencv_calib3d.so.407 libopencv-4.7.0_1
-libopencv_features2d.so.407 libopencv-4.7.0_1
-libopencv_flann.so.407 libopencv-4.7.0_1
-libopencv_highgui.so.407 libopencv-4.7.0_1
-libopencv_videoio.so.407 libopencv-4.7.0_1
-libopencv_imgcodecs.so.407 libopencv-4.7.0_1
-libopencv_imgproc.so.407 libopencv-4.7.0_1
-libopencv_core.so.407 libopencv-4.7.0_1
-libopencv_superres.so.407 libopencv-4.7.0_1
-libopencv_videostab.so.407 libopencv-4.7.0_1
-libopencv_gapi.so.407 libopencv-4.7.0_1
-libopencv_xobjdetect.so.407 libopencv-4.7.0_1
-libopencv_datasets.so.407 libopencv-4.7.0_1
-libopencv_dnn_objdetect.so.407 libopencv-4.7.0_1
-libopencv_dnn_superres.so.407 libopencv-4.7.0_1
-libopencv_dpm.so.407 libopencv-4.7.0_1
-libopencv_phase_unwrapping.so.407 libopencv-4.7.0_1
-libopencv_stereo.so.407 libopencv-4.7.0_1
-libopencv_rapid.so.407 libopencv-4.7.0_1
-libopencv_intensity_transform.so.407 libopencv-4.7.0_1
-libopencv_alphamat.so.407 libopencv-4.7.0_1
-libopencv_barcode.so.407 libopencv-4.7.0_1
-libopencv_mcc.so.407 libopencv-4.7.0_1
+libopencv_quality.so.411 libopencv-4.11.0_1
+libopencv_reg.so.411 libopencv-4.11.0_1
+libopencv_surface_matching.so.411 libopencv-4.11.0_1
+libopencv_xphoto.so.411 libopencv-4.11.0_1
+libopencv_freetype.so.411 libopencv-4.11.0_1
+libopencv_fuzzy.so.411 libopencv-4.11.0_1
+libopencv_hfs.so.411 libopencv-4.11.0_1
+libopencv_img_hash.so.411 libopencv-4.11.0_1
+libopencv_line_descriptor.so.411 libopencv-4.11.0_1
+libopencv_saliency.so.411 libopencv-4.11.0_1
+libopencv_structured_light.so.411 libopencv-4.11.0_1
+libopencv_aruco.so.411 libopencv-4.11.0_1
+libopencv_bgsegm.so.411 libopencv-4.11.0_1
+libopencv_bioinspired.so.411 libopencv-4.11.0_1
+libopencv_ccalib.so.411 libopencv-4.11.0_1
+libopencv_face.so.411 libopencv-4.11.0_1
+libopencv_tracking.so.411 libopencv-4.11.0_1
+libopencv_xfeatures2d.so.411 libopencv-4.11.0_1
+libopencv_optflow.so.411 libopencv-4.4.7_1
+libopencv_ximgproc.so.411 libopencv-4.11.0_1
+libopencv_plot.so.411 libopencv-4.11.0_1
+libopencv_text.so.411 libopencv-4.11.0_1
+libopencv_ml.so.411 libopencv-4.4.7_1
+libopencv_objdetect.so.411 libopencv-4.11.0_1
+libopencv_dnn.so.411 libopencv-4.11.0_1
+libopencv_shape.so.411 libopencv-4.11.0_1
+libopencv_stitching.so.411 libopencv-4.11.0_1
+libopencv_photo.so.411 libopencv-4.11.0_1
+libopencv_video.so.411 libopencv-4.11.0_1
+libopencv_calib3d.so.411 libopencv-4.11.0_1
+libopencv_features2d.so.411 libopencv-4.11.0_1
+libopencv_flann.so.411 libopencv-4.11.0_1
+libopencv_highgui.so.411 libopencv-4.11.0_1
+libopencv_videoio.so.411 libopencv-4.11.0_1
+libopencv_imgcodecs.so.411 libopencv-4.11.0_1
+libopencv_imgproc.so.411 libopencv-4.11.0_1
+libopencv_core.so.411 libopencv-4.11.0_1
+libopencv_superres.so.411 libopencv-4.11.0_1
+libopencv_videostab.so.411 libopencv-4.11.0_1
+libopencv_gapi.so.411 libopencv-4.11.0_1
+libopencv_xobjdetect.so.411 libopencv-4.11.0_1
+libopencv_datasets.so.411 libopencv-4.11.0_1
+libopencv_dnn_objdetect.so.411 libopencv-4.11.0_1
+libopencv_dnn_superres.so.411 libopencv-4.11.0_1
+libopencv_dpm.so.411 libopencv-4.11.0_1
+libopencv_phase_unwrapping.so.411 libopencv-4.11.0_1
+libopencv_stereo.so.411 libopencv-4.11.0_1
+libopencv_rapid.so.411 libopencv-4.11.0_1
+libopencv_intensity_transform.so.411 libopencv-4.11.0_1
+libopencv_alphamat.so.411 libopencv-4.11.0_1
+libopencv_barcode.so.411 libopencv-4.11.0_1
+libopencv_mcc.so.411 libopencv-4.11.0_1
 libuniconf.so.4.6 wvstreams-4.6.1_20
 libwvbase.so.4.6 wvstreams-4.6.1_20
 libwvutils.so.4.6 wvstreams-4.6.1_20
diff --git a/srcpkgs/opencv/patches/python3.12.patch b/srcpkgs/opencv/patches/python3.12.patch
deleted file mode 100644
index 71d0d55565b3a7..00000000000000
--- a/srcpkgs/opencv/patches/python3.12.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 00ca8f455e6a5588d905e3a0b268f18ee3fda5dd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
-Date: Sun, 1 Oct 2023 16:12:25 +0100
-Subject: [PATCH] `numpy.distutils` is removed in numpy 1.26 on Python 3.12.
-
-so we don't use numpy.distutils to get includes dirs of python-numpy
----
- cmake/OpenCVDetectPython.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/OpenCVDetectPython.cmake b/cmake/OpenCVDetectPython.cmake
-index 88a434185622..d4098ce8e60d 100644
---- a/cmake/OpenCVDetectPython.cmake
-+++ b/cmake/OpenCVDetectPython.cmake
-@@ -216,7 +216,7 @@ if(NOT ${found})
-           message(STATUS "  PYTHON3_NUMPY_INCLUDE_DIRS")
-         else()
-           # Attempt to discover the NumPy include directory. If this succeeds, then build python API with NumPy
--          execute_process(COMMAND "${_executable}" -c "import os; os.environ['DISTUTILS_USE_SDK']='1'; import numpy.distutils; print(os.pathsep.join(numpy.distutils.misc_util.get_numpy_include_dirs()))"
-+          execute_process(COMMAND "${_executable}" -c "import numpy; print(numpy.get_include())"
-                           RESULT_VARIABLE _numpy_process
-                           OUTPUT_VARIABLE _numpy_include_dirs
-                           OUTPUT_STRIP_TRAILING_WHITESPACE)
diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 66c110edd20847..f4caee7bf6fa99 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
-version=4.7.0
-revision=4
+version=4.11.0
+revision=1
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake
@@ -19,13 +19,13 @@ makedepends="ffmpeg6-devel libpng-devel libjpeg-turbo-devel tiff-devel
  python3-numpy python3-devel"
 short_desc="Computer vision and machine learning software library"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
+license="Apache-2.0"
 homepage="https://opencv.org"
 changelog="https://github.com/opencv/opencv/wiki/ChangeLog"
 distfiles="https://github.com/opencv/opencv/archive/${version}.tar.gz
  https://github.com/opencv/opencv_contrib/archive/${version}.tar.gz>contrib.tar.gz"
-checksum="8df0079cdbe179748a18d44731af62a245a45ebf5085223dc03133954c662973
- 42df840cf9055e59d0e22c249cfb19f04743e1bdad113d31b1573d3934d62584"
+checksum="9a7c11f924eff5f8d8070e297b322ee68b9227e003fd600d4b8122198091665f
+ 2dfc5957201de2aa785064711125af6abb2e80a64e2dc246aca4119b19687041"
 patch_args="-Np1 -d ${build_wrksrc}"
 # tests hang indenfinitely, even with test data included
 make_check=no

From c95b5d72ee1570ac782ef32f312245c2eaa75e21 Mon Sep 17 00:00:00 2001
From: wbailey <wilsonrandallbailey@gmail.com>
Date: Sat, 12 Apr 2025 05:09:51 -0500
Subject: [PATCH 02/11] opencv: update to 4.11.0.

---
 common/shlibs                           | 104 ++++++++++++------------
 srcpkgs/opencv/patches/python3.12.patch |  23 ------
 srcpkgs/opencv/template                 |  10 +--
 3 files changed, 57 insertions(+), 80 deletions(-)
 delete mode 100644 srcpkgs/opencv/patches/python3.12.patch

diff --git a/common/shlibs b/common/shlibs
index 7a9666a23ed309..7fc7cea6fd4204 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2192,58 +2192,58 @@ libcapstone.so.5 capstone-5.0.1_1
 libhavege.so.2 libhaveged-1.9.11_1
 libnih.so.1 libnih-1.0.3_1
 libnih-dbus.so.1 libnih-1.0.3_1
-libopencv_quality.so.407 libopencv-4.7.0_1
-libopencv_reg.so.407 libopencv-4.7.0_1
-libopencv_surface_matching.so.407 libopencv-4.7.0_1
-libopencv_xphoto.so.407 libopencv-4.7.0_1
-libopencv_freetype.so.407 libopencv-4.7.0_1
-libopencv_fuzzy.so.407 libopencv-4.7.0_1
-libopencv_hfs.so.407 libopencv-4.7.0_1
-libopencv_img_hash.so.407 libopencv-4.7.0_1
-libopencv_line_descriptor.so.407 libopencv-4.7.0_1
-libopencv_saliency.so.407 libopencv-4.7.0_1
-libopencv_structured_light.so.407 libopencv-4.7.0_1
-libopencv_aruco.so.407 libopencv-4.7.0_1
-libopencv_bgsegm.so.407 libopencv-4.4.7_1
-libopencv_bioinspired.so.407 libopencv-4.7.0_1
-libopencv_ccalib.so.407 libopencv-4.4.7_1
-libopencv_face.so.407 libopencv-4.7.0_1
-libopencv_tracking.so.407 libopencv-4.7.0_1
-libopencv_xfeatures2d.so.407 libopencv-4.7.0_1
-libopencv_optflow.so.407 libopencv-4.4.7_1
-libopencv_ximgproc.so.407 libopencv-4.7.0_1
-libopencv_plot.so.407 libopencv-4.7.0_1
-libopencv_text.so.407 libopencv-4.7.0_1
-libopencv_ml.so.407 libopencv-4.4.7_1
-libopencv_objdetect.so.407 libopencv-4.7.0_1
-libopencv_dnn.so.407 libopencv-4.7.0_1
-libopencv_shape.so.407 libopencv-4.7.0_1
-libopencv_stitching.so.407 libopencv-4.7.0_1
-libopencv_photo.so.407 libopencv-4.7.0_1
-libopencv_video.so.407 libopencv-4.7.0_1
-libopencv_calib3d.so.407 libopencv-4.7.0_1
-libopencv_features2d.so.407 libopencv-4.7.0_1
-libopencv_flann.so.407 libopencv-4.7.0_1
-libopencv_highgui.so.407 libopencv-4.7.0_1
-libopencv_videoio.so.407 libopencv-4.7.0_1
-libopencv_imgcodecs.so.407 libopencv-4.7.0_1
-libopencv_imgproc.so.407 libopencv-4.7.0_1
-libopencv_core.so.407 libopencv-4.7.0_1
-libopencv_superres.so.407 libopencv-4.7.0_1
-libopencv_videostab.so.407 libopencv-4.7.0_1
-libopencv_gapi.so.407 libopencv-4.7.0_1
-libopencv_xobjdetect.so.407 libopencv-4.7.0_1
-libopencv_datasets.so.407 libopencv-4.7.0_1
-libopencv_dnn_objdetect.so.407 libopencv-4.7.0_1
-libopencv_dnn_superres.so.407 libopencv-4.7.0_1
-libopencv_dpm.so.407 libopencv-4.7.0_1
-libopencv_phase_unwrapping.so.407 libopencv-4.7.0_1
-libopencv_stereo.so.407 libopencv-4.7.0_1
-libopencv_rapid.so.407 libopencv-4.7.0_1
-libopencv_intensity_transform.so.407 libopencv-4.7.0_1
-libopencv_alphamat.so.407 libopencv-4.7.0_1
-libopencv_barcode.so.407 libopencv-4.7.0_1
-libopencv_mcc.so.407 libopencv-4.7.0_1
+libopencv_quality.so.411 libopencv-4.11.0_1
+libopencv_reg.so.411 libopencv-4.11.0_1
+libopencv_surface_matching.so.411 libopencv-4.11.0_1
+libopencv_xphoto.so.411 libopencv-4.11.0_1
+libopencv_freetype.so.411 libopencv-4.11.0_1
+libopencv_fuzzy.so.411 libopencv-4.11.0_1
+libopencv_hfs.so.411 libopencv-4.11.0_1
+libopencv_img_hash.so.411 libopencv-4.11.0_1
+libopencv_line_descriptor.so.411 libopencv-4.11.0_1
+libopencv_saliency.so.411 libopencv-4.11.0_1
+libopencv_structured_light.so.411 libopencv-4.11.0_1
+libopencv_aruco.so.411 libopencv-4.11.0_1
+libopencv_bgsegm.so.411 libopencv-4.11.0_1
+libopencv_bioinspired.so.411 libopencv-4.11.0_1
+libopencv_ccalib.so.411 libopencv-4.11.0_1
+libopencv_face.so.411 libopencv-4.11.0_1
+libopencv_tracking.so.411 libopencv-4.11.0_1
+libopencv_xfeatures2d.so.411 libopencv-4.11.0_1
+libopencv_optflow.so.411 libopencv-4.4.7_1
+libopencv_ximgproc.so.411 libopencv-4.11.0_1
+libopencv_plot.so.411 libopencv-4.11.0_1
+libopencv_text.so.411 libopencv-4.11.0_1
+libopencv_ml.so.411 libopencv-4.4.7_1
+libopencv_objdetect.so.411 libopencv-4.11.0_1
+libopencv_dnn.so.411 libopencv-4.11.0_1
+libopencv_shape.so.411 libopencv-4.11.0_1
+libopencv_stitching.so.411 libopencv-4.11.0_1
+libopencv_photo.so.411 libopencv-4.11.0_1
+libopencv_video.so.411 libopencv-4.11.0_1
+libopencv_calib3d.so.411 libopencv-4.11.0_1
+libopencv_features2d.so.411 libopencv-4.11.0_1
+libopencv_flann.so.411 libopencv-4.11.0_1
+libopencv_highgui.so.411 libopencv-4.11.0_1
+libopencv_videoio.so.411 libopencv-4.11.0_1
+libopencv_imgcodecs.so.411 libopencv-4.11.0_1
+libopencv_imgproc.so.411 libopencv-4.11.0_1
+libopencv_core.so.411 libopencv-4.11.0_1
+libopencv_superres.so.411 libopencv-4.11.0_1
+libopencv_videostab.so.411 libopencv-4.11.0_1
+libopencv_gapi.so.411 libopencv-4.11.0_1
+libopencv_xobjdetect.so.411 libopencv-4.11.0_1
+libopencv_datasets.so.411 libopencv-4.11.0_1
+libopencv_dnn_objdetect.so.411 libopencv-4.11.0_1
+libopencv_dnn_superres.so.411 libopencv-4.11.0_1
+libopencv_dpm.so.411 libopencv-4.11.0_1
+libopencv_phase_unwrapping.so.411 libopencv-4.11.0_1
+libopencv_stereo.so.411 libopencv-4.11.0_1
+libopencv_rapid.so.411 libopencv-4.11.0_1
+libopencv_intensity_transform.so.411 libopencv-4.11.0_1
+libopencv_alphamat.so.411 libopencv-4.11.0_1
+libopencv_barcode.so.411 libopencv-4.11.0_1
+libopencv_mcc.so.411 libopencv-4.11.0_1
 libuniconf.so.4.6 wvstreams-4.6.1_20
 libwvbase.so.4.6 wvstreams-4.6.1_20
 libwvutils.so.4.6 wvstreams-4.6.1_20
diff --git a/srcpkgs/opencv/patches/python3.12.patch b/srcpkgs/opencv/patches/python3.12.patch
deleted file mode 100644
index 71d0d55565b3a7..00000000000000
--- a/srcpkgs/opencv/patches/python3.12.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 00ca8f455e6a5588d905e3a0b268f18ee3fda5dd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
-Date: Sun, 1 Oct 2023 16:12:25 +0100
-Subject: [PATCH] `numpy.distutils` is removed in numpy 1.26 on Python 3.12.
-
-so we don't use numpy.distutils to get includes dirs of python-numpy
----
- cmake/OpenCVDetectPython.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/OpenCVDetectPython.cmake b/cmake/OpenCVDetectPython.cmake
-index 88a434185622..d4098ce8e60d 100644
---- a/cmake/OpenCVDetectPython.cmake
-+++ b/cmake/OpenCVDetectPython.cmake
-@@ -216,7 +216,7 @@ if(NOT ${found})
-           message(STATUS "  PYTHON3_NUMPY_INCLUDE_DIRS")
-         else()
-           # Attempt to discover the NumPy include directory. If this succeeds, then build python API with NumPy
--          execute_process(COMMAND "${_executable}" -c "import os; os.environ['DISTUTILS_USE_SDK']='1'; import numpy.distutils; print(os.pathsep.join(numpy.distutils.misc_util.get_numpy_include_dirs()))"
-+          execute_process(COMMAND "${_executable}" -c "import numpy; print(numpy.get_include())"
-                           RESULT_VARIABLE _numpy_process
-                           OUTPUT_VARIABLE _numpy_include_dirs
-                           OUTPUT_STRIP_TRAILING_WHITESPACE)
diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 66c110edd20847..f4caee7bf6fa99 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
-version=4.7.0
-revision=4
+version=4.11.0
+revision=1
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake
@@ -19,13 +19,13 @@ makedepends="ffmpeg6-devel libpng-devel libjpeg-turbo-devel tiff-devel
  python3-numpy python3-devel"
 short_desc="Computer vision and machine learning software library"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
+license="Apache-2.0"
 homepage="https://opencv.org"
 changelog="https://github.com/opencv/opencv/wiki/ChangeLog"
 distfiles="https://github.com/opencv/opencv/archive/${version}.tar.gz
  https://github.com/opencv/opencv_contrib/archive/${version}.tar.gz>contrib.tar.gz"
-checksum="8df0079cdbe179748a18d44731af62a245a45ebf5085223dc03133954c662973
- 42df840cf9055e59d0e22c249cfb19f04743e1bdad113d31b1573d3934d62584"
+checksum="9a7c11f924eff5f8d8070e297b322ee68b9227e003fd600d4b8122198091665f
+ 2dfc5957201de2aa785064711125af6abb2e80a64e2dc246aca4119b19687041"
 patch_args="-Np1 -d ${build_wrksrc}"
 # tests hang indenfinitely, even with test data included
 make_check=no

From 13220545d78dd7f5d0375be68830212a2f1c362a Mon Sep 17 00:00:00 2001
From: wbailey <wilsonrandallbailey@gmail.com>
Date: Sat, 12 Apr 2025 12:47:16 -0500
Subject: [PATCH 03/11] actiona: rebuild for opencv-4.11.0

---
 srcpkgs/actiona/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/actiona/template b/srcpkgs/actiona/template
index 0d899311e6df75..6d049fd0290f3f 100644
--- a/srcpkgs/actiona/template
+++ b/srcpkgs/actiona/template
@@ -1,7 +1,7 @@
 # Template file for 'actiona'
 pkgname=actiona
 version=3.10.1
-revision=3
+revision=4
 build_style=qmake
 configure_args="PKGCONFIG_OPENCV=opencv4"
 hostmakedepends="pkg-config qt5-plugin-mysql qt5-qmake qt5-host-tools"

From cad4db38affd14de583fc6df1ad135fba02d7b11 Mon Sep 17 00:00:00 2001
From: wbailey <wilsonrandallbailey@gmail.com>
Date: Sat, 12 Apr 2025 12:47:16 -0500
Subject: [PATCH 04/11] digikam: rebuild for opencv-4.11.0

---
 srcpkgs/digikam/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/digikam/template b/srcpkgs/digikam/template
index 68208cb1f36a93..b33fe6e7626643 100644
--- a/srcpkgs/digikam/template
+++ b/srcpkgs/digikam/template
@@ -1,7 +1,7 @@
 # Template file for 'digikam'
 pkgname=digikam
 version=8.5.0
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
  -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DBUILD_WITH_QT6=ON

From e6387dc2951f5b446cf2b7a30635596c0ec7ba1e Mon Sep 17 00:00:00 2001
From: wbailey <wilsonrandallbailey@gmail.com>
Date: Sat, 12 Apr 2025 12:47:17 -0500
Subject: [PATCH 05/11] gmic: rebuild for opencv-4.11.0

---
 srcpkgs/gmic/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index 865423400048b9..49476d8cf8f325 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,7 +1,7 @@
 # Template file for 'gmic'
 pkgname=gmic
 version=3.5.3
-revision=1
+revision=2
 _zart_hash=d014169343f835381ad232ee11e077326561c9eb
 build_wrksrc="src"
 build_style=gnu-makefile

From e1d4ce53524db9b31667753c2ddb567aabf433c5 Mon Sep 17 00:00:00 2001
From: wbailey <wilsonrandallbailey@gmail.com>
Date: Sat, 12 Apr 2025 12:47:17 -0500
Subject: [PATCH 06/11] mlt7: rebuild for opencv-4.11.0

---
 srcpkgs/mlt7/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mlt7/template b/srcpkgs/mlt7/template
index 5f4621296f1ea0..ffdeb80498562c 100644
--- a/srcpkgs/mlt7/template
+++ b/srcpkgs/mlt7/template
@@ -1,7 +1,7 @@
 # Template file for 'mlt7'
 pkgname=mlt7
 version=7.30.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DSWIG_PYTHON=ON -DMOD_QT6=ON"
 hostmakedepends="doxygen pkg-config ladspa-sdk swig python3 which

From 80bb77f17f6ae18ca7face1317e86f81308d9486 Mon Sep 17 00:00:00 2001
From: wbailey <wilsonrandallbailey@gmail.com>
Date: Sat, 12 Apr 2025 12:47:18 -0500
Subject: [PATCH 07/11] nomacs: rebuild for opencv-4.11.0

---
 srcpkgs/nomacs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nomacs/template b/srcpkgs/nomacs/template
index 83cb5c63b50b7c..18954205aad6fb 100644
--- a/srcpkgs/nomacs/template
+++ b/srcpkgs/nomacs/template
@@ -1,7 +1,7 @@
 # Template file for 'nomacs'
 pkgname=nomacs
 version=3.17.2287
-revision=4
+revision=5
 _plugins_ver=3.17.2285
 build_wrksrc=ImageLounge
 build_style=cmake

From 48fa448cf42c7a2c4bcffb9a27a01db7b5087599 Mon Sep 17 00:00:00 2001
From: wbailey <wilsonrandallbailey@gmail.com>
Date: Sat, 12 Apr 2025 12:47:18 -0500
Subject: [PATCH 08/11] opentoonz: rebuild for opencv-4.11.0

---
 srcpkgs/opentoonz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opentoonz/template b/srcpkgs/opentoonz/template
index a61690905a53c4..4fbc62280f0df1 100644
--- a/srcpkgs/opentoonz/template
+++ b/srcpkgs/opentoonz/template
@@ -1,7 +1,7 @@
 # Template file for 'opentoonz'
 pkgname=opentoonz
 version=1.7.1
-revision=2
+revision=3
 build_wrksrc="toonz/sources"
 build_style=cmake
 make_cmd=make

From 0d0fe54cd1b89b0633599cf1a46a747a436fadef Mon Sep 17 00:00:00 2001
From: wbailey <wilsonrandallbailey@gmail.com>
Date: Sat, 12 Apr 2025 12:47:19 -0500
Subject: [PATCH 09/11] siril: rebuild for opencv-4.11.0

---
 srcpkgs/siril/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/siril/template b/srcpkgs/siril/template
index f167dd3704500c..55aaa5a72fa7ab 100644
--- a/srcpkgs/siril/template
+++ b/srcpkgs/siril/template
@@ -1,7 +1,7 @@
 # Template file for 'siril'
 pkgname=siril
 version=0.9.12
-revision=13
+revision=14
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool autoconf automake gettext-devel"
 makedepends="fftw-devel libconfig-devel libopencv-devel libffms2-devel

From 0069f4be8f7b885edd2e9235dec48f8916605a93 Mon Sep 17 00:00:00 2001
From: wbailey <wilsonrandallbailey@gmail.com>
Date: Sat, 12 Apr 2025 12:47:19 -0500
Subject: [PATCH 10/11] spectacle: rebuild for opencv-4.11.0

---
 srcpkgs/spectacle/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index 97b47d4611e959..368c1b378cdd66 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -2,7 +2,7 @@
 pkgname=spectacle
 reverts="24.12.1_1 24.12.0_1 24.08.1_2 24.08.1_1 24.08.0_1 24.05.0_4 24.05.0_3 24.05.0_2 24.05.0_2 24.05.0_2 24.05.0_1 24.02.2_1 23.08.5_1 23.08.4_1 23.08.3_1 23.08.2_1 23.08.0_1 23.04.2_1 23.04.0_1 22.12.1_1 22.08.2_1 22.08.1_1 22.04.3_1 22.04.1_1 21.12.3_1 21.12.2_1 21.12.1_1 21.12.0_1 21.08.3_1 21.08.2_1 21.08.1_1 21.08.0_1 21.04.3_1 21.04.2_1 21.04.1_1 21.04.0_1 20.12.3_1 20.12.2_1 20.12.1_1 20.12.0_1 20.08.3_1 20.08.2_1 20.08.1_1 20.08.0_1 20.04.3_1 20.04.2_1 20.04.2_1 20.04.1_1 20.04.0_1"
 version=6.3.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules qt6-tools qt6-base qt6-wayland-tools

From 9a2e58cfe1caf3329ad5b26d510d79f9ecd430c0 Mon Sep 17 00:00:00 2001
From: wbailey <wilsonrandallbailey@gmail.com>
Date: Sat, 12 Apr 2025 12:47:19 -0500
Subject: [PATCH 11/11] waifu2x-converter-cpp: rebuild for opencv-4.11.0

---
 srcpkgs/waifu2x-converter-cpp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/waifu2x-converter-cpp/template b/srcpkgs/waifu2x-converter-cpp/template
index 9bd76a982d4496..4b33ba1ed30f43 100644
--- a/srcpkgs/waifu2x-converter-cpp/template
+++ b/srcpkgs/waifu2x-converter-cpp/template
@@ -1,7 +1,7 @@
 # Template file for 'waifu2x-converter-cpp'
 pkgname=waifu2x-converter-cpp
 version=5.3.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DINSTALL_MODELS=ON"
 hostmakedepends="pkg-config"

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: opencv upgrade to 4.11
  2025-04-12 17:30 [PR PATCH] opencv upgrade to 4.11 BeefcakeTheMighty
                   ` (7 preceding siblings ...)
  2025-04-13  5:25 ` BeefcakeTheMighty
@ 2025-04-21  5:30 ` BeefcakeTheMighty
  2025-04-21 17:18 ` [PR REVIEW] " vincele
                   ` (6 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: BeefcakeTheMighty @ 2025-04-21  5:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 262 bytes --]

New comment by BeefcakeTheMighty on void-packages repository

https://github.com/void-linux/void-packages/pull/55041#issuecomment-2817669310

Comment:
@classabbyamp are there still issues I need to address before this is merged or is the queue just really long?

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR REVIEW] opencv upgrade to 4.11
  2025-04-12 17:30 [PR PATCH] opencv upgrade to 4.11 BeefcakeTheMighty
                   ` (8 preceding siblings ...)
  2025-04-21  5:30 ` BeefcakeTheMighty
@ 2025-04-21 17:18 ` vincele
  2025-04-21 17:19 ` vincele
                   ` (5 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: vincele @ 2025-04-21 17:18 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 256 bytes --]

New review comment by vincele on void-packages repository

https://github.com/void-linux/void-packages/pull/55041#discussion_r2052737629

Comment:
Is this really necessary ? Going back on this will be easy, better not to leave useless cruft in there, no ?

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR REVIEW] opencv upgrade to 4.11
  2025-04-12 17:30 [PR PATCH] opencv upgrade to 4.11 BeefcakeTheMighty
                   ` (9 preceding siblings ...)
  2025-04-21 17:18 ` [PR REVIEW] " vincele
@ 2025-04-21 17:19 ` vincele
  2025-04-22 16:09 ` classabbyamp
                   ` (4 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: vincele @ 2025-04-21 17:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 328 bytes --]

New review comment by vincele on void-packages repository

https://github.com/void-linux/void-packages/pull/55041#discussion_r2052737629

Comment:
Is this really necessary ? Going back on this will be easy, better not to leave useless cruft in there, no ?

But this only IMHO, so, let's see if anyone want to chime in on this

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: opencv upgrade to 4.11
  2025-04-12 17:30 [PR PATCH] opencv upgrade to 4.11 BeefcakeTheMighty
                   ` (10 preceding siblings ...)
  2025-04-21 17:19 ` vincele
@ 2025-04-22 16:09 ` classabbyamp
  2025-06-28  8:57 ` GitAkash
                   ` (3 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: classabbyamp @ 2025-04-22 16:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 381 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/55041#issuecomment-2821815340

Comment:
this needs to be rebased to remove the merge commits (i.e.:
```
git switch master
git pull --ff-only upstream master
git switch btm_opencv
git rebase -i master
```
(delete the merge commit lines in the todo editor, save & quit)

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: opencv upgrade to 4.11
  2025-04-12 17:30 [PR PATCH] opencv upgrade to 4.11 BeefcakeTheMighty
                   ` (11 preceding siblings ...)
  2025-04-22 16:09 ` classabbyamp
@ 2025-06-28  8:57 ` GitAkash
  2025-06-29 13:38 ` zlice
                   ` (2 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: GitAkash @ 2025-06-28  8:57 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 397 bytes --]

New comment by GitAkash on void-packages repository

https://github.com/void-linux/void-packages/pull/55041#issuecomment-3015126702

Comment:
Heya I'm trying to get this updated so I can try to update Digikam. I myself ran some tests but some package won't build with the new OpenCV.  Any Idea on when you will be able to look at this again @classabbyamp ?

The tests can be seen here:
#55993 

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: opencv upgrade to 4.11
  2025-04-12 17:30 [PR PATCH] opencv upgrade to 4.11 BeefcakeTheMighty
                   ` (12 preceding siblings ...)
  2025-06-28  8:57 ` GitAkash
@ 2025-06-29 13:38 ` zlice
  2025-07-09 16:54 ` [PR PATCH] [Closed]: " Hoshpak
  2025-07-09 16:54 ` Hoshpak
  15 siblings, 0 replies; 17+ messages in thread
From: zlice @ 2025-06-29 13:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 509 bytes --]

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/55041#issuecomment-3016706318

Comment:
> Heya I'm trying to get this updated so I can try to update Digikam. I myself ran some tests but some package won't build with the new OpenCV. Any Idea on when you will be able to look at this again @classabbyamp ?
> 
> The tests can be seen here: #55993

fwiw - didn't have any issues building here on glibc64 https://github.com/zlice/void-packages/tree/opencv411

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Closed]: opencv upgrade to 4.11
  2025-04-12 17:30 [PR PATCH] opencv upgrade to 4.11 BeefcakeTheMighty
                   ` (13 preceding siblings ...)
  2025-06-29 13:38 ` zlice
@ 2025-07-09 16:54 ` Hoshpak
  2025-07-09 16:54 ` Hoshpak
  15 siblings, 0 replies; 17+ messages in thread
From: Hoshpak @ 2025-07-09 16:54 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 939 bytes --]

There's a closed pull request on the void-packages repository

opencv upgrade to 4.11
https://github.com/void-linux/void-packages/pull/55041

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: YES

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64)




^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: opencv upgrade to 4.11
  2025-04-12 17:30 [PR PATCH] opencv upgrade to 4.11 BeefcakeTheMighty
                   ` (14 preceding siblings ...)
  2025-07-09 16:54 ` [PR PATCH] [Closed]: " Hoshpak
@ 2025-07-09 16:54 ` Hoshpak
  15 siblings, 0 replies; 17+ messages in thread
From: Hoshpak @ 2025-07-09 16:54 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 154 bytes --]

New comment by Hoshpak on void-packages repository

https://github.com/void-linux/void-packages/pull/55041#issuecomment-3053351121

Comment:
#56156 56156

^ permalink raw reply	[flat|nested] 17+ messages in thread

end of thread, other threads:[~2025-07-09 16:54 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-04-12 17:30 [PR PATCH] opencv upgrade to 4.11 BeefcakeTheMighty
2025-04-12 17:32 ` [PR REVIEW] " classabbyamp
2025-04-12 17:32 ` classabbyamp
2025-04-12 17:42 ` BeefcakeTheMighty
2025-04-12 17:44 ` classabbyamp
2025-04-12 17:45 ` BeefcakeTheMighty
2025-04-12 23:07 ` [PR PATCH] [Updated] " BeefcakeTheMighty
2025-04-12 23:45 ` BeefcakeTheMighty
2025-04-13  5:25 ` BeefcakeTheMighty
2025-04-21  5:30 ` BeefcakeTheMighty
2025-04-21 17:18 ` [PR REVIEW] " vincele
2025-04-21 17:19 ` vincele
2025-04-22 16:09 ` classabbyamp
2025-06-28  8:57 ` GitAkash
2025-06-29 13:38 ` zlice
2025-07-09 16:54 ` [PR PATCH] [Closed]: " Hoshpak
2025-07-09 16:54 ` Hoshpak

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).