[gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ffmpeg-0.5_p20373.ebuild ChangeLog ffmpeg-0.5_p22846.ebuild

[gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ffmpeg-0.5_p20373.ebuild ChangeLog ffmpeg-0.5_p22846.ebuild

[Alexis Ballier (aballier)]

aballier    10/05/11 09:50:42

  Modified:             ffmpeg-0.5_p20373.ebuild ChangeLog
                        ffmpeg-0.5_p22846.ebuild
  Log:
  force disabling vaapi to avoid automagics on unmasked versions, bug #308857
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.13                 media-video/ffmpeg/ffmpeg-0.5_p20373.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p20373.ebuild?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p20373.ebuild?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p20373.ebuild?r1=1.12&r2=1.13

Index: ffmpeg-0.5_p20373.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p20373.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ffmpeg-0.5_p20373.ebuild	23 Apr 2010 12:53:48 -0000	1.12
+++ ffmpeg-0.5_p20373.ebuild	11 May 2010 09:50:42 -0000	1.13
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p20373.ebuild,v 1.12 2010/04/23 12:53:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p20373.ebuild,v 1.13 2010/05/11 09:50:42 aballier Exp $
 
 EAPI=2
 SCM=""
@@ -153,6 +153,7 @@
 	#done
 	use video_cards_nvidia || myconf="${myconf} --disable-vdpau"
 	use vdpau || myconf="${myconf} --disable-vdpau"
+	myconf="${myconf} --disable-vaapi"
 
 	# CPU features
 	for i in mmx ssse3 altivec ; do



1.350                media-video/ffmpeg/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.350&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.350&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.349&r2=1.350

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
retrieving revision 1.349
retrieving revision 1.350
diff -u -r1.349 -r1.350
--- ChangeLog	11 May 2010 09:37:34 -0000	1.349
+++ ChangeLog	11 May 2010 09:50:42 -0000	1.350
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.349 2010/05/11 09:37:34 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.350 2010/05/11 09:50:42 aballier Exp $
+
+  11 May 2010; Alexis Ballier <aballier@gentoo.org>
+  ffmpeg-0.5_p20373.ebuild, ffmpeg-0.5_p22846.ebuild:
+  force disabling vaapi to avoid automagics on unmasked versions, bug
+  #308857
 
   11 May 2010; Alexis Ballier <aballier@gentoo.org>
   -ffmpeg-0.5_p20601-r1.ebuild, -ffmpeg-0.5_p21602.ebuild,



1.3                  media-video/ffmpeg/ffmpeg-0.5_p22846.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p22846.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p22846.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p22846.ebuild?r1=1.2&r2=1.3

Index: ffmpeg-0.5_p22846.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p22846.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ffmpeg-0.5_p22846.ebuild	23 Apr 2010 12:53:48 -0000	1.2
+++ ffmpeg-0.5_p22846.ebuild	11 May 2010 09:50:42 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p22846.ebuild,v 1.2 2010/04/23 12:53:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p22846.ebuild,v 1.3 2010/05/11 09:50:42 aballier Exp $
 
 EAPI=2
 SCM=""
@@ -142,6 +142,7 @@
 	#done
 	use video_cards_nvidia || myconf="${myconf} --disable-vdpau"
 	use vdpau || myconf="${myconf} --disable-vdpau"
+	myconf="${myconf} --disable-vaapi"
 
 	# CPU features
 	for i in mmx ssse3 altivec ; do