[tool-meson] update to 0.58 (microsoft#17631)

* update meson to latest * version stuff * update meson to 0.58 * reset version stuff * version stuff Co-authored-by: Billy Robert ONeal III <[email protected]>
Kretikus · May 6, 2021 · b93b4c4 · b93b4c4
1 parent 00b0e78
commit b93b4c4
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 10 deletions.
diff --git a/ports/tool-meson/CONTROL b/ports/tool-meson/CONTROL
diff --git a/ports/tool-meson/vcpkg.json b/ports/tool-meson/vcpkg.json
@@ -0,0 +1,6 @@
+{
+  "name": "tool-meson",
+  "version": "0.58.0",
+  "description": "Meson build system",
+  "homepage": "https://github.com/mesonbuild/meson"
+}
diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake
@@ -250,19 +250,20 @@ function(vcpkg_find_acquire_program VAR)
     set(NOEXTRACT ON)
     set(HASH 22ea847d8017cd977664d0b13c889cfb13c89143212899a511be217345a4e243d4d8d4099700114a11d26a087e83eb1a3e2b03bdb5e0db48f10403184cd26619)
   elseif(VAR MATCHES "MESON")
-    set(MESON_VERSION 0.56.01)
+    set(MESON_VERSION 0.58.0)
     set(PROGNAME meson)
     set(REQUIRED_INTERPRETER PYTHON3)
     set(APT_PACKAGE_NAME "meson")
     set(BREW_PACKAGE_NAME "meson")
     set(SCRIPTNAME meson meson.py)
-    set(PATHS ${DOWNLOADS}/tools/meson/meson-f5871f434a5b768ad9fcafa797a6db0286421842)
-    set(URL "https://github.com/mesonbuild/meson/archive/f5871f434a5b768ad9fcafa797a6db0286421842.tar.gz")
-    set(ARCHIVE "meson-f5871f434a5b768ad9fcafa797a6db0286421842.tar.gz")
+    set(REF 753954be868ed78b3e339e8811fd1d29eb2af237)
+    set(PATHS ${DOWNLOADS}/tools/meson/meson-${REF})
+    set(URL "https://github.com/mesonbuild/meson/archive/${REF}.tar.gz")
+    set(ARCHIVE "meson-${REF}.tar.gz")
     #set(PATHS ${DOWNLOADS}/tools/meson/meson-${MESON_VERSION})
     #set(URL "https://github.com/mesonbuild/meson/releases/download/${MESON_VERSION}/meson-${MESON_VERSION}.tar.gz")
     #set(ARCHIVE "meson-${MESON_VERSION}.tar.gz")
-    set(HASH e8c36166b673acfccda54dcdbbc2414c9d0ce018debcdf6a09418f2f240edf14e72725188fe7ff7a3fcdc3942e8d1393e08a28d6f1bded4610f3ab836ab8e254)
+    set(HASH 1e5b5ac216cb41af40b3e72240f3cb319772a02aaea39f672085aafb41c3c732c932c9d0c4e8deb5b4b1ec1112860e6a3ddad59898bebbd165ed7876c87728b3)
     set(_vfa_SUPPORTED ON)
     set(VERSION_CMD --version)
   elseif(VAR MATCHES "FLEX" OR VAR MATCHES "BISON")

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -6129,7 +6129,7 @@
       "port-version": 1
     },
     "tool-meson": {
-      "baseline": "0.56.02",
+      "baseline": "0.58.0",
       "port-version": 0
     },
     "torch-th": {

diff --git a/versions/t-/tool-meson.json b/versions/t-/tool-meson.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3abddc8b29ae6e5c0265237a8c3f3e8ec8348710",
+      "version": "0.58.0",
+      "port-version": 0
+    },
     {
       "git-tree": "3e9b57e374c062aa7a2b863b4c6a5d4e971da7c1",
       "version-string": "0.56.02",