From fd67439f01bfec989f7b1505f3b2f10f771470a3 Mon Sep 17 00:00:00 2001 From: Rich Logan Date: Thu, 14 Jan 2021 00:22:54 +0000 Subject: [PATCH] [tool-meson] Rev vcpkg's meson build (#15200) --- ports/tool-meson/CONTROL | 2 +- scripts/cmake/vcpkg_find_acquire_program.cmake | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ports/tool-meson/CONTROL b/ports/tool-meson/CONTROL index f40ea553fb..2c817f2473 100644 --- a/ports/tool-meson/CONTROL +++ b/ports/tool-meson/CONTROL @@ -1,4 +1,4 @@ Source: tool-meson -Version: 0.56.01 +Version: 0.56.02 Homepage: https://github.com/mesonbuild/meson Description: Meson build system diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index cc6be6b3ea..e3679c80a9 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -257,13 +257,13 @@ function(vcpkg_find_acquire_program VAR) set(APT_PACKAGE_NAME "meson") set(BREW_PACKAGE_NAME "meson") set(SCRIPTNAME meson meson.py) - set(PATHS ${DOWNLOADS}/tools/meson/meson-91876b40316962620c1705ae14075ab46f8dd644) - set(URL "https://github.com/mesonbuild/meson/archive/91876b40316962620c1705ae14075ab46f8dd644.tar.gz") - set(ARCHIVE "meson-91876b40316962620c1705ae14075ab46f8dd644.tar.gz") + 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(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 784b740a01de70312f9240d38b683b2065f40572c87d30929386fe417b2cc70bcc86213c86e143f349c78121c9cc6d7392526d6e53512ae22a6ec0db57f26e3e) + set(HASH e8c36166b673acfccda54dcdbbc2414c9d0ce018debcdf6a09418f2f240edf14e72725188fe7ff7a3fcdc3942e8d1393e08a28d6f1bded4610f3ab836ab8e254) set(_vfa_SUPPORTED ON) set(VERSION_CMD --version) elseif(VAR MATCHES "FLEX" OR VAR MATCHES "BISON")