gentoo auto-resync : 24:01:2024 - 16:45:44

5 files changed, 46 insertions, 2 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index ac0d716dfc0a..cff1f1ff31bc 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 73f3be9958cb..0e7df8288eae 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -11,6 +11,7 @@ AUX ffmpeg-5.1.2-get_cabac_inline_x86-32-bit.patch 999 BLAKE2B 736a85e60d3ee9b48
 AUX ffmpeg-5.1.3-binutils-2.41.patch 2217 BLAKE2B f013c5df1cc3495830d101e551e42dfd07b016913c7cfed82920e85e69d857fb8081e19503d7f0306ca2e0313683d00e3b20293fc8ddab491eb10ffdd3a92b1a SHA512 2db666d4e5f3e9e4f32b6a34e537b5af2229c744eebdbc6680e883b88e5d937ab59f8a0fd7da812a28d9d0a3955853cb594ac5352d31a9655da95b735bbc46c0
 AUX ffmpeg-6.0-DECLARE_ALIGNED.patch 1006 BLAKE2B 10bf1b3f618e0fad2dfb33b42fcec611329181d5481f79c42cbfda7054e2ce5f53e5b2ce439965a1beadc346492ac06c6a91a56d979a73bd72ce8952a15b2dd8 SHA512 e2d3e915a6d9ebae11e000b908bd5346de0d7731407dc783088a6d10a8e36de045a90225d16a01366ed1ad3af16fdb3b87803c03833883e7f31b93e7cdea44f7
 AUX ffmpeg-6.0-binutils-2.41.patch 2217 BLAKE2B 2c8e96610fe1d198613405941b8f6ce36c1e8a543769a0dcfa5498dc0b4638e2e936dde8ad6c81a24b31dfc674ab7a2484e1a692f1ea911a1141276c05a5b13e SHA512 ec082acaaeb42061e2c6054f26fb6483170684f148200219ec8bc1fc04cf56a0d9bb31becd367c2cfdde3a9bc6bcf4d9fcdb646a57df3cda6935951e18759f6e
+AUX ffmpeg-6.0-fix-lto-type-mismatch.patch 1782 BLAKE2B 4cafd0244136c645e8da072b21c906fba97579f667e57f678b450410759fddc834e5a2428b7d0f078130cfc7ab267cad82a46d369951efddcfc5853dd2118837 SHA512 170114d57af0a0b5fc5da71ae76f4725b8cf1a604b5eca10e60761ef22fb0cdb35a166d1dd5ebc4ef990c383e1d1331f8ef2ceccb8dc7bf4adcc7e9ebb2ba899
 AUX ffmpeg-6.0-libplacebo-remove-deprecated-field.patch 4733 BLAKE2B eba46b33bdbb387b90f89491aa638cb941e7fb72d522945394e540fdfadaf83efc6837a13eefedc285b6bce3ef4443ef32f2c04754209c4a47c4d2216574d597 SHA512 0673dab6043466eecf79048f1da8879d89a014b207910bfd6ec6ebf151fe77edf35460035583f803133969d90ab202ce31aaddf322501ac4e34e1270a66f09fe
 AUX ffmpeg-6.0-wint-conversion-vulkan.patch 1647 BLAKE2B 3d0f0de065a615f199cd3a3074f5038bf6652f41afa8f8754ade5f0112327f069d4cf8eddf3bc25139122d258caceb102dad7c2825b99f35c273e993caae817d SHA512 1fa7506eb393e44ba98ebaea1e98831912279d365ef8909f247913b912973f7782cb0ad869da4244b6a09b91f5cbb5a5207cbc5a4de8ec61fc313714ea663a80
 AUX ffmpeg-6.1-0001-avcodec-fft-Use-av_mallocz-to-avoid-invalid-free-uni.patch 1602 BLAKE2B a15fa5bf2d36743449fe718f2bbcd80dc3d1b2c26fab9cee4c9171c1ba1c2851a4101b10c1faf48b0bfb2777299244c9d0a6d0ee9e654a10ba4018c4080fbeaa SHA512 9ad0ea7aa80ec01b1623eb4cdad0cd0a6c35b2c8ed04365b0f5a63ef54297e3e66edce1b7a124a50f5c0b6c7d0f667e081fd5ef865381ad8f01d755147df2bd9
@@ -38,8 +39,8 @@ EBUILD ffmpeg-4.4.4-r8.ebuild 20210 BLAKE2B 1cd855287317cdb79d37c1ae56341006b778
 EBUILD ffmpeg-5.1.4-r2.ebuild 20036 BLAKE2B 0be8b316e9f9dc95709dac7c942966266f593b0372038b1e6b53eb178c699a5a0b765f89795bf75c216d144f4421fecf0debf69710d406a6ff980c7d5956b601 SHA512 fad46380a14d00b87bcb3ac5db958bf5a0431ab5b2a98a082b423f8da80f5205aa94f625510a229bde21ecaa606efee7e68eeb60a66660ab02a4a85fb1e53cb4
 EBUILD ffmpeg-6.0-r11.ebuild 19961 BLAKE2B 24bce1e5a491deb52f64111f2c9d7284b7a73a611a9868d626e7045e86952d5bd882fc0a112d798eb9695b7b35ec351cfe58ee4005c63046fb27a1b790021e6a SHA512 8355108b537d9fa983fead30e46b61e641cd3ed3d28085091b9c79b00be6b57384ecbb3f5bfbfb66ee48f3e7a03582c68b7808e40be4a51c7a87603b6b619400
 EBUILD ffmpeg-6.0-r9.ebuild 19903 BLAKE2B bbb891effed2da68f2192dfa6324d3ab1b0709968d7b4043cc6cd07c9d1e558b6ad80a767518abeb7b0aba7fac6e511a242246bc696e75511ffc13bc42816bec SHA512 ae992b921fc3b9cf09e274590462133a165c34349cb5b2d15b8291f7f2f1ba58cce6c203e19f79be62f7329ffb26500b10bc15f42a4279aecdf2dc1e781eb5d0
-EBUILD ffmpeg-6.0.1-r1.ebuild 19820 BLAKE2B db56588d342c6c77219d8966104990b82a85730e2df90eb89c7dfbf6141d099d785dd53bc2faf0ffe99d0024f437abadc3b9e5cf8114eb6c8594690236ff0088 SHA512 1c2e5e5dc8a9bf8c830e06c9c54b4feabebf3e99cfb133831de2c982eae1a0f6190e31f48ddbcb65aa224fbdf2d4ebc943155d0e6434f3d45f7b8c1b699b84b9
+EBUILD ffmpeg-6.0.1-r2.ebuild 19873 BLAKE2B 30d25e7de0295d0efec8fa56a0fe146333caa8b35b5aadf0f53f6f144f38b29ffc5f515074b9b3b53211fdc307263b2f8f50cda5051cc0a2f3906ae575a20743 SHA512 a5cb6080c2d2002a0006227dd7d07dbda082afa154b7c380b29765e607bbafa38310be9743d60d0ef4bf58647850bff53d70a3cff17b1cb23549ef3264563263
 EBUILD ffmpeg-6.1-r4.ebuild 19971 BLAKE2B edd1d87c7dc8bfa8de07e483c50277671334aa70f40a4b7985ab9e2e231ecddfdea16a67081cd07aeaff8104f732a723618d4efe7fec169f9d01063187fa0f03 SHA512 33f0c98aecf9baebb42a8ad4c3beb41007222c85cdd2f13cbe27b4fbf59f7450958d6fd147642ca33eeab12db07c87b05a0c0b14f98f494b91d56d5c1242411d
-EBUILD ffmpeg-6.1.1-r1.ebuild 19447 BLAKE2B c2a1b979170b4d80cc788c8a611480f3e573ebbf1af4fa788855ad623fecd8a66c803e9cb074e1699563f8c98ec281633256a6af80a53b51d2c7677ee3cd1886 SHA512 22634ab7311e67a8064052d2dcec73ebcf6ff89473d0d554248c07428dbfd1b34f216536c12735bf08ce175d0c2b77c19b08b50a7311c1f7fd99a104b92fefab
+EBUILD ffmpeg-6.1.1-r2.ebuild 19500 BLAKE2B 5b0c1888cf0cb33a0a7f103fd48db9398ed7deda57d7ae34a3ce0e635e3a70ce81b191215024b42f366a974ca19ba5cdb34e566b41c02ecbb59153741e82c280 SHA512 a62080d2802b5511af6b8523a56d91e16cb1a073bbfd01cc80f8401e55afb9827824eff89011fa8506658f06856a3295a0c5ea1ab0f5749c9b558ff373e608d7
 EBUILD ffmpeg-9999.ebuild 19352 BLAKE2B 222cbd9ff0af270460a3b447ed174d5264ce8e1304648e3832ee78f25f169881cddff8cf2b7cb0c672a7d273aa30bb9701d399809491c911debca20f76f54625 SHA512 92cd201441baa0967078204e65f6eb7ae27b173e071c1ce25a252acb6fda00c2cba84920156d22a99fde2a4b18f910f1307f57a077f4bce1a9ed7a9de2426989
 MISC metadata.xml 7626 BLAKE2B aac77cb3d4cb65c30e9654f59d6d10c59a4df70f096024ce5395c0572d1cf0289178320153d819853cfb6499cdff73ac6a2887cc2325be1e594019261f90d85e SHA512 0b59f1cbaa1800cd3896bd50046510f62933670fc3f1e7524d263f9fb1ddc722f2817b45776a0613a361d57f94aebc3b96228ae95f7e94abe1a009efbb5725b4
diff --git a/media-video/ffmpeg/ffmpeg-6.0.1-r1.ebuild b/media-video/ffmpeg/ffmpeg-6.0.1-r2.ebuild
index 654f768272b2..188b14013a42 100644
--- a/media-video/ffmpeg/ffmpeg-6.0.1-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.0.1-r2.ebuild
@@ -345,6 +345,7 @@ PATCHES=(
 	"${FILESDIR}"/chromium-r1.patch
 	"${FILESDIR}"/${PN}-5.1.2-get_cabac_inline_x86-32-bit.patch
 	"${FILESDIR}"/${PN}-6.0-libplacebo-remove-deprecated-field.patch
+	"${FILESDIR}"/${PN}-6.0-fix-lto-type-mismatch.patch
 )
 
 MULTILIB_WRAPPED_HEADERS=(
diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild b/media-video/ffmpeg/ffmpeg-6.1.1-r2.ebuild
index 73cdd4b40c76..4d42b25f4162 100644
--- a/media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.1.1-r2.ebuild
@@ -355,6 +355,7 @@ S=${WORKDIR}/${P/_/-}
 PATCHES=(
 	"${FILESDIR}"/chromium-r2.patch
 	"${FILESDIR}"/${PN}-6.1-wint-conversion.patch
+	"${FILESDIR}"/${PN}-6.0-fix-lto-type-mismatch.patch
 )
 
 MULTILIB_WRAPPED_HEADERS=(
diff --git a/media-video/ffmpeg/files/ffmpeg-6.0-fix-lto-type-mismatch.patch b/media-video/ffmpeg/files/ffmpeg-6.0-fix-lto-type-mismatch.patch
new file mode 100644
index 000000000000..9cc2dd732016
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-6.0-fix-lto-type-mismatch.patch
@@ -0,0 +1,41 @@
+https://ffmpeg.org//pipermail/ffmpeg-devel/2023-November/317055.html
+https://bugs.gentoo.org/907484
+
+From 408882a387f75ae57524073385b47d68339ec486 Mon Sep 17 00:00:00 2001
+From: Alfred Wingate <parona@protonmail.com>
+Date: Tue, 14 Nov 2023 13:26:47 +0000
+Subject: [PATCH 1/1] swscale/x86/rgb_2_rgb: Add opaque pointer to missed
+ definitions of ff_nv12ToUV
+
+Opaque parameters were previously added to the original definition of
+ff_nv12ToUV, leading to gcc noticing a type mismatch with -Wlto-type-mismatch.
+
+https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/f2de911818fbd7e73343803626b697fd0c968121
+https://bugs.gentoo.org/907484
+
+Signed-off-by: Alfred Wingate <parona@protonmail.com>
+Signed-off-by: Anton Khirnov <anton@khirnov.net>
+--- a/libswscale/x86/rgb2rgb_template.c
++++ b/libswscale/x86/rgb2rgb_template.c
+@@ -1823,7 +1823,8 @@ void RENAME(ff_nv12ToUV)(uint8_t *dstU, uint8_t *dstV,
+                          const uint8_t *src1,
+                          const uint8_t *src2,
+                          int w,
+-                         uint32_t *unused2);
++                         uint32_t *unused2,
++                         void *opq);
+ static void RENAME(deinterleaveBytes)(const uint8_t *src, uint8_t *dst1, uint8_t *dst2,
+                                       int width, int height, int srcStride,
+                                       int dst1Stride, int dst2Stride)
+@@ -1831,7 +1832,7 @@ static void RENAME(deinterleaveBytes)(const uint8_t *src, uint8_t *dst1, uint8_t
+     int h;
+ 
+     for (h = 0; h < height; h++) {
+-        RENAME(ff_nv12ToUV)(dst1, dst2, NULL, src, NULL, width, NULL);
++        RENAME(ff_nv12ToUV)(dst1, dst2, NULL, src, NULL, width, NULL, NULL);
+         src  += srcStride;
+         dst1 += dst1Stride;
+         dst2 += dst2Stride;
+-- 
+2.43.0
+