diff --git a/srcpkgs/DirectX-Headers/template b/srcpkgs/DirectX-Headers/template
new file mode 100644
index 00000000000..6ee1865f202
--- /dev/null
+++ b/srcpkgs/DirectX-Headers/template
@@ -0,0 +1,17 @@
+# Template file for 'DirectX-Headers'
+pkgname=DirectX-Headers
+version=1.616.0
+revision=1
+archs="aarch64 x86_64"
+build_style=meson
+configure_args="-Db_lto=false -Dbuild-test=false"
+short_desc="Official open-source DirectX headers"
+maintainer="Matthias von Faber <mvf@gmx.eu>"
+license="MIT"
+homepage="https://github.com/microsoft/DirectX-Headers"
+distfiles="https://github.com/microsoft/DirectX-Headers/archive/refs/tags/v${version}.tar.gz"
+checksum=125f492802939b40223bfccb83badd3f599af2d3449613d6cb893720607b9025
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 72a40093eab..b87f41ae4d5 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
 version=25.1.3
-revision=1
+revision=2
 build_style=meson
 _llvmver=19
 #Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
@@ -78,6 +78,14 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
+# Direct3D 12 for Hyper-V GPU-P / WSLg. This relies on additional
+# closed-source drivers which are only available on 64-bit glibc.
+case "$XBPS_TARGET_MACHINE" in
+	aarch64|x86_64)
+		_have_d3d12=yes
+		;;
+esac
+
 if [ "$_have_llvmpipe" ]; then
 	subpackages+=" mesa-vulkan-lavapipe"
 	_vulkan_drivers+=",swrast"
@@ -165,6 +173,11 @@ else
 	configure_args+=" -Dgallium-vdpau=disabled -Dgallium-va=disabled"
 fi
 
+if [ "$_have_d3d12" ]; then
+	_gallium_drivers+=",d3d12"
+	makedepends+=" DirectX-Headers"
+fi
+
 # empty values introduced by leading comma are not allowed; the whole enumeration can be empty
 # _gallium_drivers is not affected by this problem
 _vulkan_drivers=${_vulkan_drivers/=,/=}