From 1dd4581da22af51b0dd5108559d2447a2382ccda Mon Sep 17 00:00:00 2001 From: Ben Hillis Date: Tue, 19 May 2026 05:05:32 +0000 Subject: [PATCH 1/2] vendor: bump DirectX-Headers v1.608.0 -> v1.619.1 Updates the recommended dev-clone tag in CONTRIBUTING.md to match the new CI default ('v1.619.1' in wslg-build's pipeline-shared.yml, wslg-github-buddy.yml and wslg-github-release.yml). vendor/ itself is .gitignored, so this is the only path by which a wslg-tree change can move the version a fresh local checkout pulls. v1.608.0 (Nov 2022) is the v1.6xx.x predecessor; v1.619.1 (Mar 2026) is the latest non-preview tag in microsoft/DirectX-Headers. The v1.7xx.x line is marked 'preview' upstream and isn't picked here. cgmanifest.json: add the DirectX-Headers component (it was the only fifth vendor missing from the manifest). Recorded at v1.619.1's commit 9e393d6d so the next compliance scan picks up the right upstream pin. Pre-existing trailing comma + relaxed-JSON formatting preserved to keep this diff minimal -- not touching the manifest's parser-quirks story in this PR. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- CONTRIBUTING.md | 2 +- cgmanifest.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c373f1b7..c44d33da 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -45,7 +45,7 @@ The WSLg system distro is built using docker build. We essentially start from a git clone https://github.com/microsoft/FreeRDP-mirror wslg/vendor/FreeRDP -b working git clone https://github.com/microsoft/weston-mirror wslg/vendor/weston -b working git clone https://github.com/microsoft/PulseAudio-mirror wslg/vendor/pulseaudio -b working - git clone https://github.com/microsoft/DirectX-Headers.git wslg/vendor/DirectX-Headers-1.0 -b v1.608.0 + git clone https://github.com/microsoft/DirectX-Headers.git wslg/vendor/DirectX-Headers-1.0 -b v1.619.1 git clone https://gitlab.freedesktop.org/mesa/mesa.git wslg/vendor/mesa -b mesa-23.1.0 ``` diff --git a/cgmanifest.json b/cgmanifest.json index 164cad1e..65171f9d 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -45,7 +45,7 @@ "Type": "git", "Git": { "RepositoryUrl": "https://github.com/microsoft/DirectX-Headers.git", - "CommitHash": "cf123266ce6f1e9a6e700642edb6356bff1e3d55" + "CommitHash": "9e393d6d8a3b30dcc6f2806ef604ec16a27b0d7e" } }, "DevelopmentDependency": false From ca19168f3139f3125bec1fc7a2f55fc22c5f934a Mon Sep 17 00:00:00 2001 From: Ben Hillis Date: Tue, 19 May 2026 05:06:26 +0000 Subject: [PATCH 2/2] vendor: bump mesa 23.1.0 -> 24.0.1 Updates the recommended dev-clone tag in CONTRIBUTING.md to match the new CI default ('24.0.1' in wslg-build's pipeline-shared.yml, wslg-github-buddy.yml and wslg-github-release.yml). vendor/ itself is .gitignored, so this is the only path by which a wslg-tree change can move the version a fresh local checkout pulls. 23.1.0 is the May 2023 mesa release that has been pinned since v1.0.17 of WSLg. 24.0.1 (Feb 2024) is what Azure Linux 3.0 base ships and is the next-newer mesa tarball verifiably present on azurelinuxsrcstorage.blob.core.windows.net (anything newer 404s), so it's the obvious next step that keeps WSLg's mesa aligned with the host distro and avoids ad-hoc mirroring. WSLg only builds the swrast and d3d12 gallium drivers with LLVM and Vulkan disabled (Dockerfile:240-245), so the upgrade just pulls in fixes to that narrow surface; everything else mesa 24.0 added is unbuilt. cgmanifest.json: bump the mesa CommitHash to the upstream gitlab commit for mesa-24.0.1 (3e361635) so compliance scanning sees the same version CI actually consumes. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- CONTRIBUTING.md | 2 +- cgmanifest.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c44d33da..5633901a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -46,7 +46,7 @@ The WSLg system distro is built using docker build. We essentially start from a git clone https://github.com/microsoft/weston-mirror wslg/vendor/weston -b working git clone https://github.com/microsoft/PulseAudio-mirror wslg/vendor/pulseaudio -b working git clone https://github.com/microsoft/DirectX-Headers.git wslg/vendor/DirectX-Headers-1.0 -b v1.619.1 - git clone https://gitlab.freedesktop.org/mesa/mesa.git wslg/vendor/mesa -b mesa-23.1.0 + git clone https://gitlab.freedesktop.org/mesa/mesa.git wslg/vendor/mesa -b mesa-24.0.1 ``` 3. Build the VHD. The easiest path is the helper script, which derives a version from `git describe`, captures each vendor's commit SHA, passes everything as `--build-arg`, runs `docker build`, exports the container, and converts to a VHD via `tar2ext4`: diff --git a/cgmanifest.json b/cgmanifest.json index 65171f9d..c8c4179b 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -35,7 +35,7 @@ "Type": "git", "Git": { "RepositoryUrl": "https://gitlab.freedesktop.org/mesa/mesa.git", - "CommitHash": "be4f7fb656180ab55a50eff01f36672b0bf5f146" + "CommitHash": "3e361635b8db45dbb4896ed3cc1bda54c138334b" } }, "DevelopmentDependency": false