version bump, supports firefox-36

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED

3 files changed, 92 insertions, 7 deletions

diff --git a/media-libs/openh264/ChangeLog b/media-libs/openh264/ChangeLog
index d4240baabb01..d0432fb91117 100644
--- a/media-libs/openh264/ChangeLog
+++ b/media-libs/openh264/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/openh264
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openh264/ChangeLog,v 1.1 2014/12/04 04:01:03 axs Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openh264/ChangeLog,v 1.2 2015/02/26 21:18:49 axs Exp $
+
+*openh264-1.3.1 (26 Feb 2015)
+
+  26 Feb 2015; Ian Stakenvicius (_AxS_) <axs@gentoo.org> +openh264-1.3.1.ebuild:
+  version bump, supports firefox-36
 
 *openh264-1.2_p20141104 (04 Dec 2014)
 
@@ -11,4 +16,3 @@
   for the time being. Note also that the mozilla prefs overrides will not
   forcibly install at a later version, however a script needs to be written to
   synchronize their installation.
-
diff --git a/media-libs/openh264/Manifest b/media-libs/openh264/Manifest
index 209e345c00e8..ef38cb0d44ec 100644
--- a/media-libs/openh264/Manifest
+++ b/media-libs/openh264/Manifest
@@ -1,14 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+DIST gmp-api-Firefox36.tar.gz 15182 SHA256 2cdc1284a939cda0a6fe45a8c798637cc7d959c9d757d5b0c6d2dc650a037624 SHA512 69f367a83cca01c046abf1e6d4fdb2e1587d321ffd5c7795d33ce6b271e9e9ea588e1c363ac84c3e690410e79aa73cdf64b8f12e4726392b1adbe1a1900e4bd8 WHIRLPOOL c218e9e8ae80a84495f495dcaf545eae2e3fa611a43e6dd5b1e21adeda1dd000ac8160d8a1439d523395c36d939a762aadba18db724bd3c02169c47ffc1a1bc9
 DIST gmp-openh264-1.2_p20141104.tar.xz 11874976 SHA256 d8359d004116eba6d2444486abd81f82f9cfedf2ab209b9586fc195d199096f8 SHA512 7acd982b54cd32ee2270967131792d869a9c72dca5ba8da796c61517e99b3a40f7c53ab6228c03f72c57f4eb9d3bef536645ee33ccf08a098f0662f97f811856 WHIRLPOOL 5d997bc9349d06f5d485ce654408d5f3cd1314ccdf10c21c25c59933ffe2c4b325ec32444bb74aa754b73fcc381b5b723df9f48989cba3e7137e8a594a47e24c
+DIST openh264-1.3.1.tar.gz 37642592 SHA256 b0a9a61840b4a58fbadd2a0640a81917c0ee84e922d2476c1dbcb9f29b85d7a0 SHA512 e85e300a85cefc89a66fdebebe2f059c2c3262518f614c660535312b3ea441064a1288824bc488b741bcffa076b165eabf998d1b535fb377516695326be625c9 WHIRLPOOL 5acc9645b65c2b75d117bcbff24554e0b9567514427bc8d9dc8e8eda0d45080600bec12cd8d435ab605f8226cfc321d1c371c292cf26d30a29a77fd187db6dc4
 EBUILD openh264-1.2_p20141104.ebuild 2096 SHA256 6b7873db8d3affb60797955c8e22881e43ef7057d33e5daf4e95d1da04e47ad1 SHA512 4e0507b0889047391147ddf3613856021f407f3590a8858b558d3e7d12deb05406bd9b9c55e5136527a09675f49686ddcf31272b1257612cdca6c1860f05b004 WHIRLPOOL ad77e548a9c3ef811c4a21f6b41c7891dd4cd7c81f7769dc11b2a220a655eca07fee8dab99345b99894ed04c5a891b9b65757096d35675a80629adfdee888b8a
