gentoo resync : 25.03.2022

3 files changed, 38 insertions, 9 deletions

diff --git a/media-video/ffmpeg-chromium/Manifest b/media-video/ffmpeg-chromium/Manifest
index de98277fc635..4048c68982e0 100644
--- a/media-video/ffmpeg-chromium/Manifest
+++ b/media-video/ffmpeg-chromium/Manifest
@@ -1,7 +1,8 @@
 AUX chromium.patch 1536 BLAKE2B 8caf1ff11f8da710138cbb857bd42e8679f98f3c30a3eaddb51611b7c39fb48c23890257997d3ddfee47244e6ffc0abb241e3118e0e8bcbf63442885445bcee3 SHA512 711b338178fe042aff92375d6593197337529986ea55ac6288df4c725145dd06c41fcfc11df4843e03eeaa4bad90ed558acf8f6945b9b96c9751fff92a41811a
+AUX ffmpeg-chromium-100.patch 1653 BLAKE2B 4d0b025b024aa9ce9e325487c09bb3a566b453198626a2178b119eab56adb73d392a8f4499735310108838f73d48c50f54c9c4b1b19db66c98ef15b39e38c3d4 SHA512 89cbf0cd5c4337e4633af7c814002cb4e909b4d4d385d5a3e265882cf1c4e24e4057512bffe7311e53b8a7886c882929221b07961ae86d115803f9b991ef6a05
 AUX ffmpeg-chromium-94.patch 1617 BLAKE2B 83afc6ae7f6d3b802e7c074545f8e46980751065303dc80283af917771675c987b063a4d39d9ca853b2753c40d38c3484c09a32500011b8faac0fca7e1807dad SHA512 41f4d79581602c475f245fb08f14e065ae2ca5b4863dade0e9652e33786fec90a631aa1a0e67f262ab067a12298883aea2d40309d2303bef76d7d99d06329eb2
-DIST ffmpeg-chromium-94.tar.gz 14709687 BLAKE2B 06dedbd86befd8caed4c6cb34755b52cf70630f8fbd712f89d42e5b63e498f9d2a77935fbd7c87194f6d56fb0f83ff26beba00357dd51b3ac3e2e4480ff4351e SHA512 a6cf5404c892c878c50e3ba8369456db587e327bc3d77e857b9d34f3665ecfee7d3865b20e9871ccda570b30d9d34c03fd981cdc7f495809ea8f12cb8f15937e
+DIST ffmpeg-chromium-100.tar.gz 15144675 BLAKE2B 1195078e12ef0d8b5562b2eed068eea331a03727f3dfbd198fdd1088d70346f892bc9161ecd80ed54f7c5c842c9ae9b16f6d02858f3c4a538ce19de03b5ec9f8 SHA512 35f5ca7164d8d8f58b2f553ec7c6181629af217752fe49bd890051675734864ae4b5d1f135808d101fb0c9855d14842a0074759679a15e9b94fb571c9e2ccee7
 DIST ffmpeg-chromium-96.tar.gz 14782341 BLAKE2B 686f5e0970ab49663e43d54cdb9b0216560dabc676711666c9e51840af64d2c78d47b55bcf36625751676839869e1b1f3b65516499646db00fd29f5ed2ff90d3 SHA512 169a1bf58000be0799b05b1d3f3a63b5a93ec66023d31f1ac6f5d9cd77408a390a9308fb626e94c3f1d4e1170638c1c81ac68b248e06c28d318d731ddda8e4d2
-EBUILD ffmpeg-chromium-94.ebuild 6148 BLAKE2B 3dcc0310ab9cf7280f64bddca3dd9bb120e217afacca2eff0cdb31be84cc8398eb35da3937dec968e6b5e1afeab24ebb51f100bb3db44d8d91243e22f1f3fdfb SHA512 ac8e2cd29c98a89881580d5ae4e6cba3a0f1143e36ad553520dd12244caddc02e753b4f775454f09b1ef602765713753e2976c6d3851ae3b1f4d458728e4f5c2
+EBUILD ffmpeg-chromium-100.ebuild 6224 BLAKE2B 5e24d377ba4bface5737b8c78088d970589a48d45fbad4262972d0cede8dc31649c2f7eb58c947367552be9bf8a054e53735ad605e4c33b4766f7881fa44b17e SHA512 392db2b377bdcbadfe2e57a59f86c34f6ea5b044548d06d90d753b97bbb45e0bc813d9a3d17718d193a04fb59ef038e6fbcdcc990f54e06a8d8e8bb3ddb9edd2
 EBUILD ffmpeg-chromium-96.ebuild 6152 BLAKE2B 1afb8f595b0f1bd5259de827ca614343165b97cd60f4443d23139d5162edd065d13e3c37f59a43b8a3837058cebcb360616f7b33c65df1fa408c3afc789a9166 SHA512 00a82ddb95b0457f5347b680ae6c7bf058052de6aacdd9e15435f84a3f2d70c776149f2e9c0ff7935f19e2fe35dcbf05ab2cea43cf6d97c1882353be35d019f6
 MISC metadata.xml 669 BLAKE2B 3e1b3934b51d07a5620026f2d24e027d217380a9ef7819b3ee54e09b12b0d3ed377cef911989d63a6ab65bd7cb92752997fdd90afb0e6f29dc9496a9035daf4c SHA512 556601bbb7357eb7b8be23a93268b8f173bf16b42518f4b931e97d13880b5e0642546c1ead253a625a8938a9c7020cf52f69eaa629e65de47dfa010af6299674
diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-94.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-100.ebuild
index 94e036354132..3c7d3ee33d68 100644
--- a/media-video/ffmpeg-chromium/ffmpeg-chromium-94.ebuild
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-100.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit flag-o-matic toolchain-funcs
 
-COMMIT="2d6591aa0835768c437c221c88840ac0c99a50dc"
+COMMIT="574c39cce3231c69bc9a02ac475c27d944bdb113"
 DESCRIPTION="FFmpeg built specifically for codec support in Chromium-based browsers"
 HOMEPAGE="https://ffmpeg.org/"
 SRC_URI="https://dev.gentoo.org/~chewi/distfiles/${P}.tar.gz"
@@ -16,7 +16,7 @@ LICENSE="
 	gpl? ( GPL-2 )
 "
 
-KEYWORDS="amd64 ~arm ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64"
 
 # Options to use as use_enable in the foo[:bar] form.
 # This will feed configure with $(use_enable foo bar)
@@ -94,7 +94,7 @@ RDEPEND="
 	vaapi? ( >=x11-libs/libva-1.2.1-r1:0= )
 	video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.1.23.1 )
 	vdpau? ( >=x11-libs/libvdpau-0.7 )
-	vulkan? ( >=media-libs/vulkan-loader-1.1.97:= )
+	vulkan? ( >=media-libs/vulkan-loader-1.2.189:= )
 "
 
 DEPEND="${RDEPEND}
@@ -114,7 +114,7 @@ RESTRICT="
 S="${WORKDIR}"
 
 PATCHES=(
-	"${FILESDIR}"/${P}.patch
+	"${FILESDIR}"/${PN}-100.patch
 	"${FILESDIR}"/chromium.patch
 )
 
@@ -181,7 +181,7 @@ src_configure() {
 	fi
 
 	local extra_libs
-	if use arm || use ppc ; then
+	if use arm || use ppc || use mips || [[ ${CHOST} == *i486* ]] ; then
 		# bug #782811
 		# bug #790590
 		extra_libs+="$(test-flags-CCLD -latomic) "
@@ -195,6 +195,7 @@ src_configure() {
 		--cxx="$(tc-getCXX)" \
 		--ar="$(tc-getAR)" \
 		--nm="$(tc-getNM)" \
+		--strip="$(tc-getSTRIP)" \
 		--ranlib="$(tc-getRANLIB)" \
 		--pkg-config="$(tc-getPKG_CONFIG)" \
 		--optflags="${CFLAGS}" \
diff --git a/media-video/ffmpeg-chromium/files/ffmpeg-chromium-100.patch b/media-video/ffmpeg-chromium/files/ffmpeg-chromium-100.patch
new file mode 100644
index 000000000000..e0aa000faaa3
--- /dev/null
+++ b/media-video/ffmpeg-chromium/files/ffmpeg-chromium-100.patch
@@ -0,0 +1,27 @@
+diff -Naur a/configure b/configure
+--- a/configure	2022-03-22 10:20:35.000000000 +0000
++++ b/configure	2022-03-23 09:17:18.914615584 +0000
+@@ -6600,15 +6600,14 @@
+                                { require_pkg_config libopenjpeg "libopenjp2 >= 2.1.0" openjpeg.h opj_version -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } }
+ enabled libopenmpt        && require_pkg_config libopenmpt "libopenmpt >= 0.2.6557" libopenmpt/libopenmpt.h openmpt_module_create -lstdc++ && append libopenmpt_extralibs "-lstdc++"
+ enabled libopenvino       && require libopenvino c_api/ie_c_api.h ie_c_api_version -linference_engine_c_api
+-# Chromium uses a built in copy of libopus that is not visible to pkg-config.
+-# enabled libopus           && {
+-#    enabled libopus_decoder && {
+-#        require_pkg_config libopus opus opus_multistream.h opus_multistream_decoder_create
+-#    }
+-#    enabled libopus_encoder && {
+-#        require_pkg_config libopus opus opus_multistream.h opus_multistream_surround_encoder_create
+-#    }
+-# }
++enabled libopus           && {
++    enabled libopus_decoder && {
++        require_pkg_config libopus opus opus_multistream.h opus_multistream_decoder_create
++    }
++    enabled libopus_encoder && {
++        require_pkg_config libopus opus opus_multistream.h opus_multistream_surround_encoder_create
++    }
++}
+ enabled libplacebo        && require_pkg_config libplacebo "libplacebo >= 4.192.0" libplacebo/vulkan.h pl_vulkan_create
+ enabled libpulse          && require_pkg_config libpulse libpulse pulse/pulseaudio.h pa_context_new
+ enabled librabbitmq       && require_pkg_config librabbitmq "librabbitmq >= 0.7.1" amqp.h amqp_new_connection