diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2009-02-11 19:35:19 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2009-02-11 19:35:19 +0000 |
| commit | c6739441bca43f8d00dfd0317eadc569971ae442 (patch) | |
| tree | ac74708142840a5adb816d11397675be9a229bd3 /media-libs/xvid | |
| parent | Look mom, I can do spell checking without aspell! (diff) | |
| download | gentoo-2-c6739441bca43f8d00dfd0317eadc569971ae442.tar.gz gentoo-2-c6739441bca43f8d00dfd0317eadc569971ae442.tar.bz2 gentoo-2-c6739441bca43f8d00dfd0317eadc569971ae442.zip | |
depend on nasm-2 as that is what is required; use it on bsd too; dont inherit autotools since we are not eautoreconfing
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/xvid')
| -rw-r--r-- | media-libs/xvid/ChangeLog | 8 | ||||
| -rw-r--r-- | media-libs/xvid/xvid-1.2.1.ebuild | 21 |
2 files changed, 12 insertions, 17 deletions
diff --git a/media-libs/xvid/ChangeLog b/media-libs/xvid/ChangeLog index 7e064c6249c6..57a4dca2ebf5 100644 --- a/media-libs/xvid/ChangeLog +++ b/media-libs/xvid/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/xvid -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.103 2008/12/12 09:52:46 aballier Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.104 2009/02/11 19:35:19 aballier Exp $ + + 11 Feb 2009; Alexis Ballier <aballier@gentoo.org> xvid-1.2.1.ebuild: + depend on nasm-2 as that is what is required; use it on bsd too; dont + inherit autotools since we are not eautoreconfing 12 Dec 2008; Alexis Ballier <aballier@gentoo.org> xvid-1.2.1.ebuild: fix shared lib install diff --git a/media-libs/xvid/xvid-1.2.1.ebuild b/media-libs/xvid/xvid-1.2.1.ebuild index 2d16e14ca6a8..ed389529be0f 100644 --- a/media-libs/xvid/xvid-1.2.1.ebuild +++ b/media-libs/xvid/xvid-1.2.1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2008 Gentoo Foundation +# 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.1.ebuild,v 1.2 2008/12/12 09:52:46 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.2.1.ebuild,v 1.3 2009/02/11 19:35:19 aballier Exp $ -inherit eutils fixheadtails autotools +inherit eutils fixheadtails MY_PN="${PN}core" MY_P="${MY_PN}-${PV}" @@ -16,19 +16,10 @@ SLOT="1" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" IUSE="examples altivec" -# 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 - -# yasm < 0.6.2 has a bug when computing pic adresses. -# See http://www.tortall.net/projects/yasm/ticket/114 -# the build system prefers yasm if it finds it -# thus if we intend to have || (yasm nasm) for building -# we need to make it block yasm < 0.6.2 on x86 -# otherwise it will compile wrong code -NASM=">=dev-lang/yasm-0.6.2" +NASM=">=dev-lang/nasm-2.04" DEPEND="x86? ( ${NASM} ) - amd64? ( ${NASM} )" + amd64? ( ${NASM} ) + x86-fbsd? ( ${NASM} )" RDEPEND="" S="${WORKDIR}/${MY_PN}/build/generic" |