diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2009-06-07 13:20:06 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-06-07 13:20:06 +0000 |
| commit | c86aa6313a35a369039205fc40b3a64ca1f2051f (patch) | |
| tree | 998ca9d5b71c88c4b46f59f20ec2a6933ae0845d /media-libs | |
| parent | stable amd64 as requested by Samuli Suominen to fix bug #273008. General QA c... (diff) | |
| download | gentoo-2-c86aa6313a35a369039205fc40b3a64ca1f2051f.tar.gz gentoo-2-c86aa6313a35a369039205fc40b3a64ca1f2051f.tar.bz2 gentoo-2-c86aa6313a35a369039205fc40b3a64ca1f2051f.zip | |
configure for x86_64 prefers yasm and it needs to be 0.8.0, so adjust the ebuild accordingly wrt #273008.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/xvid/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/xvid/xvid-1.2.2-r1.ebuild | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/media-libs/xvid/ChangeLog b/media-libs/xvid/ChangeLog index 743cabf618a7..d17034323747 100644 --- a/media-libs/xvid/ChangeLog +++ b/media-libs/xvid/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/xvid # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.112 2009/06/02 16:04:26 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.113 2009/06/07 13:20:06 ssuominen Exp $ + + 07 Jun 2009; Samuli Suominen <ssuominen@gentoo.org> xvid-1.2.2-r1.ebuild: + configure for x86_64 prefers yasm and it needs to be 0.8.0, so adjust the + ebuild accordingly wrt #273008. 02 Jun 2009; Raúl Porcel <armin76@gentoo.org> xvid-1.2.2-r1.ebuild: alpha/arm/ia64/sparc stable wrt #271786 diff --git a/media-libs/xvid/xvid-1.2.2-r1.ebuild b/media-libs/xvid/xvid-1.2.2-r1.ebuild index d772a640a9af..d384c0352814 100644 --- a/media-libs/xvid/xvid-1.2.2-r1.ebuild +++ b/media-libs/xvid/xvid-1.2.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.2.2-r1.ebuild,v 1.9 2009/06/02 16:04:26 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.2.2-r1.ebuild,v 1.10 2009/06/07 13:20:06 ssuominen Exp $ EAPI=2 inherit eutils multilib @@ -17,9 +17,11 @@ SLOT="1" KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" IUSE="examples pic" -NASM=">=dev-lang/nasm-2.04" +NASM=">=dev-lang/nasm-2.05.01" +YASM=">=dev-lang/yasm-0.8.0" + DEPEND="x86? ( ${NASM} ) - amd64? ( ${NASM} ) + amd64? ( || ( ${YASM} ${NASM} ) ) x86-fbsd? ( ${NASM} )" RDEPEND="" |