diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-11-13 14:36:29 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-11-13 14:36:29 +0000 |
| commit | 22e530cb4b495eb66d11ca2a736114701fc1f551 (patch) | |
| tree | 2ea77324e4a35c171f1d5b71ec8d080428b9adef /media-libs | |
| parent | Version bump, thanks to Andreas Sturmlechner for his help (diff) | |
| download | gentoo-2-22e530cb4b495eb66d11ca2a736114701fc1f551.tar.gz gentoo-2-22e530cb4b495eb66d11ca2a736114701fc1f551.tar.bz2 gentoo-2-22e530cb4b495eb66d11ca2a736114701fc1f551.zip | |
Does not work with libav-0.8_pre, bug 384021
(Portage version: 2.1.10.34/cvs/Linux x86_64)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/opencv/ChangeLog | 5 | ||||
| -rw-r--r-- | media-libs/opencv/opencv-2.3.1a.ebuild | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog index 25aabbaaf8ed..3c0422d3e985 100644 --- a/media-libs/opencv/ChangeLog +++ b/media-libs/opencv/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/opencv # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.57 2011/11/13 14:27:17 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.58 2011/11/13 14:36:29 dilfridge Exp $ + + 13 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.3.1a.ebuild: + Does not work with libav-0.8_pre, bug 384021 *opencv-2.3.1a (13 Nov 2011) diff --git a/media-libs/opencv/opencv-2.3.1a.ebuild b/media-libs/opencv/opencv-2.3.1a.ebuild index b4eb279e8de7..53026a71283d 100644 --- a/media-libs/opencv/opencv-2.3.1a.ebuild +++ b/media-libs/opencv/opencv-2.3.1a.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.1a.ebuild,v 1.1 2011/11/13 14:27:17 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.1a.ebuild,v 1.2 2011/11/13 14:36:29 dilfridge Exp $ EAPI=3 @@ -24,7 +24,9 @@ RDEPEND=" sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-4 ) eigen? ( dev-cpp/eigen:2 ) - ffmpeg? ( virtual/ffmpeg ) + ffmpeg? ( + || ( media-video/ffmpeg <=media-video/libav-0.7.9999 ) + ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base |