1 |
ssuominen 11/11/01 00:45:41 |
2 |
|
3 |
Modified: libav-0.7.2.ebuild libav-0.8_pre20110818.ebuild |
4 |
libav-0.7.9999.ebuild libav-0.6.9999.ebuild |
5 |
ChangeLog libav-9999.ebuild libav-0.6.2.ebuild |
6 |
Log: |
7 |
Rename USE="v4l2" to USE="v4l" while removing support for video4linux 1.x wrt #385241 |
8 |
|
9 |
(Portage version: 2.2.0_alpha71_p73/cvs/Linux x86_64) |
10 |
|
11 |
Revision Changes Path |
12 |
1.3 media-video/libav/libav-0.7.2.ebuild |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-0.7.2.ebuild?rev=1.3&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-0.7.2.ebuild?rev=1.3&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-0.7.2.ebuild?r1=1.2&r2=1.3 |
17 |
|
18 |
Index: libav-0.7.2.ebuild |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.7.2.ebuild,v |
21 |
retrieving revision 1.2 |
22 |
retrieving revision 1.3 |
23 |
diff -u -r1.2 -r1.3 |
24 |
--- libav-0.7.2.ebuild 3 Oct 2011 07:39:42 -0000 1.2 |
25 |
+++ libav-0.7.2.ebuild 1 Nov 2011 00:45:41 -0000 1.3 |
26 |
@@ -1,6 +1,6 @@ |
27 |
# Copyright 1999-2011 Gentoo Foundation |
28 |
# Distributed under the terms of the GNU General Public License v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.7.2.ebuild,v 1.2 2011/10/03 07:39:42 lu_zero Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.7.2.ebuild,v 1.3 2011/11/01 00:45:41 ssuominen Exp $ |
31 |
|
32 |
EAPI=4 |
33 |
|
34 |
@@ -27,7 +27,7 @@ |
35 |
[[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 |
36 |
~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos |
37 |
~x64-solaris ~x86-solaris" |
38 |
-IUSE="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cpudetection custom-cflags debug dirac doc +encode faac frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib" |
39 |
+IUSE="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cpudetection custom-cflags debug dirac doc +encode faac frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads v4l vaapi vdpau vorbis vpx X x264 xvid +zlib" |
40 |
|
41 |
VIDEO_CARDS="nvidia" |
42 |
for x in ${VIDEO_CARDS}; do |
43 |
@@ -75,7 +75,6 @@ |
44 |
schroedinger? ( dev-util/pkgconfig ) |
45 |
test? ( net-misc/wget ) |
46 |
v4l? ( sys-kernel/linux-headers ) |
47 |
- v4l2? ( sys-kernel/linux-headers ) |
48 |
" |
49 |
|
50 |
# faac can't be binary distributed |
51 |
@@ -140,7 +139,10 @@ |
52 |
# libavdevice options |
53 |
use ieee1394 && myconf+=" --enable-libdc1394" |
54 |
# Indevs |
55 |
- for i in v4l v4l2 alsa oss jack; do |
56 |
+ # v4l1 is gone since linux-headers-2.6.38 |
57 |
+ myconf+=" --disable-indev=v4l" |
58 |
+ use v4l || myconf+=" --disable-indev=v4l2" |
59 |
+ for i in alsa oss jack; do |
60 |
use ${i} || myconf+=" --disable-indev=${i}" |
61 |
done |
62 |
use X && myconf+=" --enable-x11grab" |
63 |
|
64 |
|
65 |
|
66 |
1.4 media-video/libav/libav-0.8_pre20110818.ebuild |
67 |
|
68 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-0.8_pre20110818.ebuild?rev=1.4&view=markup |
69 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-0.8_pre20110818.ebuild?rev=1.4&content-type=text/plain |
70 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-0.8_pre20110818.ebuild?r1=1.3&r2=1.4 |
71 |
|
72 |
Index: libav-0.8_pre20110818.ebuild |
73 |
=================================================================== |
74 |
RCS file: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8_pre20110818.ebuild,v |
75 |
retrieving revision 1.3 |
76 |
retrieving revision 1.4 |
77 |
diff -u -r1.3 -r1.4 |
78 |
--- libav-0.8_pre20110818.ebuild 18 Aug 2011 09:40:05 -0000 1.3 |
79 |
+++ libav-0.8_pre20110818.ebuild 1 Nov 2011 00:45:41 -0000 1.4 |
80 |
@@ -1,6 +1,6 @@ |
81 |
# Copyright 1999-2011 Gentoo Foundation |
82 |
# Distributed under the terms of the GNU General Public License v2 |
83 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8_pre20110818.ebuild,v 1.3 2011/08/18 09:40:05 lu_zero Exp $ |
84 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8_pre20110818.ebuild,v 1.4 2011/11/01 00:45:41 ssuominen Exp $ |
85 |
|
86 |
EAPI=4 |
87 |
|
88 |
@@ -27,7 +27,7 @@ |
89 |
[[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 |
90 |
~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos |
91 |
~x64-solaris ~x86-solaris" |
92 |
-IUSE="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cpudetection custom-cflags debug dirac doc +encode faac frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib" |
93 |
+IUSE="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cpudetection custom-cflags debug dirac doc +encode faac frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads v4l vaapi vdpau vorbis vpx X x264 xvid +zlib" |
94 |
|
95 |
VIDEO_CARDS="nvidia" |
96 |
for x in ${VIDEO_CARDS}; do |
97 |
@@ -75,7 +75,6 @@ |
98 |
schroedinger? ( dev-util/pkgconfig ) |
99 |
test? ( net-misc/wget ) |
100 |
v4l? ( sys-kernel/linux-headers ) |
101 |
- v4l2? ( sys-kernel/linux-headers ) |
102 |
" |
103 |
|
104 |
# faac can't be binary distributed |
105 |
@@ -138,7 +137,10 @@ |
106 |
# libavdevice options |
107 |
use ieee1394 && myconf+=" --enable-libdc1394" |
108 |
# Indevs |
109 |
- for i in v4l v4l2 alsa oss jack; do |
110 |
+ # v4l1 is gone since linux-headers-2.6.38 |
111 |
+ myconf+=" --disable-indev=v4l" |
112 |
+ use v4l || myconf+=" --disable-indev=v4l2" |
113 |
+ for i in alsa oss jack; do |
114 |
use ${i} || myconf+=" --disable-indev=${i}" |
115 |
done |
116 |
use X && myconf+=" --enable-x11grab" |
117 |
|
118 |
|
119 |
|
120 |
1.3 media-video/libav/libav-0.7.9999.ebuild |
121 |
|
122 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-0.7.9999.ebuild?rev=1.3&view=markup |
123 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-0.7.9999.ebuild?rev=1.3&content-type=text/plain |
124 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-0.7.9999.ebuild?r1=1.2&r2=1.3 |
125 |
|
126 |
Index: libav-0.7.9999.ebuild |
127 |
=================================================================== |
128 |
RCS file: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.7.9999.ebuild,v |
129 |
retrieving revision 1.2 |
130 |
retrieving revision 1.3 |
131 |
diff -u -r1.2 -r1.3 |
132 |
--- libav-0.7.9999.ebuild 21 Jul 2011 21:38:10 -0000 1.2 |
133 |
+++ libav-0.7.9999.ebuild 1 Nov 2011 00:45:41 -0000 1.3 |
134 |
@@ -1,6 +1,6 @@ |
135 |
# Copyright 1999-2011 Gentoo Foundation |
136 |
# Distributed under the terms of the GNU General Public License v2 |
137 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.7.9999.ebuild,v 1.2 2011/07/21 21:38:10 mattst88 Exp $ |
138 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.7.9999.ebuild,v 1.3 2011/11/01 00:45:41 ssuominen Exp $ |
139 |
|
140 |
EAPI=4 |
141 |
|
142 |
@@ -27,7 +27,7 @@ |
143 |
[[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 |
144 |
~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos |
145 |
~x64-solaris ~x86-solaris" |
146 |
-IUSE="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cpudetection custom-cflags debug dirac doc +encode faac frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib" |
147 |
+IUSE="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cpudetection custom-cflags debug dirac doc +encode faac frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads v4l vaapi vdpau vorbis vpx X x264 xvid +zlib" |
148 |
|
149 |
VIDEO_CARDS="nvidia" |
150 |
for x in ${VIDEO_CARDS}; do |
151 |
@@ -75,7 +75,6 @@ |
152 |
schroedinger? ( dev-util/pkgconfig ) |
153 |
test? ( net-misc/wget ) |
154 |
v4l? ( sys-kernel/linux-headers ) |
155 |
- v4l2? ( sys-kernel/linux-headers ) |
156 |
" |
157 |
|
158 |
# faac can't be binary distributed |
159 |
@@ -137,7 +136,10 @@ |
160 |
# libavdevice options |
161 |
use ieee1394 && myconf+=" --enable-libdc1394" |
162 |
# Indevs |
163 |
- for i in v4l v4l2 alsa oss jack; do |
164 |
+ # v4l1 is gone since linux-headers-2.6.38 |
165 |
+ myconf+=" --disable-indev=v4l" |
166 |
+ use v4l || myconf+=" --disable-indev=v4l2" |
167 |
+ for i in alsa oss jack; do |
168 |
use ${i} || myconf+=" --disable-indev=${i}" |
169 |
done |
170 |
use X && myconf+=" --enable-x11grab" |
171 |
|
172 |
|
173 |
|
174 |
1.8 media-video/libav/libav-0.6.9999.ebuild |
175 |
|
176 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-0.6.9999.ebuild?rev=1.8&view=markup |
177 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-0.6.9999.ebuild?rev=1.8&content-type=text/plain |
178 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-0.6.9999.ebuild?r1=1.7&r2=1.8 |
179 |
|
180 |
Index: libav-0.6.9999.ebuild |
181 |
=================================================================== |
182 |
RCS file: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.6.9999.ebuild,v |
183 |
retrieving revision 1.7 |
184 |
retrieving revision 1.8 |
185 |
diff -u -r1.7 -r1.8 |
186 |
--- libav-0.6.9999.ebuild 20 Apr 2011 11:01:08 -0000 1.7 |
187 |
+++ libav-0.6.9999.ebuild 1 Nov 2011 00:45:41 -0000 1.8 |
188 |
@@ -1,6 +1,6 @@ |
189 |
# Copyright 1999-2011 Gentoo Foundation |
190 |
# Distributed under the terms of the GNU General Public License v2 |
191 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.6.9999.ebuild,v 1.7 2011/04/20 11:01:08 scarabeus Exp $ |
192 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.6.9999.ebuild,v 1.8 2011/11/01 00:45:41 ssuominen Exp $ |
193 |
|
194 |
EAPI=4 |
195 |
|
196 |
@@ -27,7 +27,7 @@ |
197 |
[[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 |
198 |
~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos |
199 |
~x64-solaris ~x86-solaris" |
200 |
-IUSE="+3dnow +3dnowext alsa altivec amr bindist +bzip2 cpudetection custom-cflags debug dirac doc +encode faac gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib" |
201 |
+IUSE="+3dnow +3dnowext alsa altivec amr bindist +bzip2 cpudetection custom-cflags debug dirac doc +encode faac gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads v4l vaapi vdpau vorbis vpx X x264 xvid +zlib" |
202 |
|
203 |
VIDEO_CARDS="nvidia" |
204 |
for x in ${VIDEO_CARDS}; do |
205 |
@@ -72,7 +72,6 @@ |
206 |
schroedinger? ( dev-util/pkgconfig ) |
207 |
test? ( net-misc/wget ) |
208 |
v4l? ( sys-kernel/linux-headers ) |
209 |
- v4l2? ( sys-kernel/linux-headers ) |
210 |
" |
211 |
|
212 |
# faac can't be binary distributed |
213 |
@@ -121,7 +120,10 @@ |
214 |
# libavdevice options |
215 |
use ieee1394 && myconf+=" --enable-libdc1394" |
216 |
# Indevs |
217 |
- for i in v4l v4l2 alsa oss jack; do |
218 |
+ # v4l1 is gone since linux-headers-2.6.38 |
219 |
+ myconf+=" --disable-indev=v4l" |
220 |
+ use v4l || myconf+=" --disable-indev=v4l2" |
221 |
+ for i in alsa oss jack; do |
222 |
use ${i} || myconf+=" --disable-indev=${i}" |
223 |
done |
224 |
use X && myconf+=" --enable-x11grab" |
225 |
|
226 |
|
227 |
|
228 |
1.31 media-video/libav/ChangeLog |
229 |
|
230 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/ChangeLog?rev=1.31&view=markup |
231 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/ChangeLog?rev=1.31&content-type=text/plain |
232 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/ChangeLog?r1=1.30&r2=1.31 |
233 |
|
234 |
Index: ChangeLog |
235 |
=================================================================== |
236 |
RCS file: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v |
237 |
retrieving revision 1.30 |
238 |
retrieving revision 1.31 |
239 |
diff -u -r1.30 -r1.31 |
240 |
--- ChangeLog 7 Oct 2011 11:18:25 -0000 1.30 |
241 |
+++ ChangeLog 1 Nov 2011 00:45:41 -0000 1.31 |
242 |
@@ -1,6 +1,12 @@ |
243 |
# ChangeLog for media-video/libav |
244 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
245 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.30 2011/10/07 11:18:25 scarabeus Exp $ |
246 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.31 2011/11/01 00:45:41 ssuominen Exp $ |
247 |
+ |
248 |
+ 01 Nov 2011; Samuli Suominen <ssuominen@g.o> libav-0.6.2.ebuild, |
249 |
+ libav-0.6.9999.ebuild, libav-0.7.2.ebuild, libav-0.7.9999.ebuild, |
250 |
+ libav-0.8_pre20110818.ebuild, libav-9999.ebuild: |
251 |
+ Rename USE="v4l2" to USE="v4l" while removing support for video4linux 1.x wrt |
252 |
+ #385241 |
253 |
|
254 |
07 Oct 2011; Tomáš Chvátal <scarabeus@g.o> |
255 |
-libav-0.7_pre20110327.ebuild, -libav-0.7.ebuild, -libav-0.7.1.ebuild: |
256 |
|
257 |
|
258 |
|
259 |
1.18 media-video/libav/libav-9999.ebuild |
260 |
|
261 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-9999.ebuild?rev=1.18&view=markup |
262 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-9999.ebuild?rev=1.18&content-type=text/plain |
263 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-9999.ebuild?r1=1.17&r2=1.18 |
264 |
|
265 |
Index: libav-9999.ebuild |
266 |
=================================================================== |
267 |
RCS file: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v |
268 |
retrieving revision 1.17 |
269 |
retrieving revision 1.18 |
270 |
diff -u -r1.17 -r1.18 |
271 |
--- libav-9999.ebuild 22 Sep 2011 18:47:03 -0000 1.17 |
272 |
+++ libav-9999.ebuild 1 Nov 2011 00:45:41 -0000 1.18 |
273 |
@@ -1,6 +1,6 @@ |
274 |
# Copyright 1999-2011 Gentoo Foundation |
275 |
# Distributed under the terms of the GNU General Public License v2 |
276 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.17 2011/09/22 18:47:03 lu_zero Exp $ |
277 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.18 2011/11/01 00:45:41 ssuominen Exp $ |
278 |
|
279 |
EAPI=4 |
280 |
|
281 |
@@ -27,7 +27,7 @@ |
282 |
[[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 |
283 |
~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos |
284 |
~x64-solaris ~x86-solaris" |
285 |
-IUSE="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cpudetection custom-cflags debug dirac doc +encode faac frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib" |
286 |
+IUSE="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cpudetection custom-cflags debug dirac doc +encode faac frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads v4l vaapi vdpau vorbis vpx X x264 xvid +zlib" |
287 |
|
288 |
VIDEO_CARDS="nvidia" |
289 |
for x in ${VIDEO_CARDS}; do |
290 |
@@ -75,7 +75,6 @@ |
291 |
schroedinger? ( dev-util/pkgconfig ) |
292 |
test? ( net-misc/wget ) |
293 |
v4l? ( sys-kernel/linux-headers ) |
294 |
- v4l2? ( sys-kernel/linux-headers ) |
295 |
" |
296 |
|
297 |
# faac can't be binary distributed |
298 |
@@ -140,7 +139,10 @@ |
299 |
# libavdevice options |
300 |
use ieee1394 && myconf+=" --enable-libdc1394" |
301 |
# Indevs |
302 |
- for i in v4l v4l2 alsa oss jack; do |
303 |
+ # v4l1 is gone since linux-headers-2.6.38 |
304 |
+ myconf+=" --disable-indev=v4l" |
305 |
+ use v4l || myconf+=" --disable-indev=v4l2" |
306 |
+ for i in alsa oss jack; do |
307 |
use ${i} || myconf+=" --disable-indev=${i}" |
308 |
done |
309 |
use X && myconf+=" --enable-x11grab" |
310 |
|
311 |
|
312 |
|
313 |
1.5 media-video/libav/libav-0.6.2.ebuild |
314 |
|
315 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-0.6.2.ebuild?rev=1.5&view=markup |
316 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-0.6.2.ebuild?rev=1.5&content-type=text/plain |
317 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-0.6.2.ebuild?r1=1.4&r2=1.5 |
318 |
|
319 |
Index: libav-0.6.2.ebuild |
320 |
=================================================================== |
321 |
RCS file: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.6.2.ebuild,v |
322 |
retrieving revision 1.4 |
323 |
retrieving revision 1.5 |
324 |
diff -u -r1.4 -r1.5 |
325 |
--- libav-0.6.2.ebuild 1 Apr 2011 09:45:01 -0000 1.4 |
326 |
+++ libav-0.6.2.ebuild 1 Nov 2011 00:45:41 -0000 1.5 |
327 |
@@ -1,6 +1,6 @@ |
328 |
# Copyright 1999-2011 Gentoo Foundation |
329 |
# Distributed under the terms of the GNU General Public License v2 |
330 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.6.2.ebuild,v 1.4 2011/04/01 09:45:01 scarabeus Exp $ |
331 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.6.2.ebuild,v 1.5 2011/11/01 00:45:41 ssuominen Exp $ |
332 |
|
333 |
EAPI=4 |
334 |
|
335 |
@@ -26,7 +26,7 @@ |
336 |
[[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 |
337 |
~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos |
338 |
~x64-solaris ~x86-solaris" |
339 |
-IUSE="+3dnow +3dnowext alsa altivec amr bindist +bzip2 cpudetection custom-cflags debug dirac doc +encode faac gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib" |
340 |
+IUSE="+3dnow +3dnowext alsa altivec amr bindist +bzip2 cpudetection custom-cflags debug dirac doc +encode faac gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads v4l vaapi vdpau vorbis vpx X x264 xvid +zlib" |
341 |
|
342 |
VIDEO_CARDS="nvidia" |
343 |
for x in ${VIDEO_CARDS}; do |
344 |
@@ -71,7 +71,6 @@ |
345 |
schroedinger? ( dev-util/pkgconfig ) |
346 |
test? ( net-misc/wget ) |
347 |
v4l? ( sys-kernel/linux-headers ) |
348 |
- v4l2? ( sys-kernel/linux-headers ) |
349 |
" |
350 |
|
351 |
# faac can't be binary distributed |
352 |
@@ -124,7 +123,10 @@ |
353 |
# libavdevice options |
354 |
use ieee1394 && myconf+=" --enable-libdc1394" |
355 |
# Indevs |
356 |
- for i in v4l v4l2 alsa oss jack; do |
357 |
+ # v4l1 is gone since linux-headers-2.6.38 |
358 |
+ myconf+=" --disable-indev=v4l" |
359 |
+ use v4l || myconf+=" --disable-indev=v4l2" |
360 |
+ for i in alsa oss jack; do |
361 |
use ${i} || myconf+=" --disable-indev=${i}" |
362 |
done |
363 |
use X && myconf+=" --enable-x11grab" |