[gentoo-commits] proj/mozilla:master commit in: www-client/firefox/

[Jory Pratt]

commit:     ed2f2c158adfafc3ea73358f2713dc8b4d182986
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 12 01:21:57 2015 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Fri Jun 12 01:21:57 2015 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=ed2f2c15

Add gtk3,egl support. Fix arm builds ... Thanks nerdboy for the work!!!

 www-client/firefox/firefox-38.0.1.ebuild | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/www-client/firefox/firefox-38.0.1.ebuild 
b/www-client/firefox/firefox-38.0.1.ebuild
index 65e6e6b..c03e6ee 100644
--- a/www-client/firefox/firefox-38.0.1.ebuild
+++ b/www-client/firefox/firefox-38.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-36.0.4.ebuild,v 
1.1 2015/03/24 08:53:56 polynomial-c Exp $
+# $Header: $
 
 EAPI="5"
 VIRTUALX_REQUIRED="pgo"
@@ -45,7 +45,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 
~amd64-linux ~x86-linu
 
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist hardened +minimal pgo selinux +gmp-autoupdate test"
+IUSE="bindist egl gtk3 hardened +minimal neon pgo selinux +gmp-autoupdate test"
 RESTRICT="!bindist? ( bindist )"
 
 # More URIs appended below...
@@ -210,6 +210,26 @@ src_configure() {
        # Add full relro support for hardened
        use hardened && append-ldflags "-Wl,-z,relro,-z,now"
 
+       if use neon ; then
+               mozconfig_annotate '' --with-fpu=neon
+               mozconfig_annotate '' --with-thumb=yes
+               mozconfig_annotate '' --with-thumb-interwork=no
+       fi
+
+       if [[ ${CHOST} == armv* ]] ; then
+               mozconfig_annotate '' --with-float-abi=hard
+               mozconfig_annotate '' --enable-skia
+
+               if ! use system-libvpx ; then
+                       sed -i -e "s|softfp|hard|" \
+                               "${S}"/media/libvpx/moz.build
+               fi
+       fi
+
+       use gtk3 && mozconfig_annotate 'Enable Cairo Gtk+3 support' 
--enable-default-toolkit=cairo-gtk3
+
+       use egl && mozconfig_annotate 'Enable EGL as GL provider' 
--with-gl-provider=EGL
+
        # Setup api key for location services
        echo -n "${_google_api_key}" > "${S}"/google-api-key
        mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
@@ -233,6 +253,9 @@ src_configure() {
        if [[ $(gcc-major-version) -lt 4 ]]; then
                append-cxxflags -fno-stack-protector
        fi
+
+       # workaround for funky/broken upstream configure...
+       emake -f client.mk configure
 }
 
 src_compile() {
@@ -263,7 +286,7 @@ src_compile() {
        else
                CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
                MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
-               emake -f client.mk
+               emake -f client.mk realbuild
        fi
 
 }