[gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/

[Sam James]

commit:     acdafb3f95a4dd143af220d4213893f86719b2e4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  5 02:57:22 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov  5 02:58:00 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acdafb3f

media-libs/opencv: fix check for whether nvcc is installed

```
 * Applying opencv_contrib-4.8.1-NVIDIAOpticalFlowSDK-2.0.tar.gz.patch ...
 [ ok ]
/var/tmp/portage/media-libs/opencv-4.10.0/temp/environment: line 5691: nvcc: 
command not found
 * ERROR: media-libs/opencv-4.10.0::gentoo failed (prepare phase):
 *   __eapi7_ver_compare: invalid version:
```

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/opencv/opencv-4.10.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/opencv/opencv-4.10.0.ebuild 
b/media-libs/opencv/opencv-4.10.0.ebuild
index ea1242c5e0b7..853455f07d30 100644
--- a/media-libs/opencv/opencv-4.10.0.ebuild
+++ b/media-libs/opencv/opencv-4.10.0.ebuild
@@ -458,7 +458,7 @@ src_prepare() {
                cd "${WORKDIR}/${PN}_contrib-${PV}" || die
                eapply "${FILESDIR}/${PN}_contrib-4.8.1-rgbd.patch"
                eapply 
"${FILESDIR}/${PN}_contrib-4.8.1-NVIDIAOpticalFlowSDK-2.0.tar.gz.patch"
-               if ver_test "$(nvcc --version | tail -n 1 | cut -d '_' -f 2- | 
cut -d '.' -f 1-2)" -ge 12.4; then
+               if type -P nvcc &> /dev/null && ver_test "$(nvcc --version | 
tail -n 1 | cut -d '_' -f 2- | cut -d '.' -f 1-2)" -ge 12.4; then
                        eapply "${DISTDIR}/${PN}_contrib-4.10.0-3607.patch"
                        eapply 
"${FILESDIR}/${PN}_contrib-4.10.0-CUDA-12.6-tuple_size.patch" # 3785
                fi