[vcpkg-tool-meson] Update meson to a more recent version

ports/vcpkg-tool-meson/portfile.cmake

@@ -5,17 +5,17 @@
 set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
 
 set(program MESON)
-set(program_version 0.63.0)
+set(program_version 0.64.1)
 set(program_name meson)
 set(search_names meson meson.py)
 set(interpreter PYTHON3)
 set(apt_package_name "meson")
 set(brew_package_name "meson")
-set(ref bb91cea0d66d8d036063dedec1f194d663399cdf)
+set(ref e000aa11373298c6c07e264d4436b5075210bd11)
 set(paths_to_search "${CURRENT_PACKAGES_DIR}/tools/meson")
 set(download_urls "https://github.com/mesonbuild/meson/archive/${ref}.tar.gz")
 set(download_filename "meson-${ref}.tar.gz")
-set(download_sha512 e5888eb35dd4ab5fc0a16143cfbb5a7849f6d705e211a80baf0a8b753e2cf877a4587860a79cad129ec5f3474c12a73558ffe66439b1633d80b8044eceaff2da)
+set(download_sha512 a51f799183bdcf309b52487e3b98b7b9a83379c411375369b24fdb1ebd3eedd550b922fe98117040c8033c8b476a12c9e730c67c403efa711802dfdca88c34c8)
 set(supported_on_unix ON)
 set(version_command --version)
 set(extra_search_args EXACT_VERSION_MATCH)
@@ -33,6 +33,12 @@ vcpkg_find_acquire_program(PYTHON3)
 # )
 
 if(NOT "${program}")
+    vcpkg_download_distfile(
+        python_module_path
+        URLS https://raw.githubusercontent.com/mesonbuild/meson/9c6dab2cfd310ef2d840a2a7a479ce6b9e563b1d/mesonbuild/modules/python.py
+        FILENAME python-meson-module-9c6dab.py
+        SHA512 6e93dad2d12929757a37b97c44f697413504e7238ff7bb4e87925a3b5ba6d9eae7c25ae4d1a022ee836747fac760662a33d1ea88c7c74712673ce64e538eb691
+    )
     vcpkg_download_distfile(archive_path
         URLS ${download_urls}
         SHA512 "${download_sha512}"
@@ -48,9 +54,11 @@ if(NOT "${program}")
         SOURCE_PATH "${CURRENT_PACKAGES_DIR}"
         PATCHES
             meson-intl.patch
+            python-lib-dep.patch
     )
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/meson/test cases")
     configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-port-config.cmake" @ONLY)
+    file(INSTALL "${python_module_path}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/meson/mesonbuild/modules" RENAME "python.py")
 endif()
 
 z_vcpkg_find_acquire_program_find_internal("${program}"

ports/vcpkg-tool-meson/python-lib-dep.patch

@@ -0,0 +1,16 @@
+diff --git a/tools/meson/mesonbuild/modules/python.py b/tools/meson/mesonbuild/modules/python.py
+index 84ec524..2789134 100644
+--- a/tools/meson/mesonbuild/modules/python.py
++++ b/tools/meson/mesonbuild/modules/python.py
+@@ -305,10 +305,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice',
+                 set_env('PKG_CONFIG_PATH', old_pkg_path)
+
+         candidates.append(functools.partial(wrap_in_pythons_pc_dir, pkg_name, env, kwargs, installation))
+-        # We only need to check both, if a python install has a LIBPC. It might point to the wrong location,
+-        # e.g. relocated / cross compilation, but the presence of LIBPC indicates we should definitely look for something.
+-        if pkg_libdir is not None:
+-            candidates.append(functools.partial(PythonPkgConfigDependency, pkg_name, env, kwargs, installation))
++        candidates.append(functools.partial(PythonPkgConfigDependency, pkg_name, env, kwargs, installation))
+
+     if DependencyMethods.SYSTEM in methods:
+         candidates.append(functools.partial(PythonSystemDependency, 'python', env, kwargs, installation))

ports/vcpkg-tool-meson/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "vcpkg-tool-meson",
-  "version": "0.63",
+  "version": "0.64.1",
   "description": "Meson build system",
   "homepage": "https://github.com/mesonbuild/meson",
   "license": "Apache-2.0",

versions/baseline.json

@@ -7825,7 +7825,7 @@
       "port-version": 0
     },
     "vcpkg-tool-meson": {
-      "baseline": "0.63",
+      "baseline": "0.64.1",
       "port-version": 0
     },
     "vcpkg-tool-mozbuild": {

versions/v-/vcpkg-tool-meson.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7ac7f928585a6a56f706b7a829e768793555d2c2",
+      "version": "0.64.1",
+      "port-version": 0
+    },
     {
       "git-tree": "bee0cb6c5edf45133ebc9643b86c9c775ab36cfe",
       "version": "0.63",