[meson|scripts] update scripts (#12945)

* Update meson to a recent commit to fix a bug with 0.56

* rename static libraries built by meson by default on windows

* apply cmake variables detection to meson.
use native/cross files
make arm builds work.

* update munit

* fix fribidi

* fix _FLAGS variables

* set env SDKROOT and MACOSX_DEPLOYMENT_TARGET in configure_meson

* need osx env while building and configuring

* - remove unused env backup functions
- rename internal functions to be prefixed with _vcpkg_
- fix VCPKG_CHAINLOAD_TOOLCHAIN_FILE for ios/freebsd

* replace _vcpkg with vcpkg since _ has special meaning in functions

* rename functions to vcpkg_internal_meson_generate

* update control tool-meson

6 files changed, 5 insertions, 30 deletions

diff --git a/ports/fribidi/CONTROL b/ports/fribidi/CONTROL
index 570fd1362..5ca0a10a4 100644
--- a/ports/fribidi/CONTROL
+++ b/ports/fribidi/CONTROL
@@ -1,4 +1,5 @@
 Source: fribidi
 Version: 1.0.10
+Port-Version: 1
 Description: GNU FriBidi is an implementation of the Unicode Bidirectional Algorithm (bidi)
 Build-Depends: tool-meson
diff --git a/ports/fribidi/fix-win-static-suffix.patch b/ports/fribidi/fix-win-static-suffix.patch
deleted file mode 100644
index 953b1b91b..000000000
--- a/ports/fribidi/fix-win-static-suffix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/lib/meson.build b/lib/meson.build
-index aaf2aed..3fe8937 100644
---- a/lib/meson.build
-+++ b/lib/meson.build
-@@ -71,6 +71,10 @@ fribidi_sources = [
-   'fribidi-shape.c',
- ]
- 
-+libsuffix = []
-+if host_machine.system() == 'windows' and get_option('default_library') == 'static'
-+  libsuffix = 'lib'
-+endif
- libfribidi = library('fribidi',
-   fribidi_sources, fribidi_unicode_version_h, fribidi_config_h,
-   generated_tab_include_files, config_h,
-@@ -78,7 +82,8 @@ libfribidi = library('fribidi',
-   c_args: ['-DHAVE_CONFIG_H', '-DFRIBIDI_BUILD'] + fribidi_static_cargs + visibility_args,
-   version: libversion,
-   soversion: soversion,
--  install: true)
-+  install: true,
-+  name_suffix: libsuffix)
- 
- libfribidi_dep = declare_dependency(link_with: libfribidi,
-   include_directories: incs,
diff --git a/ports/fribidi/portfile.cmake b/ports/fribidi/portfile.cmake
index 740502bdd..7e71fe68e 100644
--- a/ports/fribidi/portfile.cmake
+++ b/ports/fribidi/portfile.cmake
@@ -4,7 +4,6 @@ vcpkg_from_github(
     REF 5464c284034da9c058269377b7f5013bb089f553 # v1.0.10

     SHA512 82e42b022f23d6ecebac5071f997c9f46db6aa41c36f87a7f1a28a79b4ccaada10d68b233bbf687c552fc94d91f4b47161e0ef4909fd1de0b483089f1d1377f9

     HEAD_REF master

-    PATCHES fix-win-static-suffix.patch

 )

 

 vcpkg_configure_meson(

@@ -13,10 +12,10 @@ vcpkg_configure_meson(
         -Ddocs=false

         -Dbin=false

         -Dtests=false

-        --backend=ninja

 )

 

 vcpkg_install_meson()

+vcpkg_fixup_pkgconfig()

 vcpkg_copy_pdbs()

 

 # Define static macro

diff --git a/ports/munit/CONTROL b/ports/munit/CONTROL
index 8e1bb2e23..cd1d6f303 100644
--- a/ports/munit/CONTROL
+++ b/ports/munit/CONTROL
@@ -1,5 +1,7 @@
 Source: munit

 Version: 2019-04-06

+Port-Version: 1

 Description: A small but full-featured unit testing framework for C

+Build-Depends: tool-meson

 Supports: !(arm|arm64|uwp)

 Homepage: https://github.com/nemequ/munit

diff --git a/ports/munit/portfile.cmake b/ports/munit/portfile.cmake
index bd4595930..cf6d0df3c 100644
--- a/ports/munit/portfile.cmake
+++ b/ports/munit/portfile.cmake
@@ -14,8 +14,6 @@ vcpkg_from_github(
 

 vcpkg_configure_meson(

     SOURCE_PATH ${SOURCE_PATH}

-    OPTIONS

-        --backend=ninja

 )

 

 vcpkg_install_meson()

diff --git a/ports/tool-meson/CONTROL b/ports/tool-meson/CONTROL
index 9eb6d800b..f40ea553f 100644
--- a/ports/tool-meson/CONTROL
+++ b/ports/tool-meson/CONTROL
@@ -1,4 +1,4 @@
 Source: tool-meson
-Version: 0.56.0
+Version: 0.56.01
 Homepage: https://github.com/mesonbuild/meson
 Description: Meson build system