Gentoo Archives: gentoo-commits

From: "Alexis Ballier (aballier)" <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-video/vlc: vlc-1.1.9999.ebuild ChangeLog vlc-1.1.0_pre2.ebuild vlc-9999.ebuild
Date: Fri, 23 Apr 2010 16:18:16
Message-Id: 20100423161810.DB5F0317E1@corvid.gentoo.org
1 aballier 10/04/23 16:18:10
2
3 Modified: vlc-1.1.9999.ebuild ChangeLog vlc-1.1.0_pre2.ebuild
4 vlc-9999.ebuild
5 Log:
6 Simplify vlc_use_enable_force here too, fix some useflags deps, require dbus on avahi for avahi-client
7 (Portage version: 2.2_rc67/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.2 media-video/vlc/vlc-1.1.9999.ebuild
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild?r1=1.1&r2=1.2
15
16 Index: vlc-1.1.9999.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- vlc-1.1.9999.ebuild 23 Apr 2010 11:08:49 -0000 1.1
23 +++ vlc-1.1.9999.ebuild 23 Apr 2010 16:18:09 -0000 1.2
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2010 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v 1.1 2010/04/23 11:08:49 aballier Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v 1.2 2010/04/23 16:18:09 aballier Exp $
29
30 EAPI="2"
31
32 @@ -63,7 +63,7 @@
33 aalib? ( media-libs/aalib )
34 aac? ( >=media-libs/faad2-2.6.1 )
35 alsa? ( media-libs/alsa-lib )
36 - avahi? ( >=net-dns/avahi-0.6 )
37 + avahi? ( >=net-dns/avahi-0.6[dbus] )
38 bidi? ( >=dev-libs/fribidi-0.10.4 )
39 cdda? ( cddb? ( >=media-libs/libcddb-1.2.0 ) )
40 dbus? ( >=sys-apps/dbus-1.0.2 )
41 @@ -120,7 +120,11 @@
42 sdl? ( >=media-libs/libsdl-1.2.8
43 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) )
44 shout? ( media-libs/libshout )
45 - skins? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libXext x11-libs/libX11 )
46 + skins? (
47 + x11-libs/qt-gui:4 x11-libs/qt-core:4
48 + x11-libs/libXext x11-libs/libX11
49 + media-libs/freetype media-fonts/dejavu
50 + )
51 speex? ( media-libs/speex )
52 sqlite? ( >=dev-db/sqlite-3.6.0:3 )
53 svg? ( >=gnome-base/librsvg-2.9.0 )
54 @@ -164,14 +168,10 @@
55 use $1 && use !$2 && ewarn "USE=$1 requires $2, $2 will be enabled."
56 }
57
58 -# Use when $2 depends strictly on $3
59 -# if use $1 then enable $2 and $3, otherwise disable $2
60 +# Use when $1 depends strictly on $2
61 +# if use $1 then enable $2
62 vlc_use_enable_force() {
63 - if use $1 ; then
64 - echo "--enable-$2 --enable-$3"
65 - else
66 - echo "--disable-$2"
67 - fi
68 + use $1 && echo "--enable-$2"
69 }
70
71 pkg_setup() {
72 @@ -181,16 +181,22 @@
73 eerror "the old ${PN} version and will not work."
74 die "Unmerge vlc 1.0.x first"
75 fi
76 - vlc_use_needs skins truetype
77 +
78 + # Useflags we need to forcefuly enable
79 + vlc_use_force remoteosd gcrypt
80 + vlc_use_force skins truetype
81 vlc_use_force skins qt4
82 + vlc_use_force vlm stream
83 +
84 + # Useflags that will be automagically discarded if deps are not met
85 vlc_use_needs bidi truetype
86 - vlc_use_force remoteosd gcrypt
87 + vlc_use_needs cddb cdda
88 vlc_use_needs fontconfig truetype
89 vlc_use_needs libv4l2 v4l2
90 vlc_use_needs libv4l v4l
91 vlc_use_needs libtiger kate
92 vlc_use_needs xv xcb
93 - vlc_use_needs cddb cdda
94 +
95 if use qt4 || use skins ; then
96 qt4_pkg_setup
97 else
98 @@ -287,6 +293,7 @@
99 $(use_enable pulseaudio pulse) \
100 $(use_enable pvr) \
101 $(use_enable qt4) \
102 + $(use_enable remoteosd) \
103 $(use_enable rtsp realrtsp) \
104 $(use_enable run-as-root) \
105 $(use_enable samba smb) \
106 @@ -311,6 +318,7 @@
107 $(use_enable v4l) \
108 $(use_enable v4l2) \
109 $(use_enable vcdx) \
110 + $(use_enable vlm) \
111 $(use_enable vorbis) \
112 $(use_enable win32codecs loader) \
113 $(use_enable wma-fixed) \
114 @@ -324,9 +332,10 @@
115 --disable-growl \
116 --disable-optimizations \
117 --enable-fast-install \
118 - $(vlc_use_enable_force vlm vlm sout) \
119 - $(vlc_use_enable_force skins skins2 qt4) \
120 - $(vlc_use_enable_force remoteosd remoteosd libgcrypt)
121 + $(vlc_use_enable_force vlm sout) \
122 + $(vlc_use_enable_force skins qt4) \
123 + $(vlc_use_enable_force skins freetype) \
124 + $(vlc_use_enable_force remoteosd libgcrypt)
125 }
126
127 src_install() {
128
129
130
131 1.573 media-video/vlc/ChangeLog
132
133 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/ChangeLog?rev=1.573&view=markup
134 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/ChangeLog?rev=1.573&content-type=text/plain
135 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/ChangeLog?r1=1.572&r2=1.573
136
137 Index: ChangeLog
138 ===================================================================
139 RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v
140 retrieving revision 1.572
141 retrieving revision 1.573
142 diff -u -r1.572 -r1.573
143 --- ChangeLog 23 Apr 2010 15:24:24 -0000 1.572
144 +++ ChangeLog 23 Apr 2010 16:18:09 -0000 1.573
145 @@ -1,6 +1,11 @@
146 # ChangeLog for media-video/vlc
147 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
148 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.572 2010/04/23 15:24:24 aballier Exp $
149 +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.573 2010/04/23 16:18:09 aballier Exp $
150 +
151 + 23 Apr 2010; Alexis Ballier <aballier@g.o> vlc-1.1.0_pre2.ebuild,
152 + vlc-1.1.9999.ebuild, vlc-9999.ebuild:
153 + Simplify vlc_use_enable_force here too, fix some useflags deps, require
154 + dbus on avahi for avahi-client
155
156 23 Apr 2010; Alexis Ballier <aballier@g.o> vlc-1.0.6.ebuild,
157 vlc-1.0.9999.ebuild:
158
159
160
161 1.2 media-video/vlc/vlc-1.1.0_pre2.ebuild
162
163 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-1.1.0_pre2.ebuild?rev=1.2&view=markup
164 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-1.1.0_pre2.ebuild?rev=1.2&content-type=text/plain
165 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-1.1.0_pre2.ebuild?r1=1.1&r2=1.2
166
167 Index: vlc-1.1.0_pre2.ebuild
168 ===================================================================
169 RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.0_pre2.ebuild,v
170 retrieving revision 1.1
171 retrieving revision 1.2
172 diff -u -r1.1 -r1.2
173 --- vlc-1.1.0_pre2.ebuild 22 Apr 2010 19:26:40 -0000 1.1
174 +++ vlc-1.1.0_pre2.ebuild 23 Apr 2010 16:18:09 -0000 1.2
175 @@ -1,6 +1,6 @@
176 # Copyright 1999-2010 Gentoo Foundation
177 # Distributed under the terms of the GNU General Public License v2
178 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.0_pre2.ebuild,v 1.1 2010/04/22 19:26:40 aballier Exp $
179 +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.0_pre2.ebuild,v 1.2 2010/04/23 16:18:09 aballier Exp $
180
181 EAPI="2"
182
183 @@ -63,7 +63,7 @@
184 aalib? ( media-libs/aalib )
185 aac? ( >=media-libs/faad2-2.6.1 )
186 alsa? ( media-libs/alsa-lib )
187 - avahi? ( >=net-dns/avahi-0.6 )
188 + avahi? ( >=net-dns/avahi-0.6[dbus] )
189 bidi? ( >=dev-libs/fribidi-0.10.4 )
190 cdda? ( cddb? ( >=media-libs/libcddb-1.2.0 ) )
191 dbus? ( >=sys-apps/dbus-1.0.2 )
192 @@ -120,7 +120,11 @@
193 sdl? ( >=media-libs/libsdl-1.2.8
194 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) )
195 shout? ( media-libs/libshout )
196 - skins? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libXext x11-libs/libX11 )
197 + skins? (
198 + x11-libs/qt-gui:4 x11-libs/qt-core:4
199 + x11-libs/libXext x11-libs/libX11
200 + media-libs/freetype media-fonts/dejavu
201 + )
202 speex? ( media-libs/speex )
203 sqlite? ( >=dev-db/sqlite-3.6.0:3 )
204 svg? ( >=gnome-base/librsvg-2.9.0 )
205 @@ -164,14 +168,10 @@
206 use $1 && use !$2 && ewarn "USE=$1 requires $2, $2 will be enabled."
207 }
208
209 -# Use when $2 depends strictly on $3
210 -# if use $1 then enable $2 and $3, otherwise disable $2
211 +# Use when $1 depends strictly on $2
212 +# if use $1 then enable $2
213 vlc_use_enable_force() {
214 - if use $1 ; then
215 - echo "--enable-$2 --enable-$3"
216 - else
217 - echo "--disable-$2"
218 - fi
219 + use $1 && echo "--enable-$2"
220 }
221
222 pkg_setup() {
223 @@ -181,16 +181,22 @@
224 eerror "the old ${PN} version and will not work."
225 die "Unmerge vlc 1.0.x first"
226 fi
227 - vlc_use_needs skins truetype
228 +
229 + # Useflags we need to forcefuly enable
230 + vlc_use_force remoteosd gcrypt
231 + vlc_use_force skins truetype
232 vlc_use_force skins qt4
233 + vlc_use_force vlm stream
234 +
235 + # Useflags that will be automagically discarded if deps are not met
236 vlc_use_needs bidi truetype
237 - vlc_use_force remoteosd gcrypt
238 + vlc_use_needs cddb cdda
239 vlc_use_needs fontconfig truetype
240 vlc_use_needs libv4l2 v4l2
241 vlc_use_needs libv4l v4l
242 vlc_use_needs libtiger kate
243 vlc_use_needs xv xcb
244 - vlc_use_needs cddb cdda
245 +
246 if use qt4 || use skins ; then
247 qt4_pkg_setup
248 else
249 @@ -287,6 +293,7 @@
250 $(use_enable pulseaudio pulse) \
251 $(use_enable pvr) \
252 $(use_enable qt4) \
253 + $(use_enable remoteosd) \
254 $(use_enable rtsp realrtsp) \
255 $(use_enable run-as-root) \
256 $(use_enable samba smb) \
257 @@ -311,6 +318,7 @@
258 $(use_enable v4l) \
259 $(use_enable v4l2) \
260 $(use_enable vcdx) \
261 + $(use_enable vlm) \
262 $(use_enable vorbis) \
263 $(use_enable win32codecs loader) \
264 $(use_enable wma-fixed) \
265 @@ -324,9 +332,10 @@
266 --disable-growl \
267 --disable-optimizations \
268 --enable-fast-install \
269 - $(vlc_use_enable_force vlm vlm sout) \
270 - $(vlc_use_enable_force skins skins2 qt4) \
271 - $(vlc_use_enable_force remoteosd remoteosd libgcrypt)
272 + $(vlc_use_enable_force vlm sout) \
273 + $(vlc_use_enable_force skins qt4) \
274 + $(vlc_use_enable_force skins freetype) \
275 + $(vlc_use_enable_force remoteosd libgcrypt)
276 }
277
278 src_install() {
279
280
281
282 1.69 media-video/vlc/vlc-9999.ebuild
283
284 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-9999.ebuild?rev=1.69&view=markup
285 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-9999.ebuild?rev=1.69&content-type=text/plain
286 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-9999.ebuild?r1=1.68&r2=1.69
287
288 Index: vlc-9999.ebuild
289 ===================================================================
290 RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v
291 retrieving revision 1.68
292 retrieving revision 1.69
293 diff -u -r1.68 -r1.69
294 --- vlc-9999.ebuild 12 Apr 2010 16:36:12 -0000 1.68
295 +++ vlc-9999.ebuild 23 Apr 2010 16:18:09 -0000 1.69
296 @@ -1,6 +1,6 @@
297 # Copyright 1999-2010 Gentoo Foundation
298 # Distributed under the terms of the GNU General Public License v2
299 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.68 2010/04/12 16:36:12 aballier Exp $
300 +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.69 2010/04/23 16:18:09 aballier Exp $
301
302 EAPI="2"
303
304 @@ -63,7 +63,7 @@
305 aalib? ( media-libs/aalib )
306 aac? ( >=media-libs/faad2-2.6.1 )
307 alsa? ( media-libs/alsa-lib )
308 - avahi? ( >=net-dns/avahi-0.6 )
309 + avahi? ( >=net-dns/avahi-0.6[dbus] )
310 bidi? ( >=dev-libs/fribidi-0.10.4 )
311 cdda? ( cddb? ( >=media-libs/libcddb-1.2.0 ) )
312 dbus? ( >=sys-apps/dbus-1.0.2 )
313 @@ -120,7 +120,11 @@
314 sdl? ( >=media-libs/libsdl-1.2.8
315 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) )
316 shout? ( media-libs/libshout )
317 - skins? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libXext x11-libs/libX11 )
318 + skins? (
319 + x11-libs/qt-gui:4 x11-libs/qt-core:4
320 + x11-libs/libXext x11-libs/libX11
321 + media-libs/freetype media-fonts/dejavu
322 + )
323 speex? ( media-libs/speex )
324 sqlite? ( >=dev-db/sqlite-3.6.0:3 )
325 svg? ( >=gnome-base/librsvg-2.9.0 )
326 @@ -164,14 +168,10 @@
327 use $1 && use !$2 && ewarn "USE=$1 requires $2, $2 will be enabled."
328 }
329
330 -# Use when $2 depends strictly on $3
331 -# if use $1 then enable $2 and $3, otherwise disable $2
332 +# Use when $1 depends strictly on $2
333 +# if use $1 then enable $2
334 vlc_use_enable_force() {
335 - if use $1 ; then
336 - echo "--enable-$2 --enable-$3"
337 - else
338 - echo "--disable-$2"
339 - fi
340 + use $1 && echo "--enable-$2"
341 }
342
343 pkg_setup() {
344 @@ -181,16 +181,22 @@
345 eerror "the old ${PN} version and will not work."
346 die "Unmerge vlc 1.0.x first"
347 fi
348 - vlc_use_needs skins truetype
349 +
350 + # Useflags we need to forcefuly enable
351 + vlc_use_force remoteosd gcrypt
352 + vlc_use_force skins truetype
353 vlc_use_force skins qt4
354 + vlc_use_force vlm stream
355 +
356 + # Useflags that will be automagically discarded if deps are not met
357 vlc_use_needs bidi truetype
358 - vlc_use_force remoteosd gcrypt
359 + vlc_use_needs cddb cdda
360 vlc_use_needs fontconfig truetype
361 vlc_use_needs libv4l2 v4l2
362 vlc_use_needs libv4l v4l
363 vlc_use_needs libtiger kate
364 vlc_use_needs xv xcb
365 - vlc_use_needs cddb cdda
366 +
367 if use qt4 || use skins ; then
368 qt4_pkg_setup
369 else
370 @@ -287,6 +293,7 @@
371 $(use_enable pulseaudio pulse) \
372 $(use_enable pvr) \
373 $(use_enable qt4) \
374 + $(use_enable remoteosd) \
375 $(use_enable rtsp realrtsp) \
376 $(use_enable run-as-root) \
377 $(use_enable samba smb) \
378 @@ -311,6 +318,7 @@
379 $(use_enable v4l) \
380 $(use_enable v4l2) \
381 $(use_enable vcdx) \
382 + $(use_enable vlm) \
383 $(use_enable vorbis) \
384 $(use_enable win32codecs loader) \
385 $(use_enable wma-fixed) \
386 @@ -324,9 +332,10 @@
387 --disable-growl \
388 --disable-optimizations \
389 --enable-fast-install \
390 - $(vlc_use_enable_force vlm vlm sout) \
391 - $(vlc_use_enable_force skins skins2 qt4) \
392 - $(vlc_use_enable_force remoteosd remoteosd libgcrypt)
393 + $(vlc_use_enable_force vlm sout) \
394 + $(vlc_use_enable_force skins qt4) \
395 + $(vlc_use_enable_force skins freetype) \
396 + $(vlc_use_enable_force remoteosd libgcrypt)
397 }
398
399 src_install() {