diff options
author | V3n3RiX <venerix@koprulu.sector> | 2025-03-24 00:31:53 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2025-03-24 00:31:53 +0000 |
commit | 72e4c0bc86eea366d063d15b3d5611e8f82ffd05 (patch) | |
tree | be4116935e605807f4a03de97c876e050718881a /media-libs/opencv | |
parent | add1c3acddd7a3f49fdb230135725463d2662921 (diff) |
gentoo auto-resync : 24:03:2025 - 00:31:53
Diffstat (limited to 'media-libs/opencv')
-rw-r--r-- | media-libs/opencv/Manifest | 2 | ||||
-rw-r--r-- | media-libs/opencv/files/opencv-3.4.0-disable-download.patch | 29 | ||||
-rw-r--r-- | media-libs/opencv/files/opencv_contrib-4.9.0-cuda-12.4.patch | 70 |
3 files changed, 0 insertions, 101 deletions
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest index 033a8d673925..2add51ace5f8 100644 --- a/media-libs/opencv/Manifest +++ b/media-libs/opencv/Manifest @@ -1,4 +1,3 @@ -AUX opencv-3.4.0-disable-download.patch 1050 BLAKE2B 6f39f61588d9231cc8d877624538a49654ec8cf63091f8d0251cd01cc14684f2f5264c295a149c4a5754a9336e1ad4d1760cc26471fd85a6f571404f7c8d540d SHA512 95f2043c286a7de33fb4718fc1e2ded1fd943b20a5c4cc0c3d7af84fc317e53e3aa6358a33e4781195f8a80904d6bc615171142cde5d30a83d16045d36f85826 AUX opencv-3.4.1-cuda-add-relaxed-constexpr.patch 707 BLAKE2B 743a9c259c59fc4e3017539faef0723e0a80fb9c4bbde94811f32b3e6ae271b3db39fd35487d75078cfbe9e596604c4e37fb5c6c18619ed524c52683219dd8af SHA512 b37ce78495a3bbc439f203d9db81d9bff3e7f980c01ef5187dee537dd9c1025c5163ec3760b48d91a099a2fafb60526c9fe83f7183fc605fb3cc0f5c7a65f6bf AUX opencv-4.1.2-opencl-license.patch 519 BLAKE2B 6dcdf809c3c75a39d0e44f02e157a0c0ee074fd15144565ed51ade7e7849cb313c084100f499cc1240424f4647a2ff73c8d5e61cbdf6d0499846db61b8a30729 SHA512 2874a5140ef5028eb6c64f36325904000edd722560cf876fc49d63b040633bcfea01cae27c156b18191564805cafd2986f26eea322b1376af4f2982d66ed7653 AUX opencv-4.10.0-26234.patch 2791 BLAKE2B b55dd5fe4d554a0be48cabd7009d476fd47aa63bb4142ebb2f5681a2cdf17d530bffcec31e795a3ec7dc3524b3a9496562f83ea2fa9939d431d8d794458a2e9f SHA512 55f767366ab478cad5c2a1b89ccb38a0dbe66fc2c3e04d2cef767bb8dd2c672c6c523eba2b4fb67c73001f1a223c2c1b831f1b951c45b48fc5d649686c1a4cdf @@ -16,7 +15,6 @@ AUX opencv-4.9.0-drop-python2-detection.patch 3270 BLAKE2B bbb4021592e61d1ca99b7 AUX opencv_contrib-4.10.0-CUDA-12.6-tuple_size.patch 2348 BLAKE2B 347c194b26d177ea7e7465e51e9bd362e4f5f23c48fa2eff363a3895a6f45d80a09218ac25ec293a496c56156572a9b000583fe3788b94510a26986c8ba8ebce SHA512 0eb0db58e9fdab8e6cc4415a6430c1b80ed338a6dea8dfe21bd965eadcab9de2098b2ba094496784fc90d1648713f1af721cb7e849c049793a5159799fc128d6 AUX opencv_contrib-4.8.1-NVIDIAOpticalFlowSDK-2.0.tar.gz.patch 1158 BLAKE2B c4b139198ac5c33974d6c4fac8ebcf288f15d9edf09e55b30e47071931abdf8924dc51c2d8cb27103edb3b815ba9f7e5ea334cfb1849be7b59ff4cd076f6771a SHA512 03d4442af9b98115126473cca0a9f581bd0c0e983b8d5b7f34fdd0ea7455d4a73163f853c80438f4390c5da4c7cc419c59c24643529df9eb4222915c80e654fe AUX opencv_contrib-4.8.1-rgbd.patch 477 BLAKE2B 0120e631199d7099bae437d459f0c950c3cbd11e5f0a900d687ca5aedf1d7602f7faa3be5ba1a9b3e0758f3fd70574450f97bd7429e447df7440d58326ceb99b SHA512 6fe2ef40bf26d40e4f52d84b17183f6e536b2fe51bf65266be6a59865def0b9c074aa5eff58a60d673afec776a7ba03acaba667c917b78751950b77f68759d96 -AUX opencv_contrib-4.9.0-cuda-12.4.patch 2397 BLAKE2B 7333533f0818b04f5ec89b593f9bf7710aba496a2ba7a1688043818d4249d4a3d3e3f17c42456d2e5e0aaae728f0b9726f3943ce732f7307b0126adc68147da0 SHA512 442c97b3fbf48f0b5c1176a10b1bbcf7fccad369070b6be2a0e3e6dd2ccba88f0a7662360b108fc4d55b766d0563d5f7eef5a2fb7afa5212aac8cab73e9ad43c DIST NVIDIAOpticalFlowSDK-edb50da3cf849840d680249aa6dbef248ebce2ca.tar.gz 8771 BLAKE2B f579960448bdaf57fbefd5e88002d8f6f4dbb828429b0f3a0112916c03039d4e4de65263eb8464a4d62924c1b77f0a61c2d93b7307657439bfbf7d59785f1533 SHA512 85dfdc52260f54f62c980508f4b6ab384e44200bd1c13761c4947f9a898c08f0faed2d734a85a4ba7a46f8788ed58ee89f12f61cee97881b69ba626bbd04f655 DIST ade-0.1.2d.tar.gz 117027 BLAKE2B c544b769c7b289342a469950ed047fa13719bafba29aa41167b588cf4f24ed6e596159ec19b65e61e09519a461a5e82ac07d63e2ea493279ee182fe658810abb SHA512 46f2feee28d732a6940a5a95944f3283bde1b8c8e05466a8ca1c576623c54d1bed875ce2b24a941111d8976cb0c6ba5a4ac8408f042f5765debf1badf7d43348 DIST opencv-4.10.0.tar.gz 94993429 BLAKE2B f16de226337ce1dabda4a52ae03257b0570af0e6212102c483dce61f2bcee1549150d0016b6ea20bae5d8c838e12db3d54bcb9c2ec5d3164639cdd56818f0b1b SHA512 b4f7248f89f1cd146dbbae7860a17131cd29bd3cb81db1e678abfcfbf2d8fa4a7633bfd0edbf50afae7b838c8700e8c0d0bb05828139d5cb5662df6bbf3eb92c 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 245ad3b3d028..000000000000 --- 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 f3b5c7b36b50..000000000000 --- 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<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); |