mgorny 14/06/12 14:21:27 Modified: emul-linux-x86-medialibs-20140508-r6.ebuild ChangeLog Log: Replace the dep on virtual/ffmpeg with safer || ( ( libav postproc ) ffmpeg ). (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.3 app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r6.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r6.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r6.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r6.ebuild?r1=1.2&r2=1.3 Index: emul-linux-x86-medialibs-20140508-r6.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r6.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- emul-linux-x86-medialibs-20140508-r6.ebuild 12 Jun 2014 07:34:16 -0000 1.2 +++ emul-linux-x86-medialibs-20140508-r6.ebuild 12 Jun 2014 14:21:27 -0000 1.3 @@ -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/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r6.ebuild,v 1.2 2014/06/12 07:34:16 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r6.ebuild,v 1.3 2014/06/12 14:21:27 mgorny Exp $ EAPI=5 inherit emul-linux-x86 @@ -65,10 +65,13 @@ >=media-gfx/sane-backends-1.0.24-r4[abi_x86_32(-)] >=media-libs/taglib-1.9.1-r1[abi_x86_32(-)] >=media-libs/libofa-0.9.3-r1[abi_x86_32(-)] - >=virtual/ffmpeg-9-r1[abi_x86_32(-)] || ( + ( + >=media-video/libav-9.13-r1[abi_x86_32(-)] + >=media-libs/libpostproc-10.20140517-r1[abi_x86_32(-)] + ) >=media-video/ffmpeg-2.2.3-r1[abi_x86_32(-)] - >=media-libs/libpostproc-10.20140517-r1[abi_x86_32(-)] ) + ) >=media-video/mjpegtools-2.1.0-r2[abi_x86_32(-)] >=media-libs/gstreamer-0.10.36-r1:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36-r1:0.10[abi_x86_32(-)] 1.104 app-emulation/emul-linux-x86-medialibs/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog?rev=1.104&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog?rev=1.104&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog?r1=1.103&r2=1.104 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- ChangeLog 12 Jun 2014 07:34:16 -0000 1.103 +++ ChangeLog 12 Jun 2014 14:21:27 -0000 1.104 @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/emul-linux-x86-medialibs # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v 1.103 2014/06/12 07:34:16 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v 1.104 2014/06/12 14:21:27 mgorny Exp $ + + 12 Jun 2014; Michał Górny <mgo...@gentoo.org> + emul-linux-x86-medialibs-20140508-r6.ebuild: + Replace the dep on virtual/ffmpeg with safer || ( ( libav postproc ) ffmpeg ). 12 Jun 2014; Michał Górny <mgo...@gentoo.org> emul-linux-x86-medialibs-20140508-r6.ebuild: