diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2011-06-29 15:07:07 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2011-06-29 15:07:07 +0000 |
| commit | 24d45d96e4d26595e12fcafe3f310fe8b6535e6d (patch) | |
| tree | 8da26fa0591adca7a12c586ee95c32a7df32facb /media-video/ffmpeg | |
| parent | Stable on amd64 wrt bug #372959 (diff) | |
| download | gentoo-2-24d45d96e4d26595e12fcafe3f310fe8b6535e6d.tar.gz gentoo-2-24d45d96e4d26595e12fcafe3f310fe8b6535e6d.tar.bz2 gentoo-2-24d45d96e4d26595e12fcafe3f310fe8b6535e6d.zip | |
drop the video_cards_nvidia guard for vdpau
(Portage version: 2.2.0_alpha41/cvs/Linux x86_64)
Diffstat (limited to 'media-video/ffmpeg')
| -rw-r--r-- | media-video/ffmpeg/ChangeLog | 5 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-9999.ebuild | 18 |
2 files changed, 7 insertions, 16 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index 59a7452ca8b4..c19c0bb13e75 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-video/ffmpeg # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.427 2011/06/29 15:01:15 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.428 2011/06/29 15:07:07 aballier Exp $ + + 29 Jun 2011; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild: + drop the video_cards_nvidia guard for vdpau 29 Jun 2011; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild: drop custom-cflags useflag and always use ours diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 79971c921fff..0fa71a65556b 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.48 2011/06/29 15:01:15 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.49 2011/06/29 15:07:07 aballier Exp $ EAPI="4" @@ -36,12 +36,6 @@ IUSE=" v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib " -VIDEO_CARDS="nvidia" - -for x in ${VIDEO_CARDS}; do - IUSE="${IUSE} video_cards_${x}" -done - RDEPEND=" alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) @@ -70,7 +64,7 @@ RDEPEND=" speex? ( >=media-libs/speex-1.2_beta3 ) truetype? ( media-libs/freetype:2 ) vaapi? ( >=x11-libs/libva-0.32 ) - video_cards_nvidia? ( vdpau? ( x11-libs/libvdpau ) ) + vdpau? ( x11-libs/libvdpau ) vpx? ( >=media-libs/libvpx-0.9.6 ) X? ( x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib ) @@ -105,7 +99,7 @@ src_configure() { local version3="" # enabled by default - for i in debug doc network vaapi zlib; do + for i in debug doc network vaapi vdpau zlib; do use ${i} || myconf="${myconf} --disable-${i}" done use bzip2 || myconf="${myconf} --disable-bzlib" @@ -113,12 +107,6 @@ src_configure() { use cpudetection && myconf="${myconf} --enable-runtime-cpudetect" - #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 && use vdpau || myconf="${myconf} --disable-vdpau" - # Encoders if use encode then |