| 1 |
commit: 4d442574704b6f7d218e99e2c0b4366f75bf8ce6 |
| 2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Sep 28 20:37:27 2017 +0000 |
| 4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 28 20:37:27 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=4d442574 |
| 7 |
|
| 8 |
Put back USE=eme-free |
| 9 |
|
| 10 |
This reverts commit b1908a81624ef431c4b80e7b311c56f581b90735. |
| 11 |
|
| 12 |
Confirmed that --disable-eme does indeed remove code from mozilla builds |
| 13 |
and can ensure that widevine (and later adobe) CDM will not be loaded |
| 14 |
and cannot be used, by not including their "adaptors" in libxul. |
| 15 |
|
| 16 |
www-client/firefox/firefox-52.4.0.ebuild | 8 +++++--- |
| 17 |
www-client/firefox/firefox-56.0.ebuild | 8 +++++--- |
| 18 |
www-client/firefox/metadata.xml | 1 + |
| 19 |
3 files changed, 11 insertions(+), 6 deletions(-) |
| 20 |
|
| 21 |
diff --git a/www-client/firefox/firefox-52.4.0.ebuild b/www-client/firefox/firefox-52.4.0.ebuild |
| 22 |
index ab4e45d..4c967d6 100644 |
| 23 |
--- a/www-client/firefox/firefox-52.4.0.ebuild |
| 24 |
+++ b/www-client/firefox/firefox-52.4.0.ebuild |
| 25 |
@@ -39,7 +39,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-lin |
| 26 |
|
| 27 |
SLOT="0" |
| 28 |
LICENSE="MPL-2.0 GPL-2 LGPL-2.1" |
| 29 |
-IUSE="bindist +gmp-autoupdate hardened hwaccel jack pgo rust selinux test" |
| 30 |
+IUSE="bindist eme-free +gmp-autoupdate hardened hwaccel jack pgo rust selinux test" |
| 31 |
RESTRICT="!bindist? ( bindist )" |
| 32 |
|
| 33 |
PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/${PATCH}.tar.xz ) |
| 34 |
@@ -204,6 +204,8 @@ src_configure() { |
| 35 |
# enable JACK, bug 600002 |
| 36 |
mozconfig_use_enable jack |
| 37 |
|
| 38 |
+ use eme-free && mozconfig_annotate '+eme-free' --disable-eme |
| 39 |
+ |
| 40 |
# It doesn't compile on alpha without this LDFLAGS |
| 41 |
use alpha && append-ldflags "-Wl,--no-relax" |
| 42 |
|
| 43 |
@@ -298,7 +300,7 @@ src_install() { |
| 44 |
|| die |
| 45 |
|
| 46 |
local plugin |
| 47 |
- use gmp-autoupdate || for plugin in "${GMP_PLUGIN_LIST[@]}" ; do |
| 48 |
+ use gmp-autoupdate || use eme-free || for plugin in "${GMP_PLUGIN_LIST[@]}" ; do |
| 49 |
echo "pref(\"media.${plugin}.autoupdate\", false);" >> \ |
| 50 |
"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \ |
| 51 |
|| die |
| 52 |
@@ -386,7 +388,7 @@ pkg_postinst() { |
| 53 |
xdg_desktop_database_update |
| 54 |
gnome2_icon_cache_update |
| 55 |
|
| 56 |
- if ! use gmp-autoupdate ; then |
| 57 |
+ if ! use gmp-autoupdate && ! use eme-free ; then |
| 58 |
elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or" |
| 59 |
elog "installing into new profiles:" |
| 60 |
local plugin |
| 61 |
|
| 62 |
diff --git a/www-client/firefox/firefox-56.0.ebuild b/www-client/firefox/firefox-56.0.ebuild |
| 63 |
index 144ad8f..b970878 100644 |
| 64 |
--- a/www-client/firefox/firefox-56.0.ebuild |
| 65 |
+++ b/www-client/firefox/firefox-56.0.ebuild |
| 66 |
@@ -38,7 +38,7 @@ KEYWORDS="~amd64 ~x86" |
| 67 |
|
| 68 |
SLOT="0" |
| 69 |
LICENSE="MPL-2.0 GPL-2 LGPL-2.1" |
| 70 |
-IUSE="bindist +gmp-autoupdate hardened hwaccel jack nsplugin pgo selinux test" |
| 71 |
+IUSE="bindist eme-free +gmp-autoupdate hardened hwaccel jack nsplugin pgo selinux test" |
| 72 |
RESTRICT="!bindist? ( bindist )" |
| 73 |
|
| 74 |
PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/${PATCH}.tar.xz ) |
| 75 |
@@ -195,6 +195,8 @@ src_configure() { |
| 76 |
# enable JACK, bug 600002 |
| 77 |
mozconfig_use_enable jack |
| 78 |
|
| 79 |
+ use eme-free && mozconfig_annotate '+eme-free' --disable-eme |
| 80 |
+ |
| 81 |
# It doesn't compile on alpha without this LDFLAGS |
| 82 |
use alpha && append-ldflags "-Wl,--no-relax" |
| 83 |
|
| 84 |
@@ -292,7 +294,7 @@ src_install() { |
| 85 |
fi |
| 86 |
|
| 87 |
local plugin |
| 88 |
- use gmp-autoupdate || for plugin in "${GMP_PLUGIN_LIST[@]}" ; do |
| 89 |
+ use gmp-autoupdate || use eme-free || for plugin in "${GMP_PLUGIN_LIST[@]}" ; do |
| 90 |
echo "pref(\"media.${plugin}.autoupdate\", false);" >> \ |
| 91 |
"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \ |
| 92 |
|| die |
| 93 |
@@ -380,7 +382,7 @@ pkg_postinst() { |
| 94 |
xdg_desktop_database_update |
| 95 |
gnome2_icon_cache_update |
| 96 |
|
| 97 |
- if ! use gmp-autoupdate ; then |
| 98 |
+ if ! use gmp-autoupdate && ! use eme-free ; then |
| 99 |
elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or" |
| 100 |
elog "installing into new profiles:" |
| 101 |
local plugin |
| 102 |
|
| 103 |
diff --git a/www-client/firefox/metadata.xml b/www-client/firefox/metadata.xml |
| 104 |
index 56f4927..a338b44 100644 |
| 105 |
--- a/www-client/firefox/metadata.xml |
| 106 |
+++ b/www-client/firefox/metadata.xml |
| 107 |
@@ -10,6 +10,7 @@ |
| 108 |
are not binary-redistributable according to upstream.</flag> |
| 109 |
<flag name="custom-optimization">Build with user-specified compiler optimizations |
| 110 |
(-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)</flag> |
| 111 |
+ <flag name="eme-free">Disable EME (DRM plugin) cabability at build time</flag> |
| 112 |
<flag name="gtk2">Use the cairo-gtk2 rendering engine</flag> |
| 113 |
<flag name="gmp-autoupdate">Allow Gecko Media Plugins (binary blobs) to be automatically |
| 114 |
downloaded and kept up-to-date in user profiles</flag> |
Archives