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