diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2012-04-05 11:59:54 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2012-04-05 11:59:54 +0000 |
| commit | f876ca52ed10ff6ad85d46addfb633be5d50bbc7 (patch) | |
| tree | 2101eeab0a675e2456a6b609b97437626d9201e1 /media-video/ffmpeg | |
| parent | bump a new snapshot (diff) | |
| download | historical-f876ca52ed10ff6ad85d46addfb633be5d50bbc7.tar.gz historical-f876ca52ed10ff6ad85d46addfb633be5d50bbc7.tar.bz2 historical-f876ca52ed10ff6ad85d46addfb633be5d50bbc7.zip | |
bump gnutls dep for bug #405083
Package-Manager: portage-2.2.0_alpha99/cvs/Linux x86_64
Diffstat (limited to 'media-video/ffmpeg')
| -rw-r--r-- | media-video/ffmpeg/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-0.10.2.ebuild | 4 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-9999.ebuild | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index f76cbff3c80a..24c2d471c118 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/ffmpeg # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.535 2012/03/31 09:43:39 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.536 2012/04/05 11:59:54 aballier Exp $ + + 05 Apr 2012; Alexis Ballier <aballier@gentoo.org> ffmpeg-0.10.2.ebuild, + ffmpeg-9999.ebuild: + bump gnutls dep for bug #405083 31 Mar 2012; Agostino Sarubbo <ago@gentoo.org> ffmpeg-0.10.ebuild: reverted to ~amd64 diff --git a/media-video/ffmpeg/ffmpeg-0.10.2.ebuild b/media-video/ffmpeg/ffmpeg-0.10.2.ebuild index 8368ef945a3c..6de0c50b5b14 100644 --- a/media-video/ffmpeg/ffmpeg-0.10.2.ebuild +++ b/media-video/ffmpeg/ffmpeg-0.10.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-video/ffmpeg/ffmpeg-0.10.2.ebuild,v 1.2 2012/03/22 11:33:27 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.2.ebuild,v 1.3 2012/04/05 11:59:54 aballier Exp $ EAPI="4" @@ -70,7 +70,7 @@ RDEPEND=" xvid? ( >=media-libs/xvid-1.1.0 ) ) frei0r? ( media-plugins/frei0r-plugins ) - gnutls? ( net-libs/gnutls ) + gnutls? ( >=net-libs/gnutls-2.12.16 ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index fd254fedf289..21c29ed3a2bc 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.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-video/ffmpeg/ffmpeg-9999.ebuild,v 1.83 2012/03/22 11:33:27 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.84 2012/04/05 11:59:54 aballier Exp $ EAPI="4" @@ -71,7 +71,7 @@ RDEPEND=" xvid? ( >=media-libs/xvid-1.1.0 ) ) frei0r? ( media-plugins/frei0r-plugins ) - gnutls? ( net-libs/gnutls ) + gnutls? ( >=net-libs/gnutls-2.12.16 ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) |