summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-07-09 14:41:18 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-07-09 14:41:18 +0000
commit1ea072e8eeb48ac6976ee1ad64053e3293e0c048 (patch)
tree04974623399df964682915608ffcfe0a70532e96 /media-video/ffmpeg
parentstable x86, bug 277194 (diff)
downloadhistorical-1ea072e8eeb48ac6976ee1ad64053e3293e0c048.tar.gz
historical-1ea072e8eeb48ac6976ee1ad64053e3293e0c048.tar.bz2
historical-1ea072e8eeb48ac6976ee1ad64053e3293e0c048.zip
Fail. It seems that trunk has --disable-vdpau generic configure option now, so yet again, commit last change differently.
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'media-video/ffmpeg')
-rw-r--r--media-video/ffmpeg/Manifest2
-rw-r--r--media-video/ffmpeg/ffmpeg-9999-r1.ebuild12
2 files changed, 8 insertions, 6 deletions
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index e2fa17abaf8a..d17972394e4f 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -2,6 +2,6 @@ DIST ffmpeg-0.4.9-p20090201.tar.bz2 2697161 RMD160 8cd01f4d6b6adc772d836de592dce
DIST ffmpeg-0.5.tar.bz2 2744768 RMD160 23b4a591c422f98b634eba0ba82817ad27a4ff07 SHA1 f930971bc0ac3d11a4ffbb1af439425c24f6f5b1 SHA256 16de61d7426b1df7aee54b48c16aa728de1ed82f95db5fc4d8886d5d2702d90a
EBUILD ffmpeg-0.4.9_p20090201.ebuild 6278 RMD160 8c239d62af63bc5f04d3535d4773027335c10c4c SHA1 07abf1371986258b9557d3a4f3739ba57f0490b7 SHA256 58ee0192b3395c13ae25ffe8c5396ad4314c4dfc2199cc53fb083513992e1a99
EBUILD ffmpeg-0.5-r1.ebuild 6549 RMD160 7d3dc6f710b1944022c6a607737ea8be4e0b7385 SHA1 23b88211d4e61f9b49c7b8a3a1f85ed1616cf1b8 SHA256 83d0453256174cd98f8d7fbc0c8fca48f1b0ddd681e5345a796af1c0350668d9
-EBUILD ffmpeg-9999-r1.ebuild 6476 RMD160 d1f1d34b98e3d1fccda6c2a3b222add4f5ba5f8e SHA1 210ddffbfb4b6355c8792341b7162484a45a080c SHA256 08ed2a3ae9b84cafd62292774a87b24abb75735c2c9027a2efe592008cfb7461
+EBUILD ffmpeg-9999-r1.ebuild 6591 RMD160 14fd997f3392779cdc62bf20d3eeae1712d9e662 SHA1 1537621055e9625544c52cfca51eb25c72888521 SHA256 6b65900160cb7b7a0fef5f84cdaf091464fe1a176634d54f29cc4831e0b91423
MISC ChangeLog 45845 RMD160 f6c3d8e8af2ed6a420323188b9312a92c5a0b0df SHA1 06f438c54c00ca2e7a928a86c5a84d5107fa6bde SHA256 968291c2b8d77946e7df50fc4c72c158c36fe4f5292ffd1cf78fd797a56e9fe7
MISC metadata.xml 1917 RMD160 7e8a17dac9e2f84b7d6f1847a143cbaabd356f03 SHA1 558ae5ec3ef20f719746528d14c3d5c69e0c2260 SHA256 12f3ca404045c542c113ba34169c104f45a75d68800382b8c677a498ddd45e9f
diff --git a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
index df3e8541c9d2..0ffb67e6ab9a 100644
--- a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.11 2009/07/09 14:01:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.12 2009/07/09 14:41:18 ssuominen Exp $
EAPI=2
@@ -124,10 +124,12 @@ src_configure() {
{ use faac ; } && myconf="${myconf} --enable-nonfree"
fi
- for i in h264_vdpau mpeg1_vdpau mpeg_vdpau vc1_vdpau wmv3_vdpau; do
- use video_cards_nvidia || myconf="${myconf} --disable-decoder=$i"
- use vdpau || myconf="${myconf} --disable-decoder=$i"
- done
+ #for i in h264_vdpau mpeg1_vdpau mpeg_vdpau vc1_vdpau wmv3_vdpau; do
+ # use video_cards_nvidia || myconf="${myconf} --disable-decoder=$i"
+ # use vdpau || myconf="${myconf} --disable-decoder=$i"
+ #done
+ use video_cards_nvidia || myconf="${myconf} --disable-vdpau"
+ use vdpau || myconf="${myconf} --disable-vdpau"
# CPU features
for i in mmx ssse3 altivec ; do