diff options
| author |   Paul Zander <negril.nx+gentoo@gmail.com> | 2023-11-21 16:05:43 +0100 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2023-11-22 11:39:53 +0000 |
| commit | 8912df505fed8b242f01d5ee8d78b23c7a72fd86 (patch) | |
| tree | 59f3dbd30ac71fac97411d0a012b828d5475cf01 /media-libs | |
| parent | net-misc/gerbera: fix building with gcc 14 (diff) | |
| download | gentoo-8912df505fed8b242f01d5ee8d78b23c7a72fd86.tar.gz gentoo-8912df505fed8b242f01d5ee8d78b23c7a72fd86.tar.bz2 gentoo-8912df505fed8b242f01d5ee8d78b23c7a72fd86.zip | |
media-libs/opencv: 4.8.x fix for compatibility with CUDA Toolkit >= 12.2.0
Closes: https://bugs.gentoo.org/915775
Closes: https://bugs.gentoo.org/917675
Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33928
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/opencv/files/opencv-4.8.0-fix-cuda-12.2.0.patch | 40 | ||||
| -rw-r--r-- | media-libs/opencv/opencv-4.8.0-r1.ebuild | 1 | ||||
| -rw-r--r-- | media-libs/opencv/opencv-4.8.0.ebuild | 1 | ||||
| -rw-r--r-- | media-libs/opencv/opencv-4.8.1.ebuild | 1 |
4 files changed, 43 insertions, 0 deletions
diff --git a/media-libs/opencv/files/opencv-4.8.0-fix-cuda-12.2.0.patch b/media-libs/opencv/files/opencv-4.8.0-fix-cuda-12.2.0.patch new file mode 100644 index 000000000000..fd7d12af2644 --- /dev/null +++ b/media-libs/opencv/files/opencv-4.8.0-fix-cuda-12.2.0.patch @@ -0,0 +1,40 @@ +https://github.com/opencv/opencv/pull/24104 +https://github.com/opencv/opencv/commit/5466fd2606ca6df57bbe43f064d2ae73fe4329eb +https://bugs.gentoo.org/915775 + +From ab8cb6f8a9034da2a289b84685c6d959266029be Mon Sep 17 00:00:00 2001 +From: cudawarped <12133430+cudawarped@users.noreply.github.com> +Date: Tue, 1 Aug 2023 13:02:42 +0300 +Subject: [PATCH] cuda: fix for compatibility with CUDA Toolkit >= 12.2.0 + +--- + modules/dnn/src/cuda4dnn/primitives/normalize_bbox.hpp | 2 +- + modules/dnn/src/cuda4dnn/primitives/region.hpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/modules/dnn/src/cuda4dnn/primitives/normalize_bbox.hpp b/modules/dnn/src/cuda4dnn/primitives/normalize_bbox.hpp +index f067dddaa701..91ff33f81718 100644 +--- a/modules/dnn/src/cuda4dnn/primitives/normalize_bbox.hpp ++++ b/modules/dnn/src/cuda4dnn/primitives/normalize_bbox.hpp +@@ -111,7 +111,7 @@ namespace cv { namespace dnn { namespace cuda4dnn { + * or there might be several weights + * or we don't have to scale + */ +- if (weight != 1.0) ++ if (weight != static_cast<T>(1.0f)) + { + kernels::scale1_with_bias1<T>(stream, output, input, weight, 1.0); + } +diff --git a/modules/dnn/src/cuda4dnn/primitives/region.hpp b/modules/dnn/src/cuda4dnn/primitives/region.hpp +index d22d44214e7b..3af05155feea 100644 +--- a/modules/dnn/src/cuda4dnn/primitives/region.hpp ++++ b/modules/dnn/src/cuda4dnn/primitives/region.hpp +@@ -121,7 +121,7 @@ namespace cv { namespace dnn { namespace cuda4dnn { + new_coords + ); + +- if (nms_iou_threshold > 0) { ++ if (nms_iou_threshold > static_cast<T>(0.0f)) { + auto output_mat = output_wrapper->getMutableHostMat(); + CV_Assert(output_mat.type() == CV_32F); + for (int i = 0; i < input.get_axis_size(0); i++) { diff --git a/media-libs/opencv/opencv-4.8.0-r1.ebuild b/media-libs/opencv/opencv-4.8.0-r1.ebuild index 2910615c0b36..ad47071aba4d 100644 --- a/media-libs/opencv/opencv-4.8.0-r1.ebuild +++ b/media-libs/opencv/opencv-4.8.0-r1.ebuild @@ -295,6 +295,7 @@ PATCHES=( "${FILESDIR}"/${PN}-4.8.0-fix-protobuf.patch "${FILESDIR}"/${PN}-4.8.0-fix-flatbuffer.patch "${FILESDIR}"/${PN}-4.8.0-arm64-fp16.patch + "${FILESDIR}"/${PN}-4.8.0-fix-cuda-12.2.0.patch ) pkg_pretend() { diff --git a/media-libs/opencv/opencv-4.8.0.ebuild b/media-libs/opencv/opencv-4.8.0.ebuild index 772cd8408d98..82322d2d67fb 100644 --- a/media-libs/opencv/opencv-4.8.0.ebuild +++ b/media-libs/opencv/opencv-4.8.0.ebuild @@ -290,6 +290,7 @@ PATCHES=( "${FILESDIR}"/${PN}-4.1.2-opencl-license.patch "${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch "${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.patch + "${FILESDIR}"/${PN}-4.8.0-fix-cuda-12.2.0.patch ) pkg_pretend() { diff --git a/media-libs/opencv/opencv-4.8.1.ebuild b/media-libs/opencv/opencv-4.8.1.ebuild index 0bfc5cab4674..3f219f22a627 100644 --- a/media-libs/opencv/opencv-4.8.1.ebuild +++ b/media-libs/opencv/opencv-4.8.1.ebuild @@ -300,6 +300,7 @@ PATCHES=( "${FILESDIR}"/${PN}-4.8.0-fix-protobuf.patch "${FILESDIR}"/${PN}-4.8.0-fix-flatbuffer.patch "${FILESDIR}"/${PN}-4.8.0-arm64-fp16.patch + "${FILESDIR}"/${PN}-4.8.0-fix-cuda-12.2.0.patch ) pkg_pretend() { |