gentoo auto-resync : 26:08:2023 - 09:56:44

5 files changed, 139 insertions, 2 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 9f898575ba62..947fdcf44c8e 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 20d86a6dc29a..eb6f92a9b88d 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -20,6 +20,6 @@ DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f7
 EBUILD opencv-4.6.0-r4.ebuild 21277 BLAKE2B 458906fe516524a8d997e6645d16ca3621774795271cb06aa2bb414a5937139db84beffb1dfa39d96215f45aa56c93461463a62f5f771cfc16396b3d926e049b SHA512 2d2b557fe6b260cd4c3ffbd4159cac68dafb9fc22138ff2f119350723a44f3376ee39f20d8c8b2d61952d88d9a60b470d36477552f0a1eb9b12eccd690547e6e
 EBUILD opencv-4.7.0-r1.ebuild 21289 BLAKE2B 0e2c1ac23fcd0ec261329eeeb73f035bb92bdd0d114b6123a9934d85937034e65e22a5264553cf294c66023a23e7bab7bb77560bb422a0d36ed726bc010afdd8 SHA512 332206b352f57fd16375b104f84e3019a8358ed174159f0827f51ac522ccdb62c360fcea1a94c2333adae5468acb95e78ad6897c3e8f9daa33292161794b737e
 EBUILD opencv-4.7.0.ebuild 21242 BLAKE2B 930ce7cdb362134193217aced8fb53e6695cde0d2abf1582db923c5bad84c01189eea5d76dc6bfd81e1bbcd0e286f94c2d17b59bb3ace0dd2cdbf26e21be6d17 SHA512 43f45361d176e7f34dc0c1d98dc459b351215b9a2db8d76390b384e774a95db8792386fecd35007ffee90d2a275f3daea010da1cea5e9728221f71d6c6a44164
-EBUILD opencv-4.8.0-r1.ebuild 21426 BLAKE2B 0791907bb677e69cfb81021afe6552fbe44ba169d77168b6cef73e456df1acbdefa477fc136d42782576f3d04ba6aee259231eed919e9de8fa485b991d1186c6 SHA512 052bbd5e1f738d2f5bb2739c1ef3cedb24343f24fccd514093812fb584d4a398abc5f28748bc672492985f2b2e5a49764a0a52192a1ea4b6e9fb8ec216ea1ad8
+EBUILD opencv-4.8.0-r1.ebuild 21456 BLAKE2B 49b088c4ec805c010825ed91cbfe89521e938c50c0fba33ccdc812b5f36a920c79e7865f988b7b1241b3ac6fc06036c439b7708562e928e969c61fd8d0207361 SHA512 20bf41d3edae8b8722636114934c180c3f08701aea55e7a7f5daae4924dd543f7f3c80ad2dae1ae78b7e075bad4f709cdfdcdccb78e818879f0f67f36982343f
 EBUILD opencv-4.8.0.ebuild 21266 BLAKE2B f7eef7599c1dba1eeafc61ff2717d47229c64ce3c9592da01a2ac8d0e75e6c7158c1b66346db77d969e573d5f7e50880b42827b185184c5fa571b7cc7b4dc747 SHA512 a47347e0966585c4b5789ddb11373e5b9b7559e26a8ab401de25b2f427b85cdbf7a9d47ea53d654e79bd44fece38d45f437ad91bdbe872410b9cd881192d3055
 MISC metadata.xml 3147 BLAKE2B 37bb20a0fd752e1e3d4fae7f1b549be49648cb45cc3c6537a9bdb01b609cbab68a443bc17ded790bedd3afa800d1ce16c4220ebdd42a0d9dd73dacf415d29b5f SHA512 e9cf8dc6a63be3708ee595149122ffb2ef9722402716ac4a100c971a39c17e82e3d32253c03f56dd4814202a0727b29d8fb0879605a71c15e0a3f8e01e152069
diff --git a/media-libs/opencv/opencv-4.8.0-r1.ebuild b/media-libs/opencv/opencv-4.8.0-r1.ebuild
index f9390c38feab..846e57c7514b 100644
--- a/media-libs/opencv/opencv-4.8.0-r1.ebuild
+++ b/media-libs/opencv/opencv-4.8.0-r1.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+# No 3.12 yet for bug #912987
+PYTHON_COMPAT=( python3_{10..11} )
 inherit flag-o-matic java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
 
 DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
diff --git a/media-libs/openh264/Manifest b/media-libs/openh264/Manifest
index ebdef7f152b5..14ea9cf98c77 100644
--- a/media-libs/openh264/Manifest
+++ b/media-libs/openh264/Manifest
@@ -1,7 +1,9 @@
 AUX openh264-2.3.0-pkgconfig-pathfix.patch 2023 BLAKE2B 9d380302efe14b45959123f69591aed9f552a954dd9f2f079ba1dc95edfc59869db9ece0ea65d52e58201829e0e4bb791f0380b36b35d288b40769c1c144005e SHA512 24fb7e1bf54d5c1512dab9f5b6cbd61863022d99a1a5d07d5a69037ad3b3857f2ac01fdfae4a1477f1b200c8a4b107247fb9f46af1219e71220e55167f1620ec
 AUX openh264-2.3.1-pr3630.patch 5566 BLAKE2B 06e6ff75ccbcb287413752283d3b192ccd9ff6172bf2245f28eb219b3c8384f900a54e0d0992589b234e14080dfcdc3c026635ba6070597197f93e8514a77fd8 SHA512 7acc909c8d78e8b9cb366d822b970d4e164d40e0224fe3a07d7750b3b7c3a30ac40afc1bbaac4844d6fbdb6c144830004b12dc3bd64d2574338cebea952648a0
