Gentoo Archives: gentoo-commits

From: Amy Winston <amynka@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
Date: Thu, 26 Nov 2015 21:13:16
Message-Id: 1448572316.7bbdf13eaf0d8b6da619fa15581d1ba56c1cc072.amynka@gentoo
1 commit: 7bbdf13eaf0d8b6da619fa15581d1ba56c1cc072
2 Author: Amy Winston <amynka <AT> gentoo <DOT> org>
3 AuthorDate: Thu Nov 26 21:10:58 2015 +0000
4 Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
5 CommitDate: Thu Nov 26 21:11:56 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bbdf13e
7
8 media-libs/opencv: cuda restriction for >=gcc-4.8 disabled bug #566244.
9
10 Package-Manager: portage-2.2.20.1
11
12 media-libs/opencv/metadata.xml | 1 +
13 media-libs/opencv/opencv-3.0.0.ebuild | 13 +++----------
14 2 files changed, 4 insertions(+), 10 deletions(-)
15
16 diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
17 index 47c3b51..12a445a 100644
18 --- a/media-libs/opencv/metadata.xml
19 +++ b/media-libs/opencv/metadata.xml
20 @@ -9,6 +9,7 @@
21 <maintainer>
22 <email>amynka@g.o</email>
23 <name>Amy Winston</name>
24 + <description>Assign bugs on me.</description>
25 </maintainer>
26 <longdescription>
27 OpenCV (Open Source Computer Vision) is a library of programming functions mainly aimed at real time computer vision.
28
29 diff --git a/media-libs/opencv/opencv-3.0.0.ebuild b/media-libs/opencv/opencv-3.0.0.ebuild
30 index a101fc4..aec55eb 100644
31 --- a/media-libs/opencv/opencv-3.0.0.ebuild
32 +++ b/media-libs/opencv/opencv-3.0.0.ebuild
33 @@ -182,16 +182,9 @@ src_configure() {
34 fi
35
36 if use cuda; then
37 - if [[ "$(gcc-version)" > "4.7" ]]; then
38 - ewarn "CUDA and >=sys-devel/gcc-4.8 do not play well together. Disabling CUDA support."
39 - mycmakeargs+=( "-DWITH_CUDA=OFF" )
40 - mycmakeargs+=( "-DWITH_CUBLAS=OFF" )
41 - mycmakeargs+=( "-DWITH_CUFFT=OFF" )
42 - else
43 - mycmakeargs+=( "-DWITH_CUDA=ON" )
44 - mycmakeargs+=( "-DWITH_CUBLAS=ON" )
45 - mycmakeargs+=( "-DWITH_CUFFT=ON" )
46 - fi
47 + mycmakeargs+=( "-DWITH_CUDA=ON" )
48 + mycmakeargs+=( "-DWITH_CUBLAS=ON" )
49 + mycmakeargs+=( "-DWITH_CUFFT=ON" )
50 else
51 mycmakeargs+=( "-DWITH_CUDA=OFF" )
52 mycmakeargs+=( "-DWITH_CUBLAS=OFF" )