1 |
aballier 10/04/23 15:24:24 |
2 |
|
3 |
Modified: ChangeLog vlc-1.0.9999.ebuild vlc-1.0.6.ebuild |
4 |
Log: |
5 |
Fix some useflag combinations failures reported by andreas schürch <andreas.schuerch@×××××××××.ch>, bug #316805 and simplify vlc_use_enable_force |
6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.572 media-video/vlc/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/ChangeLog?rev=1.572&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/ChangeLog?rev=1.572&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/ChangeLog?r1=1.571&r2=1.572 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v |
18 |
retrieving revision 1.571 |
19 |
retrieving revision 1.572 |
20 |
diff -u -r1.571 -r1.572 |
21 |
--- ChangeLog 23 Apr 2010 11:08:49 -0000 1.571 |
22 |
+++ ChangeLog 23 Apr 2010 15:24:24 -0000 1.572 |
23 |
@@ -1,6 +1,12 @@ |
24 |
# ChangeLog for media-video/vlc |
25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.571 2010/04/23 11:08:49 aballier Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.572 2010/04/23 15:24:24 aballier Exp $ |
28 |
+ |
29 |
+ 23 Apr 2010; Alexis Ballier <aballier@g.o> vlc-1.0.6.ebuild, |
30 |
+ vlc-1.0.9999.ebuild: |
31 |
+ Fix some useflag combinations failures reported by andreas schürch |
32 |
+ <andreas.schuerch@×××××××××.ch>, bug #316805 and simplify |
33 |
+ vlc_use_enable_force |
34 |
|
35 |
*vlc-1.1.9999 (23 Apr 2010) |
36 |
|
37 |
|
38 |
|
39 |
|
40 |
1.40 media-video/vlc/vlc-1.0.9999.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-1.0.9999.ebuild?rev=1.40&view=markup |
43 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-1.0.9999.ebuild?rev=1.40&content-type=text/plain |
44 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-1.0.9999.ebuild?r1=1.39&r2=1.40 |
45 |
|
46 |
Index: vlc-1.0.9999.ebuild |
47 |
=================================================================== |
48 |
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.9999.ebuild,v |
49 |
retrieving revision 1.39 |
50 |
retrieving revision 1.40 |
51 |
diff -u -r1.39 -r1.40 |
52 |
--- vlc-1.0.9999.ebuild 7 Apr 2010 16:04:46 -0000 1.39 |
53 |
+++ vlc-1.0.9999.ebuild 23 Apr 2010 15:24:24 -0000 1.40 |
54 |
@@ -1,6 +1,6 @@ |
55 |
# Copyright 1999-2010 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.9999.ebuild,v 1.39 2010/04/07 16:04:46 patrick Exp $ |
58 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.9999.ebuild,v 1.40 2010/04/23 15:24:24 aballier Exp $ |
59 |
|
60 |
EAPI="2" |
61 |
|
62 |
@@ -126,7 +126,11 @@ |
63 |
sdl? ( >=media-libs/libsdl-1.2.8 |
64 |
sdl-image? ( media-libs/sdl-image ) ) |
65 |
shout? ( media-libs/libshout ) |
66 |
- skins? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libXext x11-libs/libX11 ) |
67 |
+ skins? ( |
68 |
+ x11-libs/qt-gui:4 x11-libs/qt-core:4 |
69 |
+ x11-libs/libXext x11-libs/libX11 |
70 |
+ media-libs/freetype media-fonts/dejavu |
71 |
+ ) |
72 |
speex? ( media-libs/speex ) |
73 |
svg? ( >=gnome-base/librsvg-2.9.0 ) |
74 |
svga? ( media-libs/svgalib ) |
75 |
@@ -179,13 +183,11 @@ |
76 |
use $1 && use !$2 && ewarn "USE=$1 requires $2, $2 will be enabled." |
77 |
} |
78 |
|
79 |
-# Use when $2 depends strictly on $3 |
80 |
-# if use $1 then enable $2 and $3, otherwise disable $2 |
81 |
+# Use when $1 depends strictly on $2 |
82 |
+# if use $1 then enable $2 |
83 |
vlc_use_enable_force() { |
84 |
if use $1 ; then |
85 |
- echo "--enable-$2 --enable-$3" |
86 |
- else |
87 |
- echo "--disable-$2" |
88 |
+ echo "--enable-$2" |
89 |
fi |
90 |
} |
91 |
|
92 |
@@ -196,17 +198,20 @@ |
93 |
eerror "the old ${PN} version and will not work." |
94 |
die "Unmerge vlc 0.9.x first" |
95 |
fi |
96 |
- vlc_use_needs skins truetype |
97 |
- vlc_use_force skins qt4 |
98 |
vlc_use_needs cddax cdio |
99 |
vlc_use_needs vcdx cdio |
100 |
vlc_use_needs vcdx vcdinfo |
101 |
vlc_use_needs vcdinfo cdio |
102 |
vlc_use_needs bidi truetype |
103 |
- vlc_use_force remoteosd gcrypt |
104 |
vlc_use_needs fontconfig truetype |
105 |
vlc_use_needs libv4l2 v4l2 |
106 |
vlc_use_needs libtiger kate |
107 |
+ vlc_use_force remoteosd gcrypt |
108 |
+ vlc_use_force skins truetype |
109 |
+ vlc_use_force skins qt4 |
110 |
+ vlc_use_force skins X |
111 |
+ vlc_use_force qt4 X |
112 |
+ vlc_use_force vlm stream |
113 |
use cddb && use !cdda && use !cddax && ewarn "USE=cddb requires either cdda or cddax, cddb will be disabled." |
114 |
if use qt4 || use skins ; then |
115 |
qt4_pkg_setup |
116 |
@@ -318,6 +323,7 @@ |
117 |
$(use_enable pulseaudio pulse) \ |
118 |
$(use_enable pvr) \ |
119 |
$(use_enable qt4) \ |
120 |
+ $(use_enable remoteosd) \ |
121 |
$(use_enable rtsp realrtsp) \ |
122 |
$(use_enable run-as-root) \ |
123 |
$(use_enable samba smb) \ |
124 |
@@ -342,6 +348,7 @@ |
125 |
$(use_enable v4l2) \ |
126 |
$(use_enable vcdinfo) \ |
127 |
$(use_enable vcdx) \ |
128 |
+ $(use_enable vlm) \ |
129 |
$(use_enable vorbis) \ |
130 |
$(use_enable win32codecs loader) \ |
131 |
$(use_enable wma-fixed) \ |
132 |
@@ -358,9 +365,12 @@ |
133 |
--disable-growl \ |
134 |
--disable-optimizations \ |
135 |
--enable-fast-install \ |
136 |
- $(vlc_use_enable_force vlm vlm sout) \ |
137 |
- $(vlc_use_enable_force skins skins2 qt4) \ |
138 |
- $(vlc_use_enable_force remoteosd remoteosd libgcrypt) |
139 |
+ $(vlc_use_enable_force qt4 x11) \ |
140 |
+ $(vlc_use_enable_force vlm sout) \ |
141 |
+ $(vlc_use_enable_force skins qt4) \ |
142 |
+ $(vlc_use_enable_force skins freetype) \ |
143 |
+ $(vlc_use_enable_force skins x11) \ |
144 |
+ $(vlc_use_enable_force remoteosd libgcrypt) |
145 |
} |
146 |
|
147 |
src_install() { |
148 |
|
149 |
|
150 |
|
151 |
1.2 media-video/vlc/vlc-1.0.6.ebuild |
152 |
|
153 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-1.0.6.ebuild?rev=1.2&view=markup |
154 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-1.0.6.ebuild?rev=1.2&content-type=text/plain |
155 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-1.0.6.ebuild?r1=1.1&r2=1.2 |
156 |
|
157 |
Index: vlc-1.0.6.ebuild |
158 |
=================================================================== |
159 |
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.6.ebuild,v |
160 |
retrieving revision 1.1 |
161 |
retrieving revision 1.2 |
162 |
diff -u -r1.1 -r1.2 |
163 |
--- vlc-1.0.6.ebuild 22 Apr 2010 17:56:02 -0000 1.1 |
164 |
+++ vlc-1.0.6.ebuild 23 Apr 2010 15:24:24 -0000 1.2 |
165 |
@@ -1,6 +1,6 @@ |
166 |
# Copyright 1999-2010 Gentoo Foundation |
167 |
# Distributed under the terms of the GNU General Public License v2 |
168 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.6.ebuild,v 1.1 2010/04/22 17:56:02 aballier Exp $ |
169 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.6.ebuild,v 1.2 2010/04/23 15:24:24 aballier Exp $ |
170 |
|
171 |
EAPI="2" |
172 |
|
173 |
@@ -126,7 +126,11 @@ |
174 |
sdl? ( >=media-libs/libsdl-1.2.8 |
175 |
sdl-image? ( media-libs/sdl-image ) ) |
176 |
shout? ( media-libs/libshout ) |
177 |
- skins? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libXext x11-libs/libX11 ) |
178 |
+ skins? ( |
179 |
+ x11-libs/qt-gui:4 x11-libs/qt-core:4 |
180 |
+ x11-libs/libXext x11-libs/libX11 |
181 |
+ media-libs/freetype media-fonts/dejavu |
182 |
+ ) |
183 |
speex? ( media-libs/speex ) |
184 |
svg? ( >=gnome-base/librsvg-2.9.0 ) |
185 |
svga? ( media-libs/svgalib ) |
186 |
@@ -179,13 +183,11 @@ |
187 |
use $1 && use !$2 && ewarn "USE=$1 requires $2, $2 will be enabled." |
188 |
} |
189 |
|
190 |
-# Use when $2 depends strictly on $3 |
191 |
-# if use $1 then enable $2 and $3, otherwise disable $2 |
192 |
+# Use when $1 depends strictly on $2 |
193 |
+# if use $1 then enable $2 |
194 |
vlc_use_enable_force() { |
195 |
if use $1 ; then |
196 |
- echo "--enable-$2 --enable-$3" |
197 |
- else |
198 |
- echo "--disable-$2" |
199 |
+ echo "--enable-$2" |
200 |
fi |
201 |
} |
202 |
|
203 |
@@ -196,17 +198,20 @@ |
204 |
eerror "the old ${PN} version and will not work." |
205 |
die "Unmerge vlc 0.9.x first" |
206 |
fi |
207 |
- vlc_use_needs skins truetype |
208 |
- vlc_use_force skins qt4 |
209 |
vlc_use_needs cddax cdio |
210 |
vlc_use_needs vcdx cdio |
211 |
vlc_use_needs vcdx vcdinfo |
212 |
vlc_use_needs vcdinfo cdio |
213 |
vlc_use_needs bidi truetype |
214 |
- vlc_use_force remoteosd gcrypt |
215 |
vlc_use_needs fontconfig truetype |
216 |
vlc_use_needs libv4l2 v4l2 |
217 |
vlc_use_needs libtiger kate |
218 |
+ vlc_use_force remoteosd gcrypt |
219 |
+ vlc_use_force skins truetype |
220 |
+ vlc_use_force skins qt4 |
221 |
+ vlc_use_force skins X |
222 |
+ vlc_use_force qt4 X |
223 |
+ vlc_use_force vlm stream |
224 |
use cddb && use !cdda && use !cddax && ewarn "USE=cddb requires either cdda or cddax, cddb will be disabled." |
225 |
if use qt4 || use skins ; then |
226 |
qt4_pkg_setup |
227 |
@@ -318,6 +323,7 @@ |
228 |
$(use_enable pulseaudio pulse) \ |
229 |
$(use_enable pvr) \ |
230 |
$(use_enable qt4) \ |
231 |
+ $(use_enable remoteosd) \ |
232 |
$(use_enable rtsp realrtsp) \ |
233 |
$(use_enable run-as-root) \ |
234 |
$(use_enable samba smb) \ |
235 |
@@ -342,6 +348,7 @@ |
236 |
$(use_enable v4l2) \ |
237 |
$(use_enable vcdinfo) \ |
238 |
$(use_enable vcdx) \ |
239 |
+ $(use_enable vlm) \ |
240 |
$(use_enable vorbis) \ |
241 |
$(use_enable win32codecs loader) \ |
242 |
$(use_enable wma-fixed) \ |
243 |
@@ -358,9 +365,12 @@ |
244 |
--disable-growl \ |
245 |
--disable-optimizations \ |
246 |
--enable-fast-install \ |
247 |
- $(vlc_use_enable_force vlm vlm sout) \ |
248 |
- $(vlc_use_enable_force skins skins2 qt4) \ |
249 |
- $(vlc_use_enable_force remoteosd remoteosd libgcrypt) |
250 |
+ $(vlc_use_enable_force qt4 x11) \ |
251 |
+ $(vlc_use_enable_force vlm sout) \ |
252 |
+ $(vlc_use_enable_force skins qt4) \ |
253 |
+ $(vlc_use_enable_force skins freetype) \ |
254 |
+ $(vlc_use_enable_force skins x11) \ |
255 |
+ $(vlc_use_enable_force remoteosd libgcrypt) |
256 |
} |
257 |
|
258 |
src_install() { |