Skip to content
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

[vcpkg baseline] [mesa] Fix conflicts with angle #15729

Merged
merged 13 commits into from
Jan 22, 2021
Merged

[vcpkg baseline] [mesa] Fix conflicts with angle #15729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b0065af
[mesa] Remove libs conflicted with angle
Jan 18, 2021
e567e5d
Update port_versions check
Jan 18, 2021
60ba5c7
Use gles-lib-suffix to avoid conflicts with angle
Jan 21, 2021
57ae63b
[mesa] Remove libs conflicted with angle
Jan 18, 2021
1f7832c
Update port_versions check
Jan 18, 2021
0c7cbcc
Use gles-lib-suffix to avoid conflicts with angle
Jan 21, 2021
cbdf75f
Update port_versions/m-/mesa.json
Jan 22, 2021
3952bff
Merge branch 'dev/NancLi/mesa' of https://github.com/NancyLi1013/vcpk…
Jan 22, 2021
68eb4e4
Update ports/mesa/portfile.cmake
NancyLi1013 Jan 22, 2021
3febb67
Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/…
Jan 22, 2021
21500ae
Merge branch 'dev/NancLi/mesa' of https://github.com/NancyLi1013/vcpk…
Jan 22, 2021
5a95938
Update space and versions
Jan 22, 2021
dd0a6ea
Update versions/m-/mesa.json
Jan 22, 2021
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
1 change: 1 addition & 0 deletions ports/mesa/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Source: mesa
Version: 20.2.2
Port-Version: 1
Homepage: https://www.mesa3d.org/
Description: Mesa - The 3D Graphics Library
Build-Depends: zlib, zstd, tool-meson
Expand Down
2 changes: 1 addition & 1 deletion ports/mesa/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ endif()
vcpkg_configure_meson(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
#-D gles-lib-suffix=_mesa
-Dgles-lib-suffix=_mesa
#-D egl-lib-suffix=_mesa
-Dbuild-tests=false
${MESA_OPTIONS}
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3678,7 +3678,7 @@
},
"mesa": {
"baseline": "20.2.2",
"port-version": 0
"port-version": 1
},
"meschach": {
"baseline": "1.2b-3",
Expand Down
5 changes: 5 additions & 0 deletions versions/m-/mesa.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "2966b4bb6816c1fa46e65c61f4cb30efb5c8381a",
"version-string": "20.2.2",
"port-version": 1
},
{
"git-tree": "9b75570d3f7a9cb58ff7c7c8479bbfb7e745d0d2",
"version-string": "20.2.2",
Expand Down