mgorny 14/06/13 20:31:33
Modified: emul-linux-x86-medialibs-20140508-r5.ebuild
ChangeLog
Log:
Backport the ffmpeg/libav dependency fix from -r6.
(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-r5.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r5.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-r5.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-r5.ebuild?r1=1.1&r2=1.2
Index: emul-linux-x86-medialibs-20140508-r5.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r5.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- emul-linux-x86-medialibs-20140508-r5.ebuild 10 Jun 2014 18:08:42 -0000
1.1
+++ emul-linux-x86-medialibs-20140508-r5.ebuild 13 Jun 2014 20:31:32 -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-r5.ebuild,v
1.1 2014/06/10 18:08:42 mgorny Exp $
+# $Header:
/var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r5.ebuild,v
1.2 2014/06/13 20:31:32 mgorny Exp $
EAPI=5
inherit emul-linux-x86
@@ -62,14 +62,18 @@
>=dev-libs/fribidi-0.19.5-r2[abi_x86_32(-)]
>=dev-libs/libcdio-0.92[abi_x86_32(-)]
>=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)]
- >=media-video/ffmpeg-0.10.8:0.10[abi_x86_32(-)]
>=media-libs/libdv-1.0.0-r3[abi_x86_32(-)]
>=media-libs/libgphoto2-2.5.4-r1[abi_x86_32(-)]
>=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-libs/libpostproc-10.20140517-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-video/mjpegtools-2.1.0-r2[abi_x86_32(-)]
)
"
1.105 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.105&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog?rev=1.105&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog?r1=1.104&r2=1.105
Index: ChangeLog
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- ChangeLog 12 Jun 2014 14:21:27 -0000 1.104
+++ ChangeLog 13 Jun 2014 20:31:32 -0000 1.105
@@ -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.104 2014/06/12 14:21:27 mgorny Exp $
+# $Header:
/var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v
1.105 2014/06/13 20:31:32 mgorny Exp $
+
+ 13 Jun 2014; Michał Górny <[email protected]>
+ emul-linux-x86-medialibs-20140508-r5.ebuild:
+ Backport the ffmpeg/libav dependency fix from -r6.
12 Jun 2014; Michał Górny <[email protected]>
emul-linux-x86-medialibs-20140508-r6.ebuild:
