diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2021-01-23 02:27:34 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-22 10:27:34 -0800 |
| commit | f05b2b639a4ba6bbd8b291158ab069732f249f3e (patch) | |
| tree | 5e2a132bf2d531737c18452f68eb59d89936ccff | |
| parent | 3f7b6777560cc9006aa43b3c4587e4d95bac7c40 (diff) | |
| download | vcpkg-f05b2b639a4ba6bbd8b291158ab069732f249f3e.tar.gz vcpkg-f05b2b639a4ba6bbd8b291158ab069732f249f3e.zip | |
[vcpkg baseline] [mesa] Fix conflicts with angle (#15729)
* [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
| -rw-r--r-- | ports/mesa/CONTROL | 1 | ||||
| -rw-r--r-- | ports/mesa/portfile.cmake | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/m-/mesa.json | 5 |
4 files changed, 8 insertions, 2 deletions
diff --git a/ports/mesa/CONTROL b/ports/mesa/CONTROL index c29d91e31..8ad3e5474 100644 --- a/ports/mesa/CONTROL +++ b/ports/mesa/CONTROL @@ -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
diff --git a/ports/mesa/portfile.cmake b/ports/mesa/portfile.cmake index 17e43d2c6..9461dc2c5 100644 --- a/ports/mesa/portfile.cmake +++ b/ports/mesa/portfile.cmake @@ -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}
diff --git a/versions/baseline.json b/versions/baseline.json index ca9b3fada..459758222 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3678,7 +3678,7 @@ }, "mesa": { "baseline": "20.2.2", - "port-version": 0 + "port-version": 1 }, "meschach": { "baseline": "1.2b-3", diff --git a/versions/m-/mesa.json b/versions/m-/mesa.json index a4b443891..b28bb72de 100644 --- a/versions/m-/mesa.json +++ b/versions/m-/mesa.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "2966b4bb6816c1fa46e65c61f4cb30efb5c8381a", + "version-string": "20.2.2", + "port-version": 1 + }, + { "git-tree": "9b75570d3f7a9cb58ff7c7c8479bbfb7e745d0d2", "version-string": "20.2.2", "port-version": 0 |