* [gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ffmpeg-9999.ebuild ffmpeg-1.1.2.ebuild ChangeLog
@ 2013-02-07 13:45 Alexis Ballier (aballier)
0 siblings, 0 replies; only message in thread
From: Alexis Ballier (aballier) @ 2013-02-07 13:45 UTC (permalink / raw
To: gentoo-commits
aballier 13/02/07 13:45:38
Modified: ffmpeg-9999.ebuild ffmpeg-1.1.2.ebuild ChangeLog
Log:
fix cdio dep
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path
1.112 media-video/ffmpeg/ffmpeg-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?rev=1.112&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?rev=1.112&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?r1=1.111&r2=1.112
Index: ffmpeg-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- ffmpeg-9999.ebuild 27 Jan 2013 23:51:36 -0000 1.111
+++ ffmpeg-9999.ebuild 7 Feb 2013 13:45:38 -0000 1.112
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.111 2013/01/27 23:51:36 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.112 2013/02/07 13:45:38 aballier Exp $
EAPI="4"
@@ -56,7 +56,7 @@
amr? ( media-libs/opencore-amr )
bluray? ( media-libs/libbluray )
bzip2? ( app-arch/bzip2 )
- cdio? ( dev-libs/libcdio )
+ cdio? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
celt? ( >=media-libs/celt-0.11.1 )
encode? (
aac? ( media-libs/vo-aacenc )
1.2 media-video/ffmpeg/ffmpeg-1.1.2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-1.1.2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-1.1.2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-1.1.2.ebuild?r1=1.1&r2=1.2
Index: ffmpeg-1.1.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.1.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ffmpeg-1.1.2.ebuild 7 Feb 2013 12:17:39 -0000 1.1
+++ ffmpeg-1.1.2.ebuild 7 Feb 2013 13:45:38 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.1.2.ebuild,v 1.1 2013/02/07 12:17:39 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.1.2.ebuild,v 1.2 2013/02/07 13:45:38 aballier Exp $
EAPI="4"
@@ -56,7 +56,7 @@
amr? ( media-libs/opencore-amr )
bluray? ( media-libs/libbluray )
bzip2? ( app-arch/bzip2 )
- cdio? ( dev-libs/libcdio )
+ cdio? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
celt? ( >=media-libs/celt-0.11.1 )
encode? (
aac? ( media-libs/vo-aacenc )
1.601 media-video/ffmpeg/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.601&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.601&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.600&r2=1.601
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
retrieving revision 1.600
retrieving revision 1.601
diff -u -r1.600 -r1.601
--- ChangeLog 7 Feb 2013 13:37:56 -0000 1.600
+++ ChangeLog 7 Feb 2013 13:45:38 -0000 1.601
@@ -1,6 +1,10 @@
# ChangeLog for media-video/ffmpeg
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.600 2013/02/07 13:37:56 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.601 2013/02/07 13:45:38 aballier Exp $
+
+ 07 Feb 2013; Alexis Ballier <aballier@gentoo.org> ffmpeg-1.1.2.ebuild,
+ ffmpeg-9999.ebuild:
+ fix cdio dep
*ffmpeg-1.0.4 (07 Feb 2013)
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-02-07 13:45 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-07 13:45 [gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ffmpeg-9999.ebuild ffmpeg-1.1.2.ebuild ChangeLog Alexis Ballier (aballier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox