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 | d3cdb447af5e19629fa26eb124cbaac807190dad (patch) | |
| tree | 68098a51cfc028e4a702d44117cb083979bcc416 /media-libs/xvid | |
| parent | Look mom, I can do spell checking without aspell! (diff) | |
| download | historical-d3cdb447af5e19629fa26eb124cbaac807190dad.tar.gz historical-d3cdb447af5e19629fa26eb124cbaac807190dad.tar.bz2 historical-d3cdb447af5e19629fa26eb124cbaac807190dad.zip | |
depend on nasm-2 as that is what is required; use it on bsd too; dont inherit autotools since we are not eautoreconfing
Package-Manager: portage-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/Manifest | 10 | ||||
| -rw-r--r-- | media-libs/xvid/xvid-1.2.1.ebuild | 21 |
3 files changed, 17 insertions, 22 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/Manifest b/media-libs/xvid/Manifest index 607804f3f1ad..93ba899ddc76 100644 --- a/media-libs/xvid/Manifest +++ b/media-libs/xvid/Manifest @@ -12,13 +12,13 @@ DIST xvidcore-1.2.1.tar.bz2 641101 RMD160 fcb6a5a0410d1921d99361fe5d580f00128b9b EBUILD xvid-1.1.3-r3.ebuild 2267 RMD160 02632006c8ffe14a0c37e99cc0695a05d462a8b6 SHA1 9995e7142ebd5cdc6625c3c2fbd38888df6d1991 SHA256 6ea95588e2bee8bde97f3aab330e0536d4617efa51dd66f586af50280bcbe757 EBUILD xvid-1.1.3.ebuild 1875 RMD160 61aa265000c6b92e62afe2172db47dbf62dfb5fc SHA1 0965e58a77047ba8f5e809e6eae1bbd7f7230411 SHA256 238316234351f6a64aa34ceb3291208b928f50d6bf8e29a7d24995c76b61cc59 EBUILD xvid-1.2.0.ebuild 1869 RMD160 fd3aae4ab02d4b47e4c8e5d157b97f5a2fc4279d SHA1 adc579c71f0d8114e2acbd64e93dfc005b2c0ef8 SHA256 1cccb0cad030150d4168bbb75a4aa052635ba173e90a48f5128b326b7aeb2ffe -EBUILD xvid-1.2.1.ebuild 1870 RMD160 0894ab80d6e8072eff6074791698080a52539bdb SHA1 d61b9a9649362dd3c6c49e02c24d094b2dbf9ddd SHA256 9920ba951ecf39c9e0ff47fa3b557f4cffc6895935d0bfc6a124f6e083bb7db0 -MISC ChangeLog 13504 RMD160 7d89e73ebe4d00739eae409bab25c7a308dd15e0 SHA1 8291abed954a741e6f70b340add7da4377b161c4 SHA256 aafaf47916e09b18a6f5c73f0afae093eb2af940594cdfe20b832e9cd5de53ff +EBUILD xvid-1.2.1.ebuild 1428 RMD160 3d02091ba181f259b3ebbd1d3fc45cb002d4a29a SHA1 6ced7700f08bd8f8c8cb99eb57a60722197d148a SHA256 c0577ca3e007d7cda3b6fefff8760ea7f10c48a061dd3903cc8fa36825d27c89 +MISC ChangeLog 13700 RMD160 fecb2e6bd5424f282beda3a03b6ed3663a360128 SHA1 0453139bc8b1a160abd1e9437cb535bf213139f4 SHA256 8ea139d451ea30768211c091c9e9b2d74db313822e70394b416d57e7e14f2359 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAklCNHQACgkQvFcC4BYPU0oIWwCgwF/WO9QKgYlud95Etc/y7s+7 -OHYAnijECoW/X1G/5dDcMWrdf15y6ob/ -=iHZ2 +iEYEARECAAYFAkmTKHwACgkQvFcC4BYPU0rs9ACgl9bONxCSrUMzPv2584JnOnBu +jSgAnRk+y1JOilwh/OFAR1daMOlDDoeB +=b5bV -----END PGP SIGNATURE----- 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" |