Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Michal Gorny (mgorny)" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/ffmpegsource: ffmpegsource-9999.ebuild ffmpegsource-2.20.ebuild ffmpegsource-2.19.1.ebuild ChangeLog
Date: Fri, 27 Feb 2015 22:24:43
Message-Id: 20150227222432.3EB1012B15@oystercatcher.gentoo.org
1 mgorny 15/02/27 22:24:32
2
3 Modified: ffmpegsource-9999.ebuild ffmpegsource-2.20.ebuild
4 ffmpegsource-2.19.1.ebuild ChangeLog
5 Log:
6 Use USE=libav to control ffmpeg/libav linking. Patch provided by Nikoli in https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/62.
7
8 (Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
9
10 Revision Changes Path
11 1.9 media-libs/ffmpegsource/ffmpegsource-9999.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/ffmpegsource/ffmpegsource-9999.ebuild?rev=1.9&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/ffmpegsource/ffmpegsource-9999.ebuild?rev=1.9&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/ffmpegsource/ffmpegsource-9999.ebuild?r1=1.8&r2=1.9
16
17 Index: ffmpegsource-9999.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/media-libs/ffmpegsource/ffmpegsource-9999.ebuild,v
20 retrieving revision 1.8
21 retrieving revision 1.9
22 diff -u -r1.8 -r1.9
23 --- ffmpegsource-9999.ebuild 9 Apr 2014 21:27:59 -0000 1.8
24 +++ ffmpegsource-9999.ebuild 27 Feb 2015 22:24:32 -0000 1.9
25 @@ -1,6 +1,6 @@
26 -# Copyright 1999-2014 Gentoo Foundation
27 +# Copyright 1999-2015 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/media-libs/ffmpegsource/ffmpegsource-9999.ebuild,v 1.8 2014/04/09 21:27:59 tomwij Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/media-libs/ffmpegsource/ffmpegsource-9999.ebuild,v 1.9 2015/02/27 22:24:32 mgorny Exp $
31
32 EAPI=5
33
34 @@ -15,11 +15,12 @@
35 LICENSE="MIT"
36 SLOT="0/3"
37 KEYWORDS=""
38 -IUSE="static-libs"
39 +IUSE="libav static-libs"
40
41 RDEPEND="
42 sys-libs/zlib
43 - >=virtual/ffmpeg-9
44 + libav? ( >=media-video/libav-9.17:0= )
45 + !libav? ( >=media-video/ffmpeg-1.2.6-r1:0= )
46 "
47 DEPEND="${RDEPEND}
48 virtual/pkgconfig
49
50
51
52 1.2 media-libs/ffmpegsource/ffmpegsource-2.20.ebuild
53
54 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/ffmpegsource/ffmpegsource-2.20.ebuild?rev=1.2&view=markup
55 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/ffmpegsource/ffmpegsource-2.20.ebuild?rev=1.2&content-type=text/plain
56 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/ffmpegsource/ffmpegsource-2.20.ebuild?r1=1.1&r2=1.2
57
58 Index: ffmpegsource-2.20.ebuild
59 ===================================================================
60 RCS file: /var/cvsroot/gentoo-x86/media-libs/ffmpegsource/ffmpegsource-2.20.ebuild,v
61 retrieving revision 1.1
62 retrieving revision 1.2
63 diff -u -r1.1 -r1.2
64 --- ffmpegsource-2.20.ebuild 27 Jul 2014 13:56:05 -0000 1.1
65 +++ ffmpegsource-2.20.ebuild 27 Feb 2015 22:24:32 -0000 1.2
66 @@ -1,6 +1,6 @@
67 -# Copyright 1999-2014 Gentoo Foundation
68 +# Copyright 1999-2015 Gentoo Foundation
69 # Distributed under the terms of the GNU General Public License v2
70 -# $Header: /var/cvsroot/gentoo-x86/media-libs/ffmpegsource/ffmpegsource-2.20.ebuild,v 1.1 2014/07/27 13:56:05 zlogene Exp $
71 +# $Header: /var/cvsroot/gentoo-x86/media-libs/ffmpegsource/ffmpegsource-2.20.ebuild,v 1.2 2015/02/27 22:24:32 mgorny Exp $
72
73 EAPI=5
74
75 @@ -15,11 +15,12 @@
76 LICENSE="MIT"
77 SLOT="0/3"
78 KEYWORDS="~amd64 ~x86"
79 -IUSE="static-libs"
80 +IUSE="libav static-libs"
81
82 RDEPEND="
83 sys-libs/zlib
84 - >=virtual/ffmpeg-9
85 + libav? ( >=media-video/libav-9.17:0= )
86 + !libav? ( >=media-video/ffmpeg-1.2.6-r1:0= )
87 "
88 DEPEND="${RDEPEND}
89 virtual/pkgconfig
90
91
92
93 1.3 media-libs/ffmpegsource/ffmpegsource-2.19.1.ebuild
94
95 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/ffmpegsource/ffmpegsource-2.19.1.ebuild?rev=1.3&view=markup
96 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/ffmpegsource/ffmpegsource-2.19.1.ebuild?rev=1.3&content-type=text/plain
97 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/ffmpegsource/ffmpegsource-2.19.1.ebuild?r1=1.2&r2=1.3
98
99 Index: ffmpegsource-2.19.1.ebuild
100 ===================================================================
101 RCS file: /var/cvsroot/gentoo-x86/media-libs/ffmpegsource/ffmpegsource-2.19.1.ebuild,v
102 retrieving revision 1.2
103 retrieving revision 1.3
104 diff -u -r1.2 -r1.3
105 --- ffmpegsource-2.19.1.ebuild 24 Jul 2014 16:07:21 -0000 1.2
106 +++ ffmpegsource-2.19.1.ebuild 27 Feb 2015 22:24:32 -0000 1.3
107 @@ -1,6 +1,6 @@
108 -# Copyright 1999-2014 Gentoo Foundation
109 +# Copyright 1999-2015 Gentoo Foundation
110 # Distributed under the terms of the GNU General Public License v2
111 -# $Header: /var/cvsroot/gentoo-x86/media-libs/ffmpegsource/ffmpegsource-2.19.1.ebuild,v 1.2 2014/07/24 16:07:21 pacho Exp $
112 +# $Header: /var/cvsroot/gentoo-x86/media-libs/ffmpegsource/ffmpegsource-2.19.1.ebuild,v 1.3 2015/02/27 22:24:32 mgorny Exp $
113
114 EAPI=5
115
116 @@ -15,11 +15,12 @@
117 LICENSE="MIT"
118 SLOT="0/3"
119 KEYWORDS="amd64 x86"
120 -IUSE="static-libs"
121 +IUSE="libav static-libs"
122
123 RDEPEND="
124 sys-libs/zlib
125 - >=virtual/ffmpeg-9
126 + libav? ( >=media-video/libav-9.17:0= )
127 + !libav? ( >=media-video/ffmpeg-1.2.6-r1:0= )
128 "
129 DEPEND="${RDEPEND}
130 virtual/pkgconfig
131
132
133
134 1.23 media-libs/ffmpegsource/ChangeLog
135
136 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/ffmpegsource/ChangeLog?rev=1.23&view=markup
137 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/ffmpegsource/ChangeLog?rev=1.23&content-type=text/plain
138 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/ffmpegsource/ChangeLog?r1=1.22&r2=1.23
139
140 Index: ChangeLog
141 ===================================================================
142 RCS file: /var/cvsroot/gentoo-x86/media-libs/ffmpegsource/ChangeLog,v
143 retrieving revision 1.22
144 retrieving revision 1.23
145 diff -u -r1.22 -r1.23
146 --- ChangeLog 27 Jul 2014 13:56:05 -0000 1.22
147 +++ ChangeLog 27 Feb 2015 22:24:32 -0000 1.23
148 @@ -1,6 +1,11 @@
149 # ChangeLog for media-libs/ffmpegsource
150 -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
151 -# $Header: /var/cvsroot/gentoo-x86/media-libs/ffmpegsource/ChangeLog,v 1.22 2014/07/27 13:56:05 zlogene Exp $
152 +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
153 +# $Header: /var/cvsroot/gentoo-x86/media-libs/ffmpegsource/ChangeLog,v 1.23 2015/02/27 22:24:32 mgorny Exp $
154 +
155 + 27 Feb 2015; Michał Górny <mgorny@g.o> ffmpegsource-2.19.1.ebuild,
156 + ffmpegsource-2.20.ebuild, ffmpegsource-9999.ebuild:
157 + Use USE=libav to control ffmpeg/libav linking. Patch provided by Nikoli in
158 + https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/62.
159
160 *ffmpegsource-2.20 (27 Jul 2014)
Report Message
Find on MARC Find on Google Groups