[gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ffmpeg-9999-r1.ebuild

[Samuli Suominen (ssuominen)]

ssuominen    09/07/09 14:01:13

  Modified:             ffmpeg-9999-r1.ebuild
  Log:
  Commit last change differently to avoid adding function inside the ebuild function, it's shorter anyway like this
  (Portage version: 2.2_rc33/cvs/Linux x86_64)

Revision  Changes    Path
1.11                 media-video/ffmpeg/ffmpeg-9999-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?r1=1.10&r2=1.11

Index: ffmpeg-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ffmpeg-9999-r1.ebuild	9 Jul 2009 13:43:14 -0000	1.10
+++ ffmpeg-9999-r1.ebuild	9 Jul 2009 14:01:13 -0000	1.11
@@ -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.10 2009/07/09 13:43:14 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.11 2009/07/09 14:01:13 ssuominen Exp $
 
 EAPI=2
 
@@ -124,14 +124,10 @@
 		{ use faac ; } && myconf="${myconf} --enable-nonfree"
 	fi
 
-	disable-vdpau-support() {
-		for i in h264_vdpau mpeg1_vdpau mpeg_vdpau vc1_vdpau wmv3_vdpau; do
-			myconf="${myconf} --disable-decoder=$i"
-		done
-	}
-
-	use video_cards_nvidia || disable-vdpau-support
-	use vdpau || disable-vdpau-support
+	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
 
 	# CPU features
 	for i in mmx ssse3 altivec ; do