maksbotan 14/06/09 19:27:56 Modified: mplayer2-2.0_p20131009.ebuild mplayer2-9999.ebuild ChangeLog Log: Fix ffmpeg/libav deps, bug #511046. Thanks to Nikoli. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key F8DBDADE)
Revision Changes Path 1.2 media-video/mplayer2/mplayer2-2.0_p20131009.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20131009.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20131009.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20131009.ebuild?r1=1.1&r2=1.2 Index: mplayer2-2.0_p20131009.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20131009.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mplayer2-2.0_p20131009.ebuild 2 May 2014 19:28:40 -0000 1.1 +++ mplayer2-2.0_p20131009.ebuild 9 Jun 2014 19:27:56 -0000 1.2 @@ -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 @@ 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} 1.67 media-video/mplayer2/mplayer2-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.67&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.67&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?r1=1.66&r2=1.67 Index: mplayer2-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- mplayer2-9999.ebuild 1 May 2014 20:17:09 -0000 1.66 +++ mplayer2-9999.ebuild 9 Jun 2014 19:27:56 -0000 1.67 @@ -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 @@ 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 @@ 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} 1.121 media-video/mplayer2/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.121&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.121&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?r1=1.120&r2=1.121 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v retrieving revision 1.120 retrieving revision 1.121 diff -u -r1.120 -r1.121 --- ChangeLog 2 May 2014 19:28:40 -0000 1.120 +++ ChangeLog 9 Jun 2014 19:27:56 -0000 1.121 @@ -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 <maksbo...@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)