[vcpkg-tool-meson] Update to 1.6.0 (#41395)

microsoft · Oct 24, 2024 · f56b56e · f56b56e
1 parent e1af728
commit f56b56e
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 10 deletions.
diff --git a/ports/vcpkg-tool-meson/adjust-args.patch b/ports/vcpkg-tool-meson/adjust-args.patch
@@ -1,12 +1,13 @@
 diff --git a/mesonbuild/cmake/toolchain.py b/mesonbuild/cmake/toolchain.py
-index abf2cf6..477629e 100644
+index 7d73a7c..564e6de 100644
 --- a/mesonbuild/cmake/toolchain.py
 +++ b/mesonbuild/cmake/toolchain.py
-@@ -204,6 +204,6 @@ class CMakeToolchain:
+@@ -196,7 +196,7 @@ class CMakeToolchain:
      @staticmethod
      def is_cmdline_option(compiler: 'Compiler', arg: str) -> bool:
          if compiler.get_argument_syntax() == 'msvc':
 -            return arg.startswith('/')
 +            return arg.startswith(('/','-'))
          else:
-             return arg.startswith('-')
+             if compiler.exelist[0] == 'zig' and arg in {'ar', 'cc', 'c++', 'dlltool', 'lib', 'ranlib', 'objcopy', 'rc'}:
+                 return True
diff --git a/ports/vcpkg-tool-meson/remove-freebsd-pcfile-specialization.patch b/ports/vcpkg-tool-meson/remove-freebsd-pcfile-specialization.patch
@@ -1,14 +1,14 @@
 diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py
-index ebe0d92..904090b 100644
+index 1bdf829..5f1bfd9 100644
 --- a/mesonbuild/modules/pkgconfig.py
 +++ b/mesonbuild/modules/pkgconfig.py
-@@ -693,6 +693,9 @@ class PkgConfigModule(NewExtensionModule):
+@@ -701,6 +701,9 @@ class PkgConfigModule(NewExtensionModule):
          pcfile = filebase + '.pc'
          pkgroot = pkgroot_name = kwargs['install_dir'] or default_install_dir
          if pkgroot is None:
-+            pkgroot = os.path.join(_as_str(state.environment.coredata.get_option(mesonlib.OptionKey('libdir'))), 'pkgconfig')
++            pkgroot = os.path.join(_as_str(state.environment.coredata.get_option(OptionKey('libdir'))), 'pkgconfig')
 +            pkgroot_name = os.path.join('{libdir}', 'pkgconfig')
 +        elif False:
              if mesonlib.is_freebsd():
-                 pkgroot = os.path.join(_as_str(state.environment.coredata.get_option(mesonlib.OptionKey('prefix'))), 'libdata', 'pkgconfig')
+                 pkgroot = os.path.join(_as_str(state.environment.coredata.get_option(OptionKey('prefix'))), 'libdata', 'pkgconfig')
                  pkgroot_name = os.path.join('{prefix}', 'libdata', 'pkgconfig')
diff --git a/ports/vcpkg-tool-meson/vcpkg-port-config.cmake b/ports/vcpkg-tool-meson/vcpkg-port-config.cmake
@@ -14,7 +14,7 @@ set(ref "${program_version}")
 set(path_to_search "${DOWNLOADS}/tools/meson-${program_version}-${meson_short_hash}")
 set(download_urls "https://github.com/mesonbuild/meson/archive/${ref}.tar.gz")
 set(download_filename "meson-${ref}.tar.gz")
-set(download_sha512 54c6611dd95caaffa216f03d0b96b44c86d5452f54e1282234a4646f8e50f75ea0185a1611a4c078c888154bd4e2d917c4d075de3e7577440a925f72f6152a4f)
+set(download_sha512 8cbb4af0d057e06c4efd0eb2544aa93cfa73410114f85f346e9fbf92af776f5bb5121f557d228b7cdab7f0ea7963e057b223f17036e2f36f55416fba43683248)
 
 find_program(SCRIPT_MESON NAMES ${search_names} PATHS "${path_to_search}" NO_DEFAULT_PATH) # NO_DEFAULT_PATH due top patching
 

diff --git a/ports/vcpkg-tool-meson/vcpkg.json b/ports/vcpkg-tool-meson/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "vcpkg-tool-meson",
-  "version": "1.5.2",
+  "version": "1.6.0",
   "description": "Meson build system",
   "homepage": "https://github.com/mesonbuild/meson",
   "license": "Apache-2.0",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -9349,7 +9349,7 @@
       "port-version": 1
     },
     "vcpkg-tool-meson": {
-      "baseline": "1.5.2",
+      "baseline": "1.6.0",
       "port-version": 0
     },
     "vcpkg-tool-mozbuild": {

diff --git a/versions/v-/vcpkg-tool-meson.json b/versions/v-/vcpkg-tool-meson.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ba86563d438bbe6692c2b13df4235755ba135cbc",
+      "version": "1.6.0",
+      "port-version": 0
+    },
     {
       "git-tree": "43ebfc9a69d8e47fdfbe68b6f79a02d2b5f50e6e",
       "version": "1.5.2",