commit:     0b7fa07fcef31c03426da54d049b3c79297f0f8f
Author:     Kostadin Shishmanov <kostadinshishmanov <AT> protonmail <DOT> com>
AuthorDate: Thu Feb 19 18:06:21 2026 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 19 20:38:20 2026 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b7fa07f

media-libs/mesa: fix WSL d3d12 build

Backport upstream commit 237313a2 (d3d12: Add missing using
Microsoft::WRL:ComPtr in d3d12_context_common) to fix a build failure
that occurs when building with the d3d12 driver enabled while using
WSL. The commit is already in 26.0.0 and will be in 25.3.6 whenever
that comes out.

Closes: https://bugs.gentoo.org/970315
Signed-off-by: Kostadin Shishmanov <kostadinshishmanov <AT> protonmail.com>
Part-of: https://codeberg.org/gentoo/gentoo/pulls/99
Merges: https://codeberg.org/gentoo/gentoo/pulls/99
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/mesa/files/mesa-25.3.3-wsl.patch | 32 +++++++++++++++++++++++++++++
 media-libs/mesa/mesa-25.3.3.ebuild          |  4 ++++
 media-libs/mesa/mesa-25.3.5.ebuild          |  4 ++++
 3 files changed, 40 insertions(+)

diff --git a/media-libs/mesa/files/mesa-25.3.3-wsl.patch 
b/media-libs/mesa/files/mesa-25.3.3-wsl.patch
new file mode 100644
index 000000000000..fa19bd52986c
--- /dev/null
+++ b/media-libs/mesa/files/mesa-25.3.3-wsl.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/970315
+
+From 237313a2439bf73d8eb8830bddc95d1fc3420e17 Mon Sep 17 00:00:00 2001
+From: Silvio Vilerino <[email protected]>
+Date: Thu, 22 Jan 2026 09:40:33 -0500
+Subject: [PATCH] d3d12: Add missing using Microsoft::WRL:ComPtr in
+ d3d12_context_common
+
+Fixes: b06b2fbaba0 ("d3d12: Remove Agility v717 guards for features now 
available in v618")
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39457>
+---
+ src/gallium/drivers/d3d12/d3d12_context_common.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/gallium/drivers/d3d12/d3d12_context_common.cpp 
b/src/gallium/drivers/d3d12/d3d12_context_common.cpp
+index d41cf1cd0307..287ffaea7bb4 100644
+--- a/src/gallium/drivers/d3d12/d3d12_context_common.cpp
++++ b/src/gallium/drivers/d3d12/d3d12_context_common.cpp
+@@ -62,6 +62,11 @@
+ #include <string.h>
+ #include "d3d12_interop_public.h"
+ 
++#ifndef _GAMING_XBOX
++#include <wrl/client.h>
++using Microsoft::WRL::ComPtr;
++#endif
++
+ static void
+ d3d12_context_destroy(struct pipe_context *pctx)
+ {
+-- 
+GitLab

diff --git a/media-libs/mesa/mesa-25.3.3.ebuild 
b/media-libs/mesa/mesa-25.3.3.ebuild
index cf20d76933a9..36f0e1c799b0 100644
--- a/media-libs/mesa/mesa-25.3.3.ebuild
+++ b/media-libs/mesa/mesa-25.3.3.ebuild
@@ -185,6 +185,10 @@ x86? (
        usr/lib/libGLX_mesa.so.0.0.0
 )"
 
+PATCHES=(
+       "${FILESDIR}/${PN}-25.3.3-wsl.patch"
+)
+
 src_unpack() {
        if [[ ${PV} == 9999 ]]; then
                git-r3_src_unpack

diff --git a/media-libs/mesa/mesa-25.3.5.ebuild 
b/media-libs/mesa/mesa-25.3.5.ebuild
index 21888cc886a1..4a9ca483e7af 100644
--- a/media-libs/mesa/mesa-25.3.5.ebuild
+++ b/media-libs/mesa/mesa-25.3.5.ebuild
@@ -185,6 +185,10 @@ x86? (
        usr/lib/libGLX_mesa.so.0.0.0
 )"
 
+PATCHES=(
+       "${FILESDIR}/${PN}-25.3.3-wsl.patch"
+)
+
 src_unpack() {
        if [[ ${PV} == 9999 ]]; then
                git-r3_src_unpack

Reply via email to