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 | c6ccc923f5a2928120b8261d0fc2a1a7ee4c95e8 (patch) | |
| tree | 457e02a4b4ce89f222cdc784942733a3dd39c52f /media-libs/xvid | |
| parent | stable amd64 as requested by Samuli Suominen to fix bug #273008. General QA c... (diff) | |
| download | historical-c6ccc923f5a2928120b8261d0fc2a1a7ee4c95e8.tar.gz historical-c6ccc923f5a2928120b8261d0fc2a1a7ee4c95e8.tar.bz2 historical-c6ccc923f5a2928120b8261d0fc2a1a7ee4c95e8.zip | |
configure for x86_64 prefers yasm and it needs to be 0.8.0, so adjust the ebuild accordingly wrt #273008.
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'media-libs/xvid')
| -rw-r--r-- | media-libs/xvid/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/xvid/Manifest | 4 | ||||
| -rw-r--r-- | media-libs/xvid/xvid-1.2.2-r1.ebuild | 8 |
3 files changed, 12 insertions, 6 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/Manifest b/media-libs/xvid/Manifest index fce6af359bd6..5650f05c10c1 100644 --- a/media-libs/xvid/Manifest +++ b/media-libs/xvid/Manifest @@ -1,4 +1,4 @@ DIST xvidcore-1.2.2.tar.bz2 643344 RMD160 5fbbc99a02d9eab7f2394220cec2c872957ff26f SHA1 d03270c803592f7655e7aa4181de587be25ba97f SHA256 e42a602de489438b96f7f4742b68e9bed7efa7aee3570379bb2582b4290b6d11 -EBUILD xvid-1.2.2-r1.ebuild 1237 RMD160 ef1536e9120b760a169533eeeb7030fe1d4ad553 SHA1 501514ea152bd30a2b8f2e3953a4d8e91e72b7cc SHA256 cfb0ede932f6459a375417382e2493edae9b1b114ef5ccd33b021c64ef01fd6a -MISC ChangeLog 14709 RMD160 8f6e462616e9c5d7866bf0aa0b23361562183669 SHA1 22500cb3cfa41c1ebad68c68698a48f081b20738 SHA256 103a0f019e778e85eeda5882f2e8b7843125d1d1ae4d150e14cd22d3a81a7448 +EBUILD xvid-1.2.2-r1.ebuild 1288 RMD160 093ee982a6f98d75b334bcb6575f00d9761a7ee6 SHA1 2cb7ef0a8b6c141f1e321df1249bce6d5c137481 SHA256 a1e37d1acf96c6a5147ce151579c76c4672d61d8b257272f9efbb0a14f631269 +MISC ChangeLog 14898 RMD160 48f5eff84a96867ef09c43bcf3590d4d7e28e126 SHA1 bc0616a5f7a10b9aa7e967d3b42fcc08097085e1 SHA256 451f09a374b833538da18ff6d498e284dd72b181e1a8afa75d498e11de16fe4e MISC metadata.xml 326 RMD160 91617f57d22a91f7320a8a4cf31acdb62be99786 SHA1 8a03f8977295939de344ac23e4fdd8185d953d65 SHA256 44f920b8335d7708c3208af6281abb98d71274f3400ed3538ca469c3846705c9 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="" |