From: "Ian Stakenvicius" <axs@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/mozilla:master commit in: eclass/
Date: Tue, 4 Apr 2017 15:02:37 +0000 (UTC) [thread overview]
Message-ID: <1491317528.94962582bc0ab30ccc29051d410a521089dcc7cc.axs@gentoo> (raw)
commit: 94962582bc0ab30ccc29051d410a521089dcc7cc
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 4 14:10:46 2017 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Tue Apr 4 14:52:08 2017 +0000
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=94962582
mozconfig-v6.52.eclass: various fixes
Skia support is now forced off on big-endian platforms, to avoid bug 607662
gtk+:2 is added back as a fixed dependency, as it is still needed on mozilla-52
regardless of whether or not the toolkit is cairo-gtk3, bug 601326
apulse is now an alternative dependency to pulseaudio for USE="pulseaudio"
eclass/mozconfig-v6.52.eclass | 50 +++++++++++++++++++++++++++----------------
1 file changed, 32 insertions(+), 18 deletions(-)
diff --git a/eclass/mozconfig-v6.52.eclass b/eclass/mozconfig-v6.52.eclass
index c260153..409c8ad 100644
--- a/eclass/mozconfig-v6.52.eclass
+++ b/eclass/mozconfig-v6.52.eclass
@@ -51,12 +51,14 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v4
# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_GTK3
# @DESCRIPTION:
# Set this variable before the inherit line, when an ebuild can provide
-# optional gtk3 support via IUSE="gtk3". Currently this would include
-# ebuilds for firefox, but thunderbird and seamonkey could follow in the future.
+# optional gtk3 support via IUSE="force-gtk3". Currently this would include
+# thunderbird and seamonkey in the future, once support is ready for testing.
#
-# Leave the variable UNSET if gtk3 support should not be available.
+# Leave the variable UNSET if gtk3 support should not be optionally available.
# Set the variable to "enabled" if the use flag should be enabled by default.
# Set the variable to any value if the use flag should exist but not be default-enabled.
+# If gtk+:3 is to be the standard toolkit, do not use this and instead use
+# MOZCONFIG_OPTIONAL_GTK2ONLY.
# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_GTK2ONLY
# @DESCRIPTION:
@@ -93,6 +95,7 @@ RDEPEND=">=app-text/hunspell-1.2:=
dev-libs/atk
dev-libs/expat
>=x11-libs/cairo-1.10[X]
+ >=x11-libs/gtk+-2.18:2
x11-libs/gdk-pixbuf
>=x11-libs/pango-1.22.0
>=media-libs/libpng-1.6.25:0=[apng]
@@ -100,7 +103,8 @@ RDEPEND=">=app-text/hunspell-1.2:=
media-libs/fontconfig
>=media-libs/freetype-2.4.10
kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
- pulseaudio? ( media-sound/pulseaudio )
+ pulseaudio? ( media-sound/pulseaudio
+ >=media-sound/apulse-0.1.9 )
virtual/freedesktop-icon-theme
dbus? ( >=sys-apps/dbus-0.60
>=dev-libs/dbus-glib-0.72 )
@@ -128,25 +132,18 @@ RDEPEND=">=app-text/hunspell-1.2:=
if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then
MOZCONFIG_OPTIONAL_GTK2ONLY=
if [[ ${MOZCONFIG_OPTIONAL_GTK3} = "enabled" ]]; then
- IUSE+=" +gtk3"
+ IUSE+=" +force-gtk3"
else
- IUSE+=" gtk3"
+ IUSE+=" force-gtk3"
fi
- RDEPEND+="
- gtk3? ( >=x11-libs/gtk+-3.4.0:3 )
- !gtk3? ( >=x11-libs/gtk+-2.18:2 )"
+ RDEPEND+=" force-gtk3? ( >=x11-libs/gtk+-3.4.0:3 )"
elif [[ -n ${MOZCONFIG_OPTIONAL_GTK2ONLY} ]]; then
if [[ ${MOZCONFIG_OPTIONAL_GTK2ONLY} = "enabled" ]]; then
IUSE+=" +gtk2"
else
IUSE+=" gtk2"
fi
- RDEPEND+="
- gtk2? ( >=x11-libs/gtk+-2.18:2 )
- !gtk2? ( >=x11-libs/gtk+-3.4.0:3 )"
-else
- RDEPEND+="
- >=x11-libs/gtk+-2.18:2"
+ RDEPEND+=" !gtk2? ( >=x11-libs/gtk+-3.4.0:3 )"
fi
if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then
if [[ ${MOZCONFIG_OPTIONAL_WIFI} = "enabled" ]]; then
@@ -248,10 +245,16 @@ mozconfig_config() {
mozconfig_annotate 'Gentoo default' --with-system-png
mozconfig_annotate '' --enable-system-ffi
mozconfig_annotate 'Gentoo default to honor system linker' --disable-gold
- mozconfig_annotate '' --enable-skia
mozconfig_annotate '' --disable-gconf
mozconfig_annotate '' --with-intl-api
+ # skia has no support for big-endian platforms
+ if [[ $(tc-endian) == "big" ]]; then
+ mozconfig_annotate 'big endian target' --disable-skia
+ else
+ mozconfig_annotate '' --enable-skia
+ fi
+
# default toolkit is cairo-gtk2, optional use flags can change this
local toolkit="cairo-gtk2"
local toolkit_comment=""
@@ -301,7 +304,8 @@ mozconfig_config() {
mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
mozconfig_use_enable pulseaudio
- if ! use pulseaudio ; then
+ # force the deprecated alsa sound code if pulseaudio is disabled
+ if use kernel_linux && ! use pulseaudio ; then
mozconfig_annotate '-pulseaudio' --enable-alsa
fi
@@ -321,7 +325,9 @@ mozconfig_config() {
fi
if [[ ${CHOST} == armv* ]] ; then
mozconfig_annotate '' --with-float-abi=hard
- mozconfig_annotate '' --enable-skia
+ if ! use skia ; then
+ mozconfig_annotate 'Gentoo forces skia for arm' --enable-skia
+ fi
if ! use system-libvpx ; then
sed -i -e "s|softfp|hard|" \
@@ -369,4 +375,12 @@ mozconfig_install_prefs() {
echo "sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \
>>"${prefs_file}" || die
fi
+
+ # force cairo as the canvas renderer on platforms without skia support
+ if [[ $(tc-endian) == "big" ]] ; then
+ echo "sticky_pref(\"gfx.canvas.azure.backends\",\"cairo\");" \
+ >>"${prefs_file}" || die
+ echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \
+ >>"${prefs_file}" || die
+ fi
}
next reply other threads:[~2017-04-04 15:02 UTC|newest]
Thread overview: 123+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-04 15:02 Ian Stakenvicius [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-03-20 17:26 [gentoo-commits] proj/mozilla:master commit in: eclass/ Jory Pratt
2018-08-16 16:48 Ian Stakenvicius
2018-08-15 21:11 Ian Stakenvicius
2018-08-15 19:30 Ian Stakenvicius
2018-08-15 17:18 Ian Stakenvicius
2018-06-18 4:41 Jory Pratt
2018-05-22 13:44 Jory Pratt
2018-05-22 1:19 Jory Pratt
2018-05-13 9:09 Lars Wendler
2018-02-19 12:25 Jory Pratt
2018-01-31 15:35 Ian Stakenvicius
2018-01-29 5:12 Ian Stakenvicius
2018-01-26 4:28 Ian Stakenvicius
2018-01-26 4:28 Ian Stakenvicius
2017-12-21 14:16 Jory Pratt
2017-11-14 16:18 Ian Stakenvicius
2017-10-26 8:52 Lars Wendler
2017-09-28 17:07 Ian Stakenvicius
2017-09-10 21:56 Jory Pratt
2017-08-29 0:11 Jory Pratt
2017-08-22 14:57 Lars Wendler
2017-08-17 9:31 Lars Wendler
2017-07-25 1:58 Ian Stakenvicius
2017-06-06 18:01 Jory Pratt
2017-05-31 20:38 Jory Pratt
2017-05-31 20:37 Jory Pratt
2017-05-31 20:37 Jory Pratt
2017-05-31 20:19 Jory Pratt
2017-05-04 17:46 Ian Stakenvicius
2017-04-28 13:58 Ian Stakenvicius
2017-04-19 21:00 Ian Stakenvicius
2017-04-19 21:00 Ian Stakenvicius
2017-04-19 21:00 Ian Stakenvicius
2017-04-13 17:34 Ian Stakenvicius
2017-04-04 19:42 Ian Stakenvicius
2017-03-20 21:46 Andrew Savchenko
2017-03-20 19:22 Andrew Savchenko
2017-03-20 17:31 Andrew Savchenko
2017-02-06 2:30 Jory Pratt
2017-02-04 18:30 Jory Pratt
2017-02-03 3:41 Jory Pratt
2017-02-02 3:02 Jory Pratt
2016-12-01 8:55 Lars Wendler
2016-11-29 17:17 Lars Wendler
2016-10-16 21:49 Jory Pratt
2016-10-09 17:59 Jory Pratt
2016-10-09 14:35 Ian Stakenvicius
2016-09-08 22:18 Ian Stakenvicius
2016-09-04 23:31 Jory Pratt
2016-09-04 23:31 Jory Pratt
2016-08-04 16:09 Ian Stakenvicius
2016-07-25 21:27 Ian Stakenvicius
2016-07-25 20:14 Ian Stakenvicius
2016-07-25 20:12 Ian Stakenvicius
2016-07-12 19:45 Ian Stakenvicius
2016-07-11 18:05 Ian Stakenvicius
2016-07-09 3:25 Ian Stakenvicius
2016-07-09 0:57 Ian Stakenvicius
2016-07-05 1:15 Ian Stakenvicius
2016-04-28 5:50 Lars Wendler
2016-04-27 21:27 Ian Stakenvicius
2016-03-28 14:57 Ian Stakenvicius
2016-03-28 14:57 Ian Stakenvicius
2016-02-04 16:39 Ian Stakenvicius
2016-01-11 1:25 Jory Pratt
2016-01-11 1:19 Jory Pratt
2016-01-11 1:19 Jory Pratt
2016-01-04 21:09 Ian Stakenvicius
2016-01-01 22:29 Jory Pratt
2015-12-31 22:05 Jory Pratt
2015-11-27 19:24 [gentoo-commits] proj/mozilla:crossdev " Ian Stakenvicius
2015-11-27 19:25 ` [gentoo-commits] proj/mozilla:master " Ian Stakenvicius
2015-11-10 8:33 Lars Wendler
2015-11-09 21:55 Jory Pratt
2015-11-09 21:53 Jory Pratt
2015-11-09 19:12 Jory Pratt
2015-10-30 18:41 Jory Pratt
2015-08-14 16:24 Ian Stakenvicius
2015-07-17 18:27 Ian Stakenvicius
2015-07-17 17:34 Ian Stakenvicius
2015-07-16 17:48 Ian Stakenvicius
2015-07-16 16:56 Ian Stakenvicius
2015-07-16 16:22 Ian Stakenvicius
2015-07-16 16:15 Ian Stakenvicius
2015-07-16 15:41 Ian Stakenvicius
2015-07-14 22:16 Ian Stakenvicius
2015-07-14 22:16 Ian Stakenvicius
2015-06-02 19:48 Ian Stakenvicius
2015-03-10 14:07 Ian Stakenvicius
2014-11-06 14:46 Ian Stakenvicius
2014-10-27 19:12 Ian Stakenvicius
2014-10-16 21:18 Ian Stakenvicius
2014-08-25 19:25 Ian Stakenvicius
2013-10-29 13:39 Jory Pratt
2013-10-26 2:30 Jory Pratt
2013-08-28 15:24 Ian Stakenvicius
2013-08-26 14:40 Jory Pratt
2013-05-27 21:52 Jory Pratt
2013-05-22 23:37 Jory Pratt
2013-05-22 13:32 Lars Wendler
2013-04-10 2:01 Jory Pratt
2013-03-25 13:10 Jory Pratt
2013-03-24 19:09 Jory Pratt
2013-03-10 0:14 Jory Pratt
2012-12-03 15:45 Lars Wendler
2012-09-09 16:23 Jory Pratt
2012-08-02 1:59 Jory Pratt
2012-07-18 0:17 Jory Pratt
2012-03-26 3:40 Jory Pratt
2012-03-04 14:17 Jory Pratt
2012-02-28 5:03 Jory Pratt
2012-02-04 6:10 Nirbheek Chauhan
2012-02-01 20:54 Nirbheek Chauhan
2012-01-26 14:58 Nirbheek Chauhan
2011-11-21 16:34 Jory Pratt
2011-11-21 16:33 Jory Pratt
2011-11-21 15:49 Jory Pratt
2011-11-16 14:53 Jory Pratt
2011-03-17 13:33 Jory Pratt
2011-03-16 13:41 Jory Pratt
2011-03-16 4:27 Jory Pratt
2011-03-14 6:58 Nirbheek Chauhan
2011-03-09 2:30 Mounir Lamouri
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1491317528.94962582bc0ab30ccc29051d410a521089dcc7cc.axs@gentoo \
--to=axs@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox