From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QeZyA-0005Oy-16 for garchives@archives.gentoo.org; Wed, 06 Jul 2011 21:49:18 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9162E21C02A; Wed, 6 Jul 2011 21:49:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4A82821C02A for ; Wed, 6 Jul 2011 21:49:09 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 86A772AC008 for ; Wed, 6 Jul 2011 21:49:08 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2139) id 6A0E72004B; Wed, 6 Jul 2011 21:49:06 +0000 (UTC) From: "Alexis Ballier (aballier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, aballier@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ffmpeg-9999.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: ffmpeg-9999.ebuild ChangeLog X-VCS-Directories: media-video/ffmpeg X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier Content-Type: text/plain; charset=utf8 Message-Id: <20110706214906.6A0E72004B@flycatcher.gentoo.org> Date: Wed, 6 Jul 2011 21:49:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 53f19e85a5ff0bf39e00094de24d5fcb aballier 11/07/06 21:49:06 Modified: ffmpeg-9999.ebuild ChangeLog Log: Factorise a bit the cpu features handling code and keep the declaration= s in one place, a string that will be used to fill IUSE and convert them = to ./configure arguments. Do not default-enable them anymore. =20 (Portage version: 2.2.0_alpha43/cvs/Linux x86_64) Revision Changes Path 1.50 media-video/ffmpeg/ffmpeg-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg= /ffmpeg-9999.ebuild?rev=3D1.50&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg= /ffmpeg-9999.ebuild?rev=3D1.50&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg= /ffmpeg-9999.ebuild?r1=3D1.49&r2=3D1.50 Index: ffmpeg-9999.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- ffmpeg-9999.ebuild 29 Jun 2011 15:07:07 -0000 1.49 +++ ffmpeg-9999.ebuild 6 Jul 2011 21:49:06 -0000 1.50 @@ -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.49 2011/06/29 15:07:07 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild= ,v 1.50 2011/07/06 21:49:06 aballier Exp $ =20 EAPI=3D"4" =20 @@ -29,13 +29,20 @@ KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86= -fbsd" fi IUSE=3D" - +3dnow +3dnowext aac alsa altivec amr avx bindist +bzip2 celt cpudetect= ion - debug dirac doc +encode faac frei0r gsm +hardcoded-tables ieee1394 jack - jpeg2k +mmx +mmxext mp3 network openal oss pic qt-faststart rtmp - schroedinger sdl speex +ssse3 static-libs test theora threads truetype - v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib + aac alsa amr bindist +bzip2 celt cpudetection debug dirac doc +encode f= aac + frei0r gsm +hardcoded-tables ieee1394 jack jpeg2k mp3 network openal os= s pic + qt-faststart rtmp schroedinger sdl speex static-libs test theora thread= s + truetype v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib " =20 +# String for CPU features in the useflag[:configure_option] form +# if :configure_option isn't set, it will use 'useflag' as configure opt= ion +CPU_FEATURES=3D"3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxe= xt:mmx2 ssse3" + +for i in ${CPU_FEATURES}; do + IUSE=3D"${IUSE} ${i%:*}" +done + RDEPEND=3D" alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) @@ -148,12 +155,9 @@ use jpeg2k && myconf=3D"${myconf} --enable-libopenjpeg" =20 # CPU features - for i in mmx ssse3 altivec avx ; do - use ${i} || myconf=3D"${myconf} --disable-${i}" + for i in ${CPU_FEATURES}; do + use ${i%:*} || myconf=3D"${myconf} --disable-${i#*:}" done - use mmxext || myconf=3D"${myconf} --disable-mmx2" - use 3dnow || myconf=3D"${myconf} --disable-amd3dnow" - use 3dnowext || myconf=3D"${myconf} --disable-amd3dnowext" # disable mmx accelerated code if PIC is required # as the provided asm decidedly is not PIC for x86. if use pic && use x86 ; then 1.430 media-video/ffmpeg/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg= /ChangeLog?rev=3D1.430&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg= /ChangeLog?rev=3D1.430&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg= /ChangeLog?r1=3D1.429&r2=3D1.430 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v retrieving revision 1.429 retrieving revision 1.430 diff -u -r1.429 -r1.430 --- ChangeLog 6 Jul 2011 21:08:56 -0000 1.429 +++ ChangeLog 6 Jul 2011 21:49:06 -0000 1.430 @@ -1,6 +1,11 @@ # 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.429 = 2011/07/06 21:08:56 halcy0n Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.430 = 2011/07/06 21:49:06 aballier Exp $ + + 06 Jul 2011; Alexis Ballier ffmpeg-9999.ebuild: + Factorise a bit the cpu features handling code and keep the declaratio= ns in + one place, a string that will be used to fill IUSE and convert them to + ./configure arguments. Do not default-enable them anymore. =20 06 Jul 2011; Mark Loeser ffmpeg-0.7_rc1.ebuild: Mark stable for ppc64; bug 365273