gentoo resync : 02.02.2022

2 files changed, 118 insertions, 0 deletions

diff --git a/media-libs/openh264/Manifest b/media-libs/openh264/Manifest
index 68a002fcf2e1..5e19352c1580 100644
--- a/media-libs/openh264/Manifest
+++ b/media-libs/openh264/Manifest
@@ -1,5 +1,7 @@
 AUX openh264-2.1.0-pkgconfig-pathfix.patch 1949 BLAKE2B a3894b7cb65fcdb444d389ccf6644e404bb8375a910bd51bbe5e1b6b773e4d6890a17d2f1a09400d6d0cadc41be9321d86a09b93f861812f2d72a6c1c5e39fde SHA512 00c59bd1d6fe6355ce81ead4ba898f1f602e9f9c93e382c2ead3c353d5fd1f2bf3c46a30f3b248896c9a74d347a24e200644387ce3c70e886d941c115bb42088
 DIST gmp-api-Firefox39-e3935759360861812d33cbd3b713e25f1de1ecb5.tar.gz 10440 BLAKE2B 92379258f2664778baee50b99573dbeae50e723a3f7605c62a4ca3aedd9129fbd1991d7b3ead1b8a3689e71f783ded0b15dca5e6d910345c95a6f28898bbdda3 SHA512 85e4b58cc66072fad2b6dbaa65a955a8931f73eb3664f05ddca65157ac5c2547225910c36b4507d88179a95cfb35a5aff6edadd3c0fa5418529c80ae6d736f44
 DIST openh264-2.1.1.tar.gz 60239654 BLAKE2B d541fa686b1eb8352dbb4088fc4ef508f947660815c86b2bb7db841c927b7b9f763d7fe793f0fa1511620dbdc506c20cd5ad52740140337aa12b8c31b857a8e6 SHA512 f9c2925fa902c6278da40f68b967d25e62db7ce3541e8f5e7a0ee174204b6ecc7026b5853885c361f48ca01d71bacd585fb5b91f01f0c054ece80943f1afcf79
+DIST openh264-2.2.0.tar.gz 60275282 BLAKE2B 69e44396de229c65cf7a87d6f9ce8e2ef67fbdad6740f6aa64825b71fc00af945dca3e4726b9f0b4f4b83e363f3f7aadadabbab291c612b0fb61b42478a8cacf SHA512 637e2bfa45ad586c10fc8990cad4d824ada07e277fd965c3a6cdd19bc7836b2d7082574037a3ff2ee631207dd8cb0ec4f68abafdc19646b433de561c47ce8d38
 EBUILD openh264-2.1.1_p20190331.ebuild 3457 BLAKE2B 15c0bb913b6e97f0f3a3a08f44dff9bea5026d8f936573c0aeab2c7e077691d7be2123e2cf599c4de9a61c08323fa1cb9f2af2d1a2834c97b6f3e1e06dd3614a SHA512 4505c55440f1ae4f28aeee38e6ec02ab7537f1e997a45964a36eb3474a27c8306e590dd38b345834d6feba7dc73b2e6df8b82d8af78c32d99985b1eaa3109e80
+EBUILD openh264-2.2.0.ebuild 3486 BLAKE2B 4a2ddfad4af22f2151c4df3e6d53ef41feae3e95fa07d127cf802cef2a0945f2f18e23724237981125eefd8693071b23e2e7c8893c8093c255d89825e4229035 SHA512 d741e37d9f6bd919af3ab1d25fe479b905cb7dcc75bbd5d768f20640f39b0c9367a3fc26f9d86b79bcd3db5534e3d1f938ce97bce0534b2299e927c3592c98b0
 MISC metadata.xml 569 BLAKE2B 14a021fba978f0156bab46178d05a6b9f8f67fdeba784d587759207fe60ea1d74a383eec3fc40662c39d33fcecb71d8cafe7eb6354383c253e0a3f7f1e94feae SHA512 ceb77117c6a50f16640b329368c86db26127b8e501475dbaca4c53ba41315b0fc7161f6d9268cb86d1f6dbf2cf867e2bb0e6b5f45240ab3227b99b734c344efd
diff --git a/media-libs/openh264/openh264-2.2.0.ebuild b/media-libs/openh264/openh264-2.2.0.ebuild
new file mode 100644
index 000000000000..a99a1a7fb6aa
--- /dev/null
+++ b/media-libs/openh264/openh264-2.2.0.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs multilib-minimal
+
+MOZVER=39
+MY_GMP_COMMIT="e3935759360861812d33cbd3b713e25f1de1ecb5"
+DESCRIPTION="Cisco OpenH264 library and Gecko Media Plugin for Mozilla packages"
+HOMEPAGE="https://www.openh264.org/ https://github.com/cisco/openh264"
+SRC_URI="https://github.com/cisco/openh264/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/mozilla/gmp-api/archive/${MY_GMP_COMMIT}.tar.gz -> gmp-api-Firefox${MOZVER}-${MY_GMP_COMMIT}.tar.gz"
+LICENSE="BSD"
+SLOT="0/6.1" # subslot = openh264 soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="cpu_flags_arm_neon 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
+
+	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
+}
+
+multilib_src_configure() {
+	ln -s "${WORKDIR}"/gmp-api-${MY_GMP_COMMIT} gmp-api || die
+}
+
+emakecmd() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
+	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) \
+		ARCH="$(tc-arch)" \
+		$@
+}
+
+multilib_src_compile() {
+	local myopts="ENABLE64BIT=No"
+	case "${ABI}" in
+		s390x|alpha|*64) myopts="ENABLE64BIT=Yes";;
+	esac
+
+	if use arm; then
+		myopts+=" USE_ASM=$(usex cpu_flags_arm_neon Yes No)"
+	fi
+
+	emakecmd ${myopts}
+	use plugin && emakecmd ${myopts} 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
+		newins "${T}"/${P}.js ${PN}-${PV/_p*/}.js
+
+		insinto /usr/$(get_libdir)/seamonkey/defaults/pref
+		newins "${T}"/${P}.js ${PN}-${PV/_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
+}