diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2012-06-03 08:50:43 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2012-06-03 08:50:43 +0000 |
| commit | 8aeae21ccf5ce11926357b6c78c1b823af781045 (patch) | |
| tree | f0afb742d12c699e495af2f882b82b9a4dd38713 /media-libs/opencv | |
| parent | Renamed use flag test to testprograms, as it installs additional binaries (diff) | |
| download | gentoo-2-8aeae21ccf5ce11926357b6c78c1b823af781045.tar.gz gentoo-2-8aeae21ccf5ce11926357b6c78c1b823af781045.tar.bz2 gentoo-2-8aeae21ccf5ce11926357b6c78c1b823af781045.zip | |
Depend on nvidia-cuda-toolkit-4.1 and relax gcc requirements accordingly, bug 418157
(Portage version: 2.2.0_alpha109/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/opencv')
| -rw-r--r-- | media-libs/opencv/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/opencv/opencv-2.4.0.ebuild | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog index d50d819936b4..a9e97da6eb1c 100644 --- a/media-libs/opencv/ChangeLog +++ b/media-libs/opencv/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/opencv # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.76 2012/06/03 08:45:48 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.77 2012/06/03 08:50:43 dilfridge Exp $ + + 03 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.4.0.ebuild: + Depend on nvidia-cuda-toolkit-4.1 and relax gcc requirements accordingly, bug + 418157 03 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.4.0.ebuild, metadata.xml: diff --git a/media-libs/opencv/opencv-2.4.0.ebuild b/media-libs/opencv/opencv-2.4.0.ebuild index 503d272c40c8..c7cfcdfc151d 100644 --- a/media-libs/opencv/opencv-2.4.0.ebuild +++ b/media-libs/opencv/opencv-2.4.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.0.ebuild,v 1.3 2012/06/03 08:45:48 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.0.ebuild,v 1.4 2012/06/03 08:50:43 dilfridge Exp $ EAPI=3 @@ -22,7 +22,7 @@ IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k open RDEPEND=" app-arch/bzip2 sys-libs/zlib - cuda? ( >=dev-util/nvidia-cuda-toolkit-4 ) + cuda? ( >=dev-util/nvidia-cuda-toolkit-4.1 ) eigen? ( dev-cpp/eigen:2 ) ffmpeg? ( virtual/ffmpeg ) gstreamer? ( @@ -136,8 +136,8 @@ src_configure() { ) if use cuda; then - if [[ "$(gcc-version)" > "4.4" ]]; then - ewarn "CUDA and >=sys-devel/gcc-4.5 do not play well together. Disabling CUDA support." + if [[ "$(gcc-version)" > "4.5" ]]; then + ewarn "CUDA and >=sys-devel/gcc-4.6 do not play well together. Disabling CUDA support." mycmakeargs+=( "-DWITH_CUDA=OFF" ) mycmakeargs+=( "-DWITH_CUBLAS=OFF" ) mycmakeargs+=( "-DWITH_CUFFT=OFF" ) @@ -148,6 +148,8 @@ src_configure() { fi else mycmakeargs+=( "-DWITH_CUDA=OFF" ) + mycmakeargs+=( "-DWITH_CUBLAS=OFF" ) + mycmakeargs+=( "-DWITH_CUFFT=OFF" ) fi if use python && use examples; then |