gentoo auto-resync : 28:03:2024 - 19:13:18

4 files changed, 37 insertions, 1 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index f724cdafaee4..9ec4c48a4110 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 8480a48fed24..da38278cca5f 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,3 +1,4 @@
+AUX 24.0.4-dzn-Include-vulkan_core.h-instead-of-vulkan.h-in-the.patch 1088 BLAKE2B 87a70ee57b7a6c11479af58a649398125e8461bdfd5b2a3b8f875497425cecee5f359fb06a34b0d227ac8007ef89285814090e59127e5ef7f3c74a394f7d50b6 SHA512 1af6f99f66a4add4e3401ff4f9cb4e2e06adf89518ff754b94cfe078ee285c413ee63e6a434a66eb95f551cf0231249858b0ea428cb9ab473dca190983d98960
 DIST mesa-23.3.5.tar.xz 19429564 BLAKE2B 69c7434ae9c503c14b5bf9abad9a3a26a1dd402461b098dcdb01b9da7a7e8652f897fd9681c809aa70d3ace77c448289d22400deca3854844a355eb0ac095583 SHA512 1ad29f524caee0000ef51abe58d29d9687de5fbc5168f7e677bb4e69c5e9a94918d5fbf6e10c6757fe7ce6d47bab109e452f0fa2e26aad2e6f8bfb744383b5ea
 DIST mesa-23.3.6.tar.xz 19455492 BLAKE2B 1bec42973aa849ab3553942500de253213736eca5a71550f488cf915d65ee4f47d137772af1c59042f5803cfaf8152f278ccbab29c896d104985263a7121a2ba SHA512 b52ee34de90b77cd4f204a0cfeabc72064f30c3a11668b5280ad5d1c59c3c805b14a8d892f33c32db68a8ada330fbe7fe2124edccfd45cc84636ca7605c10048
 DIST mesa-24.0.1.tar.xz 19950992 BLAKE2B 05eb98f2fec0d15e63e8da2ca2e563d0b6fb7e29d639e66fc69074b7550939160e6f29121b80f2c64083625f2b13aa728221443b1f5adf2dd0fd92056ed9dc40 SHA512 1eaff5dcff8dd314b2dfe249d25db68d530d3f0fb54e926999768d0a48aa34b67c31ec3587bb2a7d1969845b26e79a4d87aceb7a141fd2e811ae0c47c00b0963
@@ -9,6 +10,6 @@ EBUILD mesa-23.3.6.ebuild 12326 BLAKE2B bfceb07d3150be0bcb518a3c999314abdca9472e
 EBUILD mesa-24.0.1.ebuild 11544 BLAKE2B 51e4ae658d2e70eb60145a79d274e9482b8d584b996bda549c39c015dfbe1502e16694845b8419a4df263e719e64e90e8c6dbb436a24c721283c04b74f63940a SHA512 f54095f1331f8315f7230565f7a954f7fea7e246c821a30ef466750678698eeefda857eed4a5a1747b2a1eb26f50c5dd485399edd8128d74558cb7409dcbc769
 EBUILD mesa-24.0.2.ebuild 11538 BLAKE2B 105189b124b44ece9da9e4df2f808e301f44a0caf39a65d79eb874ccc1defae0745bdadab6b5e985a86a5e8f3972f9c9025552eaa0a166a60dd8d83c16542fb8 SHA512 79b4e98d78daaf0b4e210eaff14e64dcc0379893ac7f68d56a26da59a29de8092c6c4235cc8994524f0c58365932c84f55aac536c7825fbad4e84909263375cc
 EBUILD mesa-24.0.3.ebuild 11538 BLAKE2B 5c3662d09d2355060e4ffd1e8c5ac3de90c901024a2123c8213a86f2c8190301067057945d603f5c8db48389ab89f014caef7ea64e045caca4e08322ff6f04f3 SHA512 a883e4607b7045e3b46080f38494ce4ff998ffa2eb71635c83e064d2b050e4e289dce774c2d4f5a4e553d61950948c1f60689d9f1e27aef1104daffd7e4b217b
-EBUILD mesa-24.0.4.ebuild 11536 BLAKE2B ae5546dd791fa1ff793fcbee886a5324aa95e01203db86db6542799a0591e3fa6fa789f70e011bb32c94f918f746e8f1aa0f5bfc16cf106945c6e1612faa12bc SHA512 9b1334ba2173ee7b4d84779715b19da50f97f058709d6a70b1807b1f896e1e2f4a4f11361026d06dff4e22bfd832e6386436aa85a200ba977af9ebd53a0198bd
+EBUILD mesa-24.0.4.ebuild 11629 BLAKE2B 5ae290e43d914553713aeb39b48e5cab14061595203b6c84964ca0b041a6635bedec817f226c3acbee57dc865f9d903373ce46bc84b1a162205c2ee08e44bbbe SHA512 09d86f2bd32d6adc50c0059a74e245250671d86e8b0aaa236094431ce9e3eb91e731de5ed5ca9d2bedb5295ebe4f8ba09185951279f685b5eb1f9335929bc6b6
 EBUILD mesa-9999.ebuild 11442 BLAKE2B 49af919870c99badd70793ea84038e02eb5bd92bc41c3bddccfc2404e7450d0217c8144ebdd37c9a8e80895b6880a2837630b4afbe2250c560f4d3143320f7a3 SHA512 9a82ae1d9f846601c8d7344174a4a8d462f5adcbb7424d9ded565b6e10b2cfb31e75eb297f321cd332022abc5df9e6fe59c5e42768f49aa004b826c8477e9fa7
 MISC metadata.xml 1435 BLAKE2B 53690878512b86ce0b8dce38b083684c85ad5c1a655d5a69cb3265e156869845263eb16f271691b66c9f0cd76e97b56908acf7a1792d6abac0ec99447826cbb5 SHA512 842106e5d6eb60ff33c8cae7f0d52983c4f7e104152718b50fc790cbcb2506551a6fc7841fe8e3c7963850c238f77505b0e49b10a3a936baf459e1acaf73e07f
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>
+ 
+-- 
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 &&