diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2007-02-21 03:44:39 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2007-02-21 03:44:39 +0000 |
| commit | 32e4d9056b4f51231df18d5a7ea4a805f057e28d (patch) | |
| tree | 91036207806a584d8e48854f39025a269e266626 /media-libs/xvid | |
| parent | Stable for HPPA (bug #167206). (diff) | |
| download | gentoo-2-32e4d9056b4f51231df18d5a7ea4a805f057e28d.tar.gz gentoo-2-32e4d9056b4f51231df18d5a7ea4a805f057e28d.tar.bz2 gentoo-2-32e4d9056b4f51231df18d5a7ea4a805f057e28d.zip | |
Force just yasm for now #165682 ... it's better than nasm anyways.
(Portage version: 2.1.2-r10)
Diffstat (limited to 'media-libs/xvid')
| -rw-r--r-- | media-libs/xvid/ChangeLog | 5 | ||||
| -rw-r--r-- | media-libs/xvid/xvid-1.1.2.ebuild | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/media-libs/xvid/ChangeLog b/media-libs/xvid/ChangeLog index 1a9567c1ad63..1cac1002090b 100644 --- a/media-libs/xvid/ChangeLog +++ b/media-libs/xvid/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/xvid # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.83 2007/02/03 13:53:42 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.84 2007/02/21 03:44:39 vapier Exp $ + + 21 Feb 2007; Mike Frysinger <vapier@gentoo.org> xvid-1.1.2.ebuild: + Force just yasm for now #165682 ... it's better than nasm anyways. 03 Feb 2007; Simon Stelling <blubb@gentoo.org> xvid-1.1.2.ebuild: depend on yasm-0.5; bug 154369 diff --git a/media-libs/xvid/xvid-1.1.2.ebuild b/media-libs/xvid/xvid-1.1.2.ebuild index 4276950d91de..33a70f4217b9 100644 --- a/media-libs/xvid/xvid-1.1.2.ebuild +++ b/media-libs/xvid/xvid-1.1.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.1.2.ebuild,v 1.3 2007/02/03 13:53:42 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.1.2.ebuild,v 1.4 2007/02/21 03:44:39 vapier Exp $ inherit eutils fixheadtails autotools @@ -15,8 +15,12 @@ SLOT="1" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~sparc ~x86 ~x86-fbsd" IUSE="doc altivec" -DEPEND="x86? ( >=dev-lang/nasm-0.98.36 ) - amd64? ( >=dev-lang/yasm-0.5.0 )" +# once yasm-0.6.0+ comes out, we can switch this to +# dev-lang/nasm >=dev-lang/yasm-0.6.0 +# and then drop the quotes from section in the noexec-stack.patch +NASM=">=dev-lang/yasm-0.5.0" +DEPEND="x86? ( ${NASM} ) + amd64? ( ${NASM} )" RDEPEND="" S=${WORKDIR}/${MY_P}/build/generic |