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-0.5_p20373.ebuild ChangeLog ffmpeg-0.5_p22846.ebuild
Date: Tue, 11 May 2010 09:50:48
Message-Id: 20100511095042.64C802C4F8@corvid.gentoo.org
1 aballier 10/05/11 09:50:42
2
3 Modified: ffmpeg-0.5_p20373.ebuild ChangeLog
4 ffmpeg-0.5_p22846.ebuild
5 Log:
6 force disabling vaapi to avoid automagics on unmasked versions, bug #308857
7 (Portage version: 2.2_rc67/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.13 media-video/ffmpeg/ffmpeg-0.5_p20373.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p20373.ebuild?rev=1.13&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p20373.ebuild?rev=1.13&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p20373.ebuild?r1=1.12&r2=1.13
15
16 Index: ffmpeg-0.5_p20373.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p20373.ebuild,v
19 retrieving revision 1.12
20 retrieving revision 1.13
21 diff -u -r1.12 -r1.13
22 --- ffmpeg-0.5_p20373.ebuild 23 Apr 2010 12:53:48 -0000 1.12
23 +++ ffmpeg-0.5_p20373.ebuild 11 May 2010 09:50:42 -0000 1.13
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2010 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p20373.ebuild,v 1.12 2010/04/23 12:53:48 ssuominen Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p20373.ebuild,v 1.13 2010/05/11 09:50:42 aballier Exp $
29
30 EAPI=2
31 SCM=""
32 @@ -153,6 +153,7 @@
33 #done
34 use video_cards_nvidia || myconf="${myconf} --disable-vdpau"
35 use vdpau || myconf="${myconf} --disable-vdpau"
36 + myconf="${myconf} --disable-vaapi"
37
38 # CPU features
39 for i in mmx ssse3 altivec ; do
40
41
42
43 1.350 media-video/ffmpeg/ChangeLog
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.350&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.350&content-type=text/plain
47 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.349&r2=1.350
48
49 Index: ChangeLog
50 ===================================================================
51 RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
52 retrieving revision 1.349
53 retrieving revision 1.350
54 diff -u -r1.349 -r1.350
55 --- ChangeLog 11 May 2010 09:37:34 -0000 1.349
56 +++ ChangeLog 11 May 2010 09:50:42 -0000 1.350
57 @@ -1,6 +1,11 @@
58 # ChangeLog for media-video/ffmpeg
59 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
60 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.349 2010/05/11 09:37:34 aballier Exp $
61 +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.350 2010/05/11 09:50:42 aballier Exp $
62 +
63 + 11 May 2010; Alexis Ballier <aballier@g.o>
64 + ffmpeg-0.5_p20373.ebuild, ffmpeg-0.5_p22846.ebuild:
65 + force disabling vaapi to avoid automagics on unmasked versions, bug
66 + #308857
67
68 11 May 2010; Alexis Ballier <aballier@g.o>
69 -ffmpeg-0.5_p20601-r1.ebuild, -ffmpeg-0.5_p21602.ebuild,
70
71
72
73 1.3 media-video/ffmpeg/ffmpeg-0.5_p22846.ebuild
74
75 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p22846.ebuild?rev=1.3&view=markup
76 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p22846.ebuild?rev=1.3&content-type=text/plain
77 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p22846.ebuild?r1=1.2&r2=1.3
78
79 Index: ffmpeg-0.5_p22846.ebuild
80 ===================================================================
81 RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p22846.ebuild,v
82 retrieving revision 1.2
83 retrieving revision 1.3
84 diff -u -r1.2 -r1.3
85 --- ffmpeg-0.5_p22846.ebuild 23 Apr 2010 12:53:48 -0000 1.2
86 +++ ffmpeg-0.5_p22846.ebuild 11 May 2010 09:50:42 -0000 1.3
87 @@ -1,6 +1,6 @@
88 # Copyright 1999-2010 Gentoo Foundation
89 # Distributed under the terms of the GNU General Public License v2
90 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p22846.ebuild,v 1.2 2010/04/23 12:53:48 ssuominen Exp $
91 +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p22846.ebuild,v 1.3 2010/05/11 09:50:42 aballier Exp $
92
93 EAPI=2
94 SCM=""
95 @@ -142,6 +142,7 @@
96 #done
97 use video_cards_nvidia || myconf="${myconf} --disable-vdpau"
98 use vdpau || myconf="${myconf} --disable-vdpau"
99 + myconf="${myconf} --disable-vaapi"
100
101 # CPU features
102 for i in mmx ssse3 altivec ; do