From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-975465-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 BACEF1396D0
for <garchives@archives.gentoo.org>; Thu, 28 Sep 2017 17:49:55 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 0BF35E0C5F;
Thu, 28 Sep 2017 17:49:54 +0000 (UTC)
Received: from smtp.gentoo.org (dev.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 D2A1EE0C5F
for <gentoo-commits@lists.gentoo.org>; Thu, 28 Sep 2017 17:49:53 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(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 921D434172D
for <gentoo-commits@lists.gentoo.org>; Thu, 28 Sep 2017 17:49:51 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 310EC906C
for <gentoo-commits@lists.gentoo.org>; Thu, 28 Sep 2017 17:49:49 +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: <1506620919.b1908a81624ef431c4b80e7b311c56f581b90735.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: b1908a81624ef431c4b80e7b311c56f581b90735
X-VCS-Branch: master
Date: Thu, 28 Sep 2017 17:49:49 +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: 225dedc6-a49c-4cd2-9c23-2a72c7b41d1b
X-Archives-Hash: 9330a06a7e5a8155cb2f90e17303df50
commit: b1908a81624ef431c4b80e7b311c56f581b90735
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 28 17:47:32 2017 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Thu Sep 28 17:48:39 2017 +0000
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=b1908a81
Revert "www-client/firefox: add eme-free use flag to buildtime-disable all DRM plugin loading"
This reverts commit 91705546be499697c47b56a28895a519b7c31444
and commit a17df3d6c9060249605bcc9c14b4fac28efdede3. Upstream
removed the ability to compile-time-disable EME, so the only
thing left is the pref() method which needs no use flag.
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, 6 insertions(+), 11 deletions(-)
diff --git a/www-client/firefox/firefox-52.4.0.ebuild b/www-client/firefox/firefox-52.4.0.ebuild
index 4c967d6..ab4e45d 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 eme-free +gmp-autoupdate hardened hwaccel jack pgo rust selinux test"
+IUSE="bindist +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,8 +204,6 @@ 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"
@@ -300,7 +298,7 @@ src_install() {
|| die
local plugin
- use gmp-autoupdate || use eme-free || for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
+ use gmp-autoupdate || 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
@@ -388,7 +386,7 @@ pkg_postinst() {
xdg_desktop_database_update
gnome2_icon_cache_update
- if ! use gmp-autoupdate && ! use eme-free ; then
+ if ! use gmp-autoupdate ; 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 b970878..144ad8f 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 eme-free +gmp-autoupdate hardened hwaccel jack nsplugin pgo selinux test"
+IUSE="bindist +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,8 +195,6 @@ 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"
@@ -294,7 +292,7 @@ src_install() {
fi
local plugin
- use gmp-autoupdate || use eme-free || for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
+ use gmp-autoupdate || 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
@@ -382,7 +380,7 @@ pkg_postinst() {
xdg_desktop_database_update
gnome2_icon_cache_update
- if ! use gmp-autoupdate && ! use eme-free ; then
+ if ! use gmp-autoupdate ; 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 a338b44..56f4927 100644
--- a/www-client/firefox/metadata.xml
+++ b/www-client/firefox/metadata.xml
@@ -10,7 +10,6 @@
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>