1 |
ssuominen 09/10/26 23:36:37 |
2 |
|
3 |
Modified: ChangeLog ffmpeg-0.5_p19928.ebuild |
4 |
Log: |
5 |
Fix x264 dep for old snapshot. |
6 |
(Portage version: 2.2_rc46/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.323 media-video/ffmpeg/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.323&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.323&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.322&r2=1.323 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v |
18 |
retrieving revision 1.322 |
19 |
retrieving revision 1.323 |
20 |
diff -u -r1.322 -r1.323 |
21 |
--- ChangeLog 26 Oct 2009 12:04:29 -0000 1.322 |
22 |
+++ ChangeLog 26 Oct 2009 23:36:36 -0000 1.323 |
23 |
@@ -1,6 +1,6 @@ |
24 |
# ChangeLog for media-video/ffmpeg |
25 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.322 2009/10/26 12:04:29 aballier Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.323 2009/10/26 23:36:36 ssuominen Exp $ |
28 |
|
29 |
*ffmpeg-0.5_p20373 (26 Oct 2009) |
30 |
|
31 |
@@ -11,7 +11,8 @@ |
32 |
22 Oct 2009; Alexis Ballier <aballier@g.o> ffmpeg-9999-r1.ebuild: |
33 |
bump deps on x264 |
34 |
|
35 |
- 22 Oct 2009; Samuli Suominen <ssuominen@g.o> ffmpeg-0.5-r1.ebuild: |
36 |
+ 22 Oct 2009; Samuli Suominen <ssuominen@g.o> ffmpeg-0.5-r1.ebuild, |
37 |
+ ffmpeg-0.5_p19928.ebuild: |
38 |
Fix media-libs/x264 depend wrt #290080, thanks to Diego E. 'Flameeyes' |
39 |
Pettenò for reporting. |
40 |
|
41 |
|
42 |
|
43 |
|
44 |
1.5 media-video/ffmpeg/ffmpeg-0.5_p19928.ebuild |
45 |
|
46 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p19928.ebuild?rev=1.5&view=markup |
47 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p19928.ebuild?rev=1.5&content-type=text/plain |
48 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p19928.ebuild?r1=1.4&r2=1.5 |
49 |
|
50 |
Index: ffmpeg-0.5_p19928.ebuild |
51 |
=================================================================== |
52 |
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p19928.ebuild,v |
53 |
retrieving revision 1.4 |
54 |
retrieving revision 1.5 |
55 |
diff -u -r1.4 -r1.5 |
56 |
--- ffmpeg-0.5_p19928.ebuild 26 Sep 2009 21:52:02 -0000 1.4 |
57 |
+++ ffmpeg-0.5_p19928.ebuild 26 Oct 2009 23:36:36 -0000 1.5 |
58 |
@@ -1,6 +1,6 @@ |
59 |
# Copyright 1999-2009 Gentoo Foundation |
60 |
# Distributed under the terms of the GNU General Public License v2 |
61 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p19928.ebuild,v 1.4 2009/09/26 21:52:02 volkmar Exp $ |
62 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p19928.ebuild,v 1.5 2009/10/26 23:36:36 ssuominen Exp $ |
63 |
|
64 |
EAPI=2 |
65 |
SCM="" |
66 |
@@ -44,7 +44,7 @@ |
67 |
mp3? ( media-sound/lame ) |
68 |
vorbis? ( media-libs/libvorbis media-libs/libogg ) |
69 |
theora? ( media-libs/libtheora[encode] media-libs/libogg ) |
70 |
- x264? ( >=media-libs/x264-0.0.20081006 ) |
71 |
+ x264? ( >=media-libs/x264-0.0.20081006 <media-libs/x264-0.0.20090923 ) |
72 |
xvid? ( >=media-libs/xvid-1.1.0 ) ) |
73 |
faad? ( >=media-libs/faad2-2.6.1 ) |
74 |
zlib? ( sys-libs/zlib ) |