1 |
aballier 10/02/04 19:54:29 |
2 |
|
3 |
Modified: ChangeLog ffmpeg-9999-r1.ebuild |
4 |
ffmpeg-0.5_p21602.ebuild |
5 |
Log: |
6 |
Remove ipv6 useflag, it cannot be disabled separately anymore and is automatically enabled when available with USE=network, reported by marienz |
7 |
(Portage version: 2.2_rc62/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.343 media-video/ffmpeg/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.343&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.343&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.342&r2=1.343 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v |
19 |
retrieving revision 1.342 |
20 |
retrieving revision 1.343 |
21 |
diff -u -r1.342 -r1.343 |
22 |
--- ChangeLog 2 Feb 2010 08:37:00 -0000 1.342 |
23 |
+++ ChangeLog 4 Feb 2010 19:54:28 -0000 1.343 |
24 |
@@ -1,6 +1,11 @@ |
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.342 2010/02/02 08:37:00 aballier Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.343 2010/02/04 19:54:28 aballier Exp $ |
29 |
+ |
30 |
+ 04 Feb 2010; Alexis Ballier <aballier@g.o> |
31 |
+ ffmpeg-0.5_p21602.ebuild, ffmpeg-9999-r1.ebuild: |
32 |
+ Remove ipv6 useflag, it cannot be disabled separately anymore and is |
33 |
+ automatically enabled when available with USE=network, reported by marienz |
34 |
|
35 |
*ffmpeg-0.5_p21602 (02 Feb 2010) |
36 |
|
37 |
|
38 |
|
39 |
|
40 |
1.29 media-video/ffmpeg/ffmpeg-9999-r1.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.29&view=markup |
43 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.29&content-type=text/plain |
44 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?r1=1.28&r2=1.29 |
45 |
|
46 |
Index: ffmpeg-9999-r1.ebuild |
47 |
=================================================================== |
48 |
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v |
49 |
retrieving revision 1.28 |
50 |
retrieving revision 1.29 |
51 |
diff -u -r1.28 -r1.29 |
52 |
--- ffmpeg-9999-r1.ebuild 26 Jan 2010 15:56:13 -0000 1.28 |
53 |
+++ ffmpeg-9999-r1.ebuild 4 Feb 2010 19:54:28 -0000 1.29 |
54 |
@@ -1,6 +1,6 @@ |
55 |
# Copyright 1999-2010 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.28 2010/01/26 15:56:13 spatz Exp $ |
58 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.29 2010/02/04 19:54:28 aballier Exp $ |
59 |
|
60 |
EAPI=2 |
61 |
SCM="" |
62 |
@@ -26,7 +26,7 @@ |
63 |
SLOT="0" |
64 |
KEYWORDS="" |
65 |
IUSE="+3dnow +3dnowext alsa altivec cpudetection custom-cflags debug dirac |
66 |
- doc ieee1394 +encode faac faad gsm ipv6 jack +mmx +mmxext vorbis test |
67 |
+ doc ieee1394 +encode faac faad gsm jack +mmx +mmxext vorbis test |
68 |
theora threads x264 xvid network zlib sdl X mp3 opencore-amr |
69 |
oss pic schroedinger +hardcoded-tables bindist v4l v4l2 |
70 |
speex +ssse3 jpeg2k vdpau" |
71 |
@@ -87,12 +87,7 @@ |
72 |
use debug || myconf="${myconf} --disable-debug" |
73 |
use zlib || myconf="${myconf} --disable-zlib" |
74 |
use sdl || myconf="${myconf} --disable-ffplay" |
75 |
- |
76 |
- if use network; then |
77 |
- use ipv6 || myconf="${myconf} --disable-ipv6" |
78 |
- else |
79 |
- myconf="${myconf} --disable-network" |
80 |
- fi |
81 |
+ use network || myconf="${myconf} --disable-network" |
82 |
|
83 |
use custom-cflags && myconf="${myconf} --disable-optimizations" |
84 |
use cpudetection && myconf="${myconf} --enable-runtime-cpudetect" |
85 |
|
86 |
|
87 |
|
88 |
1.2 media-video/ffmpeg/ffmpeg-0.5_p21602.ebuild |
89 |
|
90 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p21602.ebuild?rev=1.2&view=markup |
91 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p21602.ebuild?rev=1.2&content-type=text/plain |
92 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p21602.ebuild?r1=1.1&r2=1.2 |
93 |
|
94 |
Index: ffmpeg-0.5_p21602.ebuild |
95 |
=================================================================== |
96 |
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p21602.ebuild,v |
97 |
retrieving revision 1.1 |
98 |
retrieving revision 1.2 |
99 |
diff -u -r1.1 -r1.2 |
100 |
--- ffmpeg-0.5_p21602.ebuild 2 Feb 2010 08:37:00 -0000 1.1 |
101 |
+++ ffmpeg-0.5_p21602.ebuild 4 Feb 2010 19:54:28 -0000 1.2 |
102 |
@@ -1,6 +1,6 @@ |
103 |
# Copyright 1999-2010 Gentoo Foundation |
104 |
# Distributed under the terms of the GNU General Public License v2 |
105 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p21602.ebuild,v 1.1 2010/02/02 08:37:00 aballier Exp $ |
106 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p21602.ebuild,v 1.2 2010/02/04 19:54:28 aballier Exp $ |
107 |
|
108 |
EAPI=2 |
109 |
SCM="" |
110 |
@@ -26,7 +26,7 @@ |
111 |
SLOT="0" |
112 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
113 |
IUSE="+3dnow +3dnowext alsa altivec cpudetection custom-cflags debug dirac |
114 |
- doc ieee1394 +encode faac faad gsm ipv6 jack +mmx +mmxext vorbis test |
115 |
+ doc ieee1394 +encode faac faad gsm jack +mmx +mmxext vorbis test |
116 |
theora threads x264 xvid network zlib sdl X mp3 opencore-amr |
117 |
oss pic schroedinger +hardcoded-tables bindist v4l v4l2 |
118 |
speex +ssse3 jpeg2k vdpau" |
119 |
@@ -87,12 +87,7 @@ |
120 |
use debug || myconf="${myconf} --disable-debug" |
121 |
use zlib || myconf="${myconf} --disable-zlib" |
122 |
use sdl || myconf="${myconf} --disable-ffplay" |
123 |
- |
124 |
- if use network; then |
125 |
- use ipv6 || myconf="${myconf} --disable-ipv6" |
126 |
- else |
127 |
- myconf="${myconf} --disable-network" |
128 |
- fi |
129 |
+ use network || myconf="${myconf} --disable-network" |
130 |
|
131 |
use custom-cflags && myconf="${myconf} --disable-optimizations" |
132 |
use cpudetection && myconf="${myconf} --enable-runtime-cpudetect" |