| 1 |
commit: 356591702a337367b0895e5e762adf1a20c9c545 |
| 2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 16 15:04:24 2017 +0000 |
| 4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 16 15:04:24 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=35659170 |
| 7 |
|
| 8 |
Drop gstreamer:0.10 support from mozilla packages |
| 9 |
|
| 10 |
eclass/mozconfig-v6.45.eclass | 13 ++----------- |
| 11 |
mail-client/thunderbird/metadata.xml | 1 - |
| 12 |
www-client/firefox/metadata.xml | 1 - |
| 13 |
3 files changed, 2 insertions(+), 13 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/mozconfig-v6.45.eclass b/eclass/mozconfig-v6.45.eclass |
| 16 |
index 15e65ab..948d40e 100644 |
| 17 |
--- a/eclass/mozconfig-v6.45.eclass |
| 18 |
+++ b/eclass/mozconfig-v6.45.eclass |
| 19 |
@@ -70,7 +70,7 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v4 |
| 20 |
# Set the variable to any value if the use flag should exist but not be default-enabled. |
| 21 |
|
| 22 |
# use-flags common among all mozilla ebuilds |
| 23 |
-IUSE="${IUSE} dbus debug ffmpeg +gstreamer gstreamer-0 +jemalloc3 neon pulseaudio selinux startup-notification system-cairo |
| 24 |
+IUSE="${IUSE} dbus debug ffmpeg +gstreamer +jemalloc3 neon pulseaudio selinux startup-notification system-cairo |
| 25 |
system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx" |
| 26 |
|
| 27 |
# some notes on deps: |
| 28 |
@@ -104,10 +104,6 @@ RDEPEND=">=app-text/hunspell-1.2:= |
| 29 |
>=media-libs/gst-plugins-good-1.4.5:1.0 |
| 30 |
>=media-plugins/gst-plugins-libav-1.4.5:1.0 |
| 31 |
) |
| 32 |
- gstreamer-0? ( |
| 33 |
- >=media-libs/gstreamer-0.10.25:0.10 |
| 34 |
- media-plugins/gst-plugins-meta:0.10[ffmpeg] |
| 35 |
- ) |
| 36 |
x11-libs/libX11 |
| 37 |
x11-libs/libXcomposite |
| 38 |
x11-libs/libXdamage |
| 39 |
@@ -188,10 +184,8 @@ DEPEND="app-arch/zip |
| 40 |
RDEPEND+=" |
| 41 |
selinux? ( sec-policy/selinux-mozilla )" |
| 42 |
|
| 43 |
-# only one of gstreamer and gstreamer-0 can be enabled at a time, so set REQUIRED_USE to signify this. |
| 44 |
-# also force system-icu if system-harfbuzz is set to avoid any potential ABI issues |
| 45 |
+# force system-icu if system-harfbuzz is set to avoid any potential ABI issues |
| 46 |
REQUIRED_USE=" |
| 47 |
- ?? ( gstreamer gstreamer-0 ) |
| 48 |
system-harfbuzz? ( system-icu )" |
| 49 |
|
| 50 |
# only one of gtk3 or qt5 should be permitted to be selected, since only one will be used. |
| 51 |
@@ -338,9 +332,6 @@ mozconfig_config() { |
| 52 |
if use gstreamer ; then |
| 53 |
use ffmpeg && einfo "${PN} will not use ffmpeg unless gstreamer:1.0 is not available at runtime" |
| 54 |
mozconfig_annotate '+gstreamer' --enable-gstreamer=1.0 |
| 55 |
- elif use gstreamer-0 ; then |
| 56 |
- use ffmpeg && einfo "${PN} will not use ffmpeg unless gstreamer:0.10 is not available at runtime" |
| 57 |
- mozconfig_annotate '+gstreamer-0' --enable-gstreamer=0.10 |
| 58 |
else |
| 59 |
mozconfig_annotate '' --disable-gstreamer |
| 60 |
fi |
| 61 |
|
| 62 |
diff --git a/mail-client/thunderbird/metadata.xml b/mail-client/thunderbird/metadata.xml |
| 63 |
index 2123a49..5b1e2e8 100644 |
| 64 |
--- a/mail-client/thunderbird/metadata.xml |
| 65 |
+++ b/mail-client/thunderbird/metadata.xml |
| 66 |
@@ -15,7 +15,6 @@ |
| 67 |
<flag name='custom-optimization'>Fine-tune custom compiler optimizations |
| 68 |
(-Os, -O0, -O1, -O2, -O3)</flag> |
| 69 |
<flag name="jemalloc3">Enable or disable jemalloc3 (forced-on when supported prior to 38.0)</flag> |
| 70 |
- <flag name='gstreamer-0'>Use gstreamer:0.10 instead of gstreamer:1 for media support</flag> |
| 71 |
<flag name="system-cairo">Use the system-wide <pkg>x11-libs/cairo</pkg> |
| 72 |
instead of bundled.</flag> |
| 73 |
<flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg> |
| 74 |
|
| 75 |
diff --git a/www-client/firefox/metadata.xml b/www-client/firefox/metadata.xml |
| 76 |
index 73dd758..fbcda11 100644 |
| 77 |
--- a/www-client/firefox/metadata.xml |
| 78 |
+++ b/www-client/firefox/metadata.xml |
| 79 |
@@ -14,7 +14,6 @@ |
| 80 |
<flag name="gtk3">Use the cairo-gtk3 rendering engine</flag> |
| 81 |
<flag name="gmp-autoupdate">Allow Gecko Media Plugins (binary blobs) to be automatically |
| 82 |
downloaded and kept up-to-date in user profiles</flag> |
| 83 |
- <flag name="gstreamer-0">Use gstreamer:0.10 instead of gstreamer:1 for media support</flag> |
| 84 |
<flag name="hwaccel">Force-enable hardware-accelerated rendering (Mozilla bug 594876)</flag> |
| 85 |
<flag name="jemalloc">Enable or disable jemalloc</flag> |
| 86 |
<flag name="jemalloc3">Enable or disable jemalloc3 (forced-on when supported prior to 38.0)</flag> |
Archives