diff options
-rw-r--r-- | media-video/ffmpeg2theora/ChangeLog | 6 | ||||
-rw-r--r-- | media-video/ffmpeg2theora/ffmpeg2theora-0.28-r1.ebuild | 5 | ||||
-rw-r--r-- | media-video/ffmpeg2theora/ffmpeg2theora-0.28.ebuild | 5 | ||||
-rw-r--r-- | media-video/mplayer2/ChangeLog | 6 | ||||
-rw-r--r-- | media-video/mplayer2/mplayer2-2.0_p20120309.ebuild | 3 |
5 files changed, 18 insertions, 7 deletions
diff --git a/media-video/ffmpeg2theora/ChangeLog b/media-video/ffmpeg2theora/ChangeLog index 8370c3dec79e..fcf4adae15cd 100644 --- a/media-video/ffmpeg2theora/ChangeLog +++ b/media-video/ffmpeg2theora/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/ffmpeg2theora # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ChangeLog,v 1.53 2012/05/05 08:58:53 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ChangeLog,v 1.54 2012/05/22 16:35:04 flameeyes Exp $ + + 22 May 2012; Diego E. Pettenò <flameeyes@gentoo.org> + ffmpeg2theora-0.28-r1.ebuild, ffmpeg2theora-0.28.ebuild: + Add an explicit dependency over libpostproc. 05 May 2012; Jeff Horelick <jdhore@gentoo.org> ffmpeg2theora-0.28.ebuild, ffmpeg2theora-0.28-r1.ebuild: diff --git a/media-video/ffmpeg2theora/ffmpeg2theora-0.28-r1.ebuild b/media-video/ffmpeg2theora/ffmpeg2theora-0.28-r1.ebuild index e3bef03f578d..1b654ef88ead 100644 --- a/media-video/ffmpeg2theora/ffmpeg2theora-0.28-r1.ebuild +++ b/media-video/ffmpeg2theora/ffmpeg2theora-0.28-r1.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/ffmpeg2theora/ffmpeg2theora-0.28-r1.ebuild,v 1.5 2012/05/05 08:58:53 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ffmpeg2theora-0.28-r1.ebuild,v 1.6 2012/05/22 16:35:04 flameeyes Exp $ EAPI=4 inherit eutils scons-utils @@ -14,7 +14,8 @@ SLOT="0" KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd" IUSE="debug kate" -RDEPEND=">=virtual/ffmpeg-0.6.90 +RDEPEND="|| ( media-libs/libpostproc media-video/ffmpeg ) + >=virtual/ffmpeg-0.6.90 >=media-libs/libvorbis-1.1 >=media-libs/libogg-1.1 >=media-libs/libtheora-1.1[encode] diff --git a/media-video/ffmpeg2theora/ffmpeg2theora-0.28.ebuild b/media-video/ffmpeg2theora/ffmpeg2theora-0.28.ebuild index 4f622f22832f..eb620dfaaa03 100644 --- a/media-video/ffmpeg2theora/ffmpeg2theora-0.28.ebuild +++ b/media-video/ffmpeg2theora/ffmpeg2theora-0.28.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/ffmpeg2theora/ffmpeg2theora-0.28.ebuild,v 1.4 2012/05/05 08:58:53 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ffmpeg2theora-0.28.ebuild,v 1.5 2012/05/22 16:35:04 flameeyes Exp $ EAPI=2 @@ -13,7 +13,8 @@ SLOT="0" KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd" IUSE="debug kate" -RDEPEND="virtual/ffmpeg +RDEPEND="|| ( media-libs/libpostproc media-video/ffmpeg ) + virtual/ffmpeg >=media-libs/libvorbis-1.1 >=media-libs/libogg-1.1 >=media-libs/libtheora-1.1[encode] diff --git a/media-video/mplayer2/ChangeLog b/media-video/mplayer2/ChangeLog index 4aa096efc73d..22e3decf430a 100644 --- a/media-video/mplayer2/ChangeLog +++ b/media-video/mplayer2/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/mplayer2 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.52 2012/05/21 11:51:39 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.53 2012/05/22 16:31:18 flameeyes Exp $ + + 22 May 2012; Diego E. Pettenò <flameeyes@gentoo.org> + mplayer2-2.0_p20120309.ebuild: + Add an explicit dependency over libpostproc. 21 May 2012; Jeroen Roovers <jer@gentoo.org> mplayer2-2.0_p20120309.ebuild: Stable for HPPA (bug #416359). diff --git a/media-video/mplayer2/mplayer2-2.0_p20120309.ebuild b/media-video/mplayer2/mplayer2-2.0_p20120309.ebuild index 0bbcd03cbd1a..2c9cb12b06ac 100644 --- a/media-video/mplayer2/mplayer2-2.0_p20120309.ebuild +++ b/media-video/mplayer2/mplayer2-2.0_p20120309.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/mplayer2/mplayer2-2.0_p20120309.ebuild,v 1.7 2012/05/21 11:51:39 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20120309.ebuild,v 1.8 2012/05/22 16:31:18 flameeyes Exp $ EAPI=4 @@ -140,6 +140,7 @@ RDEPEND+=" vorbis? ( media-libs/libvorbis ) xanim? ( media-video/xanim ) xvid? ( media-libs/xvid ) + || ( media-libs/libpostproc media-video/ffmpeg ) >=virtual/ffmpeg-0.10.2 symlink? ( !media-video/mplayer ) " |