+DIST gmp-api-Firefox114_2-e7d30b921df736a1121a0c8e0cf3ab1ce5b8a4b7.tar.gz 10915 BLAKE2B aa4b82baebbd990d94f381be4516e8780f6bc3a2104c4b899f091a9e6ec91dff9788ee6ef548d3bc07c7bf50f56347c44d01e51805f96cf9b59494889a5f7b61 SHA512 f1c75007d4f1e1ef3a11b8eb9c703935408a5e4051c8eab408e4edc09f265a71f172025269442fdab9d4c2a8b108fa69397bfbd84af4ecda22881b50de804de9
 DIST gmp-api-Firefox39-3a01c086d1b0394238ff1b5ad22e76022830625a.tar.gz 10464 BLAKE2B db6990a55b4128c267ee5ffa4e38edd2551c862e549776b4092d5683818001366665830c6304642cdd9c2c0afe06035edebafde769693082ae7a5236cdc463e8 SHA512 a6383834391d98754177b54df31d006144b5cad952df60115fd12fb6f0c87e571a10f9ce7276b817e4137efd97ffa7bca5092e289b0eb7cde2a3ad923319e874
 DIST openh264-2.3.1.tar.gz 60290897 BLAKE2B b4480150cfe7c44b89c7b294698db06f93d96f5f9f3ef4345108c4e360e99bc6133407cead54e720e6e74aa17ab9f2e4342287a42f19463a54eb44c9d3141c80 SHA512 fd59c767794cdfb934d692d5929e4500d78606cbf1e403bc7c7dce048cc07e40daa0794357adb856d29479427a53460c76338e156b6bbeaa36139afcd603c8e1
 EBUILD openh264-2.3.1-r1.ebuild 3925 BLAKE2B 3d0b73c310f1582ec7f010fd9104c44d3f4581ea8b806e2fe16d495ec29517f997e1f85b981bf0db3015bd939b3c57c34e8de97864b0faaa1ca40f4657fbc215 SHA512 118d32d0d888bdf614dbfd2ee42e27e2ec196653bcc4ef79c8bf673e87f8ce08c657a326b41f940ffc9b8e923380520ae84bf656706fe4e48ee13a26071a3d03
 EBUILD openh264-2.3.1-r2.ebuild 3952 BLAKE2B a23325be69269489c8fb404b098d9ba32addde9cc1e740dd0b6cc805dc66c19d9dec110d8eaac0d850cf0f29acb487cb188d358494db0979048317108ee10550 SHA512 a2487b8f55445d73e8ff2b78314178a66f7b897017c05db3992c6aa7e76a5967c281a27c33c1a3f6f111aa95c7c69f4c39ec2dea24ddff4917e7f5d4d38df705
+EBUILD openh264-2.3.1-r3.ebuild 3955 BLAKE2B 6c1bf0aeb775ea849951b3357debc87ecc80887db474b954ed2eb9cdc17e24f2145eded1aa45aa70844726f529b5680b57310a28c6f774c79ea197b89f703921 SHA512 7c91350363615cc9327d6deba0433d4326a8686303763ff2aef19d83e36913f2b68d19c6e9709257e2f770e26cd05ff442c7d7d4c019f4c0b0e346d48c96e09f
 MISC metadata.xml 569 BLAKE2B 14a021fba978f0156bab46178d05a6b9f8f67fdeba784d587759207fe60ea1d74a383eec3fc40662c39d33fcecb71d8cafe7eb6354383c253e0a3f7f1e94feae SHA512 ceb77117c6a50f16640b329368c86db26127b8e501475dbaca4c53ba41315b0fc7161f6d9268cb86d1f6dbf2cf867e2bb0e6b5f45240ab3227b99b734c344efd
diff --git a/media-libs/openh264/openh264-2.3.1-r3.ebuild b/media-libs/openh264/openh264-2.3.1-r3.ebuild
new file mode 100644
index 000000000000..f97e1deaaf35
--- /dev/null
+++ b/media-libs/openh264/openh264-2.3.1-r3.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs multilib-minimal
+
+MOZVER=114_2
+MY_GMP_COMMIT="e7d30b921df736a1121a0c8e0cf3ab1ce5b8a4b7"
+
+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"
+
+# openh264 soname version.
+# (2.2.0 needed a minor bump due to undocumented but breaking ABI changes, just to be sure.
+#  https://github.com/cisco/openh264/issues/3459 )
+SLOT="0/7"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="cpu_flags_arm_neon cpu_flags_x86_avx2 +plugin test utils"
+
+RESTRICT="bindist !test? ( test )"
+
+BDEPEND="
+	abi_x86_32? ( dev-lang/nasm )
+	abi_x86_64? ( dev-lang/nasm )
+	test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )"
+
+DOCS=( LICENSE CONTRIBUTORS README.md )
+
+PATCHES=(
+	"${FILESDIR}"/openh264-2.3.0-pkgconfig-pathfix.patch
+	"${FILESDIR}"/${PN}-2.3.1-pr3630.patch
+)
+
+src_prepare() {
+	default
+
+	ln -svf "/dev/null" "build/gtest-targets.mk" || die
+	sed -i -e 's/$(LIBPREFIX)gtest.$(LIBSUFFIX)//g' Makefile || die
+
+	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) \
+		HAVE_GTEST=$(usex test Yes No) \
+		ARCH="$(tc-arch)" \
+		ENABLEPIC="Yes" \
+		$@
+}
+
+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_test() {
+	emakecmd test
+}
+
+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
+}