Remove overzealous assumption regarding arm, unbreak compilation

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

4 files changed, 48 insertions, 12 deletions

diff --git a/media-libs/libvpx/ChangeLog b/media-libs/libvpx/ChangeLog
index db1f83c7334a..f6a0c1952d10 100644
--- a/media-libs/libvpx/ChangeLog
+++ b/media-libs/libvpx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libvpx
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/ChangeLog,v 1.42 2012/03/02 16:39:04 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/ChangeLog,v 1.43 2012/03/04 17:22:19 lu_zero Exp $
+
+  04 Mar 2012; Luca Barbato <lu_zero@gentoo.org> libvpx-1.0.0.ebuild,
+  +files/libvpx-1.0.0-support-arm.patch:
+  Remove overzealous assumption regarding arm, unbreak compilation
 
   02 Mar 2012; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> libvpx-1.0.0.ebuild,
   libvpx-9999.ebuild:
diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest
index 0ce2847f510e..7fe0ef2a529b 100644
--- a/media-libs/libvpx/Manifest
+++ b/media-libs/libvpx/Manifest
@@ -1,23 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX libvpx-0.9.5-enable-shared.patch 655 RMD160 a72ba77666e088103a48fb31c445fc12f8163959 SHA1 4ee0feade82667b1e6d42cafcbe4113205482011 SHA256 44239d453714ca62523b299612d2ec279eceb2e74c296de1ef8eb5c8575ad86e
+AUX libvpx-1.0.0-support-arm.patch 1086 RMD160 ff5ea1afb0bad2ed60292f4490d74495892447ee SHA1 985cf23385357b0b1285cb0573167f95551280b5 SHA256 6b743cb44b3fe26a44f335e159411c37586677e72228e2e79ad60cbb72ba02d3
 DIST libvpx-v0.9.6.tar.bz2 1230418 RMD160 b85038b92d911b29b3b912c3d71c60e13f89a551 SHA1 a3522bd2b73d52381ba767ded1cbf4760e9cc6f8 SHA256 28bd8a8ef216fb570912f0d378668051d99681bf13735b59e68a12ad79f2aa73
 DIST libvpx-v0.9.7.tar.bz2 1244448 RMD160 1e322f97de39ad0126bf847c94de06f5b34e78d4 SHA1 639596df7182a93db83f61af8f5bb5b6a13dcf63 SHA256 4436275b905d996f4f0e4a3f98f5d3ca4507a05b9b1e101adfd6f508fa6ae14b
 DIST libvpx-v1.0.0.tar.bz2 1641411 RMD160 2ee5a2e7f4cb2f126c6d0d9a36e8636455f42915 SHA1 2919e11074fef72fc61ef1a75160050ffaad6074 SHA256 07cedb0a19a44e6d81d75f52eea864f59ef10c6c725cb860431bec6641eafe21
 EBUILD libvpx-0.9.6.ebuild 2078 RMD160 aac26ec93b9bc2f84365dc7cdbc332d2ac9b8653 SHA1 d996cf6030bce9087b3db88edabb40bcea6f65aa SHA256 a87141933667b658c08f4d9d5ac4c6871f7a56213efe8d100f13877cd4b5ac74
 EBUILD libvpx-0.9.7-r1.ebuild 2132 RMD160 674cb73a25df2e72b124eb8fd275d1964086d722 SHA1 540074820ca5fb62e977adf163bd5a79c4e79f14 SHA256 e50a825cd4851d44192de4bc8cb516234555d95d2df33c2383ed08bb045c83fe
 EBUILD libvpx-0.9.7.ebuild 2085 RMD160 03df67b8bcdb7568b5e9748b87d0f45319c17e88 SHA1 9f3f38136e360d535b31846d72c9ebd83cae370c SHA256 7250b3f9fe2ef8d8d992b2e988e50abaedfdd98297f946a54180a3fe265b07f5
-EBUILD libvpx-1.0.0.ebuild 1944 RMD160 e8bf5350504632ffcfadaee89f7d158e0a1035b7 SHA1 da690b065dafc0c527565ad153c33741c6065c92 SHA256 db37339cae047ec30906a762b7544c84e550ecb8ac39fd35350661fdd7cc34d0
+EBUILD libvpx-1.0.0.ebuild 2015 RMD160 2a4335799054103e334f948afb8fe780792fcfcc SHA1 9a536a75ea410cd3c491299a952a38129e918bf6 SHA256 0b48890c911b48efffc68981f0e4edaadc95aa7a67d1aa7d27ab8c83417b5cab
 EBUILD libvpx-9999.ebuild 1946 RMD160 82b66c3f4b4e854286d9c7738ead474730fde554 SHA1 5aa10defe6e6c76220df792db48a6be3c1799b7d SHA256 2628ed740884a4d583454528c90a2ef0bf15df7c2897ba33d1f4f38b1af9d67c
-MISC ChangeLog 6182 RMD160 cc20343a75f4e7ad8866075af6f084d2a4aa7214 SHA1 c8e258d076fe39586636d167a6d3236f1b67f610 SHA256 857450d59ba04a5bd3dff3c11a9f454a78cf447e282fe720322db0dd832a8578
+MISC ChangeLog 6363 RMD160 7b72e0698b7c73620f9e560aa99334527d749ea0 SHA1 00c5fbe212f76d489d9eb4e89fe4931071207df2 SHA256 2c28624bc73399cfddfa7ed285fe622ac1f1ded82776d37a5ce9105db431927b
 MISC metadata.xml 633 RMD160 3fd0be4f03715d6228e2d6997bac46ba01c09867 SHA1 7804245c809a3f9a66310736a812817c7a82844b SHA256 3b6d0692cac6d33871e62eb7d10cf25fbadc7421e1447e83f6151f5b1e60473f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQECAAYFAk9Q97MACgkQG7kqcTWJkGfxlQP9HZYLgAANvFV19Qb8QiGMi4aU
-sJuNHWrSQnOdnkSw254dfUWMBEiixnMjaqqnPRurajjVoAdbYagRyYyty6vKK3J/
-EBYWkGMVdxS/IEQ1N8A7JdJpxzyity+NqvC6ZbGOUjYfk5O43g7KhCClaj0Q9krQ
-L7YC6qaawhyztEEjj1w=
-=lbFE
+iF4EAREIAAYFAk9TpNoACgkQYpJnKVbCxcy5nQD/bjnn7dMkpGCRmcwKAsh+JSwY
+NSiJ4Z7X47HpycMupBgBAIAqEXaH0y5KDzgm33+QaQvA8e7rHQf8gQhbG9kA3d7U
+=fai9
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libvpx/files/libvpx-1.0.0-support-arm.patch b/media-libs/libvpx/files/libvpx-1.0.0-support-arm.patch
new file mode 100644
index 000000000000..4677572479a4
--- /dev/null
+++ b/media-libs/libvpx/files/libvpx-1.0.0-support-arm.patch
@@ -0,0 +1,31 @@
+--- build/make/configure.sh.old	2012-03-04 17:22:12.968222061 +0100
++++ build/make/configure.sh	2012-03-04 17:24:36.905216824 +0100
+@@ -549,6 +549,9 @@
+             *sparc*)
+                 tgt_isa=sparc
+                 ;;
++            *armv7*)
++                tgt_isa=armv7
++                ;;
+         esac
+ 
+         # detect tgt_os
+@@ -680,7 +683,6 @@
+ 
+         case ${tgt_cc} in
+         gcc)
+-            CROSS=${CROSS:-arm-none-linux-gnueabi-}
+             link_with_cc=gcc
+             setup_gnu_toolchain
+             arch_int=${tgt_isa##armv}
+@@ -689,8 +691,8 @@
+             tune_cflags="-mtune="
+             if enabled armv7
+             then
+-                check_add_cflags -march=armv7-a -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp  #-ftree-vectorize
+-                check_add_asflags -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp  #-march=armv7-a
++                check_add_cflags -mfpu=neon
++                check_add_asflags -mfpu=neon
+             else
+                 check_add_cflags -march=${tgt_isa}
+                 check_add_asflags -march=${tgt_isa}
diff --git a/media-libs/libvpx/libvpx-1.0.0.ebuild b/media-libs/libvpx/libvpx-1.0.0.ebuild
index 949ddf76b3d2..856b499600e3 100644
--- a/media-libs/libvpx/libvpx-1.0.0.ebuild
+++ b/media-libs/libvpx/libvpx-1.0.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-1.0.0.ebuild,v 1.4 2012/03/02 16:39:04 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-1.0.0.ebuild,v 1.5 2012/03/04 17:22:19 lu_zero Exp $
 
 EAPI=4
-inherit multilib toolchain-funcs
+inherit multilib toolchain-funcs eutils
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-2
@@ -38,7 +38,9 @@ DEPEND="amd64? ( dev-lang/yasm )
 REQUIRED_USE="
 	sse2? ( mmx )
 	"
-
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-support-arm.patch
+}
 src_configure() {
 	#let the build system decide which AS to use (it honours $AS but
 	#then feeds it with yasm flags without checking...) bug 345161