gentoo auto-resync : 30:11:2024 - 02:06:22

7 files changed, 57 insertions, 4 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index c3dce74d6892..7ce71b079bc5 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/ffmpeg-chromium/Manifest b/media-video/ffmpeg-chromium/Manifest
index 07ff819ef634..e3f371e3cd07 100644
--- a/media-video/ffmpeg-chromium/Manifest
+++ b/media-video/ffmpeg-chromium/Manifest
@@ -14,7 +14,7 @@ EBUILD ffmpeg-chromium-126.ebuild 6479 BLAKE2B 31d1f47cf086e7617bcabc9b342c0155a
 EBUILD ffmpeg-chromium-127.ebuild 6479 BLAKE2B 7357fe026fd686a96c6098e5259cbbd745b9b3e16afe088f3f0001a40994599439b2638d387b3dbc2aa66eba28a366ec3d032a4ed5d18948d501f8ab8cad086b SHA512 59380fcf97cc23930f8c3ff4023a8351881e8cf11dcfdad16d8c40ebb9891074ae6661455cd3395f0ca55552e8c0782458a9409bb175401d0af2e8a4222b82f4
 EBUILD ffmpeg-chromium-128.ebuild 6479 BLAKE2B 9b7d9a1d995d0a925979ba122a51821d98e5299329f5453bcf3f80587ebc0e760afc9d9b65a3a444bf3dc00bd3bf495cc1d0fcbd6daa25ad477e2f2ae39c6beb SHA512 8c6b99f807c0b7b6bc6fe9d5c2ff436ffaab41ac4e20c7567f17d8ac6a66ec1007353a1f383052dc707da692002a05cc3a2f447947fce6c5b224e08de3a4eef5
 EBUILD ffmpeg-chromium-129.ebuild 6479 BLAKE2B 291953066345a7e3018ba56e1cd7ebb12c5f14220c19030b78197381764fb5fe5ff48fad423786ef0dbd335ba917886ab2d71765ef7cae43eed324a0cd08eb88 SHA512 e59e8ec78bcdd939b100ba681488d3c212539ee79a441be0dd6d894689b8a37b2b0e7fbf6d18a9cbf3673daec0be9055dc455c1b0d38fb5afb34594319e63206
-EBUILD ffmpeg-chromium-130.ebuild 6481 BLAKE2B 195a106874439d9465ba8674a32c3192c0166ec840f179c8b15b90fc68a68440d4312c649fa4af63100bd1d4da7caf58184bbc1267327604c5027e5b56e8c05a SHA512 c3da69729075c2a4ca3ebb4f76e4d115c3b8b9f8971c89ef2b7489447184d81070a9fb954ba1d23a71b1fd896798dee63cbacdd21a996a9f94e30986b7144ac6
+EBUILD ffmpeg-chromium-130.ebuild 6479 BLAKE2B 1f58dc1d9b2dcafc3376f6d5048257e35d6bd8b0a0e1eb282de9ea0f710a4500cef8f17653dd41b2e099d02ec5674e01b08bb06ab96e7ef941dcb1254880d80f SHA512 5a7388287e60aed2a0542343805ca1a49a887d97bb9d6e4b2a4d1730a1898c4b953106479a12444ac856099ac7376e22df5484366a0246e86910284c6d3b55a6
 EBUILD ffmpeg-chromium-131.ebuild 6479 BLAKE2B 7eb290e9d70180370f3cf2cd0ed93ecdfea60e08df4586730533709650dccd461b43f5f1f2fdc69aa751894d3aefd550ea47fb0aa03adf3c123c1896f167eff6 SHA512 d978f8a08f1f67db72cf6b9af488b71fa57752ef94b40adc42dbddf8cfbb57b2c7654cb09fcc524cf8b533dc6f8580eccdc75cbb236a46e1f1d2737e4d75f92c
 EBUILD ffmpeg-chromium-132.ebuild 6481 BLAKE2B 995a021e434a6cdb09a70967e33257f6c35a53fa2358cd0a3b8dbd49db701afee04626d88b01ecafcf4274b1316b45c49370bfe28760db08b579e4f958efb7c3 SHA512 ec690c21ec3b21634ff08ccc1b9e88f7547e8d884cfbec231de54b16999e1dc1dc46ad1de30ce556440f9a3abb5db2c32dda50348dd7ddef862e71f75bb800c7
 EBUILD ffmpeg-chromium-133.ebuild 6481 BLAKE2B 995a021e434a6cdb09a70967e33257f6c35a53fa2358cd0a3b8dbd49db701afee04626d88b01ecafcf4274b1316b45c49370bfe28760db08b579e4f958efb7c3 SHA512 ec690c21ec3b21634ff08ccc1b9e88f7547e8d884cfbec231de54b16999e1dc1dc46ad1de30ce556440f9a3abb5db2c32dda50348dd7ddef862e71f75bb800c7
diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-130.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-130.ebuild
index e2cbf285339c..3c89e9f50671 100644
--- a/media-video/ffmpeg-chromium/ffmpeg-chromium-130.ebuild
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-130.ebuild
@@ -16,7 +16,7 @@ LICENSE="
 "
 SLOT="${PV}"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64"
 
 # Options to use as use_enable in the foo[:bar] form.
 # This will feed configure with $(use_enable foo bar)
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 1c1218fa2e60..510854fc726f 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -18,6 +18,7 @@ AUX ffmpeg-6.1-gcc-14.patch 523 BLAKE2B b82fc06a7eee0c7ab68ef78f3ac205f45a68a779
 AUX ffmpeg-6.1-opencl-parallel-gmake-fix.patch 370 BLAKE2B 46afba747d26105e5520389016aa8cc73ebc1425095e7818e0c2e23ff66b822a5428fec8253a6b545456bd94d0e746ed24bc014a7fa25d97b6fc4acf753341d4 SHA512 82b16798e63736dc67ad03e62eb31c7d3653d2e53a775a0a4456e01985da2336ebde587d3acd2272065c5ce82be528ebc051cd6c121832829d7cd0ed2aba3fdd
 AUX ffmpeg-6.1-wint-conversion.patch 3514 BLAKE2B fcb65b882af964a8f45f71ea3f885fc016e3f89c3d6f0bd6d661d489715c0f746e763a86c6ade1515e212b01559d90ea9c2a97c965e0c0f9087b8396cdd58414 SHA512 7e09fc1a811a21aee9eef0370e57a37817652229a6b0e58cd2e8723e8336124396fe40f6a7c6c5f860046410596027d27d900371ff86609b86ef94dd0633977f
 AUX ffmpeg-6.1.1-amd-av1-vaapi.patch 11069 BLAKE2B f30d00fd00215b8753ba720bde8b040f03fadb9ae6d1e3ebf98ae20564104a55aa220ac91ab082e3086943677a9be6d8b709170765605ecb681458ad215e44d9 SHA512 cf8127f3e50c28824367ca489568eb1e8ff11207291b2354d4bf8027a2bc4a884e24e76bad4fd023cf80268c04e0893f3d6d1fbd8ccf4b9c5e69b74ae41775d4
+AUX ffmpeg-6.1.1-incmptbl-pntr-types.patch 2314 BLAKE2B cfd05bdec613ec3c7c7a57f294b2d56959bb062eb2bfac8f799784bf913601b7a455d7e8d706054b32ac94c894773edc37417ac022cbbd64f5faca53c0193118 SHA512 c3b4abca88d831ddfefd9639fb26df636ba0fb0f5a502c30fe26d0672b8a3e0168af098647c0204c56857b46fa22add3c880bef737592a6c35f85f191eabafd4
 AUX ffmpeg-6.1.1-memory-leak.patch 4184 BLAKE2B 93499876d5bab3dede021f646146f449d209f520ace803d9d46b0132d32aaea2bf6047c67f8804545a8eb90530c8884f5c687836cff2af111baeb52bbf1884ba SHA512 926c662c27f379c9f91ee48eb23090ba7d0c429a0e00a1ebc0fcba75657c0091da1a1b11441a61cfa77e6ba659906127bf3a51ad17d9ff921455d5495381b658
 AUX ffmpeg-6.1.1-vulkan-rename.patch 5784 BLAKE2B 25e85dc0e5d3915a709d86be60a938f4669d87a370c98bd5d17b94fd3e1fec4ae78a6fc696dd862ce5c932987aac601dfcf8f8c8a6a2acd8adf6166a4368b11d SHA512 f7d2a10b1c143d9ddbc08f0faa96ccabbbadb7ab2e293cef53f77f93b44560bf099b4a40e434295925683963887afaf34ee28052737b4207ca531d399e0243f5
 AUX ffmpeg-6.1.1-wint-inconversion-libgcrypt.patch 3442 BLAKE2B 21d441dd39595c13b7be7407c774a9e3a9d4ae8b2334aeed79d2fa5b88f4c637665b782b0705fabe6283062549138453fb01d1c1d4bbcd799474a7590e59ed75 SHA512 aa8c0c259e7ab98afd608e4c2167eebe4e373000713c84a2052b9836cd04a029d6123bc1ce27a84589048ee3634ab8b30a8e501ff48394d3fccf9f13c85273af
@@ -42,8 +43,8 @@ DIST ffmpeg-rpi-7.0.patch 807653 BLAKE2B 2d7d4fb55313c0ea227bf714af08fe17c118969
 DIST ffmpeg-rpi-7.0.patch.asc 833 BLAKE2B 3086d77e2cc05b7c295fcaef26a9a0d32775999d1bab9075eeeb0a80804b35928698efe870a432558ece55d7873e016422a00013e7d0cca160b71172c31ab449 SHA512 cc885f01b9547f17c6ef1d26d7d1d053186fdf57aa31c0a411a2ab1c0246cec9c2aeef8687e7f8eb0c998d3379712541c60432bc2521a3db1b45d72d316c2d2b
 EBUILD ffmpeg-4.4.4-r11.ebuild 20088 BLAKE2B b94b463587e62913513bf46443aa26d45979ea13c960c008202c70ca7f5a5058799a5ed6b5dd0a38436a850a0403a5771258d80edab8719308ad28cf88c1a298 SHA512 a9e592bca2a1342d369b91c9c96fccecaf53d6ffbb7313bd4bc13b64c03b62488d89416b9ed77517cf2d8f9d4559ab9ed2a860bf1f7f5fd245f1ddbd46fc5a83
 EBUILD ffmpeg-4.4.5-r1.ebuild 19907 BLAKE2B d6685515941b937124d250328c165de66fb404a7bf321166d624e1c7f57807f51dea5cb39e230a12aa93a021393191de0df98f63a60d9b5fb2f7add72016e903 SHA512 ba3c06b8bc75c77ad2ad53337225c3b6381bed8676ba782ef531a401f749ff18d4833fa940410f429c86d466d08f8fa9e7b52c7c929eeea327b2444086941a64
-EBUILD ffmpeg-6.1.1-r8.ebuild 20352 BLAKE2B 11ab7a671aab1ef238b69740cc1f0def0cbf414c66e496de9de57e25a9096f5c4e6a69187fc0159c1e4a31c9058380769e5dbd349a6c2ec70ea71d7107e18e07 SHA512 a74fc7f4dd6e87148c0c4eba1a11bde934b2b50d8a176e44851f528c5a66ce88608745a460b70650de71cb2da0f029051f8b362f64fe5d4925a8f1c13df0c234
-EBUILD ffmpeg-6.1.2.ebuild 20325 BLAKE2B 6f4f94f8e6ccd39dafa6b2df46459e26fe007022aa3400de01a401262158428aca64ca3f4c9b594a147d75e19bbfa76ba0169a5d7c0168a1452debe85e1af2d4 SHA512 b6ce8f1e006a2889aa7eb9814be5d4755bb3aa79c68fd4639c45b1d099bdeae70193a83b0bf21672427a86e5d5dd008118698b6341dddad2cc4cfecb65190329
+EBUILD ffmpeg-6.1.1-r8.ebuild 20405 BLAKE2B f3ea2cc49a555432b61c31be1328e4ffb8bcc5d953de084572a81d52d7ed6db48d1351e327f2e1888314a62b947049486127b38ff2dcd80ab9a8dec2cead7b73 SHA512 7f2d1807a4eb852b152a4a4e6532079a5252485424ef310c2ebaf0c6f6db439c99901ef2ac81b83606e79d89b597f3f04a1c572c05d75af13703918ee5adeaf8
+EBUILD ffmpeg-6.1.2.ebuild 20378 BLAKE2B 2c974aa381b135b6e3b4dfab6f74aa255909f51de6d4c654236f3b033319f12eee4c6f43b499f8482f691c926a6f4eb9ef73696bee0f4fed806bfe0f17943cf1 SHA512 f2d84d6f8dd5c31320281f7bcbbb657de0c50cadce29052b2108450fbd65f0880added02c5ec0337d1e898aa1175f5744c08ba3aa2a32eecdad19b02964ff45c
 EBUILD ffmpeg-7.0.1-r1.ebuild 20346 BLAKE2B 5c7dbecddfdf50223acffecbba3d8a3a4e35bba435fee55249cbcc1340d075e15e47255d4b524ebd5499dc931eb36cf853846f53fffd9f57434ad3cd498c964f SHA512 b03a3933050b128cc43f2ef1c110a29e6b3d7c728e50a6878cae86751be879306f25f011e52cb5ef471eea666b2e7a7f8578c5a3d9b493b1d59c6b05e9486bfd
 EBUILD ffmpeg-7.0.2-r1.ebuild 20346 BLAKE2B 5c7dbecddfdf50223acffecbba3d8a3a4e35bba435fee55249cbcc1340d075e15e47255d4b524ebd5499dc931eb36cf853846f53fffd9f57434ad3cd498c964f SHA512 b03a3933050b128cc43f2ef1c110a29e6b3d7c728e50a6878cae86751be879306f25f011e52cb5ef471eea666b2e7a7f8578c5a3d9b493b1d59c6b05e9486bfd
 EBUILD ffmpeg-9999.ebuild 20416 BLAKE2B 8646b0ba938fd96657aa8582b8970a29b00da1f91e64f4e77847db9adfee81afd22f6de08f2b25954a19e126b87c8c505189e3e685d63e84f64241d59259baac SHA512 16d70a6080163d943af6f633211d086aa59e69a9da1498b9ffc86c1b4ac43f02ba105700ff447734089177adff0ef97e34b483bc688f7a5f0862d8c435269725
diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild b/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild
index 5bb0429d2e1f..5e18288031e3 100644
--- a/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild
@@ -386,6 +386,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.1.1-wint-inconversion-libgcrypt.patch
 	"${FILESDIR}"/${PN}-6.1.1-amd-av1-vaapi.patch
 	"${FILESDIR}"/${PN}-6.1.1-wint-inconversion-vulkan.patch
+	"${FILESDIR}"/${PN}-6.1.1-incmptbl-pntr-types.patch
 )
 
 MULTILIB_WRAPPED_HEADERS=(
diff --git a/media-video/ffmpeg/ffmpeg-6.1.2.ebuild b/media-video/ffmpeg/ffmpeg-6.1.2.ebuild
index 1baa7d788876..4ef7b90632ef 100644
--- a/media-video/ffmpeg/ffmpeg-6.1.2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.1.2.ebuild
@@ -384,6 +384,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.1.1-wint-inconversion-libgcrypt.patch
 	"${FILESDIR}"/${PN}-6.1.1-amd-av1-vaapi.patch
 	"${FILESDIR}"/${PN}-6.1.1-wint-inconversion-vulkan.patch
+	"${FILESDIR}"/${PN}-6.1.1-incmptbl-pntr-types.patch
 )
 
 MULTILIB_WRAPPED_HEADERS=(
diff --git a/media-video/ffmpeg/files/ffmpeg-6.1.1-incmptbl-pntr-types.patch b/media-video/ffmpeg/files/ffmpeg-6.1.1-incmptbl-pntr-types.patch
new file mode 100644
index 000000000000..a65828e468e1
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-6.1.1-incmptbl-pntr-types.patch
@@ -0,0 +1,50 @@
+https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/347a70f101be28f8d78e8fd62ffc3a78324f49e9
+https://bugs.gentoo.org/922621
+
+From 347a70f101be28f8d78e8fd62ffc3a78324f49e9 Mon Sep 17 00:00:00 2001
+From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
+Date: Thu, 28 Mar 2024 05:35:36 +0100
+Subject: [PATCH] avcodec/pcm-bluray/dvd: Use correct pointer types on BE
+
+Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
+---
+ libavcodec/pcm-bluray.c | 5 +++--
+ libavcodec/pcm-dvd.c    | 2 +-
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/libavcodec/pcm-bluray.c b/libavcodec/pcm-bluray.c
+index f65609514a1c1..235020d78f0cf 100644
+--- a/libavcodec/pcm-bluray.c
++++ b/libavcodec/pcm-bluray.c
+@@ -167,7 +167,7 @@ static int pcm_bluray_decode_frame(AVCodecContext *avctx, AVFrame *frame,
+             samples *= num_source_channels;
+             if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) {
+ #if HAVE_BIGENDIAN
+-                bytestream2_get_buffer(&gb, dst16, buf_size);
++                bytestream2_get_buffer(&gb, (uint8_t*)dst16, buf_size);
+ #else
+                 do {
+                     *dst16++ = bytestream2_get_be16u(&gb);
+@@ -187,7 +187,8 @@ static int pcm_bluray_decode_frame(AVCodecContext *avctx, AVFrame *frame,
+             if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) {
+                 do {
+ #if HAVE_BIGENDIAN
+-                    bytestream2_get_buffer(&gb, dst16, avctx->ch_layout.nb_channels * 2);
++                    bytestream2_get_buffer(&gb, (uint8_t*)dst16,
++                                           avctx->ch_layout.nb_channels * 2);
+                     dst16 += avctx->ch_layout.nb_channels;
+ #else
+                     channel = avctx->ch_layout.nb_channels;
+diff --git a/libavcodec/pcm-dvd.c b/libavcodec/pcm-dvd.c
+index 419b2a138f887..319746c62e2dc 100644
+--- a/libavcodec/pcm-dvd.c
++++ b/libavcodec/pcm-dvd.c
+@@ -157,7 +157,7 @@ static void *pcm_dvd_decode_samples(AVCodecContext *avctx, const uint8_t *src,
+     switch (avctx->bits_per_coded_sample) {
+     case 16: {
+ #if HAVE_BIGENDIAN
+-        bytestream2_get_buffer(&gb, dst16, blocks * s->block_size);
++        bytestream2_get_buffer(&gb, (uint8_t*)dst16, blocks * s->block_size);
+         dst16 += blocks * s->block_size / 2;
+ #else
+         int samples = blocks * avctx->ch_layout.nb_channels;