[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
microsoft · Jan 22, 2021 · f05b2b6 · f05b2b6
1 parent 3f7b677
commit f05b2b6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2966b4bb6816c1fa46e65c61f4cb30efb5c8381a",
+      "version-string": "20.2.2",
+      "port-version": 1
+    },
     {
       "git-tree": "9b75570d3f7a9cb58ff7c7c8479bbfb7e745d0d2",
       "version-string": "20.2.2",