summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Sachau <tommy@gentoo.org>2011-05-28 19:08:23 +0000
committerThomas Sachau <tommy@gentoo.org>2011-05-28 19:08:23 +0000
commitc2d9e6c57bd33ca1d75412bff65b5c0f614092ae (patch)
tree6f07af010814827358d31588f7778442d12a97b3 /media-libs
parentForce newer shadow versions in the whole tree #367633. (diff)
downloadhistorical-c2d9e6c57bd33ca1d75412bff65b5c0f614092ae.tar.gz
historical-c2d9e6c57bd33ca1d75412bff65b5c0f614092ae.tar.bz2
historical-c2d9e6c57bd33ca1d75412bff65b5c0f614092ae.zip
Adding workaround for bug 345161, forces yasm as as interpreter and adjusts the target platform for cross-compilation
Package-Manager: portage-2.2.0_alpha37-r1/cvs/Linux x86_64
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/libvpx/ChangeLog6
-rw-r--r--media-libs/libvpx/Manifest14
-rw-r--r--media-libs/libvpx/libvpx-0.9.6.ebuild7
3 files changed, 18 insertions, 9 deletions
diff --git a/media-libs/libvpx/ChangeLog b/media-libs/libvpx/ChangeLog
index 424c807bf1d8..25d5e4f0458f 100644
--- a/media-libs/libvpx/ChangeLog
+++ b/media-libs/libvpx/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/libvpx
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/ChangeLog,v 1.16 2011/05/16 16:39:23 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/ChangeLog,v 1.17 2011/05/28 19:08:23 tommy Exp $
+
+ 28 May 2011; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> libvpx-0.9.6.ebuild:
+ Adding workaround for bug 345161, forces yasm as as interpreter and adjusts
+ the target platform for cross-compilation
16 May 2011; Kacper Kowalik <xarthisius@gentoo.org> libvpx-0.9.6.ebuild:
Marked ~ppc/~ppc64 wrt #360427
diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest
index 652ee1a26884..4a6e319ed383 100644
--- a/media-libs/libvpx/Manifest
+++ b/media-libs/libvpx/Manifest
@@ -10,16 +10,16 @@ EBUILD libvpx-0.9.0_p20100612.ebuild 1292 RMD160 4abee3daaaf7dea2507be2e7a64b314
EBUILD libvpx-0.9.2.ebuild 1475 RMD160 702ef07002c08c0c1c161db321490720fea1e2bd SHA1 218fc0dd1a88baf32ccb544641759f3abf8fc894 SHA256 ebdc6120025ac184902f9903ea130490cba6135b51aa524b86579a88b31d5a53
EBUILD libvpx-0.9.5-r1.ebuild 1634 RMD160 135a729f4561c952c3b191433ab106e70665bb2d SHA1 4507d748014f8fff8032cb802a7d9e6410a98c69 SHA256 f95d02aac65e2cb695c3fc8eaed40292b6ca34ef37d5a3305ed9f4c93010e920
EBUILD libvpx-0.9.5.ebuild 1495 RMD160 3976813ad95a9af8bd031089cec41d64ceda4626 SHA1 11450cbb2bd5aaa820081d8e26a1ea808a0e355c SHA256 22286888051982ed11482d036c9eba60692c71f39a6e3aeb1f252c55b9e49c41
-EBUILD libvpx-0.9.6.ebuild 1664 RMD160 eb2b3b294e0c845c7ea6a6819bd48e3fe3dcd32a SHA1 fc47580dc5a0bdcd82abcd8ced6c889ce48876f4 SHA256 2dd5dd0973d0cfd9d898811cbc72382e6274e9d132010a71dc48dd776585cced
+EBUILD libvpx-0.9.6.ebuild 1875 RMD160 dd691a151e0c95390ab137cc62e9abf872846d10 SHA1 a596767ea3ea2e336c3c198da0a0151a05e67ccd SHA256 e047585666a6f3fc30789efd058693f75d064a871b7f1f0a42deeb009a804ef3
EBUILD libvpx-9999.ebuild 1517 RMD160 79ed475ecca806b5ec5f300fadfa8deab8fcc72a SHA1 5f96f5be79db197d547d8230b172e7e9033dc524 SHA256 c0174adaf08a3122312f64c7a007322ea4a44afc576213474b9019ccd9006dcf
-MISC ChangeLog 2603 RMD160 dcab3b3e7780ff375d6cb859c84b16aacd553bc4 SHA1 98fe8965c9fee9f240bba339b38577cf8b3b18cd SHA256 301b5c82c3b6a6a329fd5d69cccc64b30acbf8e7c41c2669e28c313a01e40afc
+MISC ChangeLog 2801 RMD160 bc9a5ac568743e81d26364d153b6da44f672f2ca SHA1 cb67d88fbcf36f804843f6961d3cfe540e30bbea SHA256 3f78aed8195486b75691260dc3b521b3ce3e154eee9c939afd31fc5240233fd8
MISC metadata.xml 517 RMD160 5b8c2af107175fc8be0fd0f3d676dcb1fb1b2bc1 SHA1 a9164f13235a7bce3d266767c1d47bc2be4c3021 SHA256 b94ac8d73429cfe726eb618f80bf11865e682f5129d6268a3182c70b34325734
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iJwEAQECAAYFAk3RU0MACgkQIiMqcbOVdxQM8gP+KxkwRIPDJ6yCFUyIZR/24ExS
-aLFYpqFG8fu6EC5jiZM3HIyMShDUKbeIYC3b579hM72e6dpdF3QndNM3HyFjXMCe
-m4kzkOVY572N+4vK/4O5hZDYetl8o/UKMAvqF1cyj0HLvxZdUpNN3p1yoyyfPubR
-EhtXg+oAJonNAqhjV/M=
-=aHdd
+iJwEAQECAAYFAk3hSDQACgkQG7kqcTWJkGchfAQAq3lI38hT/JQDXjx0UnICqUCQ
+yIIiVsHD3DS9N7lrRav9/pxzQbL3TG0epUL49pK5LhPr535K4a/alNPYHIowaHw/
+g96PW3jnmyFkpUaXO8jSajDu8kRUvxaAPzWP27dXhGFyE4wclq3fZ++1qhNkG9T5
+if7WjdZbId46YMYJTqI=
+=La5J
-----END PGP SIGNATURE-----
diff --git a/media-libs/libvpx/libvpx-0.9.6.ebuild b/media-libs/libvpx/libvpx-0.9.6.ebuild
index b2e699cf99e8..ba80f16a5f6e 100644
--- a/media-libs/libvpx/libvpx-0.9.6.ebuild
+++ b/media-libs/libvpx/libvpx-0.9.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-0.9.6.ebuild,v 1.2 2011/05/16 16:39:23 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-0.9.6.ebuild,v 1.3 2011/05/28 19:08:23 tommy Exp $
EAPI=3
inherit eutils multilib toolchain-funcs
@@ -41,6 +41,10 @@ src_prepare() {
src_configure() {
tc-export CC
+ local archparams=""
+ [ "$ABI" = "x86" ] && archparams=" --target=x86-linux-gcc"
+ [ "$ABI" = "amd64" ] && archparams=" --target=x86_64-linux-gcc"
+ ( use x86 || use amd64 ) && archparams+=" --as=yasm"
./configure \
--prefix="${EPREFIX}"/usr \
--libdir="${EPREFIX}"/usr/$(get_libdir) \
@@ -58,6 +62,7 @@ src_configure() {
$(use_enable doc install-docs) \
$(use_enable postproc) \
$(use_enable threads multithread) \
+ $archparams \
|| die
}