From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-975480-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id C19311396D0
for <garchives@archives.gentoo.org>; Thu, 28 Sep 2017 21:09:09 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 051E8E085E;
Thu, 28 Sep 2017 21:09:09 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id C95CDE085E
for <gentoo-commits@lists.gentoo.org>; Thu, 28 Sep 2017 21:09:08 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id C5DCA3416AD
for <gentoo-commits@lists.gentoo.org>; Thu, 28 Sep 2017 21:09:06 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 31444906C
for <gentoo-commits@lists.gentoo.org>; Thu, 28 Sep 2017 21:09:05 +0000 (UTC)
From: "Ian Stakenvicius" <axs@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Ian Stakenvicius" <axs@gentoo.org>
Message-ID: <1506631047.4d442574704b6f7d218e99e2c0b4366f75bf8ce6.axs@gentoo>
Subject: [gentoo-commits] proj/mozilla:master commit in: www-client/firefox/
X-VCS-Repository: proj/mozilla
X-VCS-Files: www-client/firefox/firefox-52.4.0.ebuild www-client/firefox/firefox-56.0.ebuild www-client/firefox/metadata.xml
X-VCS-Directories: www-client/firefox/
X-VCS-Committer: axs
X-VCS-Committer-Name: Ian Stakenvicius
X-VCS-Revision: 4d442574704b6f7d218e99e2c0b4366f75bf8ce6
X-VCS-Branch: master
Date: Thu, 28 Sep 2017 21:09:05 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 495d38f4-76f4-406d-8362-bad2328a737e
X-Archives-Hash: 32a655006550dad3e11712a667a380c1
commit: 4d442574704b6f7d218e99e2c0b4366f75bf8ce6
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 28 20:37:27 2017 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Thu Sep 28 20:37:27 2017 +0000
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=4d442574
Put back USE=eme-free
This reverts commit b1908a81624ef431c4b80e7b311c56f581b90735.
Confirmed that --disable-eme does indeed remove code from mozilla builds
and can ensure that widevine (and later adobe) CDM will not be loaded
and cannot be used, by not including their "adaptors" in libxul.
www-client/firefox/firefox-52.4.0.ebuild | 8 +++++---
www-client/firefox/firefox-56.0.ebuild | 8 +++++---
www-client/firefox/metadata.xml | 1 +
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/www-client/firefox/firefox-52.4.0.ebuild b/www-client/firefox/firefox-52.4.0.ebuild
index ab4e45d..4c967d6 100644
--- a/www-client/firefox/firefox-52.4.0.ebuild
+++ b/www-client/firefox/firefox-52.4.0.ebuild
@@ -39,7 +39,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-lin
SLOT="0"
LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist +gmp-autoupdate hardened hwaccel jack pgo rust selinux test"
+IUSE="bindist eme-free +gmp-autoupdate hardened hwaccel jack pgo rust selinux test"
RESTRICT="!bindist? ( bindist )"
PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/${PATCH}.tar.xz )
@@ -204,6 +204,8 @@ src_configure() {
# enable JACK, bug 600002
mozconfig_use_enable jack
+ use eme-free && mozconfig_annotate '+eme-free' --disable-eme
+
# It doesn't compile on alpha without this LDFLAGS
use alpha && append-ldflags "-Wl,--no-relax"
@@ -298,7 +300,7 @@ src_install() {
|| die
local plugin
- use gmp-autoupdate || for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
+ use gmp-autoupdate || use eme-free || for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
|| die
@@ -386,7 +388,7 @@ pkg_postinst() {
xdg_desktop_database_update
gnome2_icon_cache_update
- if ! use gmp-autoupdate ; then
+ if ! use gmp-autoupdate && ! use eme-free ; then
elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
elog "installing into new profiles:"
local plugin
diff --git a/www-client/firefox/firefox-56.0.ebuild b/www-client/firefox/firefox-56.0.ebuild
index 144ad8f..b970878 100644
--- a/www-client/firefox/firefox-56.0.ebuild
+++ b/www-client/firefox/firefox-56.0.ebuild
@@ -38,7 +38,7 @@ KEYWORDS="~amd64 ~x86"
SLOT="0"
LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist +gmp-autoupdate hardened hwaccel jack nsplugin pgo selinux test"
+IUSE="bindist eme-free +gmp-autoupdate hardened hwaccel jack nsplugin pgo selinux test"
RESTRICT="!bindist? ( bindist )"
PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/${PATCH}.tar.xz )
@@ -195,6 +195,8 @@ src_configure() {
# enable JACK, bug 600002
mozconfig_use_enable jack
+ use eme-free && mozconfig_annotate '+eme-free' --disable-eme
+
# It doesn't compile on alpha without this LDFLAGS
use alpha && append-ldflags "-Wl,--no-relax"
@@ -292,7 +294,7 @@ src_install() {
fi
local plugin
- use gmp-autoupdate || for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
+ use gmp-autoupdate || use eme-free || for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
|| die
@@ -380,7 +382,7 @@ pkg_postinst() {
xdg_desktop_database_update
gnome2_icon_cache_update
- if ! use gmp-autoupdate ; then
+ if ! use gmp-autoupdate && ! use eme-free ; then
elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
elog "installing into new profiles:"
local plugin
diff --git a/www-client/firefox/metadata.xml b/www-client/firefox/metadata.xml
index 56f4927..a338b44 100644
--- a/www-client/firefox/metadata.xml
+++ b/www-client/firefox/metadata.xml
@@ -10,6 +10,7 @@
are not binary-redistributable according to upstream.</flag>
<flag name="custom-optimization">Build with user-specified compiler optimizations
(-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)</flag>
+ <flag name="eme-free">Disable EME (DRM plugin) cabability at build time</flag>
<flag name="gtk2">Use the cairo-gtk2 rendering engine</flag>
<flag name="gmp-autoupdate">Allow Gecko Media Plugins (binary blobs) to be automatically
downloaded and kept up-to-date in user profiles</flag>