1 |
scarabeus 11/03/29 12:44:13 |
2 |
|
3 |
Modified: metadata.xml ChangeLog mplayer2-9999.ebuild |
4 |
mplayer2-2.0.ebuild |
5 |
Log: |
6 |
Drop support for internal only mp3lib, always link to external ffmpeg so all features need to be in it instead of relying on some internal cloning. Separate namespace for /etc/ config to be by default mplayer2. Make symlink useflag enabled by default. |
7 |
|
8 |
(Portage version: 2.2.0_alpha28/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.2 media-video/mplayer2/metadata.xml |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/metadata.xml?rev=1.2&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/metadata.xml?rev=1.2&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/metadata.xml?r1=1.1&r2=1.2 |
16 |
|
17 |
Index: metadata.xml |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/metadata.xml,v |
20 |
retrieving revision 1.1 |
21 |
retrieving revision 1.2 |
22 |
diff -u -r1.1 -r1.2 |
23 |
--- metadata.xml 28 Mar 2011 22:59:02 -0000 1.1 |
24 |
+++ metadata.xml 29 Mar 2011 12:44:12 -0000 1.2 |
25 |
@@ -21,7 +21,6 @@ |
26 |
</longdescription> |
27 |
<use> |
28 |
<flag name="3dnowext">Enable 3dnowext cpu instructions</flag> |
29 |
- <flag name="amr">Enables Adaptive Multi-Rate format support</flag> |
30 |
<flag name="ass">SRT/SSA/ASS (SubRip / SubStation Alpha) subtitle support</flag> |
31 |
<flag name="bl">Blinkenlights video output</flag> |
32 |
<flag name="bluray">Enable playback of Blu-ray filesystems</flag> |
33 |
@@ -29,13 +28,10 @@ |
34 |
<flag name="cdio">Use libcdio for CD support (instead of cdparanoia)</flag> |
35 |
<flag name="cpudetection">Enables runtime CPU detection (useful for bindist, compatibility on other CPUs)</flag> |
36 |
<flag name="custom-cpuopts">Fine-tune custom CPU optimizations (UNSUPPORTED)</flag> |
37 |
- <flag name="dirac">Enable Dirac video support (an advanced royalty-free video compression format) via the reference library: dirac.</flag> |
38 |
<flag name="dvdnav">Use forked libdvdnav, navigate menus in GUIs</flag> |
39 |
<flag name="dxr3">Enable DXR3/H+ video output</flag> |
40 |
<flag name="enca">Enables support for charset discovery and conversion</flag> |
41 |
<flag name="faad">Use external faad library for AAC decoding</flag> |
42 |
- <flag name="ffmpeg-mt">Enable multithreaded ffmpeg</flag> |
43 |
- <flag name="hardcoded-tables">Use pre-calculated tables rather than calculating them on the fly.</flag> |
44 |
<flag name="live">Enables live.com streaming media support</flag> |
45 |
<flag name="md5sum">Enables md5sum video output</flag> |
46 |
<flag name="mmxext">Enables mmx2 support</flag> |
47 |
@@ -50,14 +46,10 @@ |
48 |
<flag name="rar">Enable Unique RAR File Library</flag> |
49 |
<flag name="real">Adds real audo/video support</flag> |
50 |
<flag name="rtc">Enables usage of the linux real time clock. The alternative is software emulation of rtc</flag> |
51 |
- <flag name="rtmp">Enables RTMPDump Streaming Media support</flag> |
52 |
- <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> |
53 |
<flag name="shm">Enable support for shm</flag> |
54 |
<flag name="ssse3">faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips)</flag> |
55 |
- <flag name="system-ffmpeg">Use shared FFmpeg libraries instead of static bundled ones. May not have ffmpeg-mt.</flag> |
56 |
<flag name="tga">Enables Targa video output</flag> |
57 |
<flag name="vdpau">Enables experimental VDPAU support (requires nVidia video cards) to offload MPEG2/MPEG4/VC1/WMV CPU processing to video card</flag> |
58 |
- <flag name="vpx">Enables vp8 codec support using libvpx: Decoding vp8 does not require this to be enabled but libvpx can also be used for decoding; encoding vp8 requires this useflag to be enabled though.</flag> |
59 |
<flag name="xanim">Enables support for xanim based codecs</flag> |
60 |
<flag name="xvmc">Enables X-Video Motion Compensation support</flag> |
61 |
</use> |
62 |
|
63 |
|
64 |
|
65 |
1.2 media-video/mplayer2/ChangeLog |
66 |
|
67 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.2&view=markup |
68 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.2&content-type=text/plain |
69 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?r1=1.1&r2=1.2 |
70 |
|
71 |
Index: ChangeLog |
72 |
=================================================================== |
73 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v |
74 |
retrieving revision 1.1 |
75 |
retrieving revision 1.2 |
76 |
diff -u -r1.1 -r1.2 |
77 |
--- ChangeLog 28 Mar 2011 22:59:02 -0000 1.1 |
78 |
+++ ChangeLog 29 Mar 2011 12:44:12 -0000 1.2 |
79 |
@@ -1,6 +1,13 @@ |
80 |
# ChangeLog for media-video/mplayer2 |
81 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
82 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.1 2011/03/28 22:59:02 lu_zero Exp $ |
83 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.2 2011/03/29 12:44:12 scarabeus Exp $ |
84 |
+ |
85 |
+ 29 Mar 2011; Tomáš Chvátal <scarabeus@g.o> mplayer2-2.0.ebuild, |
86 |
+ mplayer2-9999.ebuild, metadata.xml: |
87 |
+ Drop support for internal only mp3lib, always link to external ffmpeg so all |
88 |
+ features need to be in it instead of relying on some internal cloning. |
89 |
+ Separate namespace for /etc/ config to be by default mplayer2. Make symlink |
90 |
+ useflag enabled by default. |
91 |
|
92 |
28 Mar 2011; Luca Barbato <lu_zero@g.o> +metadata.xml, |
93 |
+mplayer2-2.0.ebuild, +mplayer2-9999.ebuild: |
94 |
|
95 |
|
96 |
|
97 |
1.2 media-video/mplayer2/mplayer2-9999.ebuild |
98 |
|
99 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.2&view=markup |
100 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.2&content-type=text/plain |
101 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?r1=1.1&r2=1.2 |
102 |
|
103 |
Index: mplayer2-9999.ebuild |
104 |
=================================================================== |
105 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v |
106 |
retrieving revision 1.1 |
107 |
retrieving revision 1.2 |
108 |
diff -u -r1.1 -r1.2 |
109 |
--- mplayer2-9999.ebuild 28 Mar 2011 22:59:02 -0000 1.1 |
110 |
+++ mplayer2-9999.ebuild 29 Mar 2011 12:44:12 -0000 1.2 |
111 |
@@ -1,26 +1,25 @@ |
112 |
# Copyright 1999-2011 Gentoo Foundation |
113 |
# Distributed under the terms of the GNU General Public License v2 |
114 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.1 2011/03/28 22:59:02 lu_zero Exp $ |
115 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.2 2011/03/29 12:44:12 scarabeus Exp $ |
116 |
|
117 |
EAPI=4 |
118 |
|
119 |
-[[ ${PV} = *9999* ]] && VCS_ECLASS="git" || VCS_ECLASS="" |
120 |
+EGIT_REPO_URI="git://git.mplayer2.org/mplayer2.git" |
121 |
+[[ ${PV} = *9999* ]] && VCS_ECLASS="git" |
122 |
|
123 |
inherit toolchain-funcs eutils flag-o-matic multilib base ${VCS_ECLASS} |
124 |
|
125 |
namesuf="${PN/mplayer/}" |
126 |
|
127 |
IUSE="3dnow 3dnowext +a52 aalib +alsa altivec aqua +ass bidi bindist bl bluray |
128 |
-bs2b +bzip2 cddb +cdio cdparanoia cpudetection custom-cpuopts custom-cflags debug dga +dirac |
129 |
+bs2b cddb +cdio cdparanoia cpudetection custom-cpuopts custom-cflags debug dga |
130 |
directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca esd +faad fbcon |
131 |
-ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa |
132 |
-libcaca lirc +live mad md5sum +mmx mmxext mng +mp3 mpg123 nas |
133 |
-+network nut amr +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime |
134 |
-radio +rar +real +rtc rtmp samba +shm +schroedinger +hardcoded-tables sdl +speex sse sse2 ssse3 |
135 |
-tga +theora threads +truetype +unicode v4l v4l2 vdpau |
136 |
-+vorbis vpx win32codecs +X xanim xinerama +xscreensaver +xv xvmc |
137 |
-" |
138 |
-IUSE+=" +ffmpeg-mt -system-ffmpeg symlink" |
139 |
+ftp gif ggi +iconv ipv6 jack joystick jpeg kernel_linux ladspa |
140 |
+libcaca lirc +live mad md5sum +mmx mmxext mng mpg123 nas |
141 |
++network nut +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime |
142 |
+radio +rar +real +rtc samba +shm +symlink sdl +speex sse sse2 ssse3 |
143 |
+tga +theora +truetype +unicode v4l v4l2 vdpau |
144 |
++vorbis win32codecs +X xanim xinerama +xscreensaver +xv xvmc" |
145 |
|
146 |
VIDEO_CARDS="s3virge mga tdfx vesa" |
147 |
for x in ${VIDEO_CARDS}; do |
148 |
@@ -32,13 +31,8 @@ |
149 |
mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 |
150 |
mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 |
151 |
" |
152 |
-if [[ ${PV} == *9999* ]]; then |
153 |
- EGIT_REPO_URI="git://repo.or.cz/mplayer-build.git" |
154 |
- EGIT_PROJECT="${PN}-build" |
155 |
- RELEASE_URI="" |
156 |
-else |
157 |
- RELEASE_URI="mirror://gentoo/${P}.tar.xz" |
158 |
-fi |
159 |
+[[ ${PV} == *9999* ]] || \ |
160 |
+ RELEASE_URI="http://ftp.${PN}.org/pub/release/${P}.tar.xz" |
161 |
SRC_URI="${RELEASE_URI} |
162 |
!truetype? ( ${FONT_URI} ) |
163 |
" |
164 |
@@ -58,6 +52,7 @@ |
165 |
# Rar: althrought -gpl version is nice, it cant do most functions normal rars can |
166 |
# nemesi? ( net-libs/libnemesi ) |
167 |
RDEPEND+=" |
168 |
+ virtual/ffmpeg |
169 |
sys-libs/ncurses |
170 |
sys-libs/zlib |
171 |
!bindist? ( |
172 |
@@ -130,19 +125,6 @@ |
173 |
truetype? ( ${FONT_RDEPS} ) |
174 |
vorbis? ( media-libs/libvorbis ) |
175 |
xanim? ( media-video/xanim ) |
176 |
- system-ffmpeg? ( |
177 |
- >=media-video/ffmpeg-0.6_p25423[amr?,bzip2?,dirac?,gsm?,hardcoded-tables?,jpeg2k?,rtmp?,schroedinger?,threads?,vpx?] |
178 |
- ) |
179 |
- !system-ffmpeg? ( |
180 |
- amr? ( media-libs/opencore-amr ) |
181 |
- bzip2? ( app-arch/bzip2 ) |
182 |
- dirac? ( media-video/dirac ) |
183 |
- gsm? ( >=media-sound/gsm-1.0.12-r1 ) |
184 |
- jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) |
185 |
- rtmp? ( media-video/rtmpdump ) |
186 |
- schroedinger? ( media-libs/schroedinger ) |
187 |
- vpx? ( media-libs/libvpx ) |
188 |
- ) |
189 |
symlink? ( !media-video/mplayer ) |
190 |
" |
191 |
|
192 |
@@ -179,14 +161,7 @@ |
193 |
KEYWORDS="" |
194 |
fi |
195 |
|
196 |
-# bindist does not cope with amr codecs (#299405#c6), win32codecs are nonfree |
197 |
-# libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio |
198 |
-# dvd navigation requires dvd read support |
199 |
-# ass and freetype font require iconv and ass requires freetype fonts |
200 |
-# unicode transformations are usefull only with iconv |
201 |
-# libvorbis require external tremor to work |
202 |
-# radio requires oss or alsa backend |
203 |
-# xvmc requires xvideo support |
204 |
+# bindist does not cope with win32codecs, which are nonfree |
205 |
REQUIRED_USE="bindist? ( !win32codecs )" |
206 |
|
207 |
PATCHES=( |
208 |
@@ -230,46 +205,13 @@ |
209 |
ewarn "3dnowext mmx mmxext sse sse2 ssse3) are properly set." |
210 |
fi |
211 |
|
212 |
- if use ffmpeg-mt && use system-ffmpeg; then |
213 |
- ewarn "USE flags ffmpeg-mt and system-ffmpeg are not compatible, system-ffmpeg will be used." |
214 |
- fi |
215 |
+ einfo "For various format support you need to enable the support on your ffmpeg package:" |
216 |
+ einfo " media-video/libav or media-video/ffmpeg" |
217 |
} |
218 |
|
219 |
src_unpack() { |
220 |
if [[ ${PV} = *9999* ]]; then |
221 |
git_src_unpack |
222 |
- |
223 |
- EGIT_REPO_URI="git://repo.or.cz/mplayer.git" |
224 |
- EGIT_PROJECT="${PN}" |
225 |
- S+="/mplayer" |
226 |
- git_fetch |
227 |
- S="${WORKDIR}/${P}" |
228 |
- |
229 |
- if ! use system-ffmpeg; then |
230 |
- if use ffmpeg-mt; then |
231 |
- EGIT_BRANCH="mt" |
232 |
- EGIT_COMMIT="mt" |
233 |
- S+="/ffmpeg-mt" |
234 |
- else |
235 |
- S+="/ffmpeg" |
236 |
- fi |
237 |
- EGIT_REPO_URI="git://repo.or.cz/FFMpeg-mirror/mplayer-patches.git" |
238 |
- EGIT_PROJECT="${PN}-ffmpeg" |
239 |
- git_fetch |
240 |
- EGIT_BRANCH="master" |
241 |
- unset EGIT_COMMIT |
242 |
- |
243 |
- cd "${S}" |
244 |
- EGIT_REPO_URI="git://git.mplayerhq.hu/libswscale" |
245 |
- EGIT_PROJECT="libswscale" |
246 |
- EGIT_COMMIT="$(git submodule status -- libswscale|sed -e 's/^-\(.*\) .*/\1/')" |
247 |
- S+="/${EGIT_PROJECT}" |
248 |
- git_fetch |
249 |
- |
250 |
- S="${WORKDIR}/${P}" |
251 |
- fi |
252 |
- |
253 |
- cd "${WORKDIR}" |
254 |
else |
255 |
unpack ${A} |
256 |
fi |
257 |
@@ -285,46 +227,18 @@ |
258 |
if [[ ${PV} = *9999* ]]; then |
259 |
git_src_prepare |
260 |
# Set GIT version manually |
261 |
- pushd mplayer |
262 |
echo "GIT-r$(git rev-list HEAD|wc -l)-$(git describe --always)" \ |
263 |
> VERSION || die |
264 |
- popd |
265 |
- fi |
266 |
- |
267 |
- # remove internal libs and use system: |
268 |
- sed -e '/^mplayer: /s/libass//' \ |
269 |
- -i Makefile || die |
270 |
- rm -rf \ |
271 |
- libass \ |
272 |
- || die |
273 |
- |
274 |
- if use system-ffmpeg; then |
275 |
- sed -e '/^mplayer: /s/ffmpeg//' \ |
276 |
- -i Makefile || die |
277 |
- rm -rf ffmpeg ffmpeg-mt || die |
278 |
- else |
279 |
- if use ffmpeg-mt; then |
280 |
- touch ffmpeg-mt-enabled || die "enable-mt failed" |
281 |
- rm -rf ffmpeg || die |
282 |
- else |
283 |
- rm -rf ffmpeg-mt || die |
284 |
- fi |
285 |
- sed -i \ |
286 |
- -e "/'--cpu=host',/d" \ |
287 |
- -e "/'--disable-debug',/d" \ |
288 |
- -e "/'--enable-pthreads',/d" \ |
289 |
- script/ffmpeg-config || die |
290 |
fi |
291 |
|
292 |
# fix path to bash executable in configure scripts |
293 |
- local bash_scripts="mplayer/configure mplayer/version.sh" |
294 |
- use system-ffmpeg || bash_scripts+=" ffmpeg*/configure ffmpeg*/version.sh" |
295 |
- sed -i -e "1c\#!${EPREFIX}/bin/bash" \ |
296 |
+ local bash_scripts="configure version.sh" |
297 |
+ sed -i \ |
298 |
+ -e "1c\#!${EPREFIX}/bin/bash" \ |
299 |
${bash_scripts} || die |
300 |
|
301 |
# We want mplayer${namesuf} |
302 |
- if [[ "${namesuf}" != "" ]]; then |
303 |
- pushd mplayer |
304 |
+ if [[ -n ${namesuf} ]]; then |
305 |
sed -e "/elif linux ; then/a\ _exesuf=\"${namesuf}\"" \ |
306 |
-i configure || die |
307 |
sed -e "/ -m 644 DOCS\/man\/en\/mplayer/i\ mv DOCS\/man\/en\/mplayer.1 DOCS\/man\/en\/mplayer${namesuf}.1" \ |
308 |
@@ -333,7 +247,6 @@ |
309 |
-i Makefile || die |
310 |
sed -e "s/mplayer/mplayer${namesuf}/" \ |
311 |
-i TOOLS/midentify.sh || die |
312 |
- popd |
313 |
fi |
314 |
|
315 |
base_src_prepare |
316 |
@@ -414,7 +327,6 @@ |
317 |
############# |
318 |
# Subtitles # |
319 |
############# |
320 |
- # |
321 |
# SRT/ASS/SSA (subtitles) requires freetype support |
322 |
# freetype support requires iconv |
323 |
# iconv optionally can use unicode |
324 |
@@ -468,12 +380,8 @@ |
325 |
# Codecs # |
326 |
########## |
327 |
myconf+=" --disable-musepack" # deprecated, libavcodec Musepack decoder is preferred |
328 |
+ myconf+=" --disable-mp3lib" # internal so disable |
329 |
use dts || myconf+=" --disable-libdca" |
330 |
- if ! use mp3; then |
331 |
- myconf+=" |
332 |
- --disable-mp3lib |
333 |
- " |
334 |
- fi |
335 |
uses="a52 bs2b dv vorbis" |
336 |
for i in ${uses}; do |
337 |
use ${i} || myconf+=" --disable-lib${i}" |
338 |
@@ -652,107 +560,18 @@ |
339 |
" |
340 |
fi |
341 |
|
342 |
- common_options=" |
343 |
- --cc=$(tc-getCC) |
344 |
- --host-cc=$(tc-getBUILD_CC) |
345 |
- " |
346 |
- myconf+=" |
347 |
- --prefix="${EPREFIX}"/usr |
348 |
- --bindir="${EPREFIX}"/usr/bin |
349 |
- --libdir="${EPREFIX}"/usr/$(get_libdir) |
350 |
- --confdir="${EPREFIX}"/etc/mplayer |
351 |
- --datadir="${EPREFIX}"/usr/share/mplayer${namesuf} |
352 |
- --mandir="${EPREFIX}"/usr/share/man |
353 |
- --localedir="${EPREFIX}"/usr/share/locale |
354 |
- --enable-translation |
355 |
- " |
356 |
- |
357 |
- echo "${common_options}" > common_options |
358 |
- echo "${myconf}" > mplayer_options |
359 |
- |
360 |
- if ! use system-ffmpeg; then |
361 |
- local ffconf=" |
362 |
- --enable-gpl |
363 |
- --enable-version3 |
364 |
- --enable-postproc |
365 |
- --disable-stripping |
366 |
- " |
367 |
- |
368 |
- # enabled by default |
369 |
- use debug || ffconf+=" --disable-debug" |
370 |
- use network || ffconf+=" --disable-network" |
371 |
- use bzip2 || ffconf+=" --disable-bzlib" |
372 |
- |
373 |
- use custom-cflags && ffconf+=" --disable-optimizations" |
374 |
- use cpudetection && ffconf+=" --enable-runtime-cpudetect" |
375 |
- |
376 |
- # Threads; we only support pthread for now but ffmpeg supports more |
377 |
- use threads || ffconf+=" --disable-pthreads" |
378 |
- |
379 |
- # ffmpeg encoders |
380 |
- for i in faac mp3lame theora vorbis x264 xvid; do |
381 |
- ffconf+=" --disable-lib${i}" |
382 |
- done |
383 |
- |
384 |
- # ffmpeg decoders |
385 |
- use amr && ffconf+=" --enable-libopencore-amrwb --enable-libopencore-amrnb" |
386 |
- for i in gsm dirac rtmp schroedinger speex vpx; do |
387 |
- use ${i} && ffconf+=" --enable-lib${i}" |
388 |
- done |
389 |
- use jpeg2k && ffconf+=" --enable-libopenjpeg" |
390 |
- |
391 |
- # CPU features |
392 |
- for i in mmx ssse3 altivec ; do |
393 |
- use ${i} || ffconf+=" --disable-${i}" |
394 |
- done |
395 |
- use mmxext || ffconf+=" --disable-mmx2" |
396 |
- use 3dnow || ffconf+=" --disable-amd3dnow" |
397 |
- use 3dnowext || ffconf+=" --disable-amd3dnowext" |
398 |
- # disable mmx accelerated code if PIC is required |
399 |
- # as the provided asm decidedly is not PIC. |
400 |
- if gcc-specs-pie ; then |
401 |
- ffconf+=" --disable-mmx --disable-mmx2" |
402 |
- fi |
403 |
- |
404 |
- # Try to get cpu type based on CFLAGS. |
405 |
- # Bug #172723 |
406 |
- # We need to do this so that features of that CPU will be better used |
407 |
- # If they contain an unknown CPU it will not hurt since ffmpeg's configure |
408 |
- # will just ignore it. |
409 |
- for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do |
410 |
- [ "${i}" = "native" ] && i="host" # bug #273421 |
411 |
- [[ ${i} = *-sse3 ]] && i="${i%-sse3}" # bug 283968 |
412 |
- ffconf+=" --cpu=${i}" |
413 |
- break |
414 |
- done |
415 |
- |
416 |
- # cross compile support |
417 |
- if tc-is-cross-compiler ; then |
418 |
- ffconf+=" --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}-" |
419 |
- case ${CHOST} in |
420 |
- *freebsd*) |
421 |
- ffconf+=" --target-os=freebsd" |
422 |
- ;; |
423 |
- mingw32*) |
424 |
- ffconf+=" --target-os=mingw32" |
425 |
- ;; |
426 |
- *linux*) |
427 |
- ffconf+=" --target-os=linux" |
428 |
- ;; |
429 |
- esac |
430 |
- fi |
431 |
- |
432 |
- # Misc stuff |
433 |
- use hardcoded-tables && ffconf+=" --enable-hardcoded-tables" |
434 |
- |
435 |
- echo "${ffconf}" > ffmpeg_options |
436 |
- fi |
437 |
- |
438 |
- sed -i \ |
439 |
- -e 's/\t//g' \ |
440 |
- -e 's/ --/\n--/g' \ |
441 |
- -e '/^$/d' \ |
442 |
- *_options || die |
443 |
+ ./configure \ |
444 |
+ --cc=$(tc-getCC) \ |
445 |
+ --host-cc=$(tc-getBUILD_CC) \ |
446 |
+ --prefix="${EPREFIX}"/usr \ |
447 |
+ --bindir="${EPREFIX}"/usr/bin \ |
448 |
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \ |
449 |
+ --confdir="${EPREFIX}"/etc/mplayer${namesuf} \ |
450 |
+ --datadir="${EPREFIX}"/usr/share/mplayer${namesuf} \ |
451 |
+ --mandir="${EPREFIX}"/usr/share/man \ |
452 |
+ --localedir="${EPREFIX}"/usr/share/locale \ |
453 |
+ --enable-translation \ |
454 |
+ ${myconf} || die |
455 |
} |
456 |
|
457 |
src_compile() { |
458 |
@@ -785,8 +604,6 @@ |
459 |
INSTALLSTRIP="" \ |
460 |
install |
461 |
|
462 |
- S+="/mplayer" |
463 |
- cd "${S}" |
464 |
dodoc AUTHORS Copyright README etc/codecs.conf |
465 |
|
466 |
docinto tech/ |
467 |
@@ -815,43 +632,39 @@ |
468 |
dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer${namesuf}/font |
469 |
fi |
470 |
|
471 |
- if use symlink; then |
472 |
- insinto /etc/mplayer |
473 |
- newins "${S}/etc/example.conf" mplayer.conf |
474 |
- doins "${S}/etc/input.conf" |
475 |
- if use osdmenu; then |
476 |
- doins "${S}/etc/menu.conf" |
477 |
- fi |
478 |
+ insinto /etc/mplayer${namesuf} |
479 |
+ newins "${S}/etc/example.conf" mplayer.conf |
480 |
+ cat >> "${ED}/etc/mplayer${namesuf}/mplayer.conf" << _EOF_ |
481 |
+# Config options can be section specific, global |
482 |
+# options should go in the default section |
483 |
+[default] |
484 |
+_EOF_ |
485 |
+ doins "${S}/etc/input.conf" |
486 |
+ if use osdmenu; then |
487 |
+ doins "${S}/etc/menu.conf" |
488 |
+ fi |
489 |
|
490 |
- if use ass || use truetype; then |
491 |
- cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_ |
492 |
+ if use ass || use truetype; then |
493 |
+ cat >> "${ED}/etc/mplayer${namesuf}/mplayer.conf" << _EOF_ |
494 |
fontconfig=1 |
495 |
subfont-osd-scale=4 |
496 |
subfont-text-scale=3 |
497 |
_EOF_ |
498 |
- fi |
499 |
+ fi |
500 |
|
501 |
- # bug 256203 |
502 |
- if use rar; then |
503 |
- cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_ |
504 |
+ # bug 256203 |
505 |
+ if use rar; then |
506 |
+ cat >> "${ED}/etc/mplayer${namesuf}/mplayer.conf" << _EOF_ |
507 |
unrarexec=${EPREFIX}/usr/bin/unrar |
508 |
_EOF_ |
509 |
- fi |
510 |
- |
511 |
- dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer${namesuf}/mplayer.conf |
512 |
fi |
513 |
+ dosym ../../../etc/mplayer${namesuf}/mplayer.conf /usr/share/mplayer${namesuf}/mplayer.conf |
514 |
|
515 |
newbin "${S}/TOOLS/midentify.sh" midentify${namesuf} |
516 |
|
517 |
- if [[ "${namesuf}" != "" ]] && use symlink; then |
518 |
+ if [[ -n ${namesuf} ]] && use symlink; then |
519 |
+ dosym /etc/mplayer${namesuf} /etc/mplayer |
520 |
dosym "mplayer${namesuf}" /usr/bin/mplayer |
521 |
dosym "midentify${namesuf}" /usr/bin/midentify |
522 |
fi |
523 |
} |
524 |
- |
525 |
-pkg_postrm() { |
526 |
- # Cleanup stale symlinks |
527 |
- [ -L "${EROOT}/usr/share/mplayer${namesuf}/font" -a \ |
528 |
- ! -e "${EROOT}/usr/share/mplayer${namesuf}/font" ] && \ |
529 |
- rm -f "${EROOT}/usr/share/mplayer${namesuf}/font" |
530 |
-} |
531 |
|
532 |
|
533 |
|
534 |
1.2 media-video/mplayer2/mplayer2-2.0.ebuild |
535 |
|
536 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild?rev=1.2&view=markup |
537 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild?rev=1.2&content-type=text/plain |
538 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild?r1=1.1&r2=1.2 |
539 |
|
540 |
Index: mplayer2-2.0.ebuild |
541 |
=================================================================== |
542 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v |
543 |
retrieving revision 1.1 |
544 |
retrieving revision 1.2 |
545 |
diff -u -r1.1 -r1.2 |
546 |
--- mplayer2-2.0.ebuild 28 Mar 2011 22:59:02 -0000 1.1 |
547 |
+++ mplayer2-2.0.ebuild 29 Mar 2011 12:44:12 -0000 1.2 |
548 |
@@ -1,26 +1,25 @@ |
549 |
# Copyright 1999-2011 Gentoo Foundation |
550 |
# Distributed under the terms of the GNU General Public License v2 |
551 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v 1.1 2011/03/28 22:59:02 lu_zero Exp $ |
552 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v 1.2 2011/03/29 12:44:12 scarabeus Exp $ |
553 |
|
554 |
EAPI=4 |
555 |
|
556 |
-[[ ${PV} = *9999* ]] && VCS_ECLASS="git" || VCS_ECLASS="" |
557 |
+EGIT_REPO_URI="git://git.mplayer2.org/mplayer2.git" |
558 |
+[[ ${PV} = *9999* ]] && VCS_ECLASS="git" |
559 |
|
560 |
inherit toolchain-funcs eutils flag-o-matic multilib base ${VCS_ECLASS} |
561 |
|
562 |
namesuf="${PN/mplayer/}" |
563 |
|
564 |
IUSE="3dnow 3dnowext +a52 aalib +alsa altivec aqua +ass bidi bindist bl bluray |
565 |
-bs2b +bzip2 cddb +cdio cdparanoia cpudetection custom-cpuopts custom-cflags debug dga +dirac |
566 |
+bs2b cddb +cdio cdparanoia cpudetection custom-cpuopts custom-cflags debug dga |
567 |
directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca esd +faad fbcon |
568 |
-ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa |
569 |
-libcaca lirc +live mad md5sum +mmx mmxext mng +mp3 mpg123 nas |
570 |
-+network nut amr +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime |
571 |
-radio +rar +real +rtc rtmp samba +shm +schroedinger +hardcoded-tables sdl +speex sse sse2 ssse3 |
572 |
-tga +theora threads +truetype +unicode v4l v4l2 vdpau |
573 |
-+vorbis vpx win32codecs +X xanim xinerama +xscreensaver +xv xvmc |
574 |
-" |
575 |
-IUSE+=" system-ffmpeg symlink" |
576 |
+ftp gif ggi +iconv ipv6 jack joystick jpeg kernel_linux ladspa |
577 |
+libcaca lirc +live mad md5sum +mmx mmxext mng mpg123 nas |
578 |
++network nut +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime |
579 |
+radio +rar +real +rtc samba +shm +symlink sdl +speex sse sse2 ssse3 |
580 |
+tga +theora +truetype +unicode v4l v4l2 vdpau |
581 |
++vorbis win32codecs +X xanim xinerama +xscreensaver +xv xvmc" |
582 |
|
583 |
VIDEO_CARDS="s3virge mga tdfx vesa" |
584 |
for x in ${VIDEO_CARDS}; do |
585 |
@@ -32,13 +31,8 @@ |
586 |
mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 |
587 |
mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 |
588 |
" |
589 |
-if [[ ${PV} == *9999* ]]; then |
590 |
- EGIT_REPO_URI="git://repo.or.cz/mplayer-build.git" |
591 |
- EGIT_PROJECT="${PN}-build" |
592 |
- RELEASE_URI="" |
593 |
-else |
594 |
- RELEASE_URI="http://ftp.mplayer2.org/pub/release/${PN}-build-${PV/_/-}.tar.xz" |
595 |
-fi |
596 |
+[[ ${PV} == *9999* ]] || \ |
597 |
+ RELEASE_URI="http://ftp.${PN}.org/pub/release/${P}.tar.xz" |
598 |
SRC_URI="${RELEASE_URI} |
599 |
!truetype? ( ${FONT_URI} ) |
600 |
" |
601 |
@@ -58,6 +52,7 @@ |
602 |
# Rar: althrought -gpl version is nice, it cant do most functions normal rars can |
603 |
# nemesi? ( net-libs/libnemesi ) |
604 |
RDEPEND+=" |
605 |
+ virtual/ffmpeg |
606 |
sys-libs/ncurses |
607 |
sys-libs/zlib |
608 |
!bindist? ( |
609 |
@@ -130,19 +125,6 @@ |
610 |
truetype? ( ${FONT_RDEPS} ) |
611 |
vorbis? ( media-libs/libvorbis ) |
612 |
xanim? ( media-video/xanim ) |
613 |
- system-ffmpeg? ( |
614 |
- >=media-video/ffmpeg-0.6_p25423[amr?,bzip2?,dirac?,gsm?,hardcoded-tables?,jpeg2k?,rtmp?,schroedinger?,threads?,vpx?] |
615 |
- ) |
616 |
- !system-ffmpeg? ( |
617 |
- amr? ( media-libs/opencore-amr ) |
618 |
- bzip2? ( app-arch/bzip2 ) |
619 |
- dirac? ( media-video/dirac ) |
620 |
- gsm? ( >=media-sound/gsm-1.0.12-r1 ) |
621 |
- jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) |
622 |
- rtmp? ( media-video/rtmpdump ) |
623 |
- schroedinger? ( media-libs/schroedinger ) |
624 |
- vpx? ( media-libs/libvpx ) |
625 |
- ) |
626 |
symlink? ( !media-video/mplayer ) |
627 |
" |
628 |
|
629 |
@@ -175,19 +157,11 @@ |
630 |
LICENSE="GPL-3" |
631 |
if [[ ${PV} != *9999* ]]; then |
632 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" |
633 |
- S="${WORKDIR}/${PN}-build-${PV}" |
634 |
else |
635 |
KEYWORDS="" |
636 |
fi |
637 |
|
638 |
-# bindist does not cope with amr codecs (#299405#c6), win32codecs are nonfree |
639 |
-# libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio |
640 |
-# dvd navigation requires dvd read support |
641 |
-# ass and freetype font require iconv and ass requires freetype fonts |
642 |
-# unicode transformations are usefull only with iconv |
643 |
-# libvorbis require external tremor to work |
644 |
-# radio requires oss or alsa backend |
645 |
-# xvmc requires xvideo support |
646 |
+# bindist does not cope with win32codecs, which are nonfree |
647 |
REQUIRED_USE="bindist? ( !win32codecs )" |
648 |
|
649 |
PATCHES=( |
650 |
@@ -231,45 +205,13 @@ |
651 |
ewarn "3dnowext mmx mmxext sse sse2 ssse3) are properly set." |
652 |
fi |
653 |
|
654 |
- if use system-ffmpeg; then |
655 |
- ewarn "System ffmpeg will be used. If you want ffmpeg-mt, disable" |
656 |
- ewarn "\"system-ffmpeg\" or use ffmpeg package with \"ffmpeg-mt\" enabled." |
657 |
- else |
658 |
- ewarn "Internal ffmpeg-mt will be used. If you don't want it, enable \"system-ffmpeg\"." |
659 |
- fi |
660 |
+ einfo "For various format support you need to enable the support on your ffmpeg package:" |
661 |
+ einfo " media-video/libav or media-video/ffmpeg" |
662 |
} |
663 |
|
664 |
src_unpack() { |
665 |
if [[ ${PV} = *9999* ]]; then |
666 |
git_src_unpack |
667 |
- |
668 |
- EGIT_REPO_URI="git://repo.or.cz/mplayer.git" |
669 |
- EGIT_PROJECT="${PN}" |
670 |
- S+="/mplayer" |
671 |
- git_fetch |
672 |
- S="${WORKDIR}/${P}" |
673 |
- |
674 |
- if ! use system-ffmpeg; then |
675 |
- EGIT_BRANCH="mt" |
676 |
- EGIT_COMMIT="mt" |
677 |
- S+="/ffmpeg-mt" |
678 |
- EGIT_REPO_URI="git://repo.or.cz/FFMpeg-mirror/mplayer-patches.git" |
679 |
- EGIT_PROJECT="${PN}-ffmpeg" |
680 |
- git_fetch |
681 |
- EGIT_BRANCH="master" |
682 |
- unset EGIT_COMMIT |
683 |
- |
684 |
- cd "${S}" |
685 |
- EGIT_REPO_URI="git://git.mplayerhq.hu/libswscale" |
686 |
- EGIT_PROJECT="libswscale" |
687 |
- EGIT_COMMIT="$(git submodule status -- libswscale|sed -e 's/^-\(.*\) .*/\1/')" |
688 |
- S+="/${EGIT_PROJECT}" |
689 |
- git_fetch |
690 |
- |
691 |
- S="${WORKDIR}/${P}" |
692 |
- fi |
693 |
- |
694 |
- cd "${WORKDIR}" |
695 |
else |
696 |
unpack ${A} |
697 |
fi |
698 |
@@ -285,40 +227,18 @@ |
699 |
if [[ ${PV} = *9999* ]]; then |
700 |
git_src_prepare |
701 |
# Set GIT version manually |
702 |
- pushd mplayer |
703 |
echo "GIT-r$(git rev-list HEAD|wc -l)-$(git describe --always)" \ |
704 |
> VERSION || die |
705 |
- popd |
706 |
- fi |
707 |
- |
708 |
- # remove internal libs and use system: |
709 |
- sed -e '/^mplayer: /s/libass//' \ |
710 |
- -i Makefile || die |
711 |
- rm -rf \ |
712 |
- libass \ |
713 |
- || die |
714 |
- |
715 |
- if use system-ffmpeg; then |
716 |
- sed -e '/^mplayer: /s/ffmpeg//' \ |
717 |
- -i Makefile || die |
718 |
- rm -rf ffmpeg-mt || die |
719 |
- else |
720 |
- sed -i \ |
721 |
- -e "/'--cpu=host',/d" \ |
722 |
- -e "/'--disable-debug',/d" \ |
723 |
- -e "/'--enable-pthreads',/d" \ |
724 |
- script/ffmpeg-config || die |
725 |
fi |
726 |
|
727 |
# fix path to bash executable in configure scripts |
728 |
- local bash_scripts="mplayer/configure mplayer/version.sh" |
729 |
- use system-ffmpeg || bash_scripts+=" ffmpeg*/configure ffmpeg*/version.sh" |
730 |
- sed -i -e "1c\#!${EPREFIX}/bin/bash" \ |
731 |
+ local bash_scripts="configure version.sh" |
732 |
+ sed -i \ |
733 |
+ -e "1c\#!${EPREFIX}/bin/bash" \ |
734 |
${bash_scripts} || die |
735 |
|
736 |
# We want mplayer${namesuf} |
737 |
- if [[ "${namesuf}" != "" ]]; then |
738 |
- pushd mplayer |
739 |
+ if [[ -n ${namesuf} ]]; then |
740 |
sed -e "/elif linux ; then/a\ _exesuf=\"${namesuf}\"" \ |
741 |
-i configure || die |
742 |
sed -e "/ -m 644 DOCS\/man\/en\/mplayer/i\ mv DOCS\/man\/en\/mplayer.1 DOCS\/man\/en\/mplayer${namesuf}.1" \ |
743 |
@@ -327,7 +247,6 @@ |
744 |
-i Makefile || die |
745 |
sed -e "s/mplayer/mplayer${namesuf}/" \ |
746 |
-i TOOLS/midentify.sh || die |
747 |
- popd |
748 |
fi |
749 |
|
750 |
base_src_prepare |
751 |
@@ -408,7 +327,6 @@ |
752 |
############# |
753 |
# Subtitles # |
754 |
############# |
755 |
- # |
756 |
# SRT/ASS/SSA (subtitles) requires freetype support |
757 |
# freetype support requires iconv |
758 |
# iconv optionally can use unicode |
759 |
@@ -462,12 +380,8 @@ |
760 |
# Codecs # |
761 |
########## |
762 |
myconf+=" --disable-musepack" # deprecated, libavcodec Musepack decoder is preferred |
763 |
+ myconf+=" --disable-mp3lib" # internal so disable |
764 |
use dts || myconf+=" --disable-libdca" |
765 |
- if ! use mp3; then |
766 |
- myconf+=" |
767 |
- --disable-mp3lib |
768 |
- " |
769 |
- fi |
770 |
uses="a52 bs2b dv vorbis" |
771 |
for i in ${uses}; do |
772 |
use ${i} || myconf+=" --disable-lib${i}" |
773 |
@@ -646,107 +560,18 @@ |
774 |
" |
775 |
fi |
776 |
|
777 |
- common_options=" |
778 |
- --cc=$(tc-getCC) |
779 |
- --host-cc=$(tc-getBUILD_CC) |
780 |
- " |
781 |
- myconf+=" |
782 |
- --prefix="${EPREFIX}"/usr |
783 |
- --bindir="${EPREFIX}"/usr/bin |
784 |
- --libdir="${EPREFIX}"/usr/$(get_libdir) |
785 |
- --confdir="${EPREFIX}"/etc/mplayer |
786 |
- --datadir="${EPREFIX}"/usr/share/mplayer${namesuf} |
787 |
- --mandir="${EPREFIX}"/usr/share/man |
788 |
- --localedir="${EPREFIX}"/usr/share/locale |
789 |
- --enable-translation |
790 |
- " |
791 |
- |
792 |
- echo "${common_options}" > common_options |
793 |
- echo "${myconf}" > mplayer_options |
794 |
- |
795 |
- if ! use system-ffmpeg; then |
796 |
- local ffconf=" |
797 |
- --enable-gpl |
798 |
- --enable-version3 |
799 |
- --enable-postproc |
800 |
- --disable-stripping |
801 |
- " |
802 |
- |
803 |
- # enabled by default |
804 |
- use debug || ffconf+=" --disable-debug" |
805 |
- use network || ffconf+=" --disable-network" |
806 |
- use bzip2 || ffconf+=" --disable-bzlib" |
807 |
- |
808 |
- use custom-cflags && ffconf+=" --disable-optimizations" |
809 |
- use cpudetection && ffconf+=" --enable-runtime-cpudetect" |
810 |
- |
811 |
- # Threads; we only support pthread for now but ffmpeg supports more |
812 |
- use threads || ffconf+=" --disable-pthreads" |
813 |
- |
814 |
- # ffmpeg encoders |
815 |
- for i in faac mp3lame theora vorbis x264 xvid; do |
816 |
- ffconf+=" --disable-lib${i}" |
817 |
- done |
818 |
- |
819 |
- # ffmpeg decoders |
820 |
- use amr && ffconf+=" --enable-libopencore-amrwb --enable-libopencore-amrnb" |
821 |
- for i in gsm dirac rtmp schroedinger speex vpx; do |
822 |
- use ${i} && ffconf+=" --enable-lib${i}" |
823 |
- done |
824 |
- use jpeg2k && ffconf+=" --enable-libopenjpeg" |
825 |
- |
826 |
- # CPU features |
827 |
- for i in mmx ssse3 altivec ; do |
828 |
- use ${i} || ffconf+=" --disable-${i}" |
829 |
- done |
830 |
- use mmxext || ffconf+=" --disable-mmx2" |
831 |
- use 3dnow || ffconf+=" --disable-amd3dnow" |
832 |
- use 3dnowext || ffconf+=" --disable-amd3dnowext" |
833 |
- # disable mmx accelerated code if PIC is required |
834 |
- # as the provided asm decidedly is not PIC. |
835 |
- if gcc-specs-pie ; then |
836 |
- ffconf+=" --disable-mmx --disable-mmx2" |
837 |
- fi |
838 |
- |
839 |
- # Try to get cpu type based on CFLAGS. |
840 |
- # Bug #172723 |
841 |
- # We need to do this so that features of that CPU will be better used |
842 |
- # If they contain an unknown CPU it will not hurt since ffmpeg's configure |
843 |
- # will just ignore it. |
844 |
- for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do |
845 |
- [ "${i}" = "native" ] && i="host" # bug #273421 |
846 |
- [[ ${i} = *-sse3 ]] && i="${i%-sse3}" # bug 283968 |
847 |
- ffconf+=" --cpu=${i}" |
848 |
- break |
849 |
- done |
850 |
- |
851 |
- # cross compile support |
852 |
- if tc-is-cross-compiler ; then |
853 |
- ffconf+=" --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}-" |
854 |
- case ${CHOST} in |
855 |
- *freebsd*) |
856 |
- ffconf+=" --target-os=freebsd" |
857 |
- ;; |
858 |
- mingw32*) |
859 |
- ffconf+=" --target-os=mingw32" |
860 |
- ;; |
861 |
- *linux*) |
862 |
- ffconf+=" --target-os=linux" |
863 |
- ;; |
864 |
- esac |
865 |
- fi |
866 |
- |
867 |
- # Misc stuff |
868 |
- use hardcoded-tables && ffconf+=" --enable-hardcoded-tables" |
869 |
- |
870 |
- echo "${ffconf}" > ffmpeg_options |
871 |
- fi |
872 |
- |
873 |
- sed -i \ |
874 |
- -e 's/\t//g' \ |
875 |
- -e 's/ --/\n--/g' \ |
876 |
- -e '/^$/d' \ |
877 |
- *_options || die |
878 |
+ ./configure \ |
879 |
+ --cc=$(tc-getCC) \ |
880 |
+ --host-cc=$(tc-getBUILD_CC) \ |
881 |
+ --prefix="${EPREFIX}"/usr \ |
882 |
+ --bindir="${EPREFIX}"/usr/bin \ |
883 |
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \ |
884 |
+ --confdir="${EPREFIX}"/etc/mplayer${namesuf} \ |
885 |
+ --datadir="${EPREFIX}"/usr/share/mplayer${namesuf} \ |
886 |
+ --mandir="${EPREFIX}"/usr/share/man \ |
887 |
+ --localedir="${EPREFIX}"/usr/share/locale \ |
888 |
+ --enable-translation \ |
889 |
+ ${myconf} || die |
890 |
} |
891 |
|
892 |
src_compile() { |
893 |
@@ -779,8 +604,6 @@ |
894 |
INSTALLSTRIP="" \ |
895 |
install |
896 |
|
897 |
- S+="/mplayer" |
898 |
- cd "${S}" |
899 |
dodoc AUTHORS Copyright README etc/codecs.conf |
900 |
|
901 |
docinto tech/ |
902 |
@@ -809,43 +632,39 @@ |
903 |
dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer${namesuf}/font |
904 |
fi |
905 |
|
906 |
- if use symlink; then |
907 |
- insinto /etc/mplayer |
908 |
- newins "${S}/etc/example.conf" mplayer.conf |
909 |
- doins "${S}/etc/input.conf" |
910 |
- if use osdmenu; then |
911 |
- doins "${S}/etc/menu.conf" |
912 |
- fi |
913 |
+ insinto /etc/mplayer${namesuf} |
914 |
+ newins "${S}/etc/example.conf" mplayer.conf |
915 |
+ cat >> "${ED}/etc/mplayer${namesuf}/mplayer.conf" << _EOF_ |
916 |
+# Config options can be section specific, global |
917 |
+# options should go in the default section |
918 |
+[default] |
919 |
+_EOF_ |
920 |
+ doins "${S}/etc/input.conf" |
921 |
+ if use osdmenu; then |
922 |
+ doins "${S}/etc/menu.conf" |
923 |
+ fi |
924 |
|
925 |
- if use ass || use truetype; then |
926 |
- cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_ |
927 |
+ if use ass || use truetype; then |
928 |
+ cat >> "${ED}/etc/mplayer${namesuf}/mplayer.conf" << _EOF_ |
929 |
fontconfig=1 |
930 |
subfont-osd-scale=4 |
931 |
subfont-text-scale=3 |
932 |
_EOF_ |
933 |
- fi |
934 |
+ fi |
935 |
|
936 |
- # bug 256203 |
937 |
- if use rar; then |
938 |
- cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_ |
939 |
+ # bug 256203 |
940 |
+ if use rar; then |
941 |
+ cat >> "${ED}/etc/mplayer${namesuf}/mplayer.conf" << _EOF_ |
942 |
unrarexec=${EPREFIX}/usr/bin/unrar |
943 |
_EOF_ |
944 |
- fi |
945 |
- |
946 |
- dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer${namesuf}/mplayer.conf |
947 |
fi |
948 |
+ dosym ../../../etc/mplayer${namesuf}/mplayer.conf /usr/share/mplayer${namesuf}/mplayer.conf |
949 |
|
950 |
newbin "${S}/TOOLS/midentify.sh" midentify${namesuf} |
951 |
|
952 |
- if [[ "${namesuf}" != "" ]] && use symlink; then |
953 |
+ if [[ -n ${namesuf} ]] && use symlink; then |
954 |
+ dosym /etc/mplayer${namesuf} /etc/mplayer |
955 |
dosym "mplayer${namesuf}" /usr/bin/mplayer |
956 |
dosym "midentify${namesuf}" /usr/bin/midentify |
957 |
fi |
958 |
} |
959 |
- |
960 |
-pkg_postrm() { |
961 |
- # Cleanup stale symlinks |
962 |
- [ -L "${EROOT}/usr/share/mplayer${namesuf}/font" -a \ |
963 |
- ! -e "${EROOT}/usr/share/mplayer${namesuf}/font" ] && \ |
964 |
- rm -f "${EROOT}/usr/share/mplayer${namesuf}/font" |
965 |
-} |