-MISC ChangeLog 691 SHA256 d30361b93b2677a7516fb225af224d2e4981b618341580e77f795a3f5c1342ab SHA512 1e0a166cb7f11fd545b2984c3c20d05997fbe8874c7e88296a8a6bb19b5af12ec587b2254af30554edf996a351f7c7e46edcfef651e87dbd5f396bdb43fceac1 WHIRLPOOL 23e06e9a12554b96b5973befbe31f97adac51c176fb0db240510c80f96c80609db04eed45738eba48fc6043e83fe821e31699f7740df007439f29c4512fce2ac
+EBUILD openh264-1.3.1.ebuild 2285 SHA256 3d8ba9b87a2cebb3088a2f46441e187119cea41db4abb8e210bc9b11032fe118 SHA512 13985cdcf0d686eab14f8d66e2db43b4256e301015840156c954947fe74c01df48aba462b71af4295258e29c24ae8b8820a4ee4c8678c38127982d193dfa1337 WHIRLPOOL 14ff436d78eceefd88dc6d0f34b4a18ba23ab41ed702a6c59a22c764c2bd874d62e9d4ae5a1466a26bee5c727fe1ae8685a6f04fc5fbc5eaa1c71013cb781768
+MISC ChangeLog 839 SHA256 6c1ff9c458b2c6bf324aeccb8d48ed061a3e6426fd8d0d97aacff7deca27e8cc SHA512 11b0777b67910ba00a2c0db94bcc3b35b8b45e79ec7f3cea4465696a838957609923bcb1c883564883b2d85baa9da8651e0f76e934807e4956ff97d82f71754e WHIRLPOOL e0a327745440fd82bd5b7e9d6b77ace33e4ae469559741d397fa165b69ea45411387a74148900f6bc651c1f84371d7e1da31727754283a5526e79b46a68904de
 MISC metadata.xml 344 SHA256 d7f9b28ed01bf2010c65bd977f082bfc1ace8bb0cca5de1bdce64fce83c38f91 SHA512 2d02205cebc7b07f3e437a0e0a0510f5f5965fb9fe205a9e989ac8d7bcdda21ea39618779415fd67580945855b5959f0825f507ab81795cde58f1296c89915e4 WHIRLPOOL d0a3587b88e1b7838d81a2c7bc40d594d91b0db7efe9e5f9d7b57a432781a831aa54f76eaa645eca846632f9c9cc3e5aa4e288b2dfdfb66c503b17a6f6a63b56
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlR/3IMACgkQ2ugaI38ACPBRxgD/eN7rQmyaFn2HSzCKwQVppEqP
-C5ubf0jzEdppVX7+9iUA/jqo6DU9TPDdOJTSPJY6Qw5pNhQBWs7l1jillYTAg+1E
-=FGYC
+iF4EAREIAAYFAlTvjb4ACgkQ2ugaI38ACPABvQEAhfNBgyNQegLnOTl677c95x4v
+mlHn7l3DCLcB5/IztsAA+wSC7E8Q9s+Os/sO/OeAMRJKOdqiq5sN4Tcz5atfE5j+
+=wujZ
 -----END PGP SIGNATURE-----
diff --git a/media-libs/openh264/openh264-1.3.1.ebuild b/media-libs/openh264/openh264-1.3.1.ebuild
new file mode 100644
index 000000000000..231db244f090
--- /dev/null
+++ b/media-libs/openh264/openh264-1.3.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openh264/openh264-1.3.1.ebuild,v 1.1 2015/02/26 21:18:49 axs Exp $
+
+EAPI=5
+
+inherit nsplugins
+
+MOZVER=36
+DESCRIPTION="Cisco OpenH264 library and Gecko Media Plugin for mozilla packages"
+HOMEPAGE="http://www.openh264.org/"
+SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/mozilla/gmp-api/archive/Firefox${MOZVER}.tar.gz -> gmp-api-Firefox${MOZVER}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+plugin"
+
+RESTRICT="bindist"
+
+RDEPEND="!<www-client/firefox-${MOZVER}"
+DEPEND="dev-lang/nasm"
+
+DOCS=( LICENSE CONTRIBUTORS README.md )
+
+src_prepare() {
+	ln -s ../gmp-api-Firefox${MOZVER} gmp-api
+}
+
+src_compile() {
+	local mybits="ENABLE64BIT=No"
+	case "${ABI}" in
+		s390x|alpha|*64) mybits="ENABLE64BIT=Yes";;
+	esac
+	emake V=Yes ${mybits}
+	use plugin && emake V=Yes ${mybits} plugin
+}
+
+src_install() {
+	emake PREFIX="${ED}usr" LIBPREFIX="${ED}usr/$(get_libdir)/" \
+		install-headers
+
+	dolib libopenh264.so
+
+	if use plugin; then
+		local plugpath="usr/$(get_libdir)/${PLUGINS_DIR}/gmp-gmp${PN}/system-installed"
+		insinto "/${plugpath}"
+		doins libgmpopenh264.so gmpopenh264.info
+		echo "MOZ_GMP_PATH=\"${EROOT}${plugpath}\"" >"${T}"/98-moz-gmp-${PN}
+		doenvd "${T}"/98-moz-gmp-${PN}
+
+		cat <<PREFEOF >"${T}"/${P}.js
+pref("media.gmp-gmp${PN}.autoupdate", false);
+pref("media.gmp-gmp${PN}.version", "system-installed");
+PREFEOF
+
+		insinto /usr/$(get_libdir)/firefox/defaults/pref
+		doins "${T}"/${P}.js
+
+		insinto /usr/$(get_libdir)/seamonkey/defaults/pref
+		doins "${T}"/${P}.js
+	fi
+}
+
+pkg_postinst() {
+	if use plugin; then
+		if [[ -z ${REPLACING_VERSIONS} ]]; then
+			elog "Please restart your login session, in order for the session's environment"
+			elog "to include the new MOZ_GMP_PATH variable."
+			elog ""
+		fi
+		elog "This package attempts to override the mozilla GMPInstaller auto-update process,"
+		elog "however even if it is not successful in doing so the profile-installed plugin"
+		elog "will not be used unless this package is removed.  This package will take precedence"
+		elog "over any gmp-gmpopenh264 that may be installed in a user's profile."
+		elog ""
+	fi
+}