[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/files/, media-video/ffmpeg/

[Sam James]

commit:     2909442704716d00025aee815212245dcbed24ff
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 23 07:04:58 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 23 07:04:58 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29094427

media-video/ffmpeg: fix -Wint-conversion for 4.4.4

Closes: https://bugs.gentoo.org/903752
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...mpeg-4.4.4-r1.ebuild => ffmpeg-4.4.4-r2.ebuild} |  1 +
 .../ffmpeg-4.4.4-wint-conversion-vulkan.patch      | 30 ++++++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r1.ebuild 
b/media-video/ffmpeg/ffmpeg-4.4.4-r2.ebuild
similarity index 99%
rename from media-video/ffmpeg/ffmpeg-4.4.4-r1.ebuild
rename to media-video/ffmpeg/ffmpeg-4.4.4-r2.ebuild
index 66c06c476313..d98da4233b78 100644
--- a/media-video/ffmpeg/ffmpeg-4.4.4-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.4.4-r2.ebuild
@@ -335,6 +335,7 @@ PATCHES=(
        "${FILESDIR}"/${PN}-5.0-backport-ranlib-build-fix.patch
        "${FILESDIR}"/${PN}-4.4.3-clang-14-ff_seek_frame_binary-crash.patch
        "${FILESDIR}"/${PN}-4.4.3-get_cabac_inline_x86-32-bit.patch
+       "${FILESDIR}"/${PN}-4.4.4-wint-conversion-vulkan.patch
 )
 
 MULTILIB_WRAPPED_HEADERS=(

diff --git a/media-video/ffmpeg/files/ffmpeg-4.4.4-wint-conversion-vulkan.patch 
b/media-video/ffmpeg/files/ffmpeg-4.4.4-wint-conversion-vulkan.patch
new file mode 100644
index 000000000000..f3766bb69f50
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-4.4.4-wint-conversion-vulkan.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/903752
+https://git.videolan.org/?p=ffmpeg.git;a=commit;h=cc76e8340d28438c1ac56ee7dfd774d25e944264
+
+(Dropped second bit for vulkan.h as has changed significantly in >4.4.)
+
+From cc76e8340d28438c1ac56ee7dfd774d25e944264 Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Kacper=20Michaj=C5=82ow?= <kaspe...@gmail.com>
+Date: Thu, 2 Mar 2023 17:27:30 +0100
+Subject: [PATCH] lavu/vulkan: fix handle type for 32-bit targets
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+Fixes compilation with clang which errors out on Wint-conversion.
+
+Signed-off-by: Kacper Michajłow <kaspe...@gmail.com>
+Signed-off-by: Martin Storsjö <mar...@martin.st>
+--- a/libavutil/hwcontext_vulkan.c
++++ b/libavutil/hwcontext_vulkan.c
+@@ -1149,7 +1149,7 @@ static void free_exec_ctx(AVHWFramesContext *hwfc, 
VulkanExecCtx *cmd)
+ 
+     av_freep(&cmd->queues);
+     av_freep(&cmd->bufs);
+-    cmd->pool = NULL;
++    cmd->pool = VK_NULL_HANDLE;
+ }
+ 
+ static VkCommandBuffer get_buf_exec_ctx(AVHWFramesContext *hwfc, 
VulkanExecCtx *cmd)
+
+