version bump, thanks to Coacher for his contributions

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

5 files changed, 151 insertions, 20 deletions

diff --git a/media-libs/openh264/ChangeLog b/media-libs/openh264/ChangeLog
index d0432fb91117..3267857c9401 100644
--- a/media-libs/openh264/ChangeLog
+++ b/media-libs/openh264/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/openh264
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openh264/ChangeLog,v 1.3 2015/06/18 22:06:24 axs Exp $
+
+*openh264-1.4.0 (18 Jun 2015)
+
+  18 Jun 2015; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+  +files/pkgconfig-pathfix.patch, +openh264-1.4.0.ebuild, metadata.xml:
+  version bump, thanks to Coacher for his contributions
 
 *openh264-1.3.1 (26 Feb 2015)
 
diff --git a/media-libs/openh264/Manifest b/media-libs/openh264/Manifest
index ee2f97aedfb9..3d6311bd5c97 100644
--- a/media-libs/openh264/Manifest
+++ b/media-libs/openh264/Manifest
@@ -1,29 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
+AUX pkgconfig-pathfix.patch 1921 SHA256 cdc83ab8e96df4daf5cec246462d5c3892bfee32125faf228b287fe10bb7aaf7 SHA512 b080d65385e384ea0402d829dabd38959f10b7f0880d3fb3f5611593493e2a2c5679c7f37a48c58c0cbccce04bffdc58a359fd5262614d5c98e98c491c5807d8 WHIRLPOOL afe37bc907548d4b87f2c8a95f21c75583e2bfcb0491687efc685ccaa5a1002f8b189c18dfdf673f93616201bde8d41e61a5c9d0299e96271ad00a30d6de4812
 DIST gmp-api-Firefox36.tar.gz 15182 SHA256 2cdc1284a939cda0a6fe45a8c798637cc7d959c9d757d5b0c6d2dc650a037624 SHA512 69f367a83cca01c046abf1e6d4fdb2e1587d321ffd5c7795d33ce6b271e9e9ea588e1c363ac84c3e690410e79aa73cdf64b8f12e4726392b1adbe1a1900e4bd8 WHIRLPOOL c218e9e8ae80a84495f495dcaf545eae2e3fa611a43e6dd5b1e21adeda1dd000ac8160d8a1439d523395c36d939a762aadba18db724bd3c02169c47ffc1a1bc9
+DIST gmp-api-Firefox38.tar.gz 16209 SHA256 6b156afe850c0d6faf0492ca5feeff4358e50ddc5ce3022ddcc6905a5bd21c80 SHA512 9aecbc84b1ba2fcfcb10c56680d92a72dd55f7ef7b8a68a3950dbce65fb7eb2c5e6a211149889f618bef2468ba1f3f8c01dc63e86e0a30d9295b019b75657eb8 WHIRLPOOL c12eb175ddf11f0ece400cc34bf9d5e690494fd4630c12667eed3765b66a625a1f9a3b41e20fc5a0c0f614eafbd75b6ddd5bd2a827077cfaac507a3f41990c42
 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
+DIST openh264-1.4.0.tar.gz 37681189 SHA256 a1b9a7a7f1ee204793c613789a505f0971bc2b03b3dbd8f05d9c4a3f3b900a22 SHA512 8192494698cb5557331be56ecbe2b7b143e0ed95739a69a88bdb34a58f66710ef1cd9234f1e98c9b16432a41a3243634e6ca63c58119315f2f9360cb2959e42b WHIRLPOOL 0d9f1f728fbceef35a5e22a6fe4c9dd42fbf84d41fe14e938194438542af182d3994694ffcd68f58798f14c8096b49b0aecad23f58ec6bdbc02de43b8d783532
 EBUILD openh264-1.2_p20141104.ebuild 2096 SHA256 6b7873db8d3affb60797955c8e22881e43ef7057d33e5daf4e95d1da04e47ad1 SHA512 4e0507b0889047391147ddf3613856021f407f3590a8858b558d3e7d12deb05406bd9b9c55e5136527a09675f49686ddcf31272b1257612cdca6c1860f05b004 WHIRLPOOL ad77e548a9c3ef811c4a21f6b41c7891dd4cd7c81f7769dc11b2a220a655eca07fee8dab99345b99894ed04c5a891b9b65757096d35675a80629adfdee888b8a
 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 423 SHA256 df1a7b54cf6edfe1f15144fca822d03c30108651d6bb10c6676ba4417fbeee8d SHA512 d015cdd53e01c94a7aad41f2ec16c147525e08dc0b4dc27fa9786240f16776fdc9529e86f1f7959f1a686aa2fdf281cb6e7b8b37014e187133c01f9a930679df WHIRLPOOL a13a72dd42c7f893b36f2182de00b91b569d9542db42755c28636ee8daffd516d79d274f4ddb27096ceb54aa191776808af38e465da3aebac7cc58ecb9bd1682
+EBUILD openh264-1.4.0.ebuild 2675 SHA256 068c027d16d85249dd24ecda9f9a1f34865bd83db90e1a0977315da3a10432af SHA512 40b5c8bedcc848fa8c071e3cc61f41e1e31970c0ca6ea1a2b0d8d63897fc0dc09aca84bbd2d7c1a8e202cfc72af7666a562e9f6c4a4d81e984d9fb13ecfd9d93 WHIRLPOOL 805f22c0b8a02b21857d198f89755f7301934c9f518b418ab013d2cd3c4c7074e52a15dea30ba01892a4211a9b85cffc5dfd4137a87946919126fd7200f78735
+MISC ChangeLog 1056 SHA256 ae2e8d4f442105c7f9a4a99a264d157de53b938d5e4428bded65a1d97187eba1 SHA512 6781b188f9b290c33ae1f9115385fc3dd300d691195c95493ed5bdfe5933df8051ee0f303b7cb4eae416f412692934d5f70d676b02a23d75aff0082644f6c6aa WHIRLPOOL 16a3a05577b52a441509eb7665f886e54c03114274a5d61f5f48cd264575a47e46ba9306859e5aca4a416a0d0b87efb6a31c7fce67063aa3de9682addfb8374c
+MISC metadata.xml 497 SHA256 2a89ea2edce7ffd51edcbfa2f354cf969ea8a30dc7b73dc92a9472a97fbfbf91 SHA512 c205948bfddb89cccee917c5859ba8d36885a4a00dc7ccb1f9a203ce72c8469be56a7c01c7116bfe67559ad9ae26a47c726da896d69e52990e831d56c05e605b WHIRLPOOL 3e20f643e7ad922f9bac879fd9d1c0b1270521ac8f7293a80ad270cab4b492e129c6e0f9548485a32afd9828892fcb1b33c6cf3125dcd8a023a6ce0d1a3295e1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVfupGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi6b0P/A6lyIq6+J+2keNyJU9cdU41
-yq8/1EK0wHgtilG4nZxjD+la4g55LXC2KNcoga/k2cfUgJjSjTcB998JpQKXHWKc
-Miv99OV/hm7yXO9yGAS+SHAG0bfttKth684WYtoJS6xm1tf89qEp720flwFKi1mr
-V9w0fpi2rvwbn1HHbIPcoABwVkMXN6Zhq2LXtBztzN7YqsBFdmbtWfG0NcR059wz
-NsYf28hawCPh02Y3MX4Qh4DeWLyEQRXMz8BHtCvSET3s7wO4/DRnJsdnU9NWeTv3
-xJQg8utUOfA5TQwkCJDBnBt4sel7oOYr0+Q49SmKQLdVyCmfFB4B1jTpZb33lhgx
-2nhuAPsvq1PZMYLwOEHhOI3KTr9pMFehVoMfKosc3SHp9N8+t+irHcBQveYsKSRg
-SjdBJxyv+fxqNfPKhq3Km3vl9QufSzU1B24ttruGJKaSFMgXZ/heuSz8csghZ0w1
-slnY03YvnuQUidaCaXMNN0dDxP/SEfUbBFubxDge2ciKPDON4LvXS2MPp1Pfa0kC
-aS9hc//KgzMrrFx2z6TFc0js42Etr2zLvc4nPnOOqZDyjzB8UU6PH//fL5UNLX6H
-EFrr9CoD28cPOiNJ5/gyyQcg692qbmZJ1OfNQbs+kwpMjo4+k7hy+MfGFKiuQ+Nk
-tLADhTdUlJ6r3zlgS1Z3
-=32YE
+iF4EAREIAAYFAlWDQNsACgkQ2ugaI38ACPAHngEArFEOFKhecWnvsMYxv8gFwPQL
+mThp9vNz7MfIrPwttMwBAIUDVZVs+V0EQPNDemKEN5Z9oi1WZu5LGdM8InTIufXK
+=aEls
 -----END PGP SIGNATURE-----
diff --git a/media-libs/openh264/files/pkgconfig-pathfix.patch b/media-libs/openh264/files/pkgconfig-pathfix.patch
new file mode 100644
index 000000000000..455b91331df4
--- /dev/null
+++ b/media-libs/openh264/files/pkgconfig-pathfix.patch
@@ -0,0 +1,40 @@
+--- a/Makefile	2015-03-25 03:43:00.000000000 -0400
++++ b/Makefile	2015-06-18 17:28:42.436110085 -0400
+@@ -24,6 +24,7 @@
+ OBJ=o
+ DESTDIR=
+ SHAREDLIB_DIR=$(PREFIX)/lib
++INCLUDES_DIR=$(PREFIX)/include
+ PROJECT_NAME=openh264
+ MODULE_NAME=gmpopenh264
+ GMP_API_BRANCH=Firefox38
+@@ -229,14 +230,14 @@
+ endif
+ 
+ $(PROJECT_NAME).pc: $(PROJECT_NAME).pc.in
+-	@sed -e 's;@prefix@;$(PREFIX);' -e 's;@VERSION@;$(VERSION);' -e 's;@LIBS@;;' -e 's;@LIBS_PRIVATE@;$(STATIC_LDFLAGS);' < $(PROJECT_NAME).pc.in > $@
++	@sed -e 's;@prefix@;$(PREFIX);' -e 's;@sharedlibdir@;$(SHAREDLIB_DIR);' -e 's;@includesdir@;$(INCLUDES_DIR);' -e 's;@VERSION@;$(VERSION);' -e 's;@LIBS@;;' -e 's;@LIBS_PRIVATE@;$(STATIC_LDFLAGS);' < $(PROJECT_NAME).pc.in > $@
+ 
+ $(PROJECT_NAME)-static.pc: $(PROJECT_NAME).pc.in
+-	@sed -e 's;@prefix@;$(PREFIX);' -e 's;@VERSION@;$(VERSION);' -e 's;@LIBS@;$(STATIC_LDFLAGS);' -e 's;@LIBS_PRIVATE@;;' < $(PROJECT_NAME).pc.in > $@
++	@sed -e 's;@prefix@;$(PREFIX);' -e 's;@sharedlibdir@;;' -e 's;@includesdir@;$(INCLUDES_DIR);' -e 's;@VERSION@;$(VERSION);' -e 's;@LIBS@;$(STATIC_LDFLAGS);' -e 's;@LIBS_PRIVATE@;;' < $(PROJECT_NAME).pc.in > $@
+ 
+ install-headers:
+-	mkdir -p $(DESTDIR)/$(PREFIX)/include/wels
+-	install -m 644 codec/api/svc/codec*.h $(DESTDIR)/$(PREFIX)/include/wels
++	mkdir -p $(DESTDIR)/$(INCLUDES_DIR)/wels
++	install -m 644 codec/api/svc/codec*.h $(DESTDIR)/$(INCLUDES_DIR)/wels
+ 
+ install-static-lib: $(LIBPREFIX)$(PROJECT_NAME).$(LIBSUFFIX) install-headers
+ 	mkdir -p $(DESTDIR)/$(PREFIX)/lib
+--- a/openh264.pc.in	2015-06-18 17:32:58.356114757 -0400
++++ b/openh264.pc.in	2015-06-18 17:31:12.096112817 -0400
+@@ -1,6 +1,6 @@
+ prefix=@prefix@
+-libdir=${prefix}/lib
+-includedir=${prefix}/include
++libdir=@sharedlibdir@
++includedir=@includesdir@
+ 
+ Name: OpenH264
+ Description: OpenH264 is a codec library which supports H.264 encoding and decoding. It is suitable for use in real time applications such as WebRTC.
diff --git a/media-libs/openh264/metadata.xml b/media-libs/openh264/metadata.xml
index 1cbc18a2e510..cc2cd190e848 100644
--- a/media-libs/openh264/metadata.xml
+++ b/media-libs/openh264/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="plugin">Install the Gecko Media Plugin (GMP) for use with Mozilla packages</flag>
+		<flag name="utils">Install the CLI encoder and decoder utilities</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">mozilla/gmp-api</remote-id>
diff --git a/media-libs/openh264/openh264-1.4.0.ebuild b/media-libs/openh264/openh264-1.4.0.ebuild
new file mode 100644
index 000000000000..e2cacd46f615
--- /dev/null
+++ b/media-libs/openh264/openh264-1.4.0.ebuild
@@ -0,0 +1,92 @@
+# 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.4.0.ebuild,v 1.1 2015/06/18 22:06:24 axs Exp $
+
+EAPI=5
+
+inherit nsplugins multilib-minimal
+
+MOZVER=38
+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 utils"
+
+RESTRICT="bindist"
+
+RDEPEND="!<www-client/firefox-${MOZVER}"
+DEPEND="dev-lang/nasm"
+
+DOCS=( LICENSE CONTRIBUTORS README.md )
+
+src_prepare() {
+	epatch "${FILESDIR}"/pkgconfig-pathfix.patch
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	ln -s "${WORKDIR}"/gmp-api-Firefox${MOZVER} gmp-api || die
+}
+
+emakecmd() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+	emake V=Yes CFLAGS_M32="" CFLAGS_M64="" CFLAGS_OPT="" \
+		PREFIX="${EPREFIX}/usr" \
+		SHAREDLIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
+		INCLUDES_DIR="${EPREFIX}/usr/include/${PN}" \
+		$@
+}
+
+multilib_src_compile() {
+	local mybits="ENABLE64BIT=No"
+	case "${ABI}" in
+		s390x|alpha|*64) mybits="ENABLE64BIT=Yes";;
+	esac
+
+	emakecmd ${mybits} ${tgt}
+	use plugin && emakecmd ${mybits} plugin
+}
+
+multilib_src_install() {
+	emakecmd DESTDIR="${D}" install-shared
+
+	use utils && dobin h264{enc,dec}
+
+	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
+}