mgorny 14/06/12 07:34:16 Modified: emul-linux-x86-medialibs-20140508-r6.ebuild ChangeLog Log: Support both ffmpeg & libpostproc as libpostproc provider, bug #513026. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.2 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.2&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.2&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.1&r2=1.2 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.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- emul-linux-x86-medialibs-20140508-r6.ebuild 10 Jun 2014 18:34:27 -0000 1.1 +++ emul-linux-x86-medialibs-20140508-r6.ebuild 12 Jun 2014 07:34:16 -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/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r6.ebuild,v 1.1 2014/06/10 18:34:27 mgorny Exp $ +# $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 $ EAPI=5 inherit emul-linux-x86 @@ -66,7 +66,9 @@ >=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-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.103 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.103&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog?rev=1.103&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog?r1=1.102&r2=1.103 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v retrieving revision 1.102 retrieving revision 1.103 diff -u -r1.102 -r1.103 --- ChangeLog 10 Jun 2014 18:34:27 -0000 1.102 +++ ChangeLog 12 Jun 2014 07:34:16 -0000 1.103 @@ -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.102 2014/06/10 18:34:27 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v 1.103 2014/06/12 07:34:16 mgorny Exp $ + + 12 Jun 2014; Michał Górny <mgo...@gentoo.org> + emul-linux-x86-medialibs-20140508-r6.ebuild: + Support both ffmpeg & libpostproc as libpostproc provider, bug #513026. *emul-linux-x86-medialibs-20140508-r6 (10 Jun 2014)