diff options
| author |   Sam James <sam@gentoo.org> | 2023-04-23 08:04:58 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2023-04-23 08:04:58 +0100 |
| commit | 2909442704716d00025aee815212245dcbed24ff (patch) | |
| tree | a723a423e65b42558e0f092e580509cdb4dce80d /media-video | |
| parent | media-video/ffmpeg: add 4.2.9 (diff) | |
| download | gentoo-2909442704716d00025aee815212245dcbed24ff.tar.gz gentoo-2909442704716d00025aee815212245dcbed24ff.tar.bz2 gentoo-2909442704716d00025aee815212245dcbed24ff.zip | |
media-video/ffmpeg: fix -Wint-conversion for 4.4.4
Closes: https://bugs.gentoo.org/903752
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-4.4.4-r2.ebuild (renamed from media-video/ffmpeg/ffmpeg-4.4.4-r1.ebuild) | 1 | ||||
| -rw-r--r-- | media-video/ffmpeg/files/ffmpeg-4.4.4-wint-conversion-vulkan.patch | 30 |
2 files changed, 31 insertions, 0 deletions
diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r1.ebuild b/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?= <kasper93@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 <kasper93@gmail.com> +Signed-off-by: Martin Storsjö <martin@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) + + |