mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
media-libs/opencv: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at> Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
This commit is contained in:
committed by
Conrad Kostecki
parent
85de97a06b
commit
49b546ca3d
@@ -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()
|
||||
@@ -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<int SDEPTH> 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<Npp32s>(), hist[1].ptr<Npp32s>(), hist[2].ptr<Npp32s>(), hist[3].ptr<Npp32s>()};
|
||||
|
||||
- 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);
|
||||
Reference in New Issue
Block a user