diff options
| author |   Sam James <sam@gentoo.org> | 2023-07-24 02:58:02 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2023-07-24 02:58:19 +0100 |
| commit | 4bc3ebaf3dc53ab956f0b21aa02a2edf1b9dca9a (patch) | |
| tree | f713823059d8c091b83a7d4b2d9d93045eea79a7 /media-video/ffmpeg/files | |
| parent | dev-python/virtualenvwrapper: fix broken sed expression (diff) | |
| download | gentoo-4bc3ebaf3dc53ab956f0b21aa02a2edf1b9dca9a.tar.gz gentoo-4bc3ebaf3dc53ab956f0b21aa02a2edf1b9dca9a.tar.bz2 gentoo-4bc3ebaf3dc53ab956f0b21aa02a2edf1b9dca9a.zip | |
media-video/ffmpeg: fix -Wint-conversion for 6.0
Bug: https://bugs.gentoo.org/903752
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-video/ffmpeg/files')
| -rw-r--r-- | media-video/ffmpeg/files/ffmpeg-6.0-wint-conversion-vulkan.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/media-video/ffmpeg/files/ffmpeg-6.0-wint-conversion-vulkan.patch b/media-video/ffmpeg/files/ffmpeg-6.0-wint-conversion-vulkan.patch new file mode 100644 index 000000000000..2c71a189329a --- /dev/null +++ b/media-video/ffmpeg/files/ffmpeg-6.0-wint-conversion-vulkan.patch @@ -0,0 +1,43 @@ +https://git.videolan.org/?p=ffmpeg.git;a=commit;h=58f18df430d48e47a82c5e740d6e63a50c97d75f + +From 58f18df430d48e47a82c5e740d6e63a50c97d75f 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> +(cherry picked from commit cc76e8340d28438c1ac56ee7dfd774d25e944264) +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) +--- a/libavutil/vulkan.h ++++ b/libavutil/vulkan.h +@@ -122,7 +122,11 @@ typedef struct FFVulkanPipeline { + VkDescriptorSetLayout *desc_layout; + VkDescriptorPool desc_pool; + VkDescriptorSet *desc_set; ++#if VK_USE_64_BIT_PTR_DEFINES == 1 + void **desc_staging; ++#else ++ uint64_t *desc_staging; ++#endif + VkDescriptorSetLayoutBinding **desc_binding; + VkDescriptorUpdateTemplate *desc_template; + int *desc_set_initialized; +-- +2.30.2 |