| 1 |
commit: 25e307504b8e608fd6602b19d7eb1d90654683c5 |
| 2 |
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Oct 29 13:38:37 2013 +0000 |
| 4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 29 13:38:37 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=25e30750 |
| 7 |
|
| 8 |
Sync eclass back from tree, drop X use on pango |
| 9 |
|
| 10 |
--- |
| 11 |
eclass/mozconfig-3.eclass | 47 ++++++++++++++++++++++++++++++++++++++++++----- |
| 12 |
1 file changed, 42 insertions(+), 5 deletions(-) |
| 13 |
|
| 14 |
diff --git a/eclass/mozconfig-3.eclass b/eclass/mozconfig-3.eclass |
| 15 |
index 867e7e2..b6efbf8 100644 |
| 16 |
--- a/eclass/mozconfig-3.eclass |
| 17 |
+++ b/eclass/mozconfig-3.eclass |
| 18 |
@@ -1,6 +1,6 @@ |
| 19 |
-# Copyright 1999-2011 Gentoo Foundation |
| 20 |
+# Copyright 1999-2013 Gentoo Foundation |
| 21 |
# Distributed under the terms of the GNU General Public License v2 |
| 22 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-3.eclass,v 1.26 2011/11/21 15:29:36 anarchy Exp $ |
| 23 |
+# $Header: $ |
| 24 |
# |
| 25 |
# mozconfig.eclass: the new mozilla.eclass |
| 26 |
|
| 27 |
@@ -40,6 +40,27 @@ mozconfig_config() { |
| 28 |
fi |
| 29 |
fi |
| 30 |
|
| 31 |
+ if ! $(mozversion_is_new_enough) ; then |
| 32 |
+ mozconfig_use_enable alsa ogg |
| 33 |
+ mozconfig_use_enable alsa wave |
| 34 |
+ mozconfig_use_enable libnotify |
| 35 |
+ mozconfig_use_enable debug debugger-info-modules |
| 36 |
+ if has +ipc ${IUSE}; then |
| 37 |
+ mozconfig_use_enable ipc |
| 38 |
+ fi |
| 39 |
+ if [[ ${PN} != thunderbird ]] ; then |
| 40 |
+ mozconfig_annotate 'places' --enable-storage --enable-places --enable-places_bookmarks |
| 41 |
+ mozconfig_annotate '' --enable-oji --enable-mathml |
| 42 |
+ mozconfig_annotate 'broken' --disable-mochitest |
| 43 |
+ fi |
| 44 |
+ if use system-sqlite; then |
| 45 |
+ mozconfig_annotate '' --with-sqlite-prefix="${EPREFIX}"/usr |
| 46 |
+ fi |
| 47 |
+ if use amd64 || use x86 || use arm || use sparc; then |
| 48 |
+ mozconfig_annotate '' --enable-tracejit |
| 49 |
+ fi |
| 50 |
+ fi |
| 51 |
+ |
| 52 |
mozconfig_use_enable dbus |
| 53 |
mozconfig_use_enable debug |
| 54 |
mozconfig_use_enable debug tests |
| 55 |
@@ -50,9 +71,25 @@ mozconfig_config() { |
| 56 |
mozconfig_use_enable system-sqlite |
| 57 |
mozconfig_use_enable wifi necko-wifi |
| 58 |
|
| 59 |
- mozconfig_annotate 'required' --enable-ogg |
| 60 |
- mozconfig_annotate 'required' --enable-wave |
| 61 |
- mozconfig_annotate 'required' --with-system-libvpx |
| 62 |
+ if $(mozversion_is_new_enough) ; then |
| 63 |
+ mozconfig_annotate 'required' --enable-ogg |
| 64 |
+ mozconfig_annotate 'required' --enable-wave |
| 65 |
+ mozconfig_annotate 'required' --with-system-libvpx |
| 66 |
+ elif has +webm ${IUSE} && use webm; then |
| 67 |
+ if ! use alsa; then |
| 68 |
+ echo "Enabling alsa support due to webm request" |
| 69 |
+ mozconfig_annotate '+webm -alsa' --enable-ogg |
| 70 |
+ mozconfig_annotate '+webm -alsa' --enable-wave |
| 71 |
+ mozconfig_annotate '+webm' --enable-webm |
| 72 |
+ mozconfig_annotate '+webm' --with-system-libvpx |
| 73 |
+ else |
| 74 |
+ mozconfig_use_enable webm |
| 75 |
+ mozconfig_annotate '+webm' --with-system-libvpx |
| 76 |
+ fi |
| 77 |
+ else |
| 78 |
+ mozconfig_annotate '' --disable-webm |
| 79 |
+ mozconfig_annotate '' --disable-system-libvpx |
| 80 |
+ fi |
| 81 |
|
| 82 |
# These are enabled by default in all mozilla applications |
| 83 |
mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${EPREFIX}"/usr |
Archives