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/mplayer: ChangeLog mplayer-9999.ebuild
Date: Sat, 24 Apr 2010 13:24:41
Message-Id: 20100424132433.083F12C04C@corvid.gentoo.org
1 aballier 10/04/24 13:24:32
2
3 Modified: ChangeLog mplayer-9999.ebuild
4 Log:
5 remove aac useflag: let faad and faac useflags handle it; otherwise there is support in ffmpeg; always use system libfaad
6 (Portage version: 2.2_rc67/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.727 media-video/mplayer/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.727&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.727&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.726&r2=1.727
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
18 retrieving revision 1.726
19 retrieving revision 1.727
20 diff -u -r1.726 -r1.727
21 --- ChangeLog 24 Apr 2010 13:03:41 -0000 1.726
22 +++ ChangeLog 24 Apr 2010 13:24:32 -0000 1.727
23 @@ -1,6 +1,10 @@
24 # ChangeLog for media-video/mplayer
25 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.726 2010/04/24 13:03:41 aballier Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.727 2010/04/24 13:24:32 aballier Exp $
28 +
29 + 24 Apr 2010; Alexis Ballier <aballier@g.o> mplayer-9999.ebuild:
30 + remove aac useflag: let faad and faac useflags handle it; otherwise there
31 + is support in ffmpeg; always use system libfaad
32
33 24 Apr 2010; Alexis Ballier <aballier@g.o> mplayer-9999.ebuild:
34 Disable opencore-amr support with bindist, Apache-2.0 vs GPL-2 issues,
35
36
37
38 1.44 media-video/mplayer/mplayer-9999.ebuild
39
40 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.44&view=markup
41 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.44&content-type=text/plain
42 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.43&r2=1.44
43
44 Index: mplayer-9999.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
47 retrieving revision 1.43
48 retrieving revision 1.44
49 diff -u -r1.43 -r1.44
50 --- mplayer-9999.ebuild 24 Apr 2010 13:07:53 -0000 1.43
51 +++ mplayer-9999.ebuild 24 Apr 2010 13:24:32 -0000 1.44
52 @@ -1,6 +1,6 @@
53 # Copyright 1999-2010 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.43 2010/04/24 13:07:53 aballier Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.44 2010/04/24 13:24:32 aballier Exp $
57
58 EAPI="2"
59
60 @@ -11,7 +11,7 @@
61
62 [[ ${PV} != *9999* ]] && MPLAYER_REVISION=SVN-r30554
63
64 -IUSE="3dnow 3dnowext +a52 +aac aalib +alsa altivec +ass bidi bindist bl bs2b
65 +IUSE="3dnow 3dnowext +a52 aalib +alsa altivec +ass bidi bindist bl bs2b
66 +cddb +cdio cdparanoia cpudetection custom-cpuopts debug dga +dirac directfb
67 doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +encode esd +faac +faad fbcon ftp
68 gif ggi -gmplayer +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
69 @@ -112,7 +112,7 @@
70 )
71 esd? ( media-sound/esound )
72 enca? ( app-i18n/enca )
73 - faad? ( !aac? ( media-libs/faad2 ) )
74 + faad? ( media-libs/faad2 )
75 gif? ( media-libs/giflib )
76 jack? ( media-sound/jack-audio-connection-kit )
77 jpeg? ( media-libs/jpeg )
78 @@ -403,7 +403,7 @@
79 # Use internal musepack codecs for SV7 and SV8 support
80 myconf+=" --disable-musepack"
81
82 - use aac || myconf+=" --disable-faad-internal"
83 + myconf+=" --disable-faad-internal" # always use system media-libs/faad2
84 use dirac || myconf+=" --disable-libdirac-lavc"
85 use dts || myconf+=" --disable-libdca"
86 use dv || myconf+=" --disable-libdv"
87 @@ -446,7 +446,7 @@
88 for i in ${uses}; do
89 use ${i} || myconf+=" --disable-${i}"
90 done
91 - use aac || myconf+=" --disable-faac-lavc"
92 + use faac || myconf+=" --disable-faac-lavc"
93 else
94 myconf+="
95 --disable-faac-lavc
96 @@ -458,7 +458,7 @@
97 --disable-twolame
98 --disable-toolame
99 "
100 - uses="aac faac x264 xvid toolame twolame"
101 + uses="faac x264 xvid toolame twolame"
102 for i in ${uses}; do
103 use ${i} && elog "Useflag \"${i}\" require \"encode\" useflag enabled to work."
104 done