mgorny 15/02/27 22:24:32
Modified: ffmpegsource-9999.ebuild ffmpegsource-2.20.ebuild
ffmpegsource-2.19.1.ebuild ChangeLog
Log:
Use USE=libav to control ffmpeg/libav linking. Patch provided by Nikoli in
https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/62.
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key
EFB4464E!)
Revision Changes Path
1.9 media-libs/ffmpegsource/ffmpegsource-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/ffmpegsource/ffmpegsource-9999.ebuild?rev=1.9&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/ffmpegsource/ffmpegsource-9999.ebuild?rev=1.9&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/ffmpegsource/ffmpegsource-9999.ebuild?r1=1.8&r2=1.9
Index: ffmpegsource-9999.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/media-libs/ffmpegsource/ffmpegsource-9999.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ffmpegsource-9999.ebuild 9 Apr 2014 21:27:59 -0000 1.8
+++ ffmpegsource-9999.ebuild 27 Feb 2015 22:24:32 -0000 1.9
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/media-libs/ffmpegsource/ffmpegsource-9999.ebuild,v 1.8
2014/04/09 21:27:59 tomwij Exp $
+# $Header:
/var/cvsroot/gentoo-x86/media-libs/ffmpegsource/ffmpegsource-9999.ebuild,v 1.9
2015/02/27 22:24:32 mgorny Exp $
EAPI=5
@@ -15,11 +15,12 @@
LICENSE="MIT"
SLOT="0/3"
KEYWORDS=""
-IUSE="static-libs"
+IUSE="libav static-libs"
RDEPEND="
sys-libs/zlib
- >=virtual/ffmpeg-9
+ libav? ( >=media-video/libav-9.17:0= )
+ !libav? ( >=media-video/ffmpeg-1.2.6-r1:0= )
"
DEPEND="${RDEPEND}
virtual/pkgconfig
1.2 media-libs/ffmpegsource/ffmpegsource-2.20.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/ffmpegsource/ffmpegsource-2.20.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/ffmpegsource/ffmpegsource-2.20.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/ffmpegsource/ffmpegsource-2.20.ebuild?r1=1.1&r2=1.2
Index: ffmpegsource-2.20.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/media-libs/ffmpegsource/ffmpegsource-2.20.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ffmpegsource-2.20.ebuild 27 Jul 2014 13:56:05 -0000 1.1
+++ ffmpegsource-2.20.ebuild 27 Feb 2015 22:24:32 -0000 1.2
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/media-libs/ffmpegsource/ffmpegsource-2.20.ebuild,v 1.1
2014/07/27 13:56:05 zlogene Exp $
+# $Header:
/var/cvsroot/gentoo-x86/media-libs/ffmpegsource/ffmpegsource-2.20.ebuild,v 1.2
2015/02/27 22:24:32 mgorny Exp $
EAPI=5
@@ -15,11 +15,12 @@
LICENSE="MIT"
SLOT="0/3"
KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
+IUSE="libav static-libs"
RDEPEND="
sys-libs/zlib
- >=virtual/ffmpeg-9
+ libav? ( >=media-video/libav-9.17:0= )
+ !libav? ( >=media-video/ffmpeg-1.2.6-r1:0= )
"
DEPEND="${RDEPEND}
virtual/pkgconfig
1.3 media-libs/ffmpegsource/ffmpegsource-2.19.1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/ffmpegsource/ffmpegsource-2.19.1.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/ffmpegsource/ffmpegsource-2.19.1.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/ffmpegsource/ffmpegsource-2.19.1.ebuild?r1=1.2&r2=1.3
Index: ffmpegsource-2.19.1.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/media-libs/ffmpegsource/ffmpegsource-2.19.1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ffmpegsource-2.19.1.ebuild 24 Jul 2014 16:07:21 -0000 1.2
+++ ffmpegsource-2.19.1.ebuild 27 Feb 2015 22:24:32 -0000 1.3
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/media-libs/ffmpegsource/ffmpegsource-2.19.1.ebuild,v
1.2 2014/07/24 16:07:21 pacho Exp $
+# $Header:
/var/cvsroot/gentoo-x86/media-libs/ffmpegsource/ffmpegsource-2.19.1.ebuild,v
1.3 2015/02/27 22:24:32 mgorny Exp $
EAPI=5
@@ -15,11 +15,12 @@
LICENSE="MIT"
SLOT="0/3"
KEYWORDS="amd64 x86"
-IUSE="static-libs"
+IUSE="libav static-libs"
RDEPEND="
sys-libs/zlib
- >=virtual/ffmpeg-9
+ libav? ( >=media-video/libav-9.17:0= )
+ !libav? ( >=media-video/ffmpeg-1.2.6-r1:0= )
"
DEPEND="${RDEPEND}
virtual/pkgconfig
1.23 media-libs/ffmpegsource/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/ffmpegsource/ChangeLog?rev=1.23&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/ffmpegsource/ChangeLog?rev=1.23&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/ffmpegsource/ChangeLog?r1=1.22&r2=1.23
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/ffmpegsource/ChangeLog,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ChangeLog 27 Jul 2014 13:56:05 -0000 1.22
+++ ChangeLog 27 Feb 2015 22:24:32 -0000 1.23
@@ -1,6 +1,11 @@
# ChangeLog for media-libs/ffmpegsource
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ffmpegsource/ChangeLog,v 1.22
2014/07/27 13:56:05 zlogene Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ffmpegsource/ChangeLog,v 1.23
2015/02/27 22:24:32 mgorny Exp $
+
+ 27 Feb 2015; Michał Górny <[email protected]> ffmpegsource-2.19.1.ebuild,
+ ffmpegsource-2.20.ebuild, ffmpegsource-9999.ebuild:
+ Use USE=libav to control ffmpeg/libav linking. Patch provided by Nikoli in
+ https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/62.
*ffmpegsource-2.20 (27 Jul 2014)
