diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-06-25 21:01:31 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-06-25 21:01:31 +0000 |
| commit | cd16c51d7cd2dc3c5f3d24b01d75023f36172485 (patch) | |
| tree | f4e3be35bdb5825b8798b5d6b4f8c7addf3c7801 /media-libs | |
| parent | Fix LINGUAS handling (bug 474732, thanks Frank Ridderbusch) (diff) | |
| download | gentoo-2-cd16c51d7cd2dc3c5f3d24b01d75023f36172485.tar.gz gentoo-2-cd16c51d7cd2dc3c5f3d24b01d75023f36172485.tar.bz2 gentoo-2-cd16c51d7cd2dc3c5f3d24b01d75023f36172485.zip | |
Backport upstream fix for armv7 hardfloat support. Bug #447046.
(Portage version: 2.2.0_alpha185/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/libvpx/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/libvpx/files/libvpx-1.2.0_pre20130625-armv7.patch | 41 | ||||
| -rw-r--r-- | media-libs/libvpx/libvpx-1.2.0_pre20130625.ebuild | 8 |
3 files changed, 52 insertions, 3 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/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 |