summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2012-09-29 02:08:58 +0000
committerAlexis Ballier <aballier@gentoo.org>2012-09-29 02:08:58 +0000
commitd4cf161ec18e33afeb286468207618057874d477 (patch)
treea7c54373b97058d6095bd0ae614cb620807c286a /media-video
parentfixup the icon tray support (bug #436426) (diff)
downloadgentoo-2-d4cf161ec18e33afeb286468207618057874d477.tar.gz
gentoo-2-d4cf161ec18e33afeb286468207618057874d477.tar.bz2
gentoo-2-d4cf161ec18e33afeb286468207618057874d477.zip
cpudetection is now enabled by default, disable it if the useflag is not enabled
(Portage version: 2.2.0_alpha134/cvs/Linux x86_64)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/ffmpeg/ChangeLog6
-rw-r--r--media-video/ffmpeg/ffmpeg-9999.ebuild4
2 files changed, 7 insertions, 3 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index ae21251a99e4..cfd762b7c269 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/ffmpeg
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.580 2012/09/25 03:50:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.581 2012/09/29 02:08:58 aballier Exp $
+
+ 29 Sep 2012; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
+ cpudetection is now enabled by default, disable it if the useflag is not
+ enabled
25 Sep 2012; Mike Frysinger <vapier@gentoo.org> ffmpeg-0.10.2.ebuild,
ffmpeg-0.10.3.ebuild, ffmpeg-0.10.4.ebuild, ffmpeg-0.10.5.ebuild,
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 0297a91580fb..148a6967c003 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 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.104 2012/09/21 11:49:42 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.105 2012/09/29 02:08:58 aballier Exp $
EAPI="4"
@@ -140,7 +140,7 @@ src_configure() {
use bzip2 || myconf="${myconf} --disable-bzlib"
use sdl || myconf="${myconf} --disable-ffplay"
- use cpudetection && myconf="${myconf} --enable-runtime-cpudetect"
+ use cpudetection || myconf="${myconf} --disable-runtime-cpudetect"
use openssl && myconf="${myconf} --enable-openssl --enable-nonfree"
for i in gnutls ; do
use $i && myconf="${myconf} --enable-$i"