diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2012-08-23 11:06:59 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2012-08-23 11:06:59 +0000 |
| commit | 3f2a83538d1fb06980881d43a592db8ca44302c6 (patch) | |
| tree | 7e2105603d43993c17addf315711eab764943277 /media-libs/opencv | |
| parent | Update path to icecc-create-env wrt #399259, missed in previous commit (diff) | |
| download | gentoo-2-3f2a83538d1fb06980881d43a592db8ca44302c6.tar.gz gentoo-2-3f2a83538d1fb06980881d43a592db8ca44302c6.tar.bz2 gentoo-2-3f2a83538d1fb06980881d43a592db8ca44302c6.zip | |
Bump required nvidia-cuda-toolkit version to allow gcc-4.6, bug 431808
(Portage version: 2.2.0_alpha121/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/opencv')
| -rw-r--r-- | media-libs/opencv/ChangeLog | 5 | ||||
| -rw-r--r-- | media-libs/opencv/opencv-2.4.2.ebuild | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog index 3b1aab403dc4..48a70262b8b9 100644 --- a/media-libs/opencv/ChangeLog +++ b/media-libs/opencv/ChangeLog @@ -1,6 +1,9 @@ # 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.79 2012/07/17 20:13:28 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.80 2012/08/23 11:06:58 dilfridge Exp $ + + 23 Aug 2012; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.4.2.ebuild: + Bump required nvidia-cuda-toolkit version to allow gcc-4.6, bug 431808 17 Jul 2012; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.4.2.ebuild: Python is always needed now, useflag makes no sense. Bug 419577 diff --git a/media-libs/opencv/opencv-2.4.2.ebuild b/media-libs/opencv/opencv-2.4.2.ebuild index 51bd955752f3..62313ef54961 100644 --- a/media-libs/opencv/opencv-2.4.2.ebuild +++ b/media-libs/opencv/opencv-2.4.2.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.2.ebuild,v 1.2 2012/07/17 20:13:28 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.2.ebuild,v 1.3 2012/08/23 11:06:59 dilfridge Exp $ EAPI=4 PYTHON_DEPEND="2:2.6" @@ -22,7 +22,7 @@ RDEPEND=" app-arch/bzip2 dev-python/numpy sys-libs/zlib - cuda? ( >=dev-util/nvidia-cuda-toolkit-4.1 ) + cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2 ) eigen? ( dev-cpp/eigen:2 ) ffmpeg? ( virtual/ffmpeg ) gstreamer? ( @@ -131,8 +131,8 @@ src_configure() { ) if use cuda; then - if [[ "$(gcc-version)" > "4.5" ]]; then - ewarn "CUDA and >=sys-devel/gcc-4.6 do not play well together. Disabling CUDA support." + if [[ "$(gcc-version)" > "4.6" ]]; then + ewarn "CUDA and >=sys-devel/gcc-4.7 do not play well together. Disabling CUDA support." mycmakeargs+=( "-DWITH_CUDA=OFF" ) mycmakeargs+=( "-DWITH_CUBLAS=OFF" ) mycmakeargs+=( "-DWITH_CUFFT=OFF" ) |