1 |
aballier 10/04/23 12:49:28 |
2 |
|
3 |
Modified: ChangeLog ffmpeg-9999-r1.ebuild |
4 |
Log: |
5 |
rename opencore-amr useflag to amr, we should get rid of the old non free one |
6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.347 media-video/ffmpeg/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.347&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.347&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.346&r2=1.347 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v |
18 |
retrieving revision 1.346 |
19 |
retrieving revision 1.347 |
20 |
diff -u -r1.346 -r1.347 |
21 |
--- ChangeLog 12 Apr 2010 09:42:02 -0000 1.346 |
22 |
+++ ChangeLog 23 Apr 2010 12:49:27 -0000 1.347 |
23 |
@@ -1,6 +1,10 @@ |
24 |
# ChangeLog for media-video/ffmpeg |
25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.346 2010/04/12 09:42:02 aballier Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.347 2010/04/23 12:49:27 aballier Exp $ |
28 |
+ |
29 |
+ 23 Apr 2010; Alexis Ballier <aballier@g.o> ffmpeg-9999-r1.ebuild: |
30 |
+ rename opencore-amr useflag to amr, we should get rid of the old non free |
31 |
+ one |
32 |
|
33 |
*ffmpeg-0.5_p22846 (12 Apr 2010) |
34 |
|
35 |
|
36 |
|
37 |
|
38 |
1.32 media-video/ffmpeg/ffmpeg-9999-r1.ebuild |
39 |
|
40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.32&view=markup |
41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.32&content-type=text/plain |
42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?r1=1.31&r2=1.32 |
43 |
|
44 |
Index: ffmpeg-9999-r1.ebuild |
45 |
=================================================================== |
46 |
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v |
47 |
retrieving revision 1.31 |
48 |
retrieving revision 1.32 |
49 |
diff -u -r1.31 -r1.32 |
50 |
--- ffmpeg-9999-r1.ebuild 13 Mar 2010 14:33:52 -0000 1.31 |
51 |
+++ ffmpeg-9999-r1.ebuild 23 Apr 2010 12:49:27 -0000 1.32 |
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/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.31 2010/03/13 14:33:52 lu_zero Exp $ |
56 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.32 2010/04/23 12:49:27 aballier Exp $ |
57 |
|
58 |
EAPI=2 |
59 |
SCM="" |
60 |
@@ -27,7 +27,7 @@ |
61 |
KEYWORDS="" |
62 |
IUSE="+3dnow +3dnowext alsa altivec cpudetection custom-cflags debug dirac |
63 |
doc ieee1394 +encode faac faad gsm jack +mmx +mmxext vorbis test |
64 |
- theora threads x264 xvid network zlib sdl X mp3 opencore-amr |
65 |
+ theora threads x264 xvid network zlib sdl X mp3 amr |
66 |
oss pic schroedinger +hardcoded-tables bindist v4l v4l2 |
67 |
speex +ssse3 jpeg2k vdpau" |
68 |
|
69 |
@@ -53,7 +53,7 @@ |
70 |
dirac? ( media-video/dirac ) |
71 |
gsm? ( >=media-sound/gsm-1.0.12-r1 ) |
72 |
jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) |
73 |
- opencore-amr? ( media-libs/opencore-amr ) |
74 |
+ amr? ( media-libs/opencore-amr ) |
75 |
schroedinger? ( media-libs/schroedinger ) |
76 |
speex? ( >=media-libs/speex-1.2_beta3 ) |
77 |
jack? ( media-sound/jack-audio-connection-kit ) |
78 |
@@ -129,7 +129,7 @@ |
79 |
use threads && myconf="${myconf} --enable-pthreads" |
80 |
|
81 |
# Decoders |
82 |
- use opencore-amr && myconf="${myconf} --enable-libopencore-amrwb |
83 |
+ use amr && myconf="${myconf} --enable-libopencore-amrwb |
84 |
--enable-libopencore-amrnb" |
85 |
for i in gsm faad dirac schroedinger speex; do |
86 |
use $i && myconf="${myconf} --enable-lib$i" |