summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2008-04-09 16:06:48 +0000
committerAlexis Ballier <aballier@gentoo.org>2008-04-09 16:06:48 +0000
commit3ac2a9ebc95df15641519de63209e61c7fb8cc26 (patch)
treee884a292f04a3a6cfb5d3b8f808e165209298f2e /media-video/x264-encoder
parentThis version should be used with current kernels. (diff)
downloadgentoo-2-3ac2a9ebc95df15641519de63209e61c7fb8cc26.tar.gz
gentoo-2-3ac2a9ebc95df15641519de63209e61c7fb8cc26.tar.bz2
gentoo-2-3ac2a9ebc95df15641519de63209e61c7fb8cc26.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-video/x264-encoder')
-rw-r--r--media-video/x264-encoder/ChangeLog7
-rw-r--r--media-video/x264-encoder/x264-encoder-0.0.20080406.ebuild4
2 files changed, 8 insertions, 3 deletions
diff --git a/media-video/x264-encoder/ChangeLog b/media-video/x264-encoder/ChangeLog
index 119ce885172e..ee9848f07581 100644
--- a/media-video/x264-encoder/ChangeLog
+++ b/media-video/x264-encoder/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-video/x264-encoder
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/ChangeLog,v 1.1 2008/04/07 21:50:34 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/ChangeLog,v 1.2 2008/04/09 16:06:47 aballier Exp $
+
+ 09 Apr 2008; Alexis Ballier <aballier@gentoo.org>
+ x264-encoder-0.0.20080406.ebuild:
+ depend on yasm only on x86-fbsd as nasm segfaults and yasm is prefered by
+ upstream
*x264-encoder-0.0.20080406 (07 Apr 2008)
*x264-encoder-0.0.20080301 (07 Apr 2008)
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20080406.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20080406.ebuild
index ab35f10b7f39..ed78c20093b6 100644
--- a/media-video/x264-encoder/x264-encoder-0.0.20080406.ebuild
+++ b/media-video/x264-encoder/x264-encoder-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-video/x264-encoder/x264-encoder-0.0.20080406.ebuild,v 1.1 2008/04/07 21:50:34 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/x264-encoder-0.0.20080406.ebuild,v 1.2 2008/04/09 16:06:48 aballier Exp $
EAPI="1"
inherit multilib eutils toolchain-funcs versionator
@@ -22,7 +22,7 @@ RDEPEND="mp4? ( >=media-video/gpac-0.4.1_pre20060122 )
DEPEND="${RDEPEND}
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 )
dev-util/pkgconfig"
# Block older than 0.6.2 versions of yasm