summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-06-19 09:00:54 +0000
committerMichał Górny <mgorny@gentoo.org>2014-06-19 09:00:54 +0000
commitc91cd8ca6480b471233a402a01f4ba1b4e14a01f (patch)
tree2ea6c676e91a6199f591bb4405c30a4af737749b /media-plugins/gst-plugins-ffmpeg
parentUpdate dependencies to require guaranteed EAPI=5 or multilib ebuilds, bug #51... (diff)
downloadgentoo-2-c91cd8ca6480b471233a402a01f4ba1b4e14a01f.tar.gz
gentoo-2-c91cd8ca6480b471233a402a01f4ba1b4e14a01f.tar.bz2
gentoo-2-c91cd8ca6480b471233a402a01f4ba1b4e14a01f.zip
Reduce ffmpeg dep, bug #513752.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'media-plugins/gst-plugins-ffmpeg')
-rw-r--r--media-plugins/gst-plugins-ffmpeg/ChangeLog6
-rw-r--r--media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211-r2.ebuild4
2 files changed, 7 insertions, 3 deletions
diff --git a/media-plugins/gst-plugins-ffmpeg/ChangeLog b/media-plugins/gst-plugins-ffmpeg/ChangeLog
index 4eb09df19cb2..8ee3e414b6c8 100644
--- a/media-plugins/gst-plugins-ffmpeg/ChangeLog
+++ b/media-plugins/gst-plugins-ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-plugins/gst-plugins-ffmpeg
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/ChangeLog,v 1.179 2014/06/18 20:05:27 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/ChangeLog,v 1.180 2014/06/19 09:00:54 mgorny Exp $
+
+ 19 Jun 2014; Michał Górny <mgorny@gentoo.org>
+ gst-plugins-ffmpeg-0.10.13_p201211-r2.ebuild:
+ Reduce ffmpeg dep, bug #513752.
18 Jun 2014; Michał Górny <mgorny@gentoo.org>
gst-plugins-ffmpeg-0.10.13_p201211-r2.ebuild:
diff --git a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211-r2.ebuild b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211-r2.ebuild
index 9693ff0ac5d1..0502377f5beb 100644
--- a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211-r2.ebuild
+++ b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211-r2.ebuild,v 1.2 2014/06/18 20:05:27 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211-r2.ebuild,v 1.3 2014/06/19 09:00:54 mgorny Exp $
EAPI=5
@@ -29,7 +29,7 @@ RDEPEND=">=media-libs/gstreamer-0.10.36-r2:0.10[${MULTILIB_USEDEP}]
>=media-libs/gst-plugins-base-0.10.36:0.10[${MULTILIB_USEDEP}]
>=virtual/ffmpeg-9-r1[${MULTILIB_USEDEP}]
|| (
- >=media-video/ffmpeg-2.2.2:0[${MULTILIB_USEDEP}]
+ >=media-video/ffmpeg-1.2.6-r1:0[${MULTILIB_USEDEP}]
>=media-libs/libpostproc-10.20140517-r1[${MULTILIB_USEDEP}]
)
orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )"