From 5637ef1a6cf214818a7b8e83615a2affa5487c6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Tue, 28 Oct 2025 21:27:35 +0100 Subject: [PATCH] Vulkan: Apply patch from 1.3.258 to fix build with latest Apple LLVM --- .../vk_video/vulkan_video_codec_h264std.h | 2 +- .../vk_video/vulkan_video_codecs_common.h | 4 +++ .../vulkan-fix-apple-llvm-extern-c.patch | 28 +++++++++++++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 thirdparty/vulkan/patches/vulkan-fix-apple-llvm-extern-c.patch diff --git a/thirdparty/vulkan/include/vk_video/vulkan_video_codec_h264std.h b/thirdparty/vulkan/include/vk_video/vulkan_video_codec_h264std.h index 21c7b667fd5..089f30912c3 100644 --- a/thirdparty/vulkan/include/vk_video/vulkan_video_codec_h264std.h +++ b/thirdparty/vulkan/include/vk_video/vulkan_video_codec_h264std.h @@ -20,7 +20,7 @@ extern "C" { #define vulkan_video_codec_h264std 1 -#include +#include "vulkan_video_codecs_common.h" #define STD_VIDEO_H264_CPB_CNT_LIST_SIZE 32 #define STD_VIDEO_H264_SCALING_LIST_4X4_NUM_LISTS 6 #define STD_VIDEO_H264_SCALING_LIST_4X4_NUM_ELEMENTS 16 diff --git a/thirdparty/vulkan/include/vk_video/vulkan_video_codecs_common.h b/thirdparty/vulkan/include/vk_video/vulkan_video_codecs_common.h index f486d3ca3fe..43bfcd09ada 100644 --- a/thirdparty/vulkan/include/vk_video/vulkan_video_codecs_common.h +++ b/thirdparty/vulkan/include/vk_video/vulkan_video_codecs_common.h @@ -20,6 +20,10 @@ extern "C" { #define vulkan_video_codecs_common 1 +#if !defined(VK_NO_STDINT_H) + #include +#endif + #define VK_MAKE_VIDEO_STD_VERSION(major, minor, patch) \ ((((uint32_t)(major)) << 22) | (((uint32_t)(minor)) << 12) | ((uint32_t)(patch))) diff --git a/thirdparty/vulkan/patches/vulkan-fix-apple-llvm-extern-c.patch b/thirdparty/vulkan/patches/vulkan-fix-apple-llvm-extern-c.patch new file mode 100644 index 00000000000..95c772a72cb --- /dev/null +++ b/thirdparty/vulkan/patches/vulkan-fix-apple-llvm-extern-c.patch @@ -0,0 +1,28 @@ +diff --git a/thirdparty/vulkan/include/vk_video/vulkan_video_codec_h264std.h b/thirdparty/vulkan/include/vk_video/vulkan_video_codec_h264std.h +index 21c7b667fd..089f30912c 100644 +--- a/thirdparty/vulkan/include/vk_video/vulkan_video_codec_h264std.h ++++ b/thirdparty/vulkan/include/vk_video/vulkan_video_codec_h264std.h +@@ -20,7 +20,7 @@ extern "C" { + + + #define vulkan_video_codec_h264std 1 +-#include ++#include "vulkan_video_codecs_common.h" + #define STD_VIDEO_H264_CPB_CNT_LIST_SIZE 32 + #define STD_VIDEO_H264_SCALING_LIST_4X4_NUM_LISTS 6 + #define STD_VIDEO_H264_SCALING_LIST_4X4_NUM_ELEMENTS 16 +diff --git a/thirdparty/vulkan/include/vk_video/vulkan_video_codecs_common.h b/thirdparty/vulkan/include/vk_video/vulkan_video_codecs_common.h +index f486d3ca3f..43bfcd09ad 100644 +--- a/thirdparty/vulkan/include/vk_video/vulkan_video_codecs_common.h ++++ b/thirdparty/vulkan/include/vk_video/vulkan_video_codecs_common.h +@@ -20,6 +20,10 @@ extern "C" { + + + #define vulkan_video_codecs_common 1 ++#if !defined(VK_NO_STDINT_H) ++ #include ++#endif ++ + #define VK_MAKE_VIDEO_STD_VERSION(major, minor, patch) \ + ((((uint32_t)(major)) << 22) | (((uint32_t)(minor)) << 12) | ((uint32_t)(patch))) +