summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2015-03-17 08:15:35 +0000
committerAlexis Ballier <aballier@gentoo.org>2015-03-17 08:15:35 +0000
commitcbbf41d8469f03101e32a38e3b25d58a559d8870 (patch)
tree1e30324aa834d35e8540e382aa7ae219ab9560dc /media-video
parentversion bump (diff)
downloadgentoo-2-cbbf41d8469f03101e32a38e3b25d58a559d8870.tar.gz
gentoo-2-cbbf41d8469f03101e32a38e3b25d58a559d8870.tar.bz2
gentoo-2-cbbf41d8469f03101e32a38e3b25d58a559d8870.zip
add := dep on fdk-aac
Signed-off-by: aballier@gentoo.org (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/ffmpeg/ChangeLog6
-rw-r--r--media-video/ffmpeg/ffmpeg-2.6.1.ebuild4
-rw-r--r--media-video/ffmpeg/ffmpeg-9999.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index f13db3d0ef07..08ef5b469d23 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/ffmpeg
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.847 2015/03/17 08:09:48 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.848 2015/03/17 08:15:35 aballier Exp $
+
+ 17 Mar 2015; Alexis Ballier <aballier@gentoo.org> ffmpeg-2.6.1.ebuild,
+ ffmpeg-9999.ebuild:
+ add := dep on fdk-aac
*ffmpeg-2.6.1 (17 Mar 2015)
diff --git a/media-video/ffmpeg/ffmpeg-2.6.1.ebuild b/media-video/ffmpeg/ffmpeg-2.6.1.ebuild
index c24be6b6060a..f165e98688f1 100644
--- a/media-video/ffmpeg/ffmpeg-2.6.1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.6.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.6.1.ebuild,v 1.1 2015/03/17 08:09:48 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.6.1.ebuild,v 1.2 2015/03/17 08:15:35 aballier Exp $
EAPI="5"
@@ -175,7 +175,7 @@ RDEPEND="
x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] )
xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
)
- fdk? ( >=media-libs/fdk-aac-0.1.3[${MULTILIB_USEDEP}] )
+ fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
frei0r? ( media-plugins/frei0r-plugins )
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 6e38ea245ce7..ecc9ccc4c0df 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 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.187 2015/03/06 14:14:17 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.188 2015/03/17 08:15:35 aballier Exp $
EAPI="5"
@@ -175,7 +175,7 @@ RDEPEND="
x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] )
xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
)
- fdk? ( >=media-libs/fdk-aac-0.1.3[${MULTILIB_USEDEP}] )
+ fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
frei0r? ( media-plugins/frei0r-plugins )