gentoo resync : 25.08.2020

6 files changed, 11 insertions, 257 deletions

diff --git a/media-libs/openh264/Manifest b/media-libs/openh264/Manifest
index feeee81edf16..01e7fec6a45e 100644
--- a/media-libs/openh264/Manifest
+++ b/media-libs/openh264/Manifest
@@ -1,10 +1,5 @@
-AUX openh264-1.7.0-pkgconfig-pathfix.patch 1921 BLAKE2B 22d3ab7bd9cbe4c0ac638760a0c2b947eb6749a18d61cd3aca22ac84647af24d6dced048f9eae2ae9e9ee9b0813a255a6d1c8a1ff04e3e6ae2bdc1d508c82d7b SHA512 4545c9c2a696d9ceaf463fe74f391614ba41abc51ce00c32b285baf37e34d8e8bc55f2c3288309a2b44a4ff420ed7d1bc2aa26f2214abe65576d267488dd0849
 AUX openh264-2.1.0-pkgconfig-pathfix.patch 1949 BLAKE2B a3894b7cb65fcdb444d389ccf6644e404bb8375a910bd51bbe5e1b6b773e4d6890a17d2f1a09400d6d0cadc41be9321d86a09b93f861812f2d72a6c1c5e39fde SHA512 00c59bd1d6fe6355ce81ead4ba898f1f602e9f9c93e382c2ead3c353d5fd1f2bf3c46a30f3b248896c9a74d347a24e200644387ce3c70e886d941c115bb42088
 DIST gmp-api-Firefox39.tar.gz 16363 BLAKE2B dd92d851c4f09476f1e394fd42c5e40ea707ac6dcabc3ceee62400eb998f1c98c781fbde581253ddd8f45b7447a0c7fdc61e74ef60b6fc3397cd4bf8995154ab SHA512 da6f05c5f0540be8d4f48d25b947b21214d34a6eed365ee5fa4a38c69f77325add4be902e0dcd9d06be43914a3518ded7e4f2289dab034a24325f0bff201692a
-DIST openh264-1.7.0.tar.gz 38681895 BLAKE2B 2e0e88bd446fdbea29ea4e863eb391dce1cc271c289165233aa1375e10ce6e60f7be7307eeb7acedd459c3170b57fbc5c7a0e9b6bd0c355be6447fb036192f35 SHA512 3e30584d6adb69c162f5b044f49155c22d44ab8e399f6bf09194593df84475b49979406f3e461d25ef1e4422c2721b975c58bc64d40a143d8493d45380ad96aa
-DIST openh264-2.1.0.tar.gz 60239088 BLAKE2B 4941399476fb6184fc09b09d9bd496d9f3fa77a424199f6cb0d61d654d6cf88b49eecc32d748b656cec663c31844165b81b7962de163441f04e5a606a48879d5 SHA512 7a65f494e6a1b5a9d96115dcd15853ebb804f0ba259b20ddab01770afde31f370536d9e365b18a6f4168eae7f57351d9fc2d3d3a0c51bb21db7b4d5c48240848
 DIST openh264-2.1.1.tar.gz 60239654 BLAKE2B d541fa686b1eb8352dbb4088fc4ef508f947660815c86b2bb7db841c927b7b9f763d7fe793f0fa1511620dbdc506c20cd5ad52740140337aa12b8c31b857a8e6 SHA512 f9c2925fa902c6278da40f68b967d25e62db7ce3541e8f5e7a0ee174204b6ecc7026b5853885c361f48ca01d71bacd585fb5b91f01f0c054ece80943f1afcf79
