diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2010-05-11 09:50:42 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2010-05-11 09:50:42 +0000 |
| commit | 3bef5c881021037a79863819c704c9a41e8dbe93 (patch) | |
| tree | 708036b2559a1aa1770d219594ecc2492670dcc1 /media-video | |
| parent | clean up (diff) | |
| download | gentoo-2-3bef5c881021037a79863819c704c9a41e8dbe93.tar.gz gentoo-2-3bef5c881021037a79863819c704c9a41e8dbe93.tar.bz2 gentoo-2-3bef5c881021037a79863819c704c9a41e8dbe93.zip | |
force disabling vaapi to avoid automagics on unmasked versions, bug #308857
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/ffmpeg/ChangeLog | 7 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-0.5_p20373.ebuild | 3 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-0.5_p22846.ebuild | 3 |
3 files changed, 10 insertions, 3 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index c49b8a42d14b..0b833f1a82dd 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -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, diff --git a/media-video/ffmpeg/ffmpeg-0.5_p20373.ebuild b/media-video/ffmpeg/ffmpeg-0.5_p20373.ebuild index a282ab4424e0..7b047639ad53 100644 --- a/media-video/ffmpeg/ffmpeg-0.5_p20373.ebuild +++ b/media-video/ffmpeg/ffmpeg-0.5_p20373.ebuild @@ -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 @@ src_configure() { #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 diff --git a/media-video/ffmpeg/ffmpeg-0.5_p22846.ebuild b/media-video/ffmpeg/ffmpeg-0.5_p22846.ebuild index 2b377327450f..6b88b6a50075 100644 --- a/media-video/ffmpeg/ffmpeg-0.5_p22846.ebuild +++ b/media-video/ffmpeg/ffmpeg-0.5_p22846.ebuild @@ -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 @@ src_configure() { #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 |