commit: 69e5fc728029cb367bb922a452031cb62551046c
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 5 22:01:13 2014 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Wed Nov 5 22:01:13 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=69e5fc72
Bumped firefox-34 to beta6, bumped gmp-openh264 and adjusted system-gmps
override
The version string as well as the path reported in about:plugins and
about:addons
is faked entirely by the media.gmp-gmpopenh264.version pref; as well this pref
is
used to determine the 'installed' status of the plugin. This bump adds a fake
and static
.version pref to show the plugin is 'system-installed', which allows the system
plugin
to be updated without a need for the user to refresh their login session and
also
show the plugin as being installed rather than 'will be installed shortly'.
---
eclass/mozconfig-v5.33.eclass | 4 +-
eclass/mozconfig-v5.34.eclass | 4 +-
media-plugins/gmp-openh264/Manifest | 1 +
.../gmp-openh264/gmp-openh264-1.2_p20141104.ebuild | 55 ++++++++++++++++++++++
www-client/firefox/Manifest | 2 +-
...34.0_beta4.ebuild => firefox-34.0_beta6.ebuild} | 6 ++-
6 files changed, 65 insertions(+), 7 deletions(-)
diff --git a/eclass/mozconfig-v5.33.eclass b/eclass/mozconfig-v5.33.eclass
index fb6c5d8..df196b8 100644
--- a/eclass/mozconfig-v5.33.eclass
+++ b/eclass/mozconfig-v5.33.eclass
@@ -45,7 +45,7 @@ esac
# 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 gstreamer pulseaudio startup-notification
system-cairo system-icu system-jpeg system-sqlite +system-libvpx"
+IUSE="${IUSE} dbus debug gstreamer pulseaudio startup-notification
system-cairo system-icu system-jpeg system-sqlite system-libvpx"
# some notes on deps:
# gtk:2 minimum is technically 2.10 but gio support (enabled by default) needs
2.14
@@ -86,7 +86,7 @@ RDEPEND=">=app-text/hunspell-1.2
system-icu? ( >=dev-libs/icu-51.1 )
system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
system-sqlite? ( >=dev-db/sqlite-3.8.5:3[secure-delete,debug=] )
- system-libvpx? ( =media-libs/libvpx-1.3.0* )
+ system-libvpx? ( =media-libs/libvpx-1.3.0*[postproc] )
"
if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then
diff --git a/eclass/mozconfig-v5.34.eclass b/eclass/mozconfig-v5.34.eclass
index 7c45cdf..bb4c41f 100644
--- a/eclass/mozconfig-v5.34.eclass
+++ b/eclass/mozconfig-v5.34.eclass
@@ -45,7 +45,7 @@ esac
# 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 gstreamer pulseaudio startup-notification
system-cairo system-icu system-jpeg system-sqlite +system-libvpx"
+IUSE="${IUSE} dbus debug gstreamer pulseaudio startup-notification
system-cairo system-icu system-jpeg system-sqlite system-libvpx"
# some notes on deps:
# gtk:2 minimum is technically 2.10 but gio support (enabled by default) needs
2.14
@@ -86,7 +86,7 @@ RDEPEND=">=app-text/hunspell-1.2
system-icu? ( >=dev-libs/icu-51.1 )
system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
system-sqlite? ( >=dev-db/sqlite-3.8.6:3[secure-delete,debug=] )
- system-libvpx? ( =media-libs/libvpx-1.3.0* )
+ system-libvpx? ( =media-libs/libvpx-1.3.0*[postproc] )
"
if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then
diff --git a/media-plugins/gmp-openh264/Manifest
b/media-plugins/gmp-openh264/Manifest
index cc77874..c8ff004 100644
--- a/media-plugins/gmp-openh264/Manifest
+++ b/media-plugins/gmp-openh264/Manifest
@@ -1 +1,2 @@
DIST gmp-openh264-1.1_p20141021.tar.xz 11808564 SHA256
88253dc65cc509cde88a602fc0d6f916d641235fcc163025f15467823a8fe363 SHA512
9ec0f3c7898f53917df8bd0b035de214a1dd804d01f17973ed0cde7c42141e5af9ccc710eaf5505ef33d4f0fa096d8f7d5db90f8a8499016b6ad26b86f63d227
WHIRLPOOL
cf4a5def4a1577139787065466f4b94d4a721ab693590bf7b95f7a1fd4e8e120f01c48a90891466bdca35651a5cf88b816bb820cdff5433a4f3bf9a2b3236b78
+DIST gmp-openh264-1.2_p20141104.tar.xz 11874976 SHA256
d8359d004116eba6d2444486abd81f82f9cfedf2ab209b9586fc195d199096f8 SHA512
7acd982b54cd32ee2270967131792d869a9c72dca5ba8da796c61517e99b3a40f7c53ab6228c03f72c57f4eb9d3bef536645ee33ccf08a098f0662f97f811856
WHIRLPOOL
5d997bc9349d06f5d485ce654408d5f3cd1314ccdf10c21c25c59933ffe2c4b325ec32444bb74aa754b73fcc381b5b723df9f48989cba3e7137e8a594a47e24c
diff --git a/media-plugins/gmp-openh264/gmp-openh264-1.2_p20141104.ebuild
b/media-plugins/gmp-openh264/gmp-openh264-1.2_p20141104.ebuild
new file mode 100644
index 0000000..c31e770
--- /dev/null
+++ b/media-plugins/gmp-openh264/gmp-openh264-1.2_p20141104.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit nsplugins
+
+DESCRIPTION="Gecko Media Plugin for openh264, to be used in mozilla packages"
+HOMEPAGE="http://www.openh264.org/";
+SRC_URI="http://dev.gentoo.org/~axs/distfiles/${P}.tar.xz";
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux
~x86-linux"
+IUSE=""
+
+RESTRICT="bindist"
+
+RDEPEND=""
+DEPEND="dev-lang/nasm"
+
+DOCS=( LICENSE CONTRIBUTORS README.md )
+
+src_compile() {
+ local mybits="ENABLE64BIT=No"
+ case "${ABI}" in
+ s390x|alpha|*64) mybits="ENABLE64BIT=Yes";;
+ esac
+ emake V=Yes ${mybits} plugin
+}
+
+src_install() {
+ local
plugpath="usr/$(get_libdir)/${PLUGINS_DIR}/gmp-${PN/-/}/system-installed"
+
+ insinto /${plugpath}
+ doins libgmpopenh264.so gmpopenh264.info
+ echo "MOZ_GMP_PATH=\"${EROOT}${plugpath}\"" >"${T}"/98-moz-${PN}
+ doenvd "${T}"/98-moz-${PN}
+}
+
+pkg_postinst() {
+ elog "USE=system-gmps on the mozilla packages will disable the default"
+ elog "autoupdates preference for this and other gmp plugins, but it may
be"
+ elog "overridden in a user's profile (ie, about:config)."
+ elog ""
+ elog "Also, if a previous mozilla version has already installed
gmp-gmpopenh264"
+ elog "into a user's profile, that version may take precedence over this
package"
+ elog "and will need to be removed before the files installed by this
package"
+ elog "are certain to be used."
+ elog ""
+ ewarn "You may need to modify each user's .mozilla profile"
+ ewarn "by hand, disabling autoupdates in about:config and deleting any"
+ ewarn "existing plugin in the profile dir, in order for this package"
+ ewarn "to have any effect."
+}
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 04ae2ce..80475a2 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -83,4 +83,4 @@ DIST firefox-33.0-zh-TW.xpi 422430 SHA256
88e13c51ab2cde95ca274c458c73af74fe2b4a
DIST firefox-33.0-zu.xpi 443460 SHA256
6deb6b853ec1923ab325332d2eb5e96e6a0cea443d447203dff0cff5352c15bf SHA512
39cf08663bf7ea3668bbddba84aa4c27fa365e6a43132c02ce78c6a63327bbc212ea179fcdd562c1962b4d167b17186c5d56dafe3267dcc4f32ee22c671b1e1f
WHIRLPOOL
56a5729de1f5daf0d5c177e40e8e58def910558c6837c40b3fb22cdb11dec347894fd23c1bd2aa4fe3f42937dadba87bf932bcff7c053300abb408b0f852fcd8
DIST firefox-33.0.source.tar.bz2 155177527 SHA256
1018c2fae8c54c8a45f5a3ce348a2617a3f8039a789b09b7cfa5a27be069b229 SHA512
856585bedb0c0cc2a5c8591a5a3d373dca66fd8c15dd2c04b09e17e9a2da2bf978e4bff872a814b42e1963c3a6def05ccc0b68d9a8f4e7c9152dca878cf17e51
WHIRLPOOL
be267b29bc9d21b6f0d35d1e42410afe9a0d6bed9174f5de5bfd80898fd1a73fc4e762a7e606c94c99562c6ac2b99eb33022509a85f5a762685cf26496a2744b
DIST firefox-34.0-patches-0.1.tar.xz 4412 SHA256
29cd2fee297ca23b9552c134051d663ad5d7b2f7acdec8e441889cc82553d373 SHA512
dd2099cb8f5c8a411439afc4aa16cfabc8bab56ff090c4e84cbe54143b177ae141c48398b6a71c7506bada50223e01a8b1eec12b5e274353803b50de6c253b8c
WHIRLPOOL
71ae7630bb5b0eff082d7a7cc89b3524b886bfe3af5556c27a47643839b166d36945a2f7e0afbd9b36ea8b4c0629daa660aeed23ad548f9a9d079a4252c1c363
-DIST firefox-34.0b4.source.tar.bz2 164290577 SHA256
b37a84e6fcf262ce3d4e9244150033d7fd5893ac954b5347c129ac65840e56a1 SHA512
16225804242952ab68526c543b36daf4fc66026ee9264f0e8c113151f54cae9ce90f18e85ad6f66244006a5156eb4d67d4bd793bb7b06a00132b746ce1c853ac
WHIRLPOOL
22e7b97c567d2803e2e377f2f09535682515f3d4f764bafa1dfce72960bc125290ea63cff1781152f1181efa61e9b6eac6c852d18d2da46c0e39f70f20ddae0b
+DIST firefox-34.0b6.source.tar.bz2 164251141 SHA256
9e630818f72b9f48ec88bb4b4e5e8f32ee2995a3947b5cd12d4c7aa69613713b SHA512
89d494e93f1353212d4400ab165abb21dd6e1ba220ca34642058da654ac062fc5f5c72a3889b9d741920ce16925ee2fa48d977262276dc58c039283aeb9a9dbe
WHIRLPOOL
7c71ec648f53b59a1c956a8ffaf84ece672ad77ecec26fd102a18189fc553df146e9ee2a3f797c31fafcad6b7308d6c62c86d02998371dc90da846fbea11e205
diff --git a/www-client/firefox/firefox-34.0_beta4.ebuild
b/www-client/firefox/firefox-34.0_beta6.ebuild
similarity index 98%
rename from www-client/firefox/firefox-34.0_beta4.ebuild
rename to www-client/firefox/firefox-34.0_beta6.ebuild
index 26857ae..e8b0de9 100644
--- a/www-client/firefox/firefox-34.0_beta4.ebuild
+++ b/www-client/firefox/firefox-34.0_beta6.ebuild
@@ -147,8 +147,6 @@ src_prepare() {
EPATCH_FORCE="yes" \
epatch "${WORKDIR}/firefox"
- epatch "${FILESDIR}"/${PN}-31.0-webm-disallow-negative-samples.patch #
bug 527010
-
# Allow user to apply any additional patches without modifing ebuild
epatch_user
@@ -305,8 +303,12 @@ src_install() {
echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
"${S}/${obj_dir}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
|| die
+ echo "pref(\"media.${plugin}.version\", \"system-installed\");"
>> \
+
"${S}/${obj_dir}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+ || die
done
+
MOZ_MAKE_FLAGS="${MAKEOPTS}" \
emake DESTDIR="${D}" install
