mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 19:42:46 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
* [mesa] Remove libs conflicted with angle

* Update port_versions check

* Use gles-lib-suffix to avoid conflicts with angle

* [mesa] Remove libs conflicted with angle

* Update port_versions check

* Use gles-lib-suffix to avoid conflicts with angle

* Update port_versions/m-/mesa.json

* Update ports/mesa/portfile.cmake

* Update space and versions

* Update versions/m-/mesa.json
This commit is contained in:
NancyLi1013 2021-01-23 02:27:34 +08:00 committed by GitHub
parent 3f7b677756
commit f05b2b639a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ports/mesa/CONTROL
View File

@ -1,5 +1,6 @@
Source: mesa Source: mesa
Version: 20.2.2 Version: 20.2.2
Port-Version: 1
Homepage: https://www.mesa3d.org/ Homepage: https://www.mesa3d.org/
Description: Mesa - The 3D Graphics Library Description: Mesa - The 3D Graphics Library
Build-Depends: zlib, zstd, tool-meson Build-Depends: zlib, zstd, tool-meson

2
ports/mesa/portfile.cmake
View File

@ -168,7 +168,7 @@ endif()
vcpkg_configure_meson( vcpkg_configure_meson(
SOURCE_PATH "${SOURCE_PATH}" SOURCE_PATH "${SOURCE_PATH}"
OPTIONS OPTIONS
#-D gles-lib-suffix=_mesa -Dgles-lib-suffix=_mesa
#-D egl-lib-suffix=_mesa #-D egl-lib-suffix=_mesa
-Dbuild-tests=false -Dbuild-tests=false
${MESA_OPTIONS} ${MESA_OPTIONS}

2
versions/baseline.json
View File

@ -3678,7 +3678,7 @@
}, },
"mesa": { "mesa": {
"baseline": "20.2.2", "baseline": "20.2.2",
"port-version": 0 "port-version": 1
}, },
"meschach": { "meschach": {
"baseline": "1.2b-3", "baseline": "1.2b-3",

5
versions/m-/mesa.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "2966b4bb6816c1fa46e65c61f4cb30efb5c8381a",
"version-string": "20.2.2",
"port-version": 1
},
{ {
"git-tree": "9b75570d3f7a9cb58ff7c7c8479bbfb7e745d0d2", "git-tree": "9b75570d3f7a9cb58ff7c7c8479bbfb7e745d0d2",
"version-string": "20.2.2", "version-string": "20.2.2",