commit: b5fa07f822c12ace6463e48a2b41cccb6f99359f Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> AuthorDate: Fri Oct 17 09:30:36 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Oct 17 14:31:25 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5fa07f8
media-libs/opencv: drop unused patches Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/44218 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/opencv-4.9.0-ade-0.1.2d.tar.gz.patch | 18 -------- ...pencv_contrib-4.10.0-CUDA-12.6-tuple_size.patch | 53 ---------------------- 2 files changed, 71 deletions(-) diff --git a/media-libs/opencv/files/opencv-4.9.0-ade-0.1.2d.tar.gz.patch b/media-libs/opencv/files/opencv-4.9.0-ade-0.1.2d.tar.gz.patch deleted file mode 100644 index 9d0d4c0d98f6..000000000000 --- a/media-libs/opencv/files/opencv-4.9.0-ade-0.1.2d.tar.gz.patch +++ /dev/null @@ -1,18 +0,0 @@ -From: Paul Zander <[email protected]> - -Use tar.gz instead of zip to make CI happy. - -diff --git a/modules/gapi/cmake/DownloadADE.cmake b/modules/gapi/cmake/DownloadADE.cmake -index e22c4f1..fb0c10a 100644 ---- a/modules/gapi/cmake/DownloadADE.cmake -+++ b/modules/gapi/cmake/DownloadADE.cmake -@@ -1,7 +1,7 @@ - set(ade_src_dir "${OpenCV_BINARY_DIR}/3rdparty/ade") --set(ade_filename "v0.1.2d.zip") -+set(ade_filename "v0.1.2d.tar.gz") - set(ade_subdir "ade-0.1.2d") --set(ade_md5 "dbb095a8bf3008e91edbbf45d8d34885") -+set(ade_md5 "a0fc51a1090100023316c08322e8b093") - ocv_download(FILENAME ${ade_filename} - HASH ${ade_md5} - URL diff --git a/media-libs/opencv/files/opencv_contrib-4.10.0-CUDA-12.6-tuple_size.patch b/media-libs/opencv/files/opencv_contrib-4.10.0-CUDA-12.6-tuple_size.patch deleted file mode 100644 index 252ecdee6cb6..000000000000 --- a/media-libs/opencv/files/opencv_contrib-4.10.0-CUDA-12.6-tuple_size.patch +++ /dev/null @@ -1,53 +0,0 @@ -https://github.com/opencv/opencv_contrib/pull/3785 -From 09eb618804588f77026924096d848800630c8d6f Mon Sep 17 00:00:00 2001 -From: Alexander Smorkalov <[email protected]> -Date: Tue, 3 Sep 2024 13:47:48 +0300 -Subject: [PATCH] Workaround for CUDA 12.6 tuple_size issue #3773. - ---- - modules/cudaarithm/src/cuda/polar_cart.cu | 20 +++++--------------- - 1 file changed, 5 insertions(+), 15 deletions(-) - -diff --git a/modules/cudaarithm/src/cuda/polar_cart.cu b/modules/cudaarithm/src/cuda/polar_cart.cu -index 725f5741d8..c65b894bf6 100644 ---- a/modules/cudaarithm/src/cuda/polar_cart.cu -+++ b/modules/cudaarithm/src/cuda/polar_cart.cu -@@ -159,25 +159,15 @@ void cv::cuda::cartToPolar(InputArray _xy, OutputArray _mag, OutputArray _angle, - GpuMat_<float> magc(mag); - GpuMat_<float> anglec(angle); - -+ gridTransformUnary(globPtr<float2>(xy), globPtr<float>(magc), magnitude_interleaved_func<float2>(), stream); -+ - if (angleInDegrees) - { -- auto f1 = magnitude_interleaved_func<float2>(); -- auto f2 = direction_interleaved_func<float2, true>(); -- cv::cudev::tuple<decltype(f1), decltype(f2)> f12 = cv::cudev::make_tuple(f1, f2); -- gridTransformTuple(globPtr<float2>(xy), -- tie(magc, anglec), -- f12, -- stream); -+ gridTransformUnary(globPtr<float2>(xy), globPtr<float>(anglec), direction_interleaved_func<float2, true>(), stream); - } - else - { -- auto f1 = magnitude_interleaved_func<float2>(); -- auto f2 = direction_interleaved_func<float2, false>(); -- cv::cudev::tuple<decltype(f1), decltype(f2)> f12 = cv::cudev::make_tuple(f1, f2); -- gridTransformTuple(globPtr<float2>(xy), -- tie(magc, anglec), -- f12, -- stream); -+ gridTransformUnary(globPtr<float2>(xy), globPtr<float>(anglec), direction_interleaved_func<float2, false>(), stream); - } - - syncOutput(mag, _mag, stream); -@@ -191,7 +181,7 @@ void cv::cuda::cartToPolar(InputArray _xy, OutputArray _magAngle, bool angleInDe - CV_Assert( xy.type() == CV_32FC2 ); - - GpuMat magAngle = getOutputMat(_magAngle, xy.size(), CV_32FC2, stream); -- -+ - if (angleInDegrees) - { - gridTransformUnary(globPtr<float2>(xy),
