force disabling vaapi to avoid automagics on unmasked versions, bug #308857

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index c49b8a42d14bc89f371035d79da27519f8790132..0b833f1a82dde9019a48385f2f3fdae5a3eb776d 100644 (file)
--- 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/Manifest b/media-video/ffmpeg/Manifest
index 68e4a68e980eeaa668604ae6490ab3e519dd57b0..3ce5e22d4419ebecd103a6925b24908da2218ded 100644 (file)
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -3,15 +3,15 @@ Hash: SHA1
 
 DIST ffmpeg-0.5_p20373.tar.bz2 3087600 RMD160 6a960e0837f419c882c7bd18c91f582df0e19c58 SHA1 ddf5d0389586d8ceb2979e0804a7b80a9640aad4 SHA256 2a217144c82f11c80f325c653157bd9fc5424dc43a2b2ccbc8eb03a01d33418d
 DIST ffmpeg-0.5_p22846.tar.bz2 3675057 RMD160 3ebd997321d59fa0baf87329518e925ccbed3cf8 SHA1 d207570ed009b63c94485ccc64439107cf700f39 SHA256 a52d82476afa7c8ed62c1a52760e49907947c1ef1ecfc3e9022fa713e9783f2f
-EBUILD ffmpeg-0.5_p20373.ebuild 7726 RMD160 6a30c400850e5db57fbae395cbf29daee2067aab SHA1 aff753318e267974fd6516f056352bc769329add SHA256 1f08d25a8b1e5bc708437218e6e8c05c7579ba6945e2d8ab8561a733e23d413c
-EBUILD ffmpeg-0.5_p22846.ebuild 7573 RMD160 dbdc2b63a8287360634a6693439dc01b35633038 SHA1 bb83bb3e68c3909d39b66d5893f51fff598976b2 SHA256 a33b9ee276d213d70a4f120f428c480222f53be89a61b7c5a81c5c74907db57e
+EBUILD ffmpeg-0.5_p20373.ebuild 7761 RMD160 872bb18a1eabab4c81cea1d4cf4f1283b14f4c34 SHA1 270130d83e1a5230102e2add113b9f3bbfe7a564 SHA256 81f73aa9857663d18734f0881bd5d8b648f9228dcec10a2dfb08bef262a1c1e9
+EBUILD ffmpeg-0.5_p22846.ebuild 7608 RMD160 d4a4c505829c6fd6c93e1e6ec465028a0997989e SHA1 46e7764045594b636d0eb6179f464e3f378b4895 SHA256 227cbee58e559eab07d0d97dbccbd2212b56be6c60cc7a57436894ac3b10e63d
 EBUILD ffmpeg-9999-r1.ebuild 7506 RMD160 a972af9e4ebbefeea08aea2e848109377d233b75 SHA1 06307a2df84a8c540c7cafcf8f9c6ce8794feecb SHA256 55404f8df8fa5c5c43394cb660d6cc9f297d13e65ec4892609880adefa8ce1cd
-MISC ChangeLog 52377 RMD160 a8032405df9c85c13cc5f6fa14c09a0e126f9b04 SHA1 bc92b718f62f3515f571fb1fcf04141a538b485d SHA256 e36f9126c57234317ba2e5747f6172efe0901249399da393862f3393fa629fa4
+MISC ChangeLog 52564 RMD160 75305e54d56336fabe457a42223e75f7731a3783 SHA1 131f090e35cedae5ce0f37053b6b80095929adf5 SHA256 839ee39238e916769782a7510d0a71fe578cc8e599bd397f2002c2b425ff168c
 MISC metadata.xml 1742 RMD160 9471b0e1a844b21af5a875e2618847aeaaea126f SHA1 0f574b277a0d395e15c59ea406d1a75685687c42 SHA256 55112c676590fe2edb972c39407bac9de0ffbf940f1ed281493a7dd6f71bbeff
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvpJWQACgkQvFcC4BYPU0qO3QCglq6lmv8TLEksifnR47KJEG+M
-3CoAnA0VkjBS7d+pBk2BUpDv3zz54BUs
-=Y4/s
+iEYEARECAAYFAkvpKHcACgkQvFcC4BYPU0qI1ACgxtFKoQJg+15S1s+vUcj2KNql
+8o0AoKoVozHBvpQOLq1y6wFjH9jRgkmE
+=Wj+J
 -----END PGP SIGNATURE-----

diff --git a/media-video/ffmpeg/ffmpeg-0.5_p20373.ebuild b/media-video/ffmpeg/ffmpeg-0.5_p20373.ebuild
index a282ab4424e06544180a8c967c3dc9b57a1fe5b3..7b047639ad53802934d320acb9fa630976fb2244 100644 (file)
--- 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 2b377327450fc269f5eca62db19196dd47282d6b..6b88b6a500753bc483f9dd054d9a8b95ae74d914 100644 (file)
--- 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