1 |
scarabeus 10/10/10 08:49:51 |
2 |
|
3 |
Modified: metadata.xml mplayer-9999.ebuild |
4 |
Log: |
5 |
Ebuild cleanup. Drop gmplayer useflag. Introduce rtmpdump useflag. Thanks to Andrew Savchenko. Fixes bug #336021 and bug #337284. |
6 |
|
7 |
(Portage version: 2.2_rc91/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.33 media-video/mplayer/metadata.xml |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/metadata.xml?rev=1.33&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/metadata.xml?rev=1.33&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/metadata.xml?r1=1.32&r2=1.33 |
15 |
|
16 |
Index: metadata.xml |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/metadata.xml,v |
19 |
retrieving revision 1.32 |
20 |
retrieving revision 1.33 |
21 |
diff -u -r1.32 -r1.33 |
22 |
--- metadata.xml 19 Jul 2010 16:12:29 -0000 1.32 |
23 |
+++ metadata.xml 10 Oct 2010 08:49:51 -0000 1.33 |
24 |
@@ -1,54 +1,55 @@ |
25 |
<?xml version="1.0" encoding="UTF-8"?> |
26 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
27 |
<pkgmetadata> |
28 |
- <herd>video</herd> |
29 |
- <maintainer> |
30 |
- <email>media-video@g.o</email> |
31 |
- </maintainer> |
32 |
- <use> |
33 |
- <flag name="3dnowext">Enable 3dnowext cpu instructions</flag> |
34 |
- <flag name="amr">Enables Adaptive Multi-Rate format support</flag> |
35 |
- <flag name="ass">SRT/SSA/ASS (SubRip / SubStation Alpha) subtitle support</flag> |
36 |
- <flag name="bl">Blinkenlights video output</flag> |
37 |
- <flag name="bluray">Enable playback of Blu-ray filesystems</flag> |
38 |
+<herd>video</herd> |
39 |
+<maintainer> |
40 |
+ <email>media-video@g.o</email> |
41 |
+</maintainer> |
42 |
+<use> |
43 |
+ <flag name="3dnowext">Enable 3dnowext cpu instructions</flag> |
44 |
+ <flag name="amr">Enables Adaptive Multi-Rate format support</flag> |
45 |
+ <flag name="ass">SRT/SSA/ASS (SubRip / SubStation Alpha) subtitle support</flag> |
46 |
+ <flag name="bl">Blinkenlights video output</flag> |
47 |
+ <flag name="bluray">Enable playback of Blu-ray filesystems</flag> |
48 |
<flag name="bs2b">Enable Bauer stereophonic-to-binaural headphone filter</flag> |
49 |
- <flag name="cdio">Use libcdio for CD support (instead of cdparanoia)</flag> |
50 |
- <flag name="cpudetection">Enables runtime CPU detection (useful for bindist, compatibility on other CPUs)</flag> |
51 |
- <flag name="custom-cpuopts">Fine-tune custom CPU optimizations (UNSUPPORTED)</flag> |
52 |
+ <flag name="cdio">Use libcdio for CD support (instead of cdparanoia)</flag> |
53 |
+ <flag name="cpudetection">Enables runtime CPU detection (useful for bindist, compatibility on other CPUs)</flag> |
54 |
+ <flag name="custom-cpuopts">Fine-tune custom CPU optimizations (UNSUPPORTED)</flag> |
55 |
<flag name="dirac">Enable Dirac video support (an advanced royalty-free video compression format) via the reference library: dirac.</flag> |
56 |
- <flag name="dvdnav">Use forked libdvdnav, navigate menus in GUIs</flag> |
57 |
- <flag name="dxr3">Enable DXR3/H+ video output</flag> |
58 |
- <flag name="enca">Enables support for charset discovery and conversion</flag> |
59 |
- <flag name="external-ffmpeg">Use shared FFmpeg libraries instead of static bundled ones. Discouraged by upstream.</flag> |
60 |
- <flag name="faac">Use external faac library for AAC encoding</flag> |
61 |
- <flag name="faad">Use external faad library for AAC decoding</flag> |
62 |
+ <flag name="dvdnav">Use forked libdvdnav, navigate menus in GUIs</flag> |
63 |
+ <flag name="dxr3">Enable DXR3/H+ video output</flag> |
64 |
+ <flag name="enca">Enables support for charset discovery and conversion</flag> |
65 |
+ <flag name="external-ffmpeg">Use shared FFmpeg libraries instead of static bundled ones. Discouraged by upstream.</flag> |
66 |
+ <flag name="faac">Use external faac library for AAC encoding</flag> |
67 |
+ <flag name="faad">Use external faad library for AAC decoding</flag> |
68 |
<flag name="gmplayer">Build gmplayer, a GTK+ MPlayer gui (UNSUPPORTED)</flag> |
69 |
- <flag name="live">Enables live.com streaming media support</flag> |
70 |
- <flag name="md5sum">Enables md5sum video output</flag> |
71 |
- <flag name="mmxext">Enables mmx2 support</flag> |
72 |
- <flag name="mng">MNG input support</flag> |
73 |
+ <flag name="live">Enables live.com streaming media support</flag> |
74 |
+ <flag name="md5sum">Enables md5sum video output</flag> |
75 |
+ <flag name="mmxext">Enables mmx2 support</flag> |
76 |
+ <flag name="mng">MNG input support</flag> |
77 |
<flag name="network">Enables network streaming support</flag> |
78 |
<flag name="nut">Enables support for the NUT container format</flag> |
79 |
<flag name="osdmenu">Enables support for on-screen display (OSD) menus</flag> |
80 |
- <flag name="pnm">Add PNM video output option, to create PPM/PGM/PGMYUV images</flag> |
81 |
- <flag name="pvr">Enable Video4Linux2 MPEG PVR</flag> |
82 |
- <flag name="radio">Enable V4L2 radio interface and support</flag> |
83 |
- <flag name="rar">Enable Unique RAR File Library</flag> |
84 |
- <flag name="real">Adds real audo/video support</flag> |
85 |
- <flag name="rtc">Enables usage of the linux real time clock. The alternative is software emulation of rtc</flag> |
86 |
- <flag name="schroedinger">Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec).</flag> |
87 |
- <flag name="shm">Enable support for shm</flag> |
88 |
- <flag name="ssse3">faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips)</flag> |
89 |
- <flag name="teletext">Support for TV teletext interface</flag> |
90 |
- <flag name="tga">Enables Targa video output</flag> |
91 |
+ <flag name="pnm">Add PNM video output option, to create PPM/PGM/PGMYUV images</flag> |
92 |
+ <flag name="pvr">Enable Video4Linux2 MPEG PVR</flag> |
93 |
+ <flag name="radio">Enable V4L2 radio interface and support</flag> |
94 |
+ <flag name="rar">Enable Unique RAR File Library</flag> |
95 |
+ <flag name="real">Adds real audo/video support</flag> |
96 |
+ <flag name="rtc">Enables usage of the linux real time clock. The alternative is software emulation of rtc</flag> |
97 |
+ <flag name="rtmpdump">Enables RTMPDump Streaming Media support</flag> |
98 |
+ <flag name="schroedinger">Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec).</flag> |
99 |
+ <flag name="shm">Enable support for shm</flag> |
100 |
+ <flag name="ssse3">faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips)</flag> |
101 |
+ <flag name="teletext">Support for TV teletext interface</flag> |
102 |
+ <flag name="tga">Enables Targa video output</flag> |
103 |
<flag name="toolame">Enable toolame MPEG-2 encoding</flag> |
104 |
<flag name="tremor">Enable internal support for Vorbis</flag> |
105 |
<flag name="twolame">Enable twolame MPEG-2 encoding</flag> |
106 |
- <flag name="vdpau">Enables experimental VDPAU support (requires nVidia video cards) to offload MPEG2/MPEG4/VC1/WMV CPU processing to video card</flag> |
107 |
+ <flag name="vdpau">Enables experimental VDPAU support (requires nVidia video cards) to offload MPEG2/MPEG4/VC1/WMV CPU processing to video card</flag> |
108 |
<flag name="vpx">Enables vp8 codec support using libvpx</flag> |
109 |
- <flag name="vidix">Support for vidix video output</flag> |
110 |
- <flag name="xanim">Enables support for xanim based codecs</flag> |
111 |
- <flag name="xvmc">Enables X-Video Motion Compensation support</flag> |
112 |
- <flag name="zoran">Enables ZR360[56]7/ZR36060 video output</flag> |
113 |
- </use> |
114 |
+ <flag name="vidix">Support for vidix video output</flag> |
115 |
+ <flag name="xanim">Enables support for xanim based codecs</flag> |
116 |
+ <flag name="xvmc">Enables X-Video Motion Compensation support</flag> |
117 |
+ <flag name="zoran">Enables ZR360[56]7/ZR36060 video output</flag> |
118 |
+</use> |
119 |
</pkgmetadata> |
120 |
|
121 |
|
122 |
|
123 |
1.77 media-video/mplayer/mplayer-9999.ebuild |
124 |
|
125 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.77&view=markup |
126 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.77&content-type=text/plain |
127 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.76&r2=1.77 |
128 |
|
129 |
Index: mplayer-9999.ebuild |
130 |
=================================================================== |
131 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v |
132 |
retrieving revision 1.76 |
133 |
retrieving revision 1.77 |
134 |
diff -u -r1.76 -r1.77 |
135 |
--- mplayer-9999.ebuild 1 Oct 2010 02:44:10 -0000 1.76 |
136 |
+++ mplayer-9999.ebuild 10 Oct 2010 08:49:51 -0000 1.77 |
137 |
@@ -1,6 +1,6 @@ |
138 |
# Copyright 1999-2010 Gentoo Foundation |
139 |
# Distributed under the terms of the GNU General Public License v2 |
140 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.76 2010/10/01 02:44:10 aballier Exp $ |
141 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.77 2010/10/10 08:49:51 scarabeus Exp $ |
142 |
|
143 |
EAPI="2" |
144 |
|
145 |
@@ -14,10 +14,10 @@ |
146 |
IUSE="3dnow 3dnowext +a52 aalib +alsa altivec +ass bidi bindist bl bluray bs2b |
147 |
+cddb +cdio cdparanoia cpudetection custom-cpuopts debug dga +dirac directfb |
148 |
doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +encode esd +faac +faad fbcon ftp |
149 |
-gif ggi -gmplayer +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa |
150 |
+gif ggi +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa |
151 |
libcaca lirc +live lzo mad md5sum +mmx mmxext mng +mp3 nas +network nut openal |
152 |
amr +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime radio +rar +real +rtc |
153 |
-samba +shm +schroedinger sdl +speex sse sse2 ssse3 tga +theora +tremor |
154 |
+rtmpdump samba +shm +schroedinger sdl +speex sse sse2 ssse3 tga +theora +tremor |
155 |
+truetype +toolame +twolame +unicode v4l v4l2 vdpau vidix +vorbis vpx |
156 |
win32codecs +X +x264 xanim xinerama +xscreensaver +xv +xvid xvmc zoran" |
157 |
[[ ${PV} == *9999* ]] && IUSE+=" external-ffmpeg" |
158 |
@@ -27,9 +27,6 @@ |
159 |
IUSE+=" video_cards_${x}" |
160 |
done |
161 |
|
162 |
-BLUV="1.7" |
163 |
-SVGV="1.9.17" |
164 |
-AMR_URI="http://www.3gpp.org/ftp/Specs/archive" |
165 |
FONT_URI=" |
166 |
mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 |
167 |
mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 |
168 |
@@ -41,8 +38,7 @@ |
169 |
RELEASE_URI="mirror://gentoo/${P}.tbz2" |
170 |
fi |
171 |
SRC_URI="${RELEASE_URI} |
172 |
- !truetype? ( ${FONT_URI} ) |
173 |
- gmplayer? ( mirror://mplayer/skins/Blue-${BLUV}.tar.bz2 )" |
174 |
+ !truetype? ( ${FONT_URI} )" |
175 |
|
176 |
DESCRIPTION="Media Player for Linux" |
177 |
HOMEPAGE="http://www.mplayerhq.hu/" |
178 |
@@ -75,11 +71,6 @@ |
179 |
media-libs/libggi |
180 |
media-libs/libggiwmh |
181 |
) |
182 |
- gmplayer? ( |
183 |
- media-libs/libpng |
184 |
- x11-libs/gtk+:2 |
185 |
- x11-libs/libXi |
186 |
- ) |
187 |
opengl? ( virtual/opengl ) |
188 |
vdpau? ( || ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 ) ) |
189 |
xinerama? ( x11-libs/libXinerama ) |
190 |
@@ -93,7 +84,7 @@ |
191 |
aalib? ( media-libs/aalib ) |
192 |
alsa? ( media-libs/alsa-lib ) |
193 |
amr? ( !bindist? ( media-libs/opencore-amr ) ) |
194 |
- ass? ( ${FONT_RDEPS} media-libs/libass[enca?] ) |
195 |
+ ass? ( ${FONT_RDEPS} >=media-libs/libass-0.9.10[enca?] ) |
196 |
bidi? ( dev-libs/fribidi ) |
197 |
bluray? ( media-libs/libbluray ) |
198 |
bs2b? ( media-libs/libbs2b ) |
199 |
@@ -139,6 +130,7 @@ |
200 |
app-arch/rar |
201 |
) |
202 |
) |
203 |
+ rtmpdump? ( media-video/rtmpdump ) |
204 |
samba? ( net-fs/samba ) |
205 |
schroedinger? ( media-libs/schroedinger ) |
206 |
sdl? ( media-libs/libsdl ) |
207 |
@@ -161,7 +153,6 @@ |
208 |
${X_DEPS} |
209 |
dga? ( x11-proto/xf86dgaproto ) |
210 |
dxr3? ( media-video/em8300-libraries ) |
211 |
- gmplayer? ( x11-proto/xextproto ) |
212 |
xinerama? ( x11-proto/xineramaproto ) |
213 |
xscreensaver? ( x11-proto/scrnsaverproto ) |
214 |
) |
215 |
@@ -187,44 +178,37 @@ |
216 |
|
217 |
pkg_setup() { |
218 |
if [[ ${PV} == *9999* ]]; then |
219 |
- elog "" |
220 |
+ elog |
221 |
elog "This is a live ebuild which installs the latest from upstream's" |
222 |
elog "subversion repository, and is unsupported by Gentoo." |
223 |
elog "Everything but bugs in the ebuild itself will be ignored." |
224 |
- elog "" |
225 |
- fi |
226 |
- |
227 |
- if use gmplayer; then |
228 |
- ewarn "" |
229 |
- ewarn "GMPlayer is no longer actively developed upstream" |
230 |
- ewarn "and is not supported by Gentoo. There are alternatives" |
231 |
- ewarn "for a GUI frontend: smplayer, gnome-mplayer or kmplayer." |
232 |
+ elog |
233 |
fi |
234 |
|
235 |
if use cpudetection; then |
236 |
- ewarn "" |
237 |
- ewarn "You've enabled the cpudetection flag. This feature is" |
238 |
+ ewarn |
239 |
+ ewarn "You've enabled the cpudetection flag. This feature is" |
240 |
ewarn "included mainly for people who want to use the same" |
241 |
ewarn "binary on another system with a different CPU architecture." |
242 |
ewarn "MPlayer will already detect your CPU settings by default at" |
243 |
ewarn "buildtime; this flag is used for runtime detection." |
244 |
ewarn "You won't need this turned on if you are only building" |
245 |
- ewarn "mplayer for this system. Also, if your compile fails, try" |
246 |
+ ewarn "mplayer for this system. Also, if your compile fails, try" |
247 |
ewarn "disabling this use flag." |
248 |
fi |
249 |
|
250 |
if use custom-cpuopts; then |
251 |
- ewarn "" |
252 |
+ ewarn |
253 |
ewarn "You are using the custom-cpuopts flag which will" |
254 |
ewarn "specifically allow you to enable / disable certain" |
255 |
ewarn "CPU optimizations." |
256 |
- ewarn "" |
257 |
+ ewarn |
258 |
ewarn "Most desktop users won't need this functionality, but it" |
259 |
ewarn "is included for corner cases like cross-compiling and" |
260 |
- ewarn "certain profiles. If unsure, disable this flag and MPlayer" |
261 |
+ ewarn "certain profiles. If unsure, disable this flag and MPlayer" |
262 |
ewarn "will automatically detect and use your available CPU" |
263 |
ewarn "optimizations." |
264 |
- ewarn "" |
265 |
+ ewarn |
266 |
ewarn "Using this flag means your build is unsupported, so" |
267 |
ewarn "please make sure your CPU optimization use flags (3dnow" |
268 |
ewarn "3dnowext mmx mmxext sse sse2 ssse3) are properly set." |
269 |
@@ -245,8 +229,6 @@ |
270 |
font-arial-iso-8859-2.tar.bz2 \ |
271 |
font-arial-cp1250.tar.bz2 |
272 |
fi |
273 |
- |
274 |
- use gmplayer && unpack "Blue-${BLUV}.tar.bz2" |
275 |
} |
276 |
|
277 |
src_prepare() { |
278 |
@@ -270,33 +252,34 @@ |
279 |
[[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/da/dk}" |
280 |
|
281 |
# mplayer ebuild uses "use foo || --disable-foo" to forcibly disable |
282 |
- # compilation in almost every situation. The reason for this is |
283 |
+ # compilation in almost every situation. The reason for this is |
284 |
# because if --enable is used, it will force the build of that option, |
285 |
# regardless of whether the dependency is available or not. |
286 |
|
287 |
################### |
288 |
#Optional features# |
289 |
################### |
290 |
+ # disable svga since we don't want it |
291 |
+ # disable arts since we don't have kde3 |
292 |
+ # always disable internal ass |
293 |
myconf+=" |
294 |
- --disable-svga --enable-svgalib_helper |
295 |
+ --disable-svga --disable-svgalib_helper |
296 |
+ --disable-ass-internal |
297 |
--disable-arts |
298 |
--disable-kai |
299 |
$(use_enable network networking) |
300 |
$(use_enable joystick) |
301 |
" |
302 |
- uses="ass bl enca ftp rtc" # nemesi <- not working with in-tree ebuild |
303 |
+ uses="ass bl bluray enca ftp rtc" # nemesi <- not working with in-tree ebuild |
304 |
myconf+=" --disable-nemesi" # nemesi automagic disable |
305 |
- # upstream includes an internal copy for lazy users. |
306 |
- # We want to always use external libs where possible. |
307 |
- myconf+=" --disable-ass-internal" # always use system libass |
308 |
for i in ${uses}; do |
309 |
use ${i} || myconf+=" --disable-${i}" |
310 |
done |
311 |
use bidi || myconf+=" --disable-fribidi" |
312 |
- use bluray || myconf+=" --disable-bluray" |
313 |
use ipv6 || myconf+=" --disable-inet6" |
314 |
use nut || myconf+=" --disable-libnut" |
315 |
use rar || myconf+=" --disable-unrarexec" |
316 |
+ use rtmpdump || myconf+=" --disable-librtmp" |
317 |
use samba || myconf+=" --disable-smb" |
318 |
if ! use lirc; then |
319 |
myconf+=" |
320 |
@@ -415,11 +398,8 @@ |
321 |
# Disable opencore-amr with bindist |
322 |
# https://bugs.gentoo.org/show_bug.cgi?id=299405#c6 |
323 |
{ use amr && use !bindist ; } || myconf+=" --disable-libopencore_amrnb --disable-libopencore_amrwb" |
324 |
- if ! use png && ! use gmplayer; then |
325 |
- myconf+=" --disable-png" |
326 |
- fi |
327 |
|
328 |
- uses="faad gif jpeg live mad mng pnm speex tga theora xanim" |
329 |
+ uses="faad gif jpeg live mad mng png pnm speex tga theora xanim" |
330 |
for i in ${uses}; do |
331 |
use ${i} || myconf+=" --disable-${i}" |
332 |
done |
333 |
@@ -442,9 +422,8 @@ |
334 |
use ${i} || myconf+=" --disable-${i}" |
335 |
done |
336 |
use faac || myconf+=" --disable-faac-lavc" |
337 |
- if use bindist |
338 |
- then |
339 |
- use faac && ewarn "faac is nonfree and cannot be distributed; disabling faac support." |
340 |
+ if use bindist && use faac; then |
341 |
+ ewarn "faac is nonfree and cannot be distributed; disabling faac support." |
342 |
myconf+=" --disable-faac --disable-faac-lavc" |
343 |
fi |
344 |
else |
345 |
@@ -481,7 +460,7 @@ |
346 |
use x86 && myconf+=" --codecsdir=/opt/RealPlayer/codecs" |
347 |
use amd64 && myconf+=" --codecsdir=/usr/$(get_libdir)/codecs" |
348 |
elif ! use bindist; then |
349 |
- myconf+=" $(use_enable win32codecs win32dll)" |
350 |
+ myconf+=" $(use_enable win32codecs win32dll)" |
351 |
fi |
352 |
|
353 |
################ |
354 |
@@ -536,7 +515,7 @@ |
355 |
|
356 |
# Turning off CPU optimizations usually will break the build. |
357 |
# However, this use flag, if enabled, will allow users to completely |
358 |
- # specify which ones to use. If disabled, mplayer will automatically |
359 |
+ # specify which ones to use. If disabled, mplayer will automatically |
360 |
# enable all CPU optimizations that the host build supports. |
361 |
if use custom-cpuopts; then |
362 |
uses="3dnow 3dnowext altivec mmx mmxext shm sse sse2 ssse3" |
363 |
@@ -560,6 +539,7 @@ |
364 |
########################### |
365 |
# X enabled configuration # |
366 |
########################### |
367 |
+ myconf+=" --disable-gui" |
368 |
if use X; then |
369 |
uses="dxr3 ggi xinerama" |
370 |
for i in ${uses}; do |
371 |
@@ -573,10 +553,6 @@ |
372 |
use vidix || myconf+=" --disable-vidix --disable-vidix-pcidb" |
373 |
use xscreensaver || myconf+=" --disable-xss" |
374 |
|
375 |
- # GTK gmplayer gui |
376 |
- # Unsupported by Gentoo, upstream has dropped development |
377 |
- myconf+=" $(use_enable gmplayer gui)" |
378 |
- |
379 |
if use xv; then |
380 |
if use xvmc; then |
381 |
myconf+=" --enable-xvmc --with-xvmclib=XvMCW" |
382 |
@@ -641,11 +617,10 @@ |
383 |
for i in ${LINGUAS} ; do |
384 |
hasq ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}" |
385 |
done |
386 |
- if [[ -z $BUILT_DOCS ]] |
387 |
- then |
388 |
+ if [[ -z $BUILT_DOCS ]]; then |
389 |
emake -j1 -C DOCS/xml html-chunked || die "Failed to generate html docs" |
390 |
else |
391 |
- for i in ${BUILT_DOCS} ; do |
392 |
+ for i in ${BUILT_DOCS}; do |
393 |
emake -j1 -C DOCS/xml html-chunked-${i} || die "Failed to generate html docs for ${i}" |
394 |
done |
395 |
fi |
396 |
@@ -684,17 +659,6 @@ |
397 |
dohtml -r "${S}"/DOCS/HTML/* || die |
398 |
fi |
399 |
|
400 |
- # Install the default Skin and Gnome menu entry |
401 |
- if use gmplayer; then |
402 |
- dodir /usr/share/mplayer/skins |
403 |
- cp -r "${WORKDIR}/Blue" \ |
404 |
- "${D}/usr/share/mplayer/skins/default" || die "cp skins died" |
405 |
- |
406 |
- # Fix the symlink |
407 |
- rm -rf "${D}/usr/bin/gmplayer" |
408 |
- dosym mplayer /usr/bin/gmplayer |
409 |
- fi |
410 |
- |
411 |
if ! use ass && ! use truetype; then |
412 |
dodir /usr/share/mplayer/fonts |
413 |
# Do this generic, as the mplayer people like to change the structure |
414 |
@@ -714,7 +678,7 @@ |
415 |
doins "${S}/etc/menu.conf" || die |
416 |
fi |
417 |
|
418 |
- if use ass || use truetype; then |
419 |
+ if use ass || use truetype; then |
420 |
cat >> "${D}/etc/mplayer/mplayer.conf" << _EOF_ |
421 |
fontconfig=1 |
422 |
subfont-osd-scale=4 |