-EBUILD openh264-1.7.0-r1.ebuild 2949 BLAKE2B 2085049cb86b5ac355e552acf9b0aedb363f6d9fd6ed806ce1bdf70e9da633b8a9657eef131af8dbc647e9e66e410190fe7c05ae99ff4311423b81ec4ceda08f SHA512 d5ed45707baa5a689b9060e0a1c784721b3f8be5632565bc0581acc9dec982666b54bed97aa7e04f0ecd429784e45aabf20c2fed88f7bf5d8e648308668c1140
-EBUILD openh264-2.1.0.ebuild 3015 BLAKE2B 2706d011a3f40bc4aa9580b42a17bf867f059d7a5c35f5cfa8a62c41d22a4b9a367b5d40796eeaa1a434091251efb02f48c9f14efb3163bd295db9d3fbc6f961 SHA512 3402b5d01047da3ea94c40223999c3be15d5f8ce34a2440b5ed807198d67c1ea1dfa532c0228385d0394b9bf2be13e9a12a321d6f504d59daf15da5a99b6a114
-EBUILD openh264-2.1.1.ebuild 3151 BLAKE2B 5f72a6b52cfc6d2483eb078f70d1eb5b197182d86c45acf1b35d69aa2a1528515d11036ecb0812d9a82386c1991b1dd1e5cb9c772fe5842c7d59ae8316e85304 SHA512 8d7dab0838b532243281c9c1e90c480a1394b00f169a958d925d7a0ddae62770dd554d143d49d3e775597868e6d4bcd1c9e199b99c54644a683e736e9fa05894
-MISC metadata.xml 595 BLAKE2B 9d5fd608235086cb070457016516be296db695e67d50e8b3c0958133bff3cfa24a87c9abb42c043d94d5d64ba6fb3e9d485b4c9d07042054a9eb25e6ee73ad4b SHA512 8fc3fa7f260a188f7ebf43d85da27a49a924a2ce0835fd37f0db356caa401102eee0ade0fa414303d8a0681ddb4b10abd4da5a9bb5cf79ea31f5b96199897220
+EBUILD openh264-2.1.1.ebuild 3306 BLAKE2B 430b9c0c23ac5e918a5b4c8701c7dc761fefd36c1d39f92c777decd56cae32a10141abed6e98b65f6bef21d0873e43cb7c5396c6be28bc6b805b4654a74956d7 SHA512 427ff6516341fd9d73e7c9089a15e76f223eb99fb3a9e427a5ed9148cc7b1392df140ad6deac87d1a28f8f38b5aeb2c110c39caf533d1810ee5522cb4052f8bb
+MISC metadata.xml 723 BLAKE2B cbfe3ee6a6d784293770d948a306c9dbefe11d78f1cad1fcf58a35a0c968c6c48f35e2e6f607bee6434629ac4bc4428f5cf4e195ebf800c77af414e6823170c0 SHA512 82762247dea80f68510db32609263501b20320abca844776176dc6f6439498d61b05f93a573829ebf7ca88e932cda812c296ceb351e071c401e2ea6647d55e88
diff --git a/media-libs/openh264/files/openh264-1.7.0-pkgconfig-pathfix.patch b/media-libs/openh264/files/openh264-1.7.0-pkgconfig-pathfix.patch
deleted file mode 100644
index b0813888477a..000000000000
--- a/media-libs/openh264/files/openh264-1.7.0-pkgconfig-pathfix.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/openh264.pc.in	2015-10-19 21:49:05.000000000 -0400
-+++ b/openh264.pc.in	2016-02-17 12:17:03.792768147 -0500
-@@ -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.
---- a/Makefile	2017-06-16 00:20:14.000000000 -0400
-+++ b/Makefile	2017-07-14 15:15:51.461652524 -0400
-@@ -27,6 +27,7 @@
- DESTDIR=
- LIBDIR_NAME=lib
- SHAREDLIB_DIR=$(PREFIX)/lib
-+INCLUDES_DIR=$(PREFIX)/include
- PROJECT_NAME=openh264
- MODULE_NAME=gmpopenh264
- GMP_API_BRANCH=Firefox39
-@@ -282,14 +283,14 @@
- endif
- 
- $(PROJECT_NAME).pc: $(PROJECT_NAME).pc.in
--	@sed -e 's;@prefix@;$(PREFIX);' -e 's;@VERSION@;$(FULL_VERSION);' -e 's;@LIBS@;;' -e 's;@LIBS_PRIVATE@;$(STATIC_LDFLAGS);' < $< > $@
-+	@sed -e 's;@prefix@;$(PREFIX);' -e 's;@sharedlibdir@;$(SHAREDLIB_DIR);' -e 's;@includesdir@;$(INCLUDES_DIR);' -e 's;@VERSION@;$(FULL_VERSION);' -e 's;@LIBS@;;' -e 's;@LIBS_PRIVATE@;$(STATIC_LDFLAGS);' < $< > $@
- 
- $(PROJECT_NAME)-static.pc: $(PROJECT_NAME).pc.in
--	@sed -e 's;@prefix@;$(PREFIX);' -e 's;@VERSION@;$(FULL_VERSION);' -e 's;@LIBS@;$(STATIC_LDFLAGS);' -e 's;@LIBS_PRIVATE@;;' < $< > $@
-+	@sed -e 's;@prefix@;$(PREFIX);' -e 's;@sharedlibdir@;$(SHAREDLIB_DIR);' -e 's;@includesdir@;$(INCLUDES_DIR);' -e 's;@VERSION@;$(FULL_VERSION);' -e 's;@LIBS@;$(STATIC_LDFLAGS);' -e 's;@LIBS_PRIVATE@;;' < $< > $@
- 
- install-headers:
--	mkdir -p $(DESTDIR)$(PREFIX)/include/wels
--	install -m 644 $(SRC_PATH)/codec/api/svc/codec*.h $(DESTDIR)$(PREFIX)/include/wels
-+	mkdir -p $(DESTDIR)$(INCLUDES_DIR)/wels
-+	install -m 644 $(SRC_PATH)/codec/api/svc/codec*.h $(DESTDIR)$(INCLUDES_DIR)/wels
- 
- install-static-lib: $(LIBPREFIX)$(PROJECT_NAME).$(LIBSUFFIX) install-headers
- 	mkdir -p $(DESTDIR)$(PREFIX)/$(LIBDIR_NAME)
diff --git a/media-libs/openh264/metadata.xml b/media-libs/openh264/metadata.xml
index 4971276ef942..b3191d7ceff5 100644
--- a/media-libs/openh264/metadata.xml
+++ b/media-libs/openh264/metadata.xml
@@ -8,6 +8,10 @@
 	<maintainer type="project">
 		<email>media-video@gentoo.org</email>
 	</maintainer>
+	<maintainer type="project">
+		<email>mozilla@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</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>
diff --git a/media-libs/openh264/openh264-1.7.0-r1.ebuild b/media-libs/openh264/openh264-1.7.0-r1.ebuild
deleted file mode 100644
index 28a7fdd49087..000000000000
--- a/media-libs/openh264/openh264-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit nsplugins multilib-minimal toolchain-funcs
-
-MOZVER=39
-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="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="+plugin utils"
-
-RESTRICT="bindist"
-
-RDEPEND="!<www-client/firefox-${MOZVER}"
-DEPEND="
-	abi_x86_32? ( dev-lang/nasm )
-	abi_x86_64? ( dev-lang/nasm )"
-
-DOCS=( LICENSE CONTRIBUTORS README.md )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.7.0-pkgconfig-pathfix.patch
-	epatch_user
-	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" \
-		LIBDIR_NAME="$(get_libdir)" \
-		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
-
-	if use utils ; then
-		newbin h264enc openh264enc
-		newbin h264dec openh264dec
-	fi
-
-	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
-	if use utils; then
-		elog "Utilities h264enc and h264dec are installed as openh264enc and openh264dec"
-		elog "to avoid file collisions with media-video/h264enc"
-		elog ""
-	fi
-}
diff --git a/media-libs/openh264/openh264-2.1.0.ebuild b/media-libs/openh264/openh264-2.1.0.ebuild
deleted file mode 100644
index 486e6828d1b7..000000000000
--- a/media-libs/openh264/openh264-2.1.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs multilib-minimal
-
-MOZVER=39
-DESCRIPTION="Cisco OpenH264 library and Gecko Media Plugin for Mozilla packages"
-HOMEPAGE="https://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/5" # subslot = openh264 soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cpu_flags_x86_avx2 +plugin utils"
-
-RESTRICT="bindist test"
-
-BDEPEND="
-	abi_x86_32? ( dev-lang/nasm )
-	abi_x86_64? ( dev-lang/nasm )"
-
-DOCS=( LICENSE CONTRIBUTORS README.md )
-
-PATCHES=( "${FILESDIR}/${PN}-2.1.0-pkgconfig-pathfix.patch" )
-
-src_prepare() {
-	default
-
-	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" \
-		LIBDIR_NAME="$(get_libdir)" \
-		SHAREDLIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
-		INCLUDES_DIR="${EPREFIX}/usr/include/${PN}" \
-		HAVE_AVX2=$(usex cpu_flags_x86_avx2 Yes No) \
-		$@
-}
-
-multilib_src_compile() {
-	local mybits="ENABLE64BIT=No"
-	case "${ABI}" in
-		s390x|alpha|*64) mybits="ENABLE64BIT=Yes";;
-	esac
-
-	emakecmd ${mybits}
-	use plugin && emakecmd ${mybits} plugin
-}
-
-multilib_src_install() {
-	emakecmd DESTDIR="${D}" install-shared
-
-	if use utils; then
-		newbin h264enc openh264enc
-		newbin h264dec openh264dec
-	fi
-
-	if use plugin; then
-		local plugpath="${ROOT}/usr/$(get_libdir)/nsbrowser/plugins/gmp-gmp${PN}/system-installed"
-		insinto "${plugpath}"
-		doins libgmpopenh264.so* gmpopenh264.info
-		echo "MOZ_GMP_PATH=\"${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
-
-	if use utils; then
-		elog "Utilities h264enc and h264dec are installed as openh264enc and openh264dec"
-		elog "to avoid file collisions with media-video/h264enc"
-		elog ""
-	fi
-}
diff --git a/media-libs/openh264/openh264-2.1.1.ebuild b/media-libs/openh264/openh264-2.1.1.ebuild
index b18de1c269b6..604607fa52b7 100644
--- a/media-libs/openh264/openh264-2.1.1.ebuild
+++ b/media-libs/openh264/openh264-2.1.1.ebuild
@@ -12,7 +12,7 @@ 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/6" # subslot = openh264 soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="cpu_flags_arm_neon cpu_flags_x86_avx2 +plugin utils"
 
 RESTRICT="bindist test"
@@ -28,6 +28,10 @@ PATCHES=( "${FILESDIR}/${PN}-2.1.0-pkgconfig-pathfix.patch" )
 src_prepare() {
 	default
 
+	sed -i -e 's/ | generate-version//g' Makefile || die
+	sed -e 's|$FULL_VERSION|""|g' codec/common/inc/version_gen.h.template > \
+		codec/common/inc/version_gen.h
+
 	multilib_copy_sources
 }