gentoo auto-resync : 03.08.2022 - 13:42:43

5 files changed, 45 insertions, 3 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 8dcbcac3b5ba..341155ef1b94 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 5f3f62f31412..7d7b170d4bcc 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -10,7 +10,7 @@ DIST ffmpeg-4.4.2.tar.xz.asc 520 BLAKE2B 1ff4a886c7703a05a19499ae5b2b6207df24e05
 DIST ffmpeg-5.0.1.tar.xz 9812524 BLAKE2B 0a37d425780f7e15836848048214411829bceb0de12bb7089803feb3dda07a077be9c8e8174b72792558ed86d92224bee9d4db20cc74690ea54312fbf2f10e83 SHA512 e5810c7379748a6bbe1a903bf36b4372b67cb3973179727b6af6f0118eef46f4c990155961cc37255e08a5bafdc4b4683503ad410ebb7afe7a35b891c01fa602
 DIST ffmpeg-5.0.1.tar.xz.asc 520 BLAKE2B 686a8c372d26bd0158a0e79f6cbe8d9c46127bd200df7f4f6e2a4285bfd412cfa9aff865eca125a27a7204f32ba0cca86bcbf769ee4874e5202cc700b0eb4449 SHA512 9c4bd404196c3a3808bae92873aefc77f8c26a9419cc6130a3f2359a75c8e83189d206e9aee8ff85c5a7fe4a98da24e11cf607ec351386c18979ec2d5ad3b3ad
 EBUILD ffmpeg-4.2.4-r2.ebuild 17868 BLAKE2B e78ee4ec8c2b6ed7132f4a7b61d71df2c8a8af22f6b1206dea5d6a8f988922293827b5f3fd56dfc039933af849db58f7eeedb9531ba5c7a16a03806ec7e78e68 SHA512 f8eb67f028d2d062a11550e8e55446e6956bb88e9c5c50f0ee4fb2941b797777e4f6ba304fcabc99854456d439619e4f1d3cf0c74214214ae2d388279fb2d557
-EBUILD ffmpeg-4.4.2.ebuild 18912 BLAKE2B aa3bff38d1be5fd199fd2b4b58edd57093b9432390e02581606fb5f5aaf065cb96877480653d07839663b50ee4a432c62ae51264041b187a32e7cdba05df4102 SHA512 82f807718901e4dfabbb1ae1302fa40ff735c6824c13ba83cf1803bb21867b15a0c6e1a929497dce4162515b8b12bf6406f10fa22cad187b9eff41981b981fb0
-EBUILD ffmpeg-5.0.1.ebuild 19008 BLAKE2B 038624992189463e2e2ec040a3b40a42e11eb112619d091284cd4c8450656b0c5f4540702920078bc88ce90f5dcd205b8bdb53387ee9143acbe2f5c69781e9e6 SHA512 c06bff583f9779c318ca3f7a7e8ec65334592291429146696e326797e140003361e059ff20b86067b4c1ec748b7db9f99f66cc8beb63c515fa688ac089116f1f
-EBUILD ffmpeg-9999.ebuild 18885 BLAKE2B 3a106b2308f49c0b115351fc238e258974eeb72b4e2bd57a59f9c1d2bf937e71b541a755108093d171285534c15f408b3934797ce032f044c489ae46220b5cce SHA512 62fc2ff67c82eed4bb6e38bc4577ee02b74c5ca2d82ec553d9193962f04d4f2b0b8dbc8a3acb14774ad1134677d1027486f1073d3232f1160976ef559078ac6c
+EBUILD ffmpeg-4.4.2.ebuild 19655 BLAKE2B e2a0735622b1b66f245b462cf11aa3226a53bb434bb107a1bb830004a62eac06149d15c9a36671713868f41df8da3c736fc556932e4e829d36c0df25cb703c36 SHA512 321c5f6f46c3b4c17918ed843c6572fd1073a0562f745d3f95a27d44aa6a8c362293428ce3146b62fee1bec05548062946cf43f83d9e3076b2a025eb6be5f6f5
+EBUILD ffmpeg-5.0.1.ebuild 19751 BLAKE2B 5930fdf191779e4fdf4cf7b4f6f2ab2ecc110528b8aa3d193a68ce5ff9fd533ecaaecd858d17c8b038ecd9cbe449332361ca9191c84ec94df385dc9dab55d502 SHA512 d426c0578c3b81f71d3081d2ead9adc316a5365b8c0316b33d5e6daf991c4ca056dc0ee948a8ed102a43c13c093f1a40625133fd2c87d288e2945d139f741eb1
+EBUILD ffmpeg-9999.ebuild 19628 BLAKE2B a9b3807ee2245067cd697121caea4adc76ba0f7a18e0563c126d51a2ee373788f38f52a64942ea4321ca97c052d964780320ca37a78e7f70e13f51e17a6419e4 SHA512 4c5ccacacef26ff55e23312b4929f35c58a63418b272d267775e7ebc5c4852428ddb3f191c321555f927ca22a7de127d6e400e7219d52fac25ba985b0ccfb348
 MISC metadata.xml 6416 BLAKE2B 050774bf3950f0931b51028e47470178287ea9ea858cbbd8f71b48bba0e138abb1282e5250ba887d3deeefbbc3c9663ce324f5a2e2ea310502ca3a818f313d87 SHA512 2c7a782d48c01bba23f42a500b5c66f8eb56fef910d316740606b6db32d91660b38497438278f27c66de392ca513200b1b90b91a6b848d239ee4723d0f2a31e8
diff --git a/media-video/ffmpeg/ffmpeg-4.4.2.ebuild b/media-video/ffmpeg/ffmpeg-4.4.2.ebuild
index 1a4bbf4e4830..161cb301720b 100644
--- a/media-video/ffmpeg/ffmpeg-4.4.2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.4.2.ebuild
@@ -343,6 +343,20 @@ build_separate_libffmpeg() {
 	use opencl
 }
 
+pkg_setup() {
+	# ffmpeg[chromaprint] depends on chromaprint, and chromaprint[tools] depends on ffmpeg.
+	# May cause breakage while updating, #862996, #625210, #833821.
+	if has_version media-libs/chromaprint[tools] && use chromaprint; then
+		ewarn "You have media-libs/chromaprint installed with 'tools' USE flag, which "
+		ewarn "links to ffmpeg, and you have enabled 'chromaprint' USE flag for ffmpeg, "
+		ewarn "which links to chromaprint. This may cause issues while rebuilding ffmpeg."
+		ewarn ""
+		ewarn "If your build fails to 'ERROR: chromaprint not found', rebuild chromaprint "
+		ewarn "without the 'tools' use flag first, then rebuild ffmpeg, and then finally enable "
+		ewarn "'tools' USE flag for chromaprint. See #862996."
+	fi
+}
+
 src_prepare() {
 	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
 		export revision=git-N-${FFMPEG_REVISION}
diff --git a/media-video/ffmpeg/ffmpeg-5.0.1.ebuild b/media-video/ffmpeg/ffmpeg-5.0.1.ebuild
index d3e7c93b04de..17f3f4c919f0 100644
--- a/media-video/ffmpeg/ffmpeg-5.0.1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-5.0.1.ebuild
@@ -343,6 +343,20 @@ build_separate_libffmpeg() {
 	use opencl
 }
 
+pkg_setup() {
+	# ffmpeg[chromaprint] depends on chromaprint, and chromaprint[tools] depends on ffmpeg.
+	# May cause breakage while updating, #862996, #625210, #833821.
+	if has_version media-libs/chromaprint[tools] && use chromaprint; then
+		ewarn "You have media-libs/chromaprint installed with 'tools' USE flag, which "
+		ewarn "links to ffmpeg, and you have enabled 'chromaprint' USE flag for ffmpeg, "
+		ewarn "which links to chromaprint. This may cause issues while rebuilding ffmpeg."
+		ewarn ""
+		ewarn "If your build fails to 'ERROR: chromaprint not found', rebuild chromaprint "
+		ewarn "without the 'tools' use flag first, then rebuild ffmpeg, and then finally enable "
+		ewarn "'tools' USE flag for chromaprint. See #862996."
+	fi
+}
+
 src_prepare() {
 	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
 		export revision=git-N-${FFMPEG_REVISION}
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 28afbd6ce4a2..222d27490cb1 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -342,6 +342,20 @@ build_separate_libffmpeg() {
 	use opencl
 }
 
+pkg_setup() {
+	# ffmpeg[chromaprint] depends on chromaprint, and chromaprint[tools] depends on ffmpeg.
+	# May cause breakage while updating, #862996, #625210, #833821.
+	if has_version media-libs/chromaprint[tools] && use chromaprint; then
+		ewarn "You have media-libs/chromaprint installed with 'tools' USE flag, which "
+		ewarn "links to ffmpeg, and you have enabled 'chromaprint' USE flag for ffmpeg, "
+		ewarn "which links to chromaprint. This may cause issues while rebuilding ffmpeg."
+		ewarn ""
+		ewarn "If your build fails to 'ERROR: chromaprint not found', rebuild chromaprint "
+		ewarn "without the 'tools' use flag first, then rebuild ffmpeg, and then finally enable "
+		ewarn "'tools' USE flag for chromaprint. See #862996."
+	fi
+}
+
 src_prepare() {
 	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
 		export revision=git-N-${FFMPEG_REVISION}