1 |
scarabeus 11/01/30 12:55:54 |
2 |
|
3 |
Modified: ChangeLog mplayer-9999.ebuild |
4 |
Log: |
5 |
Update live verison to eapi4 and use_required syntax. Fix default configuration section, some setitngs were eaten for me otherwise. |
6 |
|
7 |
(Portage version: 2.2.0_alpha19/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.777 media-video/mplayer/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.777&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.777&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.776&r2=1.777 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v |
19 |
retrieving revision 1.776 |
20 |
retrieving revision 1.777 |
21 |
diff -u -r1.776 -r1.777 |
22 |
--- ChangeLog 30 Jan 2011 11:20:53 -0000 1.776 |
23 |
+++ ChangeLog 30 Jan 2011 12:55:54 -0000 1.777 |
24 |
@@ -1,6 +1,10 @@ |
25 |
# ChangeLog for media-video/mplayer |
26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.776 2011/01/30 11:20:53 scarabeus Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.777 2011/01/30 12:55:54 scarabeus Exp $ |
29 |
+ |
30 |
+ 30 Jan 2011; Tomáš Chvátal <scarabeus@g.o> mplayer-9999.ebuild: |
31 |
+ Update live verison to eapi4 and use_required syntax. Fix default |
32 |
+ configuration section, some setitngs were eaten for me otherwise. |
33 |
|
34 |
30 Jan 2011; Tomáš Chvátal <scarabeus@g.o> mplayer-9999.ebuild: |
35 |
Fix dependency on vdpau (it specificaly check for headers in libvdpau). Per |
36 |
|
37 |
|
38 |
|
39 |
1.90 media-video/mplayer/mplayer-9999.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.90&view=markup |
42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.90&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.89&r2=1.90 |
44 |
|
45 |
Index: mplayer-9999.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v |
48 |
retrieving revision 1.89 |
49 |
retrieving revision 1.90 |
50 |
diff -u -r1.89 -r1.90 |
51 |
--- mplayer-9999.ebuild 30 Jan 2011 11:20:53 -0000 1.89 |
52 |
+++ mplayer-9999.ebuild 30 Jan 2011 12:55:54 -0000 1.90 |
53 |
@@ -1,8 +1,8 @@ |
54 |
# Copyright 1999-2011 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.89 2011/01/30 11:20:53 scarabeus Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.90 2011/01/30 12:55:54 scarabeus Exp $ |
58 |
|
59 |
-EAPI=3 |
60 |
+EAPI=4 |
61 |
|
62 |
ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk" |
63 |
[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion" || SVN_ECLASS="" |
64 |
@@ -182,6 +182,47 @@ |
65 |
KEYWORDS="" |
66 |
fi |
67 |
|
68 |
+# bindist does not cope with amr codecs (#299405#c6), faac codecs are nonfree, win32codecs are nonfree |
69 |
+# libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio |
70 |
+# dvd navigation requires dvd read support |
71 |
+# ass and freetype font require iconv and ass requires freetype fonts |
72 |
+# unicode transformations are usefull only with iconv |
73 |
+# libvorbis require external tremor to work |
74 |
+# radio requires oss or alsa backend |
75 |
+# xvmc requires xvideo support |
76 |
+REQUIRED_USE="bindist? ( !amr !faac !win32codecs ) |
77 |
+ cdio? ( !cdparanoia !cddb ) |
78 |
+ dvdnav? ( dvd ) |
79 |
+ ass? ( iconv truetype ) |
80 |
+ truetype? ( iconv ) |
81 |
+ unicode? ( iconv ) |
82 |
+ vorbis? ( tremor ) |
83 |
+ radio? ( || ( alsa oss ) ) |
84 |
+ xvmc? ( xv )" |
85 |
+# encoder codecs needs encoder support enabled |
86 |
+uses="faac x264 xvid toolame twolame" |
87 |
+for x in ${uses}; do |
88 |
+ REQUIRED_USE+=" |
89 |
+ ${x}? ( encode ) |
90 |
+ " |
91 |
+done |
92 |
+# cpu options needs custom-cpuopts enabled |
93 |
+# but since it is not so fatal we rather ignore them |
94 |
+#uses="3dnow 3dnowext altivec mmx mmxext shm sse sse2 ssse3" |
95 |
+#for x in ${uses}; do |
96 |
+# REQUIRED_USE+=" |
97 |
+# ${x}? ( custom-cpuopts ) |
98 |
+# " |
99 |
+#done |
100 |
+# xorg options require X useflag enabled |
101 |
+uses="dga dxr3 ggi opengl osdmenu vdpau vidix xinerama xscreensaver xv xvmc" |
102 |
+for x in ${uses}; do |
103 |
+ REQUIRED_USE+=" |
104 |
+ ${x}? ( X ) |
105 |
+ " |
106 |
+done |
107 |
+unset uses |
108 |
+ |
109 |
PATCHES=( |
110 |
) |
111 |
|
112 |
@@ -300,15 +341,10 @@ |
113 |
" |
114 |
fi |
115 |
|
116 |
- # libcdio support: prefer libcdio over cdparanoia |
117 |
- # don't check for cddb w/cdio |
118 |
- if use cdio; then |
119 |
- myconf+=" --disable-cdparanoia" |
120 |
- else |
121 |
- myconf+=" --disable-libcdio" |
122 |
- use cdparanoia || myconf+=" --disable-cdparanoia" |
123 |
- use cddb || myconf+=" --disable-cddb" |
124 |
- fi |
125 |
+ use cdio && myconf+=" --disable-cdparanoia" |
126 |
+ use cdio || myconf+=" --disable-libcdio" |
127 |
+ use cdparanoia || myconf+=" --disable-cdparanoia" |
128 |
+ use cddb || myconf+=" --disable-cddb" |
129 |
|
130 |
################################ |
131 |
# DVD read, navigation support # |
132 |
@@ -319,15 +355,8 @@ |
133 |
# |
134 |
# use external libdvdcss, dvdread and dvdnav |
135 |
myconf+=" --disable-dvdread-internal --disable-libdvdcss-internal" |
136 |
- |
137 |
- if use dvd; then |
138 |
- use dvdnav || myconf+=" --disable-dvdnav" |
139 |
- else |
140 |
- myconf+=" |
141 |
- --disable-dvdnav |
142 |
- --disable-dvdread |
143 |
- " |
144 |
- fi |
145 |
+ use dvd || myconf+=" --disable-dvdread" |
146 |
+ use dvdnav || myconf+=" --disable-dvdnav" |
147 |
|
148 |
############# |
149 |
# Subtitles # |
150 |
@@ -336,16 +365,14 @@ |
151 |
# SRT/ASS/SSA (subtitles) requires freetype support |
152 |
# freetype support requires iconv |
153 |
# iconv optionally can use unicode |
154 |
- if ! use ass && ! use truetype; then |
155 |
- myconf+=" --disable-freetype" |
156 |
- if ! use iconv; then |
157 |
- myconf+=" |
158 |
- --disable-iconv |
159 |
- --charset=noconv |
160 |
- " |
161 |
- fi |
162 |
+ use truetype || myconf+=" --disable-freetype" |
163 |
+ if ! use iconv; then |
164 |
+ myconf+=" |
165 |
+ --disable-iconv |
166 |
+ --charset=noconv |
167 |
+ " |
168 |
fi |
169 |
- use iconv && use unicode && myconf+=" --charset=UTF-8" |
170 |
+ use unicode && myconf+=" --charset=UTF-8" |
171 |
|
172 |
##################################### |
173 |
# DVB / Video4Linux / Radio support # |
174 |
@@ -401,45 +428,24 @@ |
175 |
use ${i} || myconf+=" --disable-lib${i}" |
176 |
done |
177 |
use schroedinger || myconf+=" --disable-libschroedinger-lavc" |
178 |
- # Disable opencore-amr with bindist |
179 |
- # https://bugs.gentoo.org/show_bug.cgi?id=299405#c6 |
180 |
- { use amr && use !bindist ; } || myconf+=" --disable-libopencore_amrnb --disable-libopencore_amrwb" |
181 |
+ use amr || myconf+=" --disable-libopencore_amrnb --disable-libopencore_amrwb" |
182 |
|
183 |
uses="faad gif jpeg libmpeg2 live mad mng mpg123 png pnm speex tga theora xanim" |
184 |
for i in ${uses}; do |
185 |
use ${i} || myconf+=" --disable-${i}" |
186 |
done |
187 |
use jpeg2k || myconf+=" --disable-libopenjpeg" |
188 |
- if use vorbis || use tremor; then |
189 |
- use tremor || myconf+=" --disable-tremor-internal" |
190 |
- use vorbis || myconf+=" --disable-libvorbis" |
191 |
- else |
192 |
- myconf+=" |
193 |
- --disable-tremor-internal |
194 |
- --disable-tremor |
195 |
- --disable-libvorbis |
196 |
- " |
197 |
- fi |
198 |
+ use tremor && myconf+=" --disable-tremor-internal" |
199 |
+ use tremor || myconf+=" --disable-tremor-internal --disable-tremor" |
200 |
+ use vorbis || myconf+=" --disable-libvorbis" |
201 |
use vpx || myconf+=" --disable-libvpx-lavc" |
202 |
# Encoding |
203 |
+ use encode || myconf+=" --disable-mencoder" |
204 |
uses="faac x264 xvid toolame twolame" |
205 |
- if use encode; then |
206 |
- for i in ${uses}; do |
207 |
- use ${i} || myconf+=" --disable-${i}" |
208 |
- done |
209 |
- use faac || myconf+=" --disable-faac-lavc" |
210 |
- if use bindist && use faac; then |
211 |
- ewarn "faac is nonfree and cannot be distributed; disabling faac support." |
212 |
- myconf+=" --disable-faac --disable-faac-lavc" |
213 |
- fi |
214 |
- else |
215 |
- myconf+=" --disable-mencoder" |
216 |
- myconf+=" --disable-faac-lavc" |
217 |
- for i in ${uses}; do |
218 |
- myconf+=" --disable-${i}" |
219 |
- use ${i} && elog "Useflag \"${i}\" require \"encode\" useflag enabled to work." |
220 |
- done |
221 |
- fi |
222 |
+ for i in ${uses}; do |
223 |
+ use ${i} || myconf+=" --disable-${i}" |
224 |
+ done |
225 |
+ use faac || myconf+=" --disable-faac-lavc" |
226 |
|
227 |
################# |
228 |
# Binary codecs # |
229 |
@@ -465,9 +471,8 @@ |
230 |
if use real; then |
231 |
use x86 && myconf+=" --codecsdir=/opt/RealPlayer/codecs" |
232 |
use amd64 && myconf+=" --codecsdir=/usr/$(get_libdir)/codecs" |
233 |
- elif ! use bindist; then |
234 |
- myconf+=" $(use_enable win32codecs win32dll)" |
235 |
fi |
236 |
+ myconf+=" $(use_enable win32codecs win32dll)" |
237 |
|
238 |
################ |
239 |
# Video Output # |
240 |
@@ -510,17 +515,13 @@ |
241 |
use ${i} || myconf+=" --disable-${i}" |
242 |
done |
243 |
use pulseaudio || myconf+=" --disable-pulse" |
244 |
- if ! use radio; then |
245 |
- use oss || myconf+=" --disable-ossaudio" |
246 |
- fi |
247 |
+ use oss || myconf+=" --disable-ossaudio" |
248 |
|
249 |
#################### |
250 |
# Advanced Options # |
251 |
#################### |
252 |
# Platform specific flags, hardcoded on amd64 (see below) |
253 |
- if use cpudetection; then |
254 |
- myconf+=" --enable-runtime-cpudetection" |
255 |
- fi |
256 |
+ use cpudetection && myconf+=" --enable-runtime-cpudetection" |
257 |
|
258 |
# Turning off CPU optimizations usually will break the build. |
259 |
# However, this use flag, if enabled, will allow users to completely |
260 |
@@ -553,53 +554,17 @@ |
261 |
# X enabled configuration # |
262 |
########################### |
263 |
myconf+=" --disable-gui" |
264 |
- if use X; then |
265 |
- uses="dxr3 ggi xinerama" |
266 |
- for i in ${uses}; do |
267 |
- use ${i} || myconf+=" --disable-${i}" |
268 |
- done |
269 |
- use dga || myconf+=" --disable-dga1 --disable-dga2" |
270 |
- use opengl || myconf+=" --disable-gl" |
271 |
- use osdmenu && myconf+=" --enable-menu" |
272 |
- use vdpau || myconf+=" --disable-vdpau" |
273 |
- use video_cards_vesa || myconf+=" --disable-vesa" |
274 |
- use vidix || myconf+=" --disable-vidix --disable-vidix-pcidb" |
275 |
- use xscreensaver || myconf+=" --disable-xss" |
276 |
- |
277 |
- if use xv; then |
278 |
- if use xvmc; then |
279 |
- myconf+=" --enable-xvmc --with-xvmclib=XvMCW" |
280 |
- else |
281 |
- myconf+=" --disable-xvmc" |
282 |
- fi |
283 |
- else |
284 |
- myconf+=" |
285 |
- --disable-xv |
286 |
- --disable-xvmc |
287 |
- " |
288 |
- use xvmc && elog "Disabling xvmc because it requires \"xv\" useflag enabled." |
289 |
- fi |
290 |
- else |
291 |
- myconf+=" |
292 |
- --disable-dga1 |
293 |
- --disable-dga2 |
294 |
- --disable-dxr3 |
295 |
- --disable-ggi |
296 |
- --disable-gl |
297 |
- --disable-vdpau |
298 |
- --disable-vidix |
299 |
- --disable-vidix-pcidb |
300 |
- --disable-xinerama |
301 |
- --disable-xss |
302 |
- --disable-xv |
303 |
- --disable-xvmc |
304 |
- --disable-x11 |
305 |
- " |
306 |
- uses="dga dxr3 ggi opengl osdmenu vdpau vidix xinerama xscreensaver xv" |
307 |
- for i in ${uses}; do |
308 |
- use ${i} && elog "Useflag \"${i}\" require \"X\" useflag enabled to work." |
309 |
- done |
310 |
- fi |
311 |
+ uses="dxr3 ggi vdpau vidix xinerama xv xvmc" |
312 |
+ for i in ${uses}; do |
313 |
+ use ${i} || myconf+=" --disable-${i}" |
314 |
+ done |
315 |
+ use dga || myconf+=" --disable-dga1 --disable-dga2" |
316 |
+ use opengl || myconf+=" --disable-gl" |
317 |
+ use osdmenu && myconf+=" --enable-menu" |
318 |
+ use video_cards_vesa || myconf+=" --disable-vesa" |
319 |
+ use vidix || myconf+=" --disable-vidix-pcidb" |
320 |
+ use xscreensaver || myconf+=" --disable-xss" |
321 |
+ use xvmc && myconf+=" --with-xvmclib=XvMCW" |
322 |
|
323 |
############################ |
324 |
# OSX (aqua) configuration # |
325 |
@@ -626,7 +591,7 @@ |
326 |
--libdir=${EPREFIX}/usr/$(get_libdir) |
327 |
${myconf}" |
328 |
|
329 |
- CFLAGS="${CFLAGS}" ./configure ${myconf} || die "configure died" |
330 |
+ CFLAGS="${CFLAGS}" ./configure ${myconf} || die |
331 |
} |
332 |
|
333 |
src_compile() { |
334 |
@@ -641,10 +606,10 @@ |
335 |
hasq ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}" |
336 |
done |
337 |
if [[ -z $BUILT_DOCS ]]; then |
338 |
- emake -j1 -C DOCS/xml html-chunked || die "Failed to generate html docs" |
339 |
+ emake -j1 -C DOCS/xml html-chunked |
340 |
else |
341 |
for i in ${BUILT_DOCS}; do |
342 |
- emake -j1 -C DOCS/xml html-chunked-${i} || die "Failed to generate html docs for ${i}" |
343 |
+ emake -j1 -C DOCS/xml html-chunked-${i} |
344 |
done |
345 |
fi |
346 |
fi |
347 |
@@ -660,26 +625,26 @@ |
348 |
DATADIR="${ED}/usr/share/mplayer" \ |
349 |
MANDIR="${ED}/usr/share/man" \ |
350 |
INSTALLSTRIP="" \ |
351 |
- install || die "emake install failed" |
352 |
+ install |
353 |
|
354 |
- dodoc AUTHORS Changelog Copyright README etc/codecs.conf || die |
355 |
+ dodoc AUTHORS Changelog Copyright README etc/codecs.conf |
356 |
|
357 |
docinto tech/ |
358 |
- dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist} || die |
359 |
+ dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist} |
360 |
docinto TOOLS/ |
361 |
- dodoc TOOLS/* || die |
362 |
+ dodoc TOOLS/* |
363 |
if use real; then |
364 |
docinto tech/realcodecs/ |
365 |
- dodoc DOCS/tech/realcodecs/* || die |
366 |
+ dodoc DOCS/tech/realcodecs/* |
367 |
docinto TOOLS/realcodecs/ |
368 |
- dodoc TOOLS/realcodecs/* || die |
369 |
+ dodoc TOOLS/realcodecs/* |
370 |
fi |
371 |
docinto tech/mirrors/ |
372 |
- dodoc DOCS/tech/mirrors/* || die |
373 |
+ dodoc DOCS/tech/mirrors/* |
374 |
|
375 |
if use doc; then |
376 |
docinto html/ |
377 |
- dohtml -r "${S}"/DOCS/HTML/* || die |
378 |
+ dohtml -r "${S}"/DOCS/HTML/* |
379 |
fi |
380 |
|
381 |
if ! use ass && ! use truetype; then |
382 |
@@ -695,10 +660,15 @@ |
383 |
fi |
384 |
|
385 |
insinto /etc/mplayer |
386 |
- newins "${S}/etc/example.conf" mplayer.conf || die |
387 |
- doins "${S}/etc/input.conf" || die |
388 |
+ newins "${S}/etc/example.conf" mplayer.conf |
389 |
+ cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_ |
390 |
+# Config options can be section specific, global |
391 |
+# options should go in the default section |
392 |
+[default] |
393 |
+_EOF_ |
394 |
+ doins "${S}/etc/input.conf" |
395 |
if use osdmenu; then |
396 |
- doins "${S}/etc/menu.conf" || die |
397 |
+ doins "${S}/etc/menu.conf" |
398 |
fi |
399 |
|
400 |
if use ass || use truetype; then |
401 |
@@ -717,7 +687,7 @@ |
402 |
fi |
403 |
|
404 |
dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf |
405 |
- newbin "${S}/TOOLS/midentify.sh" midentify || die |
406 |
+ newbin "${S}/TOOLS/midentify.sh" midentify |
407 |
} |
408 |
|
409 |
pkg_preinst() { |