Backport upstream fix for armv7 hardfloat support. Bug #447046.

Package-Manager: portage-2.2.0_alpha185/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

4 files changed, 58 insertions, 8 deletions

diff --git a/media-libs/libvpx/ChangeLog b/media-libs/libvpx/ChangeLog
index 09ccf80921bf..fab8c7665bdf 100644
--- a/media-libs/libvpx/ChangeLog
+++ b/media-libs/libvpx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libvpx
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/ChangeLog,v 1.93 2013/06/25 20:48:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/ChangeLog,v 1.94 2013/06/25 21:01:30 aballier Exp $
+
+  25 Jun 2013; Alexis Ballier <aballier@gentoo.org>
+  libvpx-1.2.0_pre20130625.ebuild, +files/libvpx-1.2.0_pre20130625-armv7.patch:
+  Backport upstream fix for armv7 hardfloat support. Bug #447046.
 
 *libvpx-1.2.0_pre20130625 (25 Jun 2013)
 
diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest
index ac335b4b0ca9..2713c7789e00 100644
--- a/media-libs/libvpx/Manifest
+++ b/media-libs/libvpx/Manifest
@@ -5,18 +5,19 @@ AUX libvpx-1.1.0-arm.patch 1159 SHA256 173d50ecf7806683f5729db95bf204430d7bd791d
 AUX libvpx-1.1.0-chost.patch 1441 SHA256 ad4f06433f403bffbe6e72809cae7d63545bb19a034bf87d8a6c0d09b183546e SHA512 3591bcbf4535c608eab2ff51befe60b492e0f1b738aaa864a02c463b89abebb38dde6e683fb92f47f6d5f6139cbc1feced6464c5f4501bdbeb91cc5b39ac9f3e WHIRLPOOL ecac0141e9688a12854813dbe7c57746e4ba096c91e38435fcb3e9d5a289b9c1b9cfb2498f42b4def899997e86fcd7441771a4c9d0514f9e49447711a423a8be
 AUX libvpx-1.1.0-generic-gnu-shared.patch 1466 SHA256 411335557d7b8f04f53c971dc7654fa04a5beaeab8114b6222cbf23c8f33958d SHA512 82d78a5c8acdd16bbecb250d049446d8a0804094311feec0ffb85865e1a90d5895833a410d88d036dc653971b43b69fbe947ceb21f8b82d3a79e0325e31daf68 WHIRLPOOL a500811c5560846930d3781558e0079b2fbbb7c98e646e930782f37ce67571e49c37fe549aee0aea72a36e522a9d8ecaf21c421c72ad9d020ff60b0b57f9eb34
 AUX libvpx-1.1.0-x32.patch 1768 SHA256 931c23ed8d45c878943c6c7d9c647295962ab81d4b71a737063da95fd105b45e SHA512 87fa2fe4e7e47df1fe5eabc852937be1d893585b21d0533f80e33fcdacfa45edb66755ff31276d9d42d2922d2cb086c69a0c00c598df52fc171deaf5f5138373 WHIRLPOOL 9dce21ca3d1602c6ecc657eb2aa145c5a2dabfb360107f881a6668b1549194b3c24aab6bb8c6c0d1906f1b51fc6f97860629ebcc2fae175b9555e1606829c2bc
+AUX libvpx-1.2.0_pre20130625-armv7.patch 1480 SHA256 80518bcba1f7e8dce0a89cf4c6933669be2090f5bd86230b6bf88ae7938ad6f9 SHA512 abe70c9adce2a95aafa7fba296247c5c006bb99765b657b674be83f8feb2df118710eaaed7ba0b68c196273b585552d7f085c889525acde226164ce24064905b WHIRLPOOL b4cd4065d403e87a3a31ab63b4c899cda68e3c6174238bab84209e5a4e6e1f47ed5e0b28cd5ee642d56b7fa6a6a8e7cd56450af3fa1adf744684bfb123f45f83
 DIST libvpx-1.2.0_pre20130625.tar.bz2 1726341 SHA256 61e7a3b0e0587ed899fb5cc8240324a4f578489abf06c8916abcb59d322f6b58 SHA512 198575c2adec26e7772f59eb4915dda2fb0de04ca5980b51057557ba6a15f0fb6ca9a0db583866fcbe2585939b8cc09500642a0aea46ac2b696ec1ae54cf6c7f WHIRLPOOL 194df8c550a302e678aaf0959ea395185aea004206d24b969263ffedf77adfc76f04f5bc89cbbd66e9d7d925e07cedceb698507c92afba8d4096839b6575ae1f
 DIST libvpx-testdata-1.2.0.tar.bz2 43521881 SHA256 41dc3eb8ad0b24177ccc43f7dd6ec7946f78e6aaa5ff94d0883487e02eb4da2c SHA512 77d909435137965d2d13d5bbd053e658664caa035dfc60b2ba91d075a37624ed27d75cac53f013c8043624fc9b56219ad0b0dd20dd4eecc471935b2757110637 WHIRLPOOL 19c3d8d27e03407098f9e9f3120c242b25bea442aa1fb1755b63fce875662ec00942949af3c5e499f6e18ccfef67f18e1403c226b288e925786ef6fc64e112e0
 DIST libvpx-v1.1.0.tar.bz2 1653485 SHA256 9ce074cf4b3bcd9a49ff93e05485b71c273bfc3685a305e55a0e7fa51beb72c5 SHA512 5c165a1a171143f7c406ef899914a353d35f6dec0e3c49eec9a4f3311fd4072dea2e0da8ceb80651ad23e24cdbf2d6da328805bda8be042bbea2c65c9e53eaaa WHIRLPOOL 2dc8164e3f812903a1b52901438857bcdf172cb1d979f1ced45933fc12ffbb0c49e2a6c02b0c6f3360f48b146e1e5c6ea25c1613abafc3089030f6c1e7af92ed
 EBUILD libvpx-1.1.0.ebuild 2530 SHA256 67231b8d32861e18070a1936f62892d9c339a2f91e587b73b984d660a4dae8c3 SHA512 bd43732385d6ceb483bebf0891c2fa2052f9593951578f106e9d412b9caed51e13ee3ac004b664b88990c0115d33737e0d5ee613691e949d4a1ee3c72b72fff1 WHIRLPOOL f43c7f458c14c347529ea67b469a2174f0ee6ef1655e818650f8e46942cc5de307f4f32f6001dd86255f0a1377c3d112d67e94baa3472892d7e9e37119212494
-EBUILD libvpx-1.2.0_pre20130625.ebuild 3411 SHA256 25db0ca9d4bc4a92cf7216aa1949c4035593be725ec41c31af48731decd26754 SHA512 8a35969c3b9fa9722d50c797c0b6534faaa7bd0f866478c4c54c1151162075fe05442fb121010a41d71983d11f7b59728aa6e025e27983892a98249698716dd0 WHIRLPOOL 8e1644d1cbaf3e0519ebda9c09485319bec9cba7034d2f8147cde43e506459a7c59fd42d39c025dab11d1a94f8ff6b96cf7c2f80d83a58ae04a0fa7c1f8458e1
+EBUILD libvpx-1.2.0_pre20130625.ebuild 3476 SHA256 dab80f5549d7553e65460a472d3aa09f3394aec397b3fb6a31ccf453455213ae SHA512 42af07dc49e02c995417ca2dd87c736150f36926e8dd605132e2a328df20c24e58c6082f8cad2b6811001cb275ac7c4ed90d8377b7be7244513ac8003a1db0a7 WHIRLPOOL 5aca91e21cb2a2eedd019514a584ce09e151b583c63c06e4ee1802937afdbcd8a4f4b279057e85c6beccd038fcd0576341b19e832668e5ace931b9676f721bc9
 EBUILD libvpx-9999.ebuild 3399 SHA256 5ecd9d799209477bf853c0a7baf40061a53180057f06f036d4f419066c8cebb5 SHA512 ffb5ba9894e7b0cc00d4d22b956da4a68e69a560a50a3f4ced3e6d76b737ebca28b30c5edc8e74ab2944d55c0736cbfd7b651d68d700c4071a4450ff3757b6df WHIRLPOOL 434b34a83fd3d155024d132ffe66b62748e8df77776b6f185843b6ed8ac16f39f03115de1bbeb638aab8ab36a7fcfe204d69241cfa4e46b848149e76f32b18e3
-MISC ChangeLog 13876 SHA256 3be0c855b0552631abb4316f997702e1794e516b57132cf17245ae52fe0d988c SHA512 c540828a17001db1c73439a68f9bfabfa3a2db4e605eb48aa922d1ad14e8c80c7208b26a3abc101dc6284ef47e13603a142eca6113ecb641ad388b7b26dc0e14 WHIRLPOOL 70fdc0f2ab366b185c5489070a9cdb8ca9a688177e2839ffce1b80f5021618b2bcf80ccfe684384f85d89a3deb53688da841a927bce9fca3720649e4bff0fef9
+MISC ChangeLog 14075 SHA256 33bf643f0cfb0616357a694bd94788d2a472f2c9459626dcf5fcdb76aab0c386 SHA512 ecc8c92ff493c2706208ef3f59ef8d96314ddba169640ffe0272d2a20ec79ab46f172b0d60f992987d7ef9cbde72f5c8281387d6b4ce542d24f480a1419e6f84 WHIRLPOOL 2f88b95bf83e5797cc12dbf9264c615e2db54a0cd2fc77f57573224ea28c7e8614b2c426713e377586a8dff5d4c53db0edfea5a08fe02888e85489cf251e8c1c
 MISC metadata.xml 695 SHA256 9ce8ec472b7274e76137dcb0ee7881d478281161e56f5efc622b4a5eb85820e1 SHA512 19c4f1736767b4df3a0262d16a48b8c39aea5748ec7d6f87fde0231fcc26edf4b0953ba3d3ca0af226370481538958e1b37af91e4af4e6913d80d661ccaf3959 WHIRLPOOL 8c69f5f37908c5ed1d2c820a115e5a26a00282754424d0deadee1a05ff783ae8e62c08cb68c98030ca3f242a8fff8b475f1174cf7f9be441379956458376cea5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHKAi0ACgkQvFcC4BYPU0o/LQCeNF3JtZ9xFZYYpEMDavZYySLK
-A8UAn2/ovj19hGMeU9njzW8i7Nc7ea5q
-=7rNM
+iEYEAREIAAYFAlHKBSwACgkQvFcC4BYPU0rhygCgpURA0kNnepFr3LN66RhCff43
+efEAn0KHYKIOhJWRvkO1Tn6i4HprJneN
+=mZ4y
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libvpx/files/libvpx-1.2.0_pre20130625-armv7.patch b/media-libs/libvpx/files/libvpx-1.2.0_pre20130625-armv7.patch
new file mode 100644
index 000000000000..6e8eba908faf
--- /dev/null
+++ b/media-libs/libvpx/files/libvpx-1.2.0_pre20130625-armv7.patch
@@ -0,0 +1,41 @@
+commit af9dd50e42e0a7558d0d555ee12a1eb60e87a458
+Author: Luca Barbato <lu_zero@gentoo.org>
+Date:   Thu Jan 10 05:13:57 2013 +0100
+
+    configure: support hardfloat armv7 CHOSTS
+    
+    Many linux distribution for arm switched to armhf/hardfloat, support
+    them.
+    
+    Change-Id: I8ab39d34782b4f24b7028ac76342118166fd5905
+
+diff --git a/build/make/configure.sh b/build/make/configure.sh
+index e27af96..f69b6d7 100755
+--- a/build/make/configure.sh
++++ b/build/make/configure.sh
+@@ -597,8 +597,13 @@ process_common_toolchain() {
+             armv6*)
+                 tgt_isa=armv6
+                 ;;
++            armv7*-hardfloat*)
++                tgt_isa=armv7
++                float_abi=hard
++                ;;
+             armv7*)
+                 tgt_isa=armv7
++                float_abi=softfp
+                 ;;
+             armv5te*)
+                 tgt_isa=armv5te
+@@ -784,8 +789,9 @@ process_common_toolchain() {
+             check_add_asflags --defsym ARCHITECTURE=${arch_int}
+             tune_cflags="-mtune="
+             if [ ${tgt_isa} == "armv7" ]; then
+-                check_add_cflags  -march=armv7-a -mfloat-abi=softfp
+-                check_add_asflags -march=armv7-a -mfloat-abi=softfp
++                [ -z "${float_abi}" ] && float_abi=softfp
++                check_add_cflags  -march=armv7-a -mfloat-abi=${float_abi}
++                check_add_asflags -march=armv7-a -mfloat-abi=${float_abi}
+ 
+                 if enabled neon
+                 then
diff --git a/media-libs/libvpx/libvpx-1.2.0_pre20130625.ebuild b/media-libs/libvpx/libvpx-1.2.0_pre20130625.ebuild
index 119e2b6970e2..3cb124675caa 100644
--- a/media-libs/libvpx/libvpx-1.2.0_pre20130625.ebuild
+++ b/media-libs/libvpx/libvpx-1.2.0_pre20130625.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-1.2.0_pre20130625.ebuild,v 1.1 2013/06/25 20:48:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-1.2.0_pre20130625.ebuild,v 1.2 2013/06/25 21:01:30 aballier Exp $
 
 EAPI=4
-inherit multilib toolchain-funcs multilib-minimal
+inherit multilib toolchain-funcs multilib-minimal eutils
 
 LIBVPX_TESTDATA_VER=1.2.0
 
@@ -47,6 +47,10 @@ REQUIRED_USE="
 	ssse3? ( sse2 )
 	"
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-armv7.patch"
+}
+
 multilib_src_configure() {
 	unset CODECS #357487