diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-07-28 19:07:46 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-07-28 19:07:46 +0000 |
| commit | 16acb514e21b09b4c88b5fffd4c36b7a2d8101d1 (patch) | |
| tree | 941556f84ce5cd566b1e32b28d202031423d75bf /media-libs/xvid | |
| parent | Fix optional-kerberos patch (bug #458668, thanks to SN (Enlik)). Require mit-... (diff) | |
| download | historical-16acb514e21b09b4c88b5fffd4c36b7a2d8101d1.tar.gz historical-16acb514e21b09b4c88b5fffd4c36b7a2d8101d1.tar.bz2 historical-16acb514e21b09b4c88b5fffd4c36b7a2d8101d1.zip | |
Force using nasm on FreeBSD as it doesnt
Package-Manager: portage-2.2.0_alpha190/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A
Diffstat (limited to 'media-libs/xvid')
| -rw-r--r-- | media-libs/xvid/ChangeLog | 5 | ||||
| -rw-r--r-- | media-libs/xvid/Manifest | 10 | ||||
| -rw-r--r-- | media-libs/xvid/xvid-1.3.2-r1.ebuild | 10 |
3 files changed, 15 insertions, 10 deletions
diff --git a/media-libs/xvid/ChangeLog b/media-libs/xvid/ChangeLog index fad8b906956d..0f81051dbb39 100644 --- a/media-libs/xvid/ChangeLog +++ b/media-libs/xvid/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/xvid # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.137 2013/06/26 17:18:16 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.138 2013/07/28 19:07:38 aballier Exp $ + + 28 Jul 2013; Alexis Ballier <aballier@gentoo.org> xvid-1.3.2-r1.ebuild: + Force using nasm on FreeBSD as it doesnt build with yasm, bug 26 Jun 2013; Alexis Ballier <aballier@gentoo.org> xvid-1.3.2-r1.ebuild: update emul-linux blocker, bug #473838 diff --git a/media-libs/xvid/Manifest b/media-libs/xvid/Manifest index 7bf2b3380f9a..0b2c2432d0f9 100644 --- a/media-libs/xvid/Manifest +++ b/media-libs/xvid/Manifest @@ -2,14 +2,14 @@ Hash: SHA256 DIST xvidcore-1.3.2.tar.bz2 697038 SHA256 d6c11334e1e771f9e4722eff454762325fd0989f6a4217abca296d6770160bf4 SHA512 0b7725314abc1dbe1f0ba4700393c391b8f98589300051ad7ebc5bdef7e87b20f19dcc88c37afbc1dfa117b6c8c1d5051b8f8d263c419e6965c5bc5f0201dc97 WHIRLPOOL c9e3f1a99544fe5b2394afc9adee3764565572b7b7fb46e2c92500d13851a8225b3e8b8e0db280a37aba72ff978e11a8c9f80d3a65b27f682087b1308f506dfa -EBUILD xvid-1.3.2-r1.ebuild 1868 SHA256 44394a027cff01cceead4d6f5c81c3df763657f9950665a65b876ac95279e917 SHA512 5b4ab31eab380300866e304d673cb80638616e8c7f0217f28037d91357c907648375abaaf9c924556e134c1022fd8bd466959301df0d48d8321c428f9c5f1d56 WHIRLPOOL e0421e0c5d247bf0231d5a6b04cca38c41b56fc23ca66566dbff495ad2dfac45b7ce48ba1dee419491c6c41a0557cb17059c208435f69abcb6c4ce89deb384d2 +EBUILD xvid-1.3.2-r1.ebuild 1963 SHA256 3cc637e7752722eaa0c9413d5dbebdd7592c2074102cd59f076c3f97c7950800 SHA512 9102ec463d61315bb16c10dc68da231835a5b9df58ce4352c0c2e03b78bbc62323762c5de7912e3b0461a3030a7a67337737710f6f72aa6666f475f816032f66 WHIRLPOOL acebcd6ba93a02d5033508e890c33448aa2a112c906b7a124c35437411c51844162f8ebcfb814615ab1e1316171674313367e0a2d370f9783bbd1598317a5ede EBUILD xvid-1.3.2.ebuild 1407 SHA256 94d8f7fe834e9c510a1d8caa5e7b906b459324f880e8ced4abf162a3fc9ec046 SHA512 701ceff32fa0a811fec700ff2034078d04e0fd5a55107e27759d64c3f506dc2a687d64e3ff2f1efd68934ca4c0486595dbd54b358b58b7e30e4a3c72cd2e0db9 WHIRLPOOL 7f2195e71311cfd61976589debd6e7efaa1e78baa2dbfc90f92c5f5244f14540585ee3ccad96dccde8f00981fd8a9b8ecf50ad3e9c75463a7301d6ba6a0e3221 -MISC ChangeLog 17619 SHA256 fab35316b3455d5497d6f05e7d2f6fe9b5690730d0ae92cdf27f1df30ac71a5a SHA512 c8a8a543b4defde786623a1a94e7730300191a0188e7c5b1a60992495f89d7b824c9d13f74f785d63b1d87a598f229a2fb6a338c83499cc3d0fbf724c4f2ea8d WHIRLPOOL 59c56214b8bd2c2b301b0f4920c62d06f566cc8340b24bfc4ede0039d8ffdb2ca0a1aeea79ae211c89ffec70ad313e1d48785959158a217feddb4be1ec89951a +MISC ChangeLog 17758 SHA256 c72335ce9082a6412da3cf6565879fc3883622b1447cf69a3e8614cd3d4a216b SHA512 36f85207820e77206607add0e380b57be0afeac538ea45fbfbd7075c1ed11cc496c7ee4272424d63cfc2ce716c3ae1b74fd92bfb2207c7a03c71f8ebc4c35f69 WHIRLPOOL b36a286d3393deeec3513fa44708b0746ae668ecea6d474447ba8cc70e031ec85e86c9007886e20f9a87eca617178ab46b1d3636a00d02e0e524d79284a2a75d MISC metadata.xml 326 SHA256 44f920b8335d7708c3208af6281abb98d71274f3400ed3538ca469c3846705c9 SHA512 56eb9fa6a5cebf28725a3b0023545cc5c7d1967f63b94358d30f69e08c1837c9129e761108200579f209b9743695999b45ab9c0301e190eadd59bbb17346c42e WHIRLPOOL de611ff8bb19c90f6810575bc79b83cd0116ab70715e7445364236e6ad78f1665fd7a5e33b3a84500b9bd45f853f809dcc98586494f57d743f6bec559ed1ae70 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) -iEYEAREIAAYFAlHLIloACgkQvFcC4BYPU0r08QCeKQOl3ag9Yi7WU/d5TfdBFoAi -Y7cAn0uojQQVibn6Rbeu71XL15BvohRx -=tTbU +iEYEAREIAAYFAlH1a/wACgkQvFcC4BYPU0rymQCgjHqjXH8R26oRgpcbCZrxFuo4 +c+4An1Eq17fCk6pKMAFBXvsGLAgh1Zj/ +=H8am -----END PGP SIGNATURE----- diff --git a/media-libs/xvid/xvid-1.3.2-r1.ebuild b/media-libs/xvid/xvid-1.3.2-r1.ebuild index f2fd7af039ca..a187969a3a74 100644 --- a/media-libs/xvid/xvid-1.3.2-r1.ebuild +++ b/media-libs/xvid/xvid-1.3.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.3.2-r1.ebuild,v 1.2 2013/06/26 17:18:16 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.3.2-r1.ebuild,v 1.3 2013/07/28 19:07:38 aballier Exp $ EAPI=5 inherit flag-o-matic multilib multilib-minimal @@ -14,15 +14,16 @@ SRC_URI="http://downloads.xvid.org/downloads/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="examples +threads pic" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +IUSE="examples elibc_FreeBSD +threads pic" NASM=">=dev-lang/nasm-2" YASM=">=dev-lang/yasm-1" DEPEND="amd64? ( || ( ${YASM} ${NASM} ) ) + amd64-fbsd? ( ${NASM} ) x86? ( || ( ${YASM} ${NASM} ) ) - x86-fbsd? ( || ( ${YASM} ${NASM} ) )" + x86-fbsd? ( ${NASM} )" RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" S=${WORKDIR}/${MY_PN}/build/generic @@ -43,6 +44,7 @@ src_prepare() { multilib_src_configure() { use sparc && append-cflags -mno-vis #357149 + use elibc_FreeBSD && export ac_cv_prog_ac_yasm=no #477736 local myconf if use pic || [[ ${ABI} == "x32" ]] ; then #421841 |