gentoo auto-resync : 20:11:2024 - 03:02:59

4 files changed, 40 insertions, 2 deletions

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index a740ad73cc92..a47d01f65167 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -23,6 +23,7 @@ AUX ffmpeg-6.1.1-amd-av1-vaapi.patch 11069 BLAKE2B f30d00fd00215b8753ba720bde8b0
 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
+AUX ffmpeg-6.1.1-wint-inconversion-vulkan.patch 1565 BLAKE2B 275132b55cdd9b6e1671dc2db5cf5aea1b6198d0942f2ecda5078902ad62172742bf29e17ba63847133b7eb3ff93ccb832ad92e7a7c42ab8c8cc917e964be888 SHA512 fef857daa13fe2b146d22764ede340ccf348d21beda5db4635273c37e22acb054e9d000466fd06b057c97187ba406e5fb08b929808b49e64d67ffcfa0e459a9e
 AUX vmaf-models-default-path.patch 1126 BLAKE2B 71f83765dc89b85e929af393f9d1415d119e71a91aaf45e8a32fd4fff270a129ca797c3b383a6074bea32fb582816660022a59d33bb6f557514df038baaf0271 SHA512 4d21f4b1622d8e47d2821ecac6b893847ada74d75db7d8aaac70efc7e6e7a6607c011b6fb2d015cb0c5e05f6a56e4feed43eca7d35b0f686a68261e6d9981b6a
 DIST ffmpeg-4.4.4-texinfo.patch.xz 19136 BLAKE2B 591b46180fccdb58c5b6b102c5e12075ff4388dc6bc0ab1752531d4f9f2802c1fd09ed1353ed70a539fdc5c2298f9cfc84ec24e3a04d371ef0d9f3f30d8e8f38 SHA512 f86a324efe261801a5192d4f204f48de581466550cca49b54432fdf5430f1b3bc9a9d31b9b52e2f23481def67ad55b5ad315752c482709aa67b1f3a3e6c17a4f
 DIST ffmpeg-4.4.4.tar.xz 9565584 BLAKE2B 8cd76a91ae6e485e56c6e5ae7b31d678e2fc2d634b1c56240619a4b6924dae4ec7adb445932bf4455f409dbc03fdc6d52b4fc270da55393e329ccd3d129f5770 SHA512 253799eccd129dad331db85def5352178ae22303e42af47fc013a6adfd4b60d1e59ff5f9ac6118fe3b403affa56ea1f3ba658042f526a914fba27050c3065daf
@@ -43,8 +44,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 19846 BLAKE2B fa792dff1e42d56ef923af54e5ad98832c500b8398604a67c962daf0a396c1205783602132f36e9e9711b228d2d8b3c375ccb9d5b6854e12dbca921fe2239f69 SHA512 d06a2c0d3c55fed10223f63bd1060da5c08c1d8e4b6867a851fd223fe7b9ad9a709052b22109ccc13a8c9db925e1a783b9ce69d64dd5a293080a5c3cee8ad68d
-EBUILD ffmpeg-6.1.1-r8.ebuild 20294 BLAKE2B 9e09f71537f8d73364ab1371ce8627922bf6d952795904a42debf53bfd00a5f42436d3ea31220c8c2a614707bb69f40a28a7d736a74bd18d978f1a182e3427ff SHA512 99259d44b686bf59afb0538e229b3585c09efef82d31fa338a2b5f6cdea4ad4119c6a6349a72feb89d47efc9024c9fb8c8a788b90d942843862f5193ca01701a
-EBUILD ffmpeg-6.1.2.ebuild 20209 BLAKE2B a6c41374f4b3484691be74877da97110711ffe0114fa441635b7096d6f84d4c9256752b1652dc860b8a34a19220a68aae715ee85d2e98f16310cb9dfcbd5f26a SHA512 673f4c60ff2ee97b8b230a9d32975c3db3821eee587e98133ecb105bc9efff15a3b5d58b1a310115accb73019c2d484821200bd779d2455e5e55d64636b8fa65
+EBUILD ffmpeg-6.1.1-r8.ebuild 20352 BLAKE2B 11ab7a671aab1ef238b69740cc1f0def0cbf414c66e496de9de57e25a9096f5c4e6a69187fc0159c1e4a31c9058380769e5dbd349a6c2ec70ea71d7107e18e07 SHA512 a74fc7f4dd6e87148c0c4eba1a11bde934b2b50d8a176e44851f528c5a66ce88608745a460b70650de71cb2da0f029051f8b362f64fe5d4925a8f1c13df0c234
+EBUILD ffmpeg-6.1.2.ebuild 20267 BLAKE2B 75dbaf8b802ad194d6fcccf12fe3c1eb19e756963de1aafa860ad2daaa949ef3fe8cf3882cdff609a30584e5b6df5dfcb97f010c86b247b70cfb35e13582ea6a SHA512 3ccfe3a169c93ce912aa38844f4105d5b9f7966ee32405571e12addd3cc77573fba989021789c5e0172d22b639b54c8ad88d2b307b5269227b457eb2a982627e
 EBUILD ffmpeg-7.0.1-r1.ebuild 20288 BLAKE2B 95c3335a8eacc6e7aee3c8bb56bc8a6d140172d05376694407c3e442b305eb6d45bdc9e6fdd6d336c40673f7ad8b2f4a853d1eb690940e8b5d9f02cb2e2b03e8 SHA512 5b362a3893950b70c69dfc8377afab78e8aaed2d3fc0e6009bcc445dc5153a5fea9478c5852b2920a104e717462f00eac99da29388f7f2bc910beb8234d6d4b0
 EBUILD ffmpeg-7.0.2-r1.ebuild 20288 BLAKE2B 95c3335a8eacc6e7aee3c8bb56bc8a6d140172d05376694407c3e442b305eb6d45bdc9e6fdd6d336c40673f7ad8b2f4a853d1eb690940e8b5d9f02cb2e2b03e8 SHA512 5b362a3893950b70c69dfc8377afab78e8aaed2d3fc0e6009bcc445dc5153a5fea9478c5852b2920a104e717462f00eac99da29388f7f2bc910beb8234d6d4b0
 EBUILD ffmpeg-9999.ebuild 20350 BLAKE2B 9159ff5687cd4a7ad20136cc748349e2fbfa0607b20e165ec7ca6b5155cb9e8cf110323fdccee5c7557f2f695e967187ebcb0f19888d89fccff416ca00167487 SHA512 f067c01e6602a57424b31f5f2462bb255194a323f15cf5c0139952a037cb49b078a32138595a78767371e7a92cb873eceeda019ee088ed6b2b2d7a549fc54bfa
diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild b/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild
index 906e3e77d5e4..5bb0429d2e1f 100644
--- a/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild
@@ -385,6 +385,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.1.1-memory-leak.patch
 	"${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
 )
 
 MULTILIB_WRAPPED_HEADERS=(
diff --git a/media-video/ffmpeg/ffmpeg-6.1.2.ebuild b/media-video/ffmpeg/ffmpeg-6.1.2.ebuild
index c913e481816f..32eb9022ffd3 100644
--- a/media-video/ffmpeg/ffmpeg-6.1.2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.1.2.ebuild
@@ -383,6 +383,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.0.1-alignment.patch
 	"${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
 )
 
 MULTILIB_WRAPPED_HEADERS=(
diff --git a/media-video/ffmpeg/files/ffmpeg-6.1.1-wint-inconversion-vulkan.patch b/media-video/ffmpeg/files/ffmpeg-6.1.1-wint-inconversion-vulkan.patch
new file mode 100644
index 000000000000..56c2d11efcd1
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-6.1.1-wint-inconversion-vulkan.patch
@@ -0,0 +1,35 @@
+From 5860a966d2fffbbda1af0014f0a4d37a21c4f2ca Mon Sep 17 00:00:00 2001
+From: Lynne <dev@lynne.ee>
+Date: Wed, 31 Jan 2024 14:15:04 +0100
+Subject: [PATCH] lavfi/vsrc_testsrc_vulkan: fix -Wint-conversion
+
+While VK_NULL_HANDLE is equivalent to NULL on 64-bit platforms, the same is not
+true across all platforms.
+
+Fixes building with gcc-14.
+---
+ libavfilter/vsrc_testsrc_vulkan.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libavfilter/vsrc_testsrc_vulkan.c b/libavfilter/vsrc_testsrc_vulkan.c
+index 8761c21dfd1ed..1720bfac5e3a2 100644
+--- a/libavfilter/vsrc_testsrc_vulkan.c
++++ b/libavfilter/vsrc_testsrc_vulkan.c
+@@ -231,7 +231,7 @@ static int testsrc_vulkan_activate(AVFilterContext *ctx)
+                 return AVERROR(ENOMEM);
+ 
+             err = ff_vk_filter_process_simple(&s->vkctx, &s->e, &s->pl, s->picref, NULL,
+-                                              NULL, &s->opts, sizeof(s->opts));
++                                              VK_NULL_HANDLE, &s->opts, sizeof(s->opts));
+             if (err < 0)
+                 return err;
+         }
+@@ -250,7 +250,7 @@ static int testsrc_vulkan_activate(AVFilterContext *ctx)
+     frame->sample_aspect_ratio = s->sar;
+     if (!s->draw_once) {
+         err = ff_vk_filter_process_simple(&s->vkctx, &s->e, &s->pl, frame, NULL,
+-                                          NULL, &s->opts, sizeof(s->opts));
++                                          VK_NULL_HANDLE, &s->opts, sizeof(s->opts));
+         if (err < 0) {
+             av_frame_free(&frame);
+             return err;