commit: 356591702a337367b0895e5e762adf1a20c9c545
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 16 15:04:24 2017 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Thu Feb 16 15:04:24 2017 +0000
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=35659170
Drop gstreamer:0.10 support from mozilla packages
eclass/mozconfig-v6.45.eclass | 13 ++-----------
mail-client/thunderbird/metadata.xml | 1 -
www-client/firefox/metadata.xml | 1 -
3 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/eclass/mozconfig-v6.45.eclass b/eclass/mozconfig-v6.45.eclass
index 15e65ab..948d40e 100644
--- a/eclass/mozconfig-v6.45.eclass
+++ b/eclass/mozconfig-v6.45.eclass
@@ -70,7 +70,7 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v4
# Set the variable to any value if the use flag should exist but not be
default-enabled.
# use-flags common among all mozilla ebuilds
-IUSE="${IUSE} dbus debug ffmpeg +gstreamer gstreamer-0 +jemalloc3 neon
pulseaudio selinux startup-notification system-cairo
+IUSE="${IUSE} dbus debug ffmpeg +gstreamer +jemalloc3 neon pulseaudio selinux
startup-notification system-cairo
system-harfbuzz system-icu system-jpeg system-libevent system-sqlite
system-libvpx"
# some notes on deps:
@@ -104,10 +104,6 @@ RDEPEND=">=app-text/hunspell-1.2:=
>=media-libs/gst-plugins-good-1.4.5:1.0
>=media-plugins/gst-plugins-libav-1.4.5:1.0
)
- gstreamer-0? (
- >=media-libs/gstreamer-0.10.25:0.10
- media-plugins/gst-plugins-meta:0.10[ffmpeg]
- )
x11-libs/libX11
x11-libs/libXcomposite
x11-libs/libXdamage
@@ -188,10 +184,8 @@ DEPEND="app-arch/zip
RDEPEND+="
selinux? ( sec-policy/selinux-mozilla )"
-# only one of gstreamer and gstreamer-0 can be enabled at a time, so set
REQUIRED_USE to signify this.
-# also force system-icu if system-harfbuzz is set to avoid any potential ABI
issues
+# force system-icu if system-harfbuzz is set to avoid any potential ABI issues
REQUIRED_USE="
- ?? ( gstreamer gstreamer-0 )
system-harfbuzz? ( system-icu )"
# only one of gtk3 or qt5 should be permitted to be selected, since only one
will be used.
@@ -338,9 +332,6 @@ mozconfig_config() {
if use gstreamer ; then
use ffmpeg && einfo "${PN} will not use ffmpeg unless
gstreamer:1.0 is not available at runtime"
mozconfig_annotate '+gstreamer' --enable-gstreamer=1.0
- elif use gstreamer-0 ; then
- use ffmpeg && einfo "${PN} will not use ffmpeg unless
gstreamer:0.10 is not available at runtime"
- mozconfig_annotate '+gstreamer-0' --enable-gstreamer=0.10
else
mozconfig_annotate '' --disable-gstreamer
fi
diff --git a/mail-client/thunderbird/metadata.xml
b/mail-client/thunderbird/metadata.xml
index 2123a49..5b1e2e8 100644
--- a/mail-client/thunderbird/metadata.xml
+++ b/mail-client/thunderbird/metadata.xml
@@ -15,7 +15,6 @@
<flag name='custom-optimization'>Fine-tune custom compiler optimizations
(-Os, -O0, -O1, -O2, -O3)</flag>
<flag name="jemalloc3">Enable or disable jemalloc3 (forced-on when
supported prior to 38.0)</flag>
- <flag name='gstreamer-0'>Use gstreamer:0.10 instead of gstreamer:1 for
media support</flag>
<flag name="system-cairo">Use the system-wide <pkg>x11-libs/cairo</pkg>
instead of bundled.</flag>
<flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg>
diff --git a/www-client/firefox/metadata.xml b/www-client/firefox/metadata.xml
index 73dd758..fbcda11 100644
--- a/www-client/firefox/metadata.xml
+++ b/www-client/firefox/metadata.xml
@@ -14,7 +14,6 @@
<flag name="gtk3">Use the cairo-gtk3 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>
- <flag name="gstreamer-0">Use gstreamer:0.10 instead of gstreamer:1 for
media support</flag>
<flag name="hwaccel">Force-enable hardware-accelerated rendering
(Mozilla bug 594876)</flag>
<flag name="jemalloc">Enable or disable jemalloc</flag>
<flag name="jemalloc3">Enable or disable jemalloc3 (forced-on when
supported prior to 38.0)</flag>
