summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2008-04-09 16:04:11 +0000
committerAlexis Ballier <aballier@gentoo.org>2008-04-09 16:04:11 +0000
commitf7686852a6ccdee8302fdae2fcd3d544f961b092 (patch)
treeb3e3e2b41a907d018a897f4587f6e996c922eeeb /media-libs/x264
parentkeyword ~x86-fbsd (diff)
downloadgentoo-2-f7686852a6ccdee8302fdae2fcd3d544f961b092.tar.gz
gentoo-2-f7686852a6ccdee8302fdae2fcd3d544f961b092.tar.bz2
gentoo-2-f7686852a6ccdee8302fdae2fcd3d544f961b092.zip
depend on yasm only on x86-fbsd as nasm segfaults and yasm is prefered by upstream
(Portage version: 2.1.5_rc2)
Diffstat (limited to 'media-libs/x264')
-rw-r--r--media-libs/x264/ChangeLog7
-rw-r--r--media-libs/x264/x264-0.0.20080406.ebuild4
2 files changed, 8 insertions, 3 deletions
diff --git a/media-libs/x264/ChangeLog b/media-libs/x264/ChangeLog
index 625faf21b34b..c010508f67f8 100644
--- a/media-libs/x264/ChangeLog
+++ b/media-libs/x264/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-libs/x264
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.1 2008/04/07 21:43:23 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.2 2008/04/09 16:04:11 aballier Exp $
+
+ 09 Apr 2008; Alexis Ballier <aballier@gentoo.org>
+ x264-0.0.20080406.ebuild:
+ depend on yasm only on x86-fbsd as nasm segfaults and yasm is prefered by
+ upstream
*x264-0.0.20080406 (07 Apr 2008)
*x264-0.0.20080301 (07 Apr 2008)
diff --git a/media-libs/x264/x264-0.0.20080406.ebuild b/media-libs/x264/x264-0.0.20080406.ebuild
index 9e2206be8ff6..206c563e9ba5 100644
--- a/media-libs/x264/x264-0.0.20080406.ebuild
+++ b/media-libs/x264/x264-0.0.20080406.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-0.0.20080406.ebuild,v 1.1 2008/04/07 21:43:23 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-0.0.20080406.ebuild,v 1.2 2008/04/09 16:04:11 aballier Exp $
EAPI="1"
inherit multilib eutils toolchain-funcs versionator
@@ -18,7 +18,7 @@ IUSE="debug +threads"
RDEPEND=""
DEPEND="amd64? ( >=dev-lang/yasm-0.6.0 )
x86? ( || ( >=dev-lang/yasm-0.6.2 dev-lang/nasm ) )
- x86-fbsd? ( dev-lang/nasm )"
+ x86-fbsd? ( >=dev-lang/yasm-0.6.2 )"
# Block older than 0.6.2 versions of yasm
# It generates incorect pic code and will cause segfaults