diff options
| author |   Maxim Koltsov <maksbotan@gentoo.org> | 2014-06-09 19:27:56 +0000 |
|---|---|---|
| committer | Maxim Koltsov <maksbotan@gentoo.org> | 2014-06-09 19:27:56 +0000 |
| commit | 8840b55831a022a0f569530edeac49040af4d81f (patch) | |
| tree | ca049a4af6530f022a476d9bf7816c27ee7c5063 /media-video | |
| parent | Update icon cache and desktop database, bug #508116. Respect LINGUAS, bug #50... (diff) | |
| download | gentoo-2-8840b55831a022a0f569530edeac49040af4d81f.tar.gz gentoo-2-8840b55831a022a0f569530edeac49040af4d81f.tar.bz2 gentoo-2-8840b55831a022a0f569530edeac49040af4d81f.zip | |
Fix ffmpeg/libav deps, bug #511046. Thanks to Nikoli.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key F8DBDADE)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/mplayer2/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/mplayer2/mplayer2-2.0_p20131009.ebuild | 7 | ||||
| -rw-r--r-- | media-video/mplayer2/mplayer2-9999.ebuild | 11 |
3 files changed, 17 insertions, 7 deletions
diff --git a/media-video/mplayer2/ChangeLog b/media-video/mplayer2/ChangeLog index 2743c5b4d044..f488a2f55e3f 100644 --- a/media-video/mplayer2/ChangeLog +++ b/media-video/mplayer2/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/mplayer2 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.120 2014/05/02 19:28:40 maksbotan Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.121 2014/06/09 19:27:56 maksbotan Exp $ + + 09 Jun 2014; Maxim Koltsov <maksbotan@gentoo.org> + mplayer2-2.0_p20131009.ebuild, mplayer2-9999.ebuild: + Fix ffmpeg/libav deps, bug #511046. Thanks to Nikoli. *mplayer2-2.0_p20131009 (02 May 2014) diff --git a/media-video/mplayer2/mplayer2-2.0_p20131009.ebuild b/media-video/mplayer2/mplayer2-2.0_p20131009.ebuild index b9b9c61a9c75..d752899ac103 100644 --- a/media-video/mplayer2/mplayer2-2.0_p20131009.ebuild +++ b/media-video/mplayer2/mplayer2-2.0_p20131009.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-video/mplayer2/mplayer2-2.0_p20131009.ebuild,v 1.1 2014/05/02 19:28:40 maksbotan Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20131009.ebuild,v 1.2 2014/06/09 19:27:56 maksbotan Exp $ EAPI=5 @@ -106,7 +106,10 @@ RDEPEND+=" quvi? ( >=media-libs/libquvi-0.4.1 <media-libs/libquvi-0.9 ) samba? ( net-fs/samba ) selinux? ( sec-policy/selinux-mplayer ) - >=virtual/ffmpeg-9[threads?,vdpau?] + || ( + >=media-video/libav-9.12:=[threads?,vdpau?] + >=media-video/ffmpeg-1.2.6:0=[threads?,vdpau?] + ) symlink? ( !media-video/mplayer ) " DEPEND="${RDEPEND} diff --git a/media-video/mplayer2/mplayer2-9999.ebuild b/media-video/mplayer2/mplayer2-9999.ebuild index d4cf8977190f..833acc460b51 100644 --- a/media-video/mplayer2/mplayer2-9999.ebuild +++ b/media-video/mplayer2/mplayer2-9999.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-video/mplayer2/mplayer2-9999.ebuild,v 1.66 2014/05/01 20:17:09 maksbotan Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.67 2014/06/09 19:27:56 maksbotan Exp $ EAPI=5 @@ -16,12 +16,12 @@ NAMESUF="${PN/mplayer/}" DESCRIPTION="Media Player for Linux" HOMEPAGE="http://www.mplayer2.org/" [[ ${PV} == *9999* ]] || \ -SRC_URI="http://rion-overlay.googlecode.com/files/${P}.tar.xz" +SRC_URI="http://dev.gentoo.org/~maksbotan/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" [[ ${PV} == *9999* ]] || \ -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux" IUSE="+alsa aqua bluray bs2b cddb +cdio cpudetection debug directfb doc dvb +dvd +dvdnav +enca ftp gif +iconv ipv6 jack joystick jpeg ladspa lcms +libass libcaca lirc md5sum mng +mp3 +network +opengl oss png pnm portaudio +postproc pulseaudio @@ -106,7 +106,10 @@ RDEPEND+=" quvi? ( >=media-libs/libquvi-0.4.1 <media-libs/libquvi-0.9 ) samba? ( net-fs/samba ) selinux? ( sec-policy/selinux-mplayer ) - >=virtual/ffmpeg-9[threads?,vdpau?] + || ( + >=media-video/libav-9.12:=[threads?,vdpau?] + >=media-video/ffmpeg-1.2.6:0=[threads?,vdpau?] + ) symlink? ( !media-video/mplayer ) " DEPEND="${RDEPEND} |