From 49b546ca3d427240d0ea56ef0422271eb3191bf8 Mon Sep 17 00:00:00 2001 From: Michael Mair-Keimberger Date: Thu, 20 Mar 2025 08:15:04 +0100 Subject: [PATCH] media-libs/opencv: remove unused patches Signed-off-by: Michael Mair-Keimberger Signed-off-by: Conrad Kostecki --- .../files/opencv-3.4.0-disable-download.patch | 29 -------- .../opencv_contrib-4.9.0-cuda-12.4.patch | 70 ------------------- 2 files changed, 99 deletions(-) delete mode 100644 media-libs/opencv/files/opencv-3.4.0-disable-download.patch delete mode 100644 media-libs/opencv/files/opencv_contrib-4.9.0-cuda-12.4.patch diff --git a/media-libs/opencv/files/opencv-3.4.0-disable-download.patch b/media-libs/opencv/files/opencv-3.4.0-disable-download.patch deleted file mode 100644 index 245ad3b3d028c..0000000000000 --- a/media-libs/opencv/files/opencv-3.4.0-disable-download.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/CMakeLists.txt 2018-05-13 20:47:11.635871328 +0200 -+++ b/CMakeLists.txt 2018-05-13 20:47:49.289872617 +0200 -@@ -187,6 +187,7 @@ - # ---------------------------------------------------------------------------- - - OCV_OPTION(OPENCV_ENABLE_NONFREE "Enable non-free algorithms" OFF) -+OCV_OPTION(ENABLE_DOWNLOAD "Enable download during configure" ON) - - # 3rd party libs - OCV_OPTION(BUILD_ZLIB "Build zlib from source" WIN32 OR APPLE) - ---- a/cmake/OpenCVDownload.cmake 2018-05-13 21:22:14.966943336 +0200 -+++ b/cmake/OpenCVDownload.cmake 2018-05-13 21:23:15.959945424 +0200 -@@ -32,6 +32,7 @@ - - - function(ocv_download) -+ if(ENABLE_DOWNLOAD) - cmake_parse_arguments(DL "UNPACK;RELATIVE_URL" "FILENAME;HASH;DESTINATION_DIR;ID;STATUS" "URL" ${ARGN}) - - macro(ocv_download_log) -@@ -236,4 +237,7 @@ - if(OCV_DOWNLOAD_HASH_NAME) - set(${OCV_DOWNLOAD_HASH_NAME} "${DL_HASH}" CACHE INTERNAL "") - endif() -+ else() -+ message( "Download was disabled during configure phase by ENABLE_DOWNLOAD=OFF" ) -+ endif() - endfunction() diff --git a/media-libs/opencv/files/opencv_contrib-4.9.0-cuda-12.4.patch b/media-libs/opencv/files/opencv_contrib-4.9.0-cuda-12.4.patch deleted file mode 100644 index f3b5c7b36b506..0000000000000 --- a/media-libs/opencv/files/opencv_contrib-4.9.0-cuda-12.4.patch +++ /dev/null @@ -1,70 +0,0 @@ -From: https://gitlab.archlinux.org/archlinux/packaging/packages/opencv/-/blob/main/fix-nppi-bufsize-type.patch?ref_type=heads ---- a/modules/cudaarithm/src/reductions.cpp 2023-12-26 22:24:58.000000000 +0100 -+++ b/modules/cudaarithm/src/reductions.cpp 2024-03-18 16:51:32.108049155 +0100 -@@ -151,7 +151,7 @@ - sz.width = gsrc.cols; - sz.height = gsrc.rows; - -- int bufSize; -+ size_t bufSize; - #if (CUDA_VERSION <= 4020) - nppSafeCall( nppiMeanStdDev8uC1RGetBufferHostSize(sz, &bufSize) ); - #else -@@ -227,7 +227,7 @@ - sz.width = gsrc.cols; - sz.height = gsrc.rows; - -- int bufSize; -+ size_t bufSize; - #if (CUDA_VERSION <= 4020) - nppSafeCall( nppiMeanStdDev8uC1MRGetBufferHostSize(sz, &bufSize) ); - #else ---- a/modules/cudaimgproc/src/histogram.cpp 2023-12-26 22:24:58.000000000 +0100 -+++ b/modules/cudaimgproc/src/histogram.cpp 2024-03-18 17:51:37.005208948 +0100 -@@ -281,8 +281,8 @@ - - namespace - { -- typedef NppStatus (*get_buf_size_c1_t)(NppiSize oSizeROI, int nLevels, int* hpBufferSize); -- typedef NppStatus (*get_buf_size_c4_t)(NppiSize oSizeROI, int nLevels[], int* hpBufferSize); -+ typedef NppStatus (*get_buf_size_c1_t)(NppiSize oSizeROI, int nLevels, size_t* hpBufferSize); -+ typedef NppStatus (*get_buf_size_c4_t)(NppiSize oSizeROI, int nLevels[], size_t* hpBufferSize); - - template struct NppHistogramEvenFuncC1 - { -@@ -315,7 +315,7 @@ - sz.width = src.cols; - sz.height = src.rows; - -- int buf_size; -+ size_t buf_size; - get_buf_size(sz, levels, &buf_size); - - BufferPool pool(stream); -@@ -349,7 +349,7 @@ - - Npp32s* pHist[] = {hist[0].ptr(), hist[1].ptr(), hist[2].ptr(), hist[3].ptr()}; - -- int buf_size; -+ size_t buf_size; - get_buf_size(sz, levels, &buf_size); - - BufferPool pool(stream); -@@ -419,7 +419,7 @@ - sz.width = src.cols; - sz.height = src.rows; - -- int buf_size; -+ size_t buf_size; - get_buf_size(sz, levels.cols, &buf_size); - - BufferPool pool(stream); -@@ -460,7 +460,7 @@ - sz.width = src.cols; - sz.height = src.rows; - -- int buf_size; -+ size_t buf_size; - get_buf_size(sz, nLevels, &buf_size); - - BufferPool pool(stream);