diff options
| author |   Ben de Groot <yngwin@gentoo.org> | 2008-04-14 22:20:36 +0000 |
|---|---|---|
| committer | Ben de Groot <yngwin@gentoo.org> | 2008-04-14 22:20:36 +0000 |
| commit | df1615fe74b3a0fcf1cc98681e8969ef03730f9d (patch) | |
| tree | f197fe92a82842fe6eadcc575ded42d8ee88dad6 /media-libs/x264 | |
| parent | version bump (diff) | |
| download | gentoo-2-df1615fe74b3a0fcf1cc98681e8969ef03730f9d.tar.gz gentoo-2-df1615fe74b3a0fcf1cc98681e8969ef03730f9d.tar.bz2 gentoo-2-df1615fe74b3a0fcf1cc98681e8969ef03730f9d.zip | |
x264: Drop nasm from DEPEND to fix bug 217630.
(Portage version: 2.1.5_rc3)
Diffstat (limited to 'media-libs/x264')
| -rw-r--r-- | media-libs/x264/ChangeLog | 5 | ||||
| -rw-r--r-- | media-libs/x264/x264-0.0.20080406.ebuild | 12 |
2 files changed, 7 insertions, 10 deletions
diff --git a/media-libs/x264/ChangeLog b/media-libs/x264/ChangeLog index c010508f67f8..4f495188a33f 100644 --- a/media-libs/x264/ChangeLog +++ b/media-libs/x264/ChangeLog @@ -1,6 +1,9 @@ # 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.2 2008/04/09 16:04:11 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.3 2008/04/14 22:20:36 yngwin Exp $ + + 14 Apr 2008; Ben de Groot <yngwin@gentoo.org> x264-0.0.20080406.ebuild: + Drop nasm from DEPEND to fix bug 217630. 09 Apr 2008; Alexis Ballier <aballier@gentoo.org> x264-0.0.20080406.ebuild: diff --git a/media-libs/x264/x264-0.0.20080406.ebuild b/media-libs/x264/x264-0.0.20080406.ebuild index 206c563e9ba5..69cac4d1fd82 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.2 2008/04/09 16:04:11 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-0.0.20080406.ebuild,v 1.3 2008/04/14 22:20:36 yngwin Exp $ EAPI="1" inherit multilib eutils toolchain-funcs versionator @@ -16,16 +16,10 @@ KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" IUSE="debug +threads" RDEPEND="" -DEPEND="amd64? ( >=dev-lang/yasm-0.6.0 ) - x86? ( || ( >=dev-lang/yasm-0.6.2 dev-lang/nasm ) ) +DEPEND="amd64? ( >=dev-lang/yasm-0.6.2 ) + x86? ( >=dev-lang/yasm-0.6.2 ) 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 -# See http://www.tortall.net/projects/yasm/ticket/114 -DEPEND="${DEPEND} - x86? ( !<dev-lang/yasm-0.6.2 )" - S="${WORKDIR}/${MY_P}" src_unpack() { |