From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9C385158041 for ; Thu, 28 Mar 2024 16:05:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D64122BC014; Thu, 28 Mar 2024 16:05:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AFD092BC014 for ; Thu, 28 Mar 2024 16:05:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DB07A335D2B for ; Thu, 28 Mar 2024 16:05:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 163A214C3 for ; Thu, 28 Mar 2024 16:05:38 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1711641933.d0bae4a0682e777ae19d3ac501cfc1fb42432210.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/mesa/, media-libs/mesa/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/mesa/files/24.0.4-dzn-Include-vulkan_core.h-instead-of-vulkan.h-in-the.patch media-libs/mesa/mesa-24.0.4.ebuild X-VCS-Directories: media-libs/mesa/files/ media-libs/mesa/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: d0bae4a0682e777ae19d3ac501cfc1fb42432210 X-VCS-Branch: master Date: Thu, 28 Mar 2024 16:05:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 01b128cb-b84c-4d8d-af0d-3cdef2d2ec0f X-Archives-Hash: de224f0f3319ef7092437a19a175f5db commit: d0bae4a0682e777ae19d3ac501cfc1fb42432210 Author: Matt Turner gentoo org> AuthorDate: Thu Mar 28 16:04:37 2024 +0000 Commit: Matt Turner gentoo 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 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 +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: +--- + 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 ++#include + + #include + +-- 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 &&