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

Gentoo Archives: gentoo-commits

From: "Dror Levin (spatz)" <spatz@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ChangeLog ffmpeg-9999-r1.ebuild ffmpeg-0.5_p20601-r1.ebuild
Date: Tue, 26 Jan 2010 15:00:49
Message-Id: E1NZmuI-0006yc-Ds@stork.gentoo.org
1 spatz 10/01/26 15:00:42
2
3 Modified: ChangeLog ffmpeg-9999-r1.ebuild
4 ffmpeg-0.5_p20601-r1.ebuild
5 Log:
6 Fix faac handling if USE=-encode, bug 300364.
7 (Portage version: 2.2_rc61/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.339 media-video/ffmpeg/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.339&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.339&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.338&r2=1.339
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
19 retrieving revision 1.338
20 retrieving revision 1.339
21 diff -u -r1.338 -r1.339
22 --- ChangeLog 24 Jan 2010 16:43:59 -0000 1.338
23 +++ ChangeLog 26 Jan 2010 15:00:41 -0000 1.339
24 @@ -1,6 +1,10 @@
25 # ChangeLog for media-video/ffmpeg
26 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.338 2010/01/24 16:43:59 klausman Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.339 2010/01/26 15:00:41 spatz Exp $
29 +
30 + 26 Jan 2010; Dror Levin <spatz@g.o> ffmpeg-0.5_p20601-r1.ebuild,
31 + ffmpeg-9999-r1.ebuild:
32 + Fix faac handling if USE=-encode, bug 300364.
33
34 24 Jan 2010; Tobias Klausmann <klausman@g.o>
35 ffmpeg-0.5_p20373.ebuild:
36
37
38
39 1.27 media-video/ffmpeg/ffmpeg-9999-r1.ebuild
40
41 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.27&view=markup
42 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.27&content-type=text/plain
43 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?r1=1.26&r2=1.27
44
45 Index: ffmpeg-9999-r1.ebuild
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v
48 retrieving revision 1.26
49 retrieving revision 1.27
50 diff -u -r1.26 -r1.27
51 --- ffmpeg-9999-r1.ebuild 19 Jan 2010 11:41:08 -0000 1.26
52 +++ ffmpeg-9999-r1.ebuild 26 Jan 2010 15:00:41 -0000 1.27
53 @@ -1,6 +1,6 @@
54 # Copyright 1999-2010 Gentoo Foundation
55 # Distributed under the terms of the GNU General Public License v2
56 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.26 2010/01/19 11:41:08 aballier Exp $
57 +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.27 2010/01/26 15:00:41 spatz Exp $
58
59 EAPI=2
60 SCM=""
61 @@ -105,6 +105,13 @@
62 use theora && myconf="${myconf} --enable-libtheora"
63 use x264 && myconf="${myconf} --enable-libx264"
64 use xvid && myconf="${myconf} --enable-libxvid"
65 + if use bindist
66 + then
67 + use faac && ewarn "faac is nonfree and cannot be distributed;
68 + disabling faac support."
69 + else
70 + use faac && myconf="${myconf} --enable-libfaac --enable-nonfree"
71 + fi
72 else
73 myconf="${myconf} --disable-encoders"
74 fi
75 @@ -136,14 +143,6 @@
76 # Crappy detection or our installation is weird, pick one (FIXME)
77 append-flags -I/usr/include/gsm
78 fi
79 - if use bindist
80 - then
81 - use faac && ewarn "faac is nonfree and cannot be distributed; disabling
82 - faac support."
83 - else
84 - use faac && myconf="${myconf} --enable-libfaac"
85 - { use faac ; } && myconf="${myconf} --enable-nonfree"
86 - fi
87
88 #for i in h264_vdpau mpeg1_vdpau mpeg_vdpau vc1_vdpau wmv3_vdpau; do
89 # use video_cards_nvidia || myconf="${myconf} --disable-decoder=$i"
90
91
92
93 1.3 media-video/ffmpeg/ffmpeg-0.5_p20601-r1.ebuild
94
95 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p20601-r1.ebuild?rev=1.3&view=markup
96 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p20601-r1.ebuild?rev=1.3&content-type=text/plain
97 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p20601-r1.ebuild?r1=1.2&r2=1.3
98
99 Index: ffmpeg-0.5_p20601-r1.ebuild
100 ===================================================================
101 RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p20601-r1.ebuild,v
102 retrieving revision 1.2
103 retrieving revision 1.3
104 diff -u -r1.2 -r1.3
105 --- ffmpeg-0.5_p20601-r1.ebuild 26 Nov 2009 04:55:11 -0000 1.2
106 +++ ffmpeg-0.5_p20601-r1.ebuild 26 Jan 2010 15:00:41 -0000 1.3
107 @@ -1,6 +1,6 @@
108 -# Copyright 1999-2009 Gentoo Foundation
109 +# Copyright 1999-2010 Gentoo Foundation
110 # Distributed under the terms of the GNU General Public License v2
111 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p20601-r1.ebuild,v 1.2 2009/11/26 04:55:11 beandog Exp $
112 +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p20601-r1.ebuild,v 1.3 2010/01/26 15:00:41 spatz Exp $
113
114 EAPI=2
115 SCM=""
116 @@ -109,6 +109,13 @@
117 use theora && myconf="${myconf} --enable-libtheora"
118 use x264 && myconf="${myconf} --enable-libx264"
119 use xvid && myconf="${myconf} --enable-libxvid"
120 + if use bindist
121 + then
122 + use faac && ewarn "faac is nonfree and cannot be distributed;
123 + disabling faac support."
124 + else
125 + use faac && myconf="${myconf} --enable-libfaac --enable-nonfree"
126 + fi
127 else
128 myconf="${myconf} --disable-encoders"
129 fi
130 @@ -140,14 +147,6 @@
131 # Crappy detection or our installation is weird, pick one (FIXME)
132 append-flags -I/usr/include/gsm
133 fi
134 - if use bindist
135 - then
136 - use faac && ewarn "faac is nonfree and cannot be distributed; disabling
137 - faac support."
138 - else
139 - use faac && myconf="${myconf} --enable-libfaac"
140 - { use faac ; } && myconf="${myconf} --enable-nonfree"
141 - fi
142
143 #for i in h264_vdpau mpeg1_vdpau mpeg_vdpau vc1_vdpau wmv3_vdpau; do
144 # use video_cards_nvidia || myconf="${myconf} --disable-decoder=$i"
Report Message
Find on MARC Find on Google Groups