diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2012-05-22 16:44:06 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2012-05-22 16:44:06 +0000 |
| commit | 8f5785ea4402c9a6a0cc52b8d5820239a38d1e48 (patch) | |
| tree | f83b176359f882130f85dd5e5d79285416d102e7 /media-video/mplayer2 | |
| parent | Remove dev-libs/ from elog message for libusb. (diff) | |
| download | gentoo-2-8f5785ea4402c9a6a0cc52b8d5820239a38d1e48.tar.gz gentoo-2-8f5785ea4402c9a6a0cc52b8d5820239a38d1e48.tar.bz2 gentoo-2-8f5785ea4402c9a6a0cc52b8d5820239a38d1e48.zip | |
Allow using older libav as well, for postproc.
(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)
Diffstat (limited to 'media-video/mplayer2')
| -rw-r--r-- | media-video/mplayer2/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/mplayer2/mplayer2-2.0_p20120309.ebuild | 4 | ||||
| -rw-r--r-- | media-video/mplayer2/mplayer2-9999.ebuild | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/media-video/mplayer2/ChangeLog b/media-video/mplayer2/ChangeLog index 22e3decf430a..408bf8c63ebb 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.53 2012/05/22 16:31:18 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.54 2012/05/22 16:44:06 flameeyes Exp $ + + 22 May 2012; Diego E. Pettenò <flameeyes@gentoo.org> + mplayer2-2.0_p20120309.ebuild, mplayer2-9999.ebuild: + Allow using older libav as well, for postproc. 22 May 2012; Diego E. Pettenò <flameeyes@gentoo.org> mplayer2-2.0_p20120309.ebuild: diff --git a/media-video/mplayer2/mplayer2-2.0_p20120309.ebuild b/media-video/mplayer2/mplayer2-2.0_p20120309.ebuild index 2c9cb12b06ac..3731861628e3 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.8 2012/05/22 16:31:18 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20120309.ebuild,v 1.9 2012/05/22 16:44:06 flameeyes Exp $ EAPI=4 @@ -140,7 +140,7 @@ RDEPEND+=" vorbis? ( media-libs/libvorbis ) xanim? ( media-video/xanim ) xvid? ( media-libs/xvid ) - || ( media-libs/libpostproc media-video/ffmpeg ) + || ( media-libs/libpostproc <media-video/libav-0.8.2-r1 media-video/ffmpeg ) >=virtual/ffmpeg-0.10.2 symlink? ( !media-video/mplayer ) " diff --git a/media-video/mplayer2/mplayer2-9999.ebuild b/media-video/mplayer2/mplayer2-9999.ebuild index 640f7b5eaf0b..0859a29bb909 100644 --- a/media-video/mplayer2/mplayer2-9999.ebuild +++ b/media-video/mplayer2/mplayer2-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/mplayer2/mplayer2-9999.ebuild,v 1.35 2012/05/19 18:27:33 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.36 2012/05/22 16:44:06 flameeyes Exp $ EAPI=4 @@ -124,7 +124,7 @@ RDEPEND+=" png? ( media-libs/libpng ) pnm? ( media-libs/netpbm ) portaudio? ( >=media-libs/portaudio-19_pre20111121 ) - postproc? ( || ( media-libs/libpostproc media-video/ffmpeg ) ) + postproc? ( || ( media-libs/libpostproc <media-video/libav-0.8.2-r1 media-video/ffmpeg ) ) pulseaudio? ( media-sound/pulseaudio ) rar? ( || ( |