commit: d0bae4a0682e777ae19d3ac501cfc1fb42432210 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Thu Mar 28 16:04:37 2024 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Thu Mar 28 16:05:33 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0bae4a0
media-libs/mesa: Fix build with new directx-headers Closes: https://bugs.gentoo.org/927636 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> ...-vulkan_core.h-instead-of-vulkan.h-in-the.patch | 31 ++++++++++++++++++++++ media-libs/mesa/mesa-24.0.4.ebuild | 4 +++ 2 files changed, 35 insertions(+) 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 <[email protected]> +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> + +-- diff --git a/media-libs/mesa/mesa-24.0.4.ebuild b/media-libs/mesa/mesa-24.0.4.ebuild index 200ede5280b2..903a98e2b651 100644 --- a/media-libs/mesa/mesa-24.0.4.ebuild +++ b/media-libs/mesa/mesa-24.0.4.ebuild @@ -160,6 +160,10 @@ x86? ( usr/lib/libGLX_mesa.so.0.0.0 )" +PATCHES=( + "${FILESDIR}"/${PV}-dzn-Include-vulkan_core.h-instead-of-vulkan.h-in-the.patch +) + pkg_pretend() { if use vulkan; then if ! use video_cards_d3d12 &&
