Skip to content

Update Mesa sourcing #1419

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
linghengqian wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update Mesa sourcing #1419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.608.0
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-25.3.4
```

2. Create the VHD:
Expand Down
16 changes: 8 additions & 8 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ stages:

- template: devops/common-linux.yml

- script: wget https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/mesa-23.1.0.tar.xz &&
tar -xvf mesa-23.1.0.tar.xz
displayName: 'Download Mesa from Azure Linux'
- script: wget https://archive.mesa3d.org/mesa-25.3.4.tar.xz &&
tar -xvf mesa-25.3.4.tar.xz
displayName: 'Download Mesa from mesa3d.org'

- script: wget https://github.com/microsoft/DirectX-Headers/archive/refs/tags/v1.608.0.tar.gz &&
tar -xvf v1.608.0.tar.gz
Expand All @@ -49,7 +49,7 @@ stages:
- script: mv FreeRDP-mirror/ wslg/vendor/FreeRDP &&
mv weston-mirror/ wslg/vendor/weston &&
mv pulseaudio-mirror/ wslg/vendor/pulseaudio &&
mv mesa-23.1.0/ wslg/vendor/mesa &&
mv mesa-25.3.4/ wslg/vendor/mesa &&
mv DirectX-Headers-1.608.0/ wslg/vendor/DirectX-Headers-1.0
displayName: 'Move sub projects (FreeRDP, Weston, PulseAudio, Mesa, DirectX-Headers)'

Expand Down Expand Up @@ -186,9 +186,9 @@ stages:
sudo service docker restart
displayName: 'Enable Docker Engine experimental '

- script: wget https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/mesa-23.1.0.tar.xz &&
tar -xvf mesa-23.1.0.tar.xz
displayName: 'Download Mesa from Azure Linux'
- script: wget https://archive.mesa3d.org/mesa-25.3.4.tar.xz &&
tar -xvf mesa-25.3.4.tar.xz
displayName: 'Download Mesa from mesa3d.org'

- script: wget https://github.com/microsoft/DirectX-Headers/archive/refs/tags/v1.608.0.tar.gz &&
tar -xvf v1.608.0.tar.gz
Expand All @@ -197,7 +197,7 @@ stages:
- script: mv FreeRDP-mirror/ wslg/vendor/FreeRDP &&
mv weston-mirror/ wslg/vendor/weston &&
mv pulseaudio-mirror/ wslg/vendor/pulseaudio &&
mv mesa-23.1.0/ wslg/vendor/mesa &&
mv mesa-25.3.4/ wslg/vendor/mesa &&
mv DirectX-Headers-1.608.0/ wslg/vendor/DirectX-Headers-1.0
displayName: 'Move sub projects (FreeRDP, Weston, PulseAudio, Mesa, DirectX-Headers)'

Expand Down
2 changes: 1 addition & 1 deletion cgmanifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"Type": "mesa",
"Git": {
"RepositoryUrl": "https://github.com/mesa3d/mesa",
"CommitHash": "731ea06758663a2de3a2bd1f12eb8809d4c136fd"
"CommitHash": "23e3445940104465152dcfc1d5952d09d3ba7b37"
}
},
"DevelopmentDependency": false
Expand Down
6 changes: 3 additions & 3 deletions config/BUILD.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ For self-hosting WSLG check use this instructions https://github.com/microsoft/w
2. Download the mesa and directx headers code.

```
wget https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/mesa-23.1.0.tar.xz
tar -xf mesa-23.1.0.tar.xz -C vendor
mv vendor/mesa-23.1.0 vendor/mesa
wget https://archive.mesa3d.org/mesa-25.3.4.tar.xz
tar -xf mesa-25.3.4.tar.xz -C vendor
mv vendor/mesa-25.3.4 vendor/mesa

wget https://github.com/microsoft/DirectX-Headers/archive/refs/tags/v1.608.0.tar.gz
tar -xvf v1.608.0.tar.gz -C vendor
Expand Down