1 |
ssuominen 11/10/31 16:32:02 |
2 |
|
3 |
Modified: vlc-1.1.11.ebuild ChangeLog vlc-1.1.12.ebuild |
4 |
vlc-1.1.9999.ebuild |
5 |
Log: |
6 |
Rename USE="v4l2" to USE="v4l" while removing support for video4linux 1.x wrt #385241 |
7 |
|
8 |
(Portage version: 2.2.0_alpha71_p73/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.8 media-video/vlc/vlc-1.1.11.ebuild |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-1.1.11.ebuild?rev=1.8&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-1.1.11.ebuild?rev=1.8&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-1.1.11.ebuild?r1=1.7&r2=1.8 |
16 |
|
17 |
Index: vlc-1.1.11.ebuild |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.11.ebuild,v |
20 |
retrieving revision 1.7 |
21 |
retrieving revision 1.8 |
22 |
diff -u -r1.7 -r1.8 |
23 |
--- vlc-1.1.11.ebuild 22 Sep 2011 15:29:42 -0000 1.7 |
24 |
+++ vlc-1.1.11.ebuild 31 Oct 2011 16:32:02 -0000 1.8 |
25 |
@@ -1,6 +1,6 @@ |
26 |
# Copyright 1999-2011 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.11.ebuild,v 1.7 2011/09/22 15:29:42 aballier Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.11.ebuild,v 1.8 2011/10/31 16:32:02 ssuominen Exp $ |
30 |
|
31 |
EAPI="3" |
32 |
|
33 |
@@ -56,7 +56,7 @@ |
34 |
modplug mp3 mpeg mtp musepack ncurses nsplugin ogg opengl optimisememory oss |
35 |
png projectm pulseaudio pvr +qt4 remoteosd rtsp run-as-root samba |
36 |
schroedinger sdl sdl-image shine shout skins speex sqlite sse stream |
37 |
- svg svga taglib theora truetype twolame udev upnp v4l v4l2 vaapi vcdx vlm |
38 |
+ svg svga taglib theora truetype twolame udev upnp v4l vaapi vcdx vlm |
39 |
vorbis win32codecs wma-fixed +X x264 +xcb xml xosd xv zvbi" |
40 |
|
41 |
RDEPEND=" |
42 |
@@ -133,8 +133,10 @@ |
43 |
twolame? ( media-sound/twolame ) |
44 |
udev? ( >=sys-fs/udev-142 ) |
45 |
upnp? ( net-libs/libupnp ) |
46 |
- v4l2? ( libv4l2? ( media-libs/libv4l ) ) |
47 |
- v4l? ( libv4l? ( media-libs/libv4l ) ) |
48 |
+ v4l? ( |
49 |
+ libv4l2? ( media-libs/libv4l ) |
50 |
+ libv4l? ( media-libs/libv4l ) |
51 |
+ ) |
52 |
vaapi? ( x11-libs/libva virtual/ffmpeg ) |
53 |
vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) |
54 |
vorbis? ( media-libs/libvorbis ) |
55 |
@@ -152,8 +154,7 @@ |
56 |
alsa? ( >=media-sound/alsa-headers-1.0.23 ) |
57 |
dvb? ( sys-kernel/linux-headers ) |
58 |
kde? ( >=kde-base/kdelibs-4 ) |
59 |
- v4l? ( sys-kernel/linux-headers ) |
60 |
- v4l2? ( >=sys-kernel/linux-headers-2.6.25 ) |
61 |
+ v4l? ( >=sys-kernel/linux-headers-2.6.25 ) |
62 |
xcb? ( x11-proto/xproto ) |
63 |
dev-util/pkgconfig" |
64 |
|
65 |
@@ -192,7 +193,7 @@ |
66 |
vlc_use_needs bidi truetype |
67 |
vlc_use_needs cddb cdda |
68 |
vlc_use_needs fontconfig truetype |
69 |
- vlc_use_needs libv4l2 v4l2 |
70 |
+ vlc_use_needs libv4l2 v4l |
71 |
vlc_use_needs libv4l v4l |
72 |
vlc_use_needs libtiger kate |
73 |
vlc_use_needs xv xcb |
74 |
@@ -316,8 +317,8 @@ |
75 |
$(use_enable twolame) \ |
76 |
$(use_enable udev) \ |
77 |
$(use_enable upnp) \ |
78 |
- $(use_enable v4l) \ |
79 |
- $(use_enable v4l2) \ |
80 |
+ --disable-v4l \ |
81 |
+ $(use_enable v4l v4l2) \ |
82 |
$(use_enable vcdx) \ |
83 |
$(use_enable vaapi libva) \ |
84 |
$(use_enable vlm) \ |
85 |
|
86 |
|
87 |
|
88 |
1.748 media-video/vlc/ChangeLog |
89 |
|
90 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?rev=1.748&view=markup |
91 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?rev=1.748&content-type=text/plain |
92 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?r1=1.747&r2=1.748 |
93 |
|
94 |
Index: ChangeLog |
95 |
=================================================================== |
96 |
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v |
97 |
retrieving revision 1.747 |
98 |
retrieving revision 1.748 |
99 |
diff -u -r1.747 -r1.748 |
100 |
--- ChangeLog 9 Oct 2011 18:52:39 -0000 1.747 |
101 |
+++ ChangeLog 31 Oct 2011 16:32:02 -0000 1.748 |
102 |
@@ -1,6 +1,11 @@ |
103 |
# ChangeLog for media-video/vlc |
104 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
105 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.747 2011/10/09 18:52:39 xarthisius Exp $ |
106 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.748 2011/10/31 16:32:02 ssuominen Exp $ |
107 |
+ |
108 |
+ 31 Oct 2011; Samuli Suominen <ssuominen@g.o> vlc-1.1.11.ebuild, |
109 |
+ vlc-1.1.12.ebuild, vlc-1.1.9999.ebuild: |
110 |
+ Rename USE="v4l2" to USE="v4l" while removing support for video4linux 1.x wrt |
111 |
+ #385241 |
112 |
|
113 |
09 Oct 2011; Kacper Kowalik <xarthisius@g.o> vlc-1.1.12.ebuild: |
114 |
ppc/ppc64 stable wrt #385953 |
115 |
|
116 |
|
117 |
|
118 |
1.5 media-video/vlc/vlc-1.1.12.ebuild |
119 |
|
120 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-1.1.12.ebuild?rev=1.5&view=markup |
121 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-1.1.12.ebuild?rev=1.5&content-type=text/plain |
122 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-1.1.12.ebuild?r1=1.4&r2=1.5 |
123 |
|
124 |
Index: vlc-1.1.12.ebuild |
125 |
=================================================================== |
126 |
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.12.ebuild,v |
127 |
retrieving revision 1.4 |
128 |
retrieving revision 1.5 |
129 |
diff -u -r1.4 -r1.5 |
130 |
--- vlc-1.1.12.ebuild 9 Oct 2011 18:52:39 -0000 1.4 |
131 |
+++ vlc-1.1.12.ebuild 31 Oct 2011 16:32:02 -0000 1.5 |
132 |
@@ -1,6 +1,6 @@ |
133 |
# Copyright 1999-2011 Gentoo Foundation |
134 |
# Distributed under the terms of the GNU General Public License v2 |
135 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.12.ebuild,v 1.4 2011/10/09 18:52:39 xarthisius Exp $ |
136 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.12.ebuild,v 1.5 2011/10/31 16:32:02 ssuominen Exp $ |
137 |
|
138 |
EAPI="3" |
139 |
|
140 |
@@ -56,7 +56,7 @@ |
141 |
modplug mp3 mpeg mtp musepack ncurses nsplugin ogg opengl optimisememory oss |
142 |
png projectm pulseaudio pvr +qt4 remoteosd rtsp run-as-root samba |
143 |
schroedinger sdl sdl-image shine shout skins speex sqlite sse stream |
144 |
- svg svga taglib theora truetype twolame udev upnp v4l v4l2 vaapi vcdx vlm |
145 |
+ svg svga taglib theora truetype twolame udev upnp v4l vaapi vcdx vlm |
146 |
vorbis win32codecs wma-fixed +X x264 +xcb xml xosd xv zvbi" |
147 |
|
148 |
RDEPEND=" |
149 |
@@ -133,8 +133,10 @@ |
150 |
twolame? ( media-sound/twolame ) |
151 |
udev? ( >=sys-fs/udev-142 ) |
152 |
upnp? ( net-libs/libupnp ) |
153 |
- v4l2? ( libv4l2? ( media-libs/libv4l ) ) |
154 |
- v4l? ( libv4l? ( media-libs/libv4l ) ) |
155 |
+ v4l? ( |
156 |
+ libv4l2? ( media-libs/libv4l ) |
157 |
+ libv4l? ( media-libs/libv4l ) |
158 |
+ ) |
159 |
vaapi? ( x11-libs/libva virtual/ffmpeg ) |
160 |
vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) |
161 |
vorbis? ( media-libs/libvorbis ) |
162 |
@@ -152,8 +154,7 @@ |
163 |
alsa? ( >=media-sound/alsa-headers-1.0.23 ) |
164 |
dvb? ( sys-kernel/linux-headers ) |
165 |
kde? ( >=kde-base/kdelibs-4 ) |
166 |
- v4l? ( sys-kernel/linux-headers ) |
167 |
- v4l2? ( >=sys-kernel/linux-headers-2.6.25 ) |
168 |
+ v4l? ( >=sys-kernel/linux-headers-2.6.25 ) |
169 |
xcb? ( x11-proto/xproto ) |
170 |
dev-util/pkgconfig" |
171 |
|
172 |
@@ -192,7 +193,7 @@ |
173 |
vlc_use_needs bidi truetype |
174 |
vlc_use_needs cddb cdda |
175 |
vlc_use_needs fontconfig truetype |
176 |
- vlc_use_needs libv4l2 v4l2 |
177 |
+ vlc_use_needs libv4l2 v4l |
178 |
vlc_use_needs libv4l v4l |
179 |
vlc_use_needs libtiger kate |
180 |
vlc_use_needs xv xcb |
181 |
@@ -316,8 +317,8 @@ |
182 |
$(use_enable twolame) \ |
183 |
$(use_enable udev) \ |
184 |
$(use_enable upnp) \ |
185 |
- $(use_enable v4l) \ |
186 |
- $(use_enable v4l2) \ |
187 |
+ --disable-v4l \ |
188 |
+ $(use_enable v4l v4l2) \ |
189 |
$(use_enable vcdx) \ |
190 |
$(use_enable vaapi libva) \ |
191 |
$(use_enable vlm) \ |
192 |
|
193 |
|
194 |
|
195 |
1.34 media-video/vlc/vlc-1.1.9999.ebuild |
196 |
|
197 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild?rev=1.34&view=markup |
198 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild?rev=1.34&content-type=text/plain |
199 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild?r1=1.33&r2=1.34 |
200 |
|
201 |
Index: vlc-1.1.9999.ebuild |
202 |
=================================================================== |
203 |
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v |
204 |
retrieving revision 1.33 |
205 |
retrieving revision 1.34 |
206 |
diff -u -r1.33 -r1.34 |
207 |
--- vlc-1.1.9999.ebuild 22 Sep 2011 15:29:42 -0000 1.33 |
208 |
+++ vlc-1.1.9999.ebuild 31 Oct 2011 16:32:02 -0000 1.34 |
209 |
@@ -1,6 +1,6 @@ |
210 |
# Copyright 1999-2011 Gentoo Foundation |
211 |
# Distributed under the terms of the GNU General Public License v2 |
212 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v 1.33 2011/09/22 15:29:42 aballier Exp $ |
213 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v 1.34 2011/10/31 16:32:02 ssuominen Exp $ |
214 |
|
215 |
EAPI="3" |
216 |
|
217 |
@@ -54,7 +54,7 @@ |
218 |
modplug mp3 mpeg mtp musepack ncurses nsplugin ogg opengl optimisememory oss |
219 |
png projectm pulseaudio pvr +qt4 remoteosd rtsp run-as-root samba |
220 |
schroedinger sdl sdl-image shine shout skins speex sqlite sse stream |
221 |
- svg svga taglib theora truetype twolame udev upnp v4l v4l2 vaapi vcdx vlm |
222 |
+ svg svga taglib theora truetype twolame udev upnp v4l vaapi vcdx vlm |
223 |
vorbis win32codecs wma-fixed +X x264 +xcb xml xosd xv zvbi" |
224 |
|
225 |
RDEPEND=" |
226 |
@@ -131,8 +131,10 @@ |
227 |
twolame? ( media-sound/twolame ) |
228 |
udev? ( >=sys-fs/udev-142 ) |
229 |
upnp? ( net-libs/libupnp ) |
230 |
- v4l2? ( libv4l2? ( media-libs/libv4l ) ) |
231 |
- v4l? ( libv4l? ( media-libs/libv4l ) ) |
232 |
+ v4l? ( |
233 |
+ libv4l2? ( media-libs/libv4l ) |
234 |
+ libv4l? ( media-libs/libv4l ) |
235 |
+ ) |
236 |
vaapi? ( x11-libs/libva virtual/ffmpeg ) |
237 |
vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) |
238 |
vorbis? ( media-libs/libvorbis ) |
239 |
@@ -150,8 +152,7 @@ |
240 |
alsa? ( >=media-sound/alsa-headers-1.0.23 ) |
241 |
dvb? ( sys-kernel/linux-headers ) |
242 |
kde? ( >=kde-base/kdelibs-4 ) |
243 |
- v4l? ( sys-kernel/linux-headers ) |
244 |
- v4l2? ( >=sys-kernel/linux-headers-2.6.25 ) |
245 |
+ v4l? ( >=sys-kernel/linux-headers-2.6.25 ) |
246 |
xcb? ( x11-proto/xproto ) |
247 |
dev-util/pkgconfig" |
248 |
|
249 |
@@ -190,7 +191,7 @@ |
250 |
vlc_use_needs bidi truetype |
251 |
vlc_use_needs cddb cdda |
252 |
vlc_use_needs fontconfig truetype |
253 |
- vlc_use_needs libv4l2 v4l2 |
254 |
+ vlc_use_needs libv4l2 v4l |
255 |
vlc_use_needs libv4l v4l |
256 |
vlc_use_needs libtiger kate |
257 |
vlc_use_needs xv xcb |
258 |
@@ -311,8 +312,8 @@ |
259 |
$(use_enable twolame) \ |
260 |
$(use_enable udev) \ |
261 |
$(use_enable upnp) \ |
262 |
- $(use_enable v4l) \ |
263 |
- $(use_enable v4l2) \ |
264 |
+ --disable-v4l \ |
265 |
+ $(use_enable v4l v4l2) \ |
266 |
$(use_enable vcdx) \ |
267 |
$(use_enable vaapi libva) \ |
268 |
$(use_enable vlm) \ |