Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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/ffmpeg: ffmpeg-9999.ebuild metadata.xml ChangeLog
Date: Tue, 27 Sep 2011 18:15:04
Message-Id: 20110927181453.5F3AA20036@flycatcher.gentoo.org
1 aballier 11/09/27 18:14:53
2
3 Modified: ffmpeg-9999.ebuild metadata.xml ChangeLog
4 Log:
5 add libaacplus support
6
7 (Portage version: 2.2.0_alpha59/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.55 media-video/ffmpeg/ffmpeg-9999.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?rev=1.55&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?rev=1.55&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?r1=1.54&r2=1.55
15
16 Index: ffmpeg-9999.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v
19 retrieving revision 1.54
20 retrieving revision 1.55
21 diff -u -r1.54 -r1.55
22 --- ffmpeg-9999.ebuild 21 Sep 2011 15:21:46 -0000 1.54
23 +++ ffmpeg-9999.ebuild 27 Sep 2011 18:14:53 -0000 1.55
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2011 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.54 2011/09/21 15:21:46 aballier Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.55 2011/09/27 18:14:53 aballier Exp $
29
30 EAPI="4"
31
32 @@ -29,10 +29,10 @@
33 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
34 fi
35 IUSE="
36 - aac alsa amr bindist +bzip2 cdio celt cpudetection debug dirac doc +encode
37 - faac frei0r gsm +hardcoded-tables ieee1394 jack jpeg2k mp3 network openal
38 - oss pic qt-faststart rtmp schroedinger sdl speex static-libs test theora
39 - threads truetype v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib
40 + aac aacplus alsa amr bindist +bzip2 cdio celt cpudetection debug dirac doc
41 + +encode faac frei0r gsm +hardcoded-tables ieee1394 jack jpeg2k mp3 network
42 + openal oss pic qt-faststart rtmp schroedinger sdl speex static-libs test
43 + theora threads truetype v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib
44 "
45
46 # String for CPU features in the useflag[:configure_option] form
47 @@ -52,6 +52,7 @@
48 dirac? ( media-video/dirac )
49 encode? (
50 aac? ( media-libs/vo-aacenc )
51 + aacplus? ( media-libs/libaacplus )
52 amr? ( media-libs/vo-amrwbenc )
53 faac? ( media-libs/faac )
54 mp3? ( >=media-sound/lame-3.98.3 )
55 @@ -93,7 +94,7 @@
56 v4l2? ( sys-kernel/linux-headers )
57 "
58 # faac is license-incompatible with ffmpeg
59 -REQUIRED_USE="bindist? ( encode? ( !faac ) )"
60 +REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) )"
61
62 S=${WORKDIR}/${P/_/-}
63
64 @@ -126,6 +127,7 @@
65 for i in theora vorbis x264 xvid; do
66 use ${i} && myconf="${myconf} --enable-lib${i}"
67 done
68 + use aacplus && myconf="${myconf} --enable-libaacplus --enable-nonfree"
69 use faac && myconf="${myconf} --enable-libfaac --enable-nonfree"
70 else
71 myconf="${myconf} --disable-encoders"
72
73
74
75 1.31 media-video/ffmpeg/metadata.xml
76
77 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/metadata.xml?rev=1.31&view=markup
78 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/metadata.xml?rev=1.31&content-type=text/plain
79 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/metadata.xml?r1=1.30&r2=1.31
80
81 Index: metadata.xml
82 ===================================================================
83 RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/metadata.xml,v
84 retrieving revision 1.30
85 retrieving revision 1.31
86 diff -u -r1.30 -r1.31
87 --- metadata.xml 21 Sep 2011 15:21:46 -0000 1.30
88 +++ metadata.xml 27 Sep 2011 18:14:53 -0000 1.31
89 @@ -11,6 +11,7 @@
90 instruction set, present in modern AMD CPUs. (Check for
91 3dnowext in /proc/cpuinfo to know whether your CPU supports it).
92 </flag>
93 + <flag name="aacplus">AAC+ encoding via <pkg>media-libs/libaacplus</pkg>.</flag>
94 <flag name="amr">Enables Adaptive Multi-Rate Audio support</flag>
95 <flag name="avx">Adds support for Advanced Vector Extensions instructions (Intel Sandy Bridge, AMD Bulldozer and later chips)</flag>
96 <flag name="cdio">Enables audio CD grabbing with <pkg>dev-libs/libcdio</pkg>.</flag>
97
98
99
100 1.461 media-video/ffmpeg/ChangeLog
101
102 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.461&view=markup
103 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.461&content-type=text/plain
104 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.460&r2=1.461
105
106 Index: ChangeLog
107 ===================================================================
108 RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
109 retrieving revision 1.460
110 retrieving revision 1.461
111 diff -u -r1.460 -r1.461
112 --- ChangeLog 27 Sep 2011 15:34:16 -0000 1.460
113 +++ ChangeLog 27 Sep 2011 18:14:53 -0000 1.461
114 @@ -1,6 +1,10 @@
115 # ChangeLog for media-video/ffmpeg
116 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
117 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.460 2011/09/27 15:34:16 jer Exp $
118 +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.461 2011/09/27 18:14:53 aballier Exp $
119 +
120 + 27 Sep 2011; Alexis Ballier <aballier@g.o> ffmpeg-9999.ebuild,
121 + metadata.xml:
122 + add libaacplus support
123
124 27 Sep 2011; Jeroen Roovers <jer@g.o> ffmpeg-0.7.5.ebuild:
125 Stable for HPPA (bug #384095).
Report Message
Find on MARC Find on Google Groups