diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-03-28 19:13:18 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-03-28 19:13:18 +0000 |
commit | 9173ac495b70d91abace8e732906b844522cdb3b (patch) | |
tree | d4dced96e0b1f492507e987b1ced7cf582a985e4 /media-libs/mesa/files/24.0.4-dzn-Include-vulkan_core.h-instead-of-vulkan.h-in-the.patch | |
parent | ac4d0ec6279a51ce08af9e3293666bc339be6b6f (diff) |
gentoo auto-resync : 28:03:2024 - 19:13:18
Diffstat (limited to 'media-libs/mesa/files/24.0.4-dzn-Include-vulkan_core.h-instead-of-vulkan.h-in-the.patch')
-rw-r--r-- | media-libs/mesa/files/24.0.4-dzn-Include-vulkan_core.h-instead-of-vulkan.h-in-the.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/media-libs/mesa/files/24.0.4-dzn-Include-vulkan_core.h-instead-of-vulkan.h-in-the.patch b/media-libs/mesa/files/24.0.4-dzn-Include-vulkan_core.h-instead-of-vulkan.h-in-the.patch new file mode 100644 index 000000000000..437954a0960d --- /dev/null +++ b/media-libs/mesa/files/24.0.4-dzn-Include-vulkan_core.h-instead-of-vulkan.h-in-the.patch @@ -0,0 +1,31 @@ +https://bugs.gentoo.org/927636 + +From 5957778c164bbe95411837f2fd80ad0001b6b7ec Mon Sep 17 00:00:00 2001 +From: Jesse Natalie <jenatali@microsoft.com> +Date: Fri, 22 Mar 2024 09:15:23 -0700 +Subject: [PATCH] dzn: Include vulkan_core.h instead of vulkan.h in the device + enum header + +Prevents pulling in X11 "None" define into the DXCore implementation, +which conflicts with updated DXCore headers. + +Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10803 +Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28339> +--- + src/microsoft/vulkan/dzn_physical_device_enum.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/microsoft/vulkan/dzn_physical_device_enum.h b/src/microsoft/vulkan/dzn_physical_device_enum.h +index 7ecc5d34630..4aec1c2b7c1 100644 +--- a/src/microsoft/vulkan/dzn_physical_device_enum.h ++++ b/src/microsoft/vulkan/dzn_physical_device_enum.h +@@ -24,7 +24,7 @@ + #ifndef DZN_PHYSICAL_DEVICE_ENUM_H + #define DZN_PHYSICAL_DEVICE_ENUM_H + +-#include <vulkan/vulkan.h> ++#include <vulkan/vulkan_core.h> + + #include <wsl/winadapter.h> + +-- |