[vcpkg-tool-meson] update meson to 0.62.1 (#23717)

* update meson and see what breaks * include patch again. * update meson to 0.62.1 * remove old patch * move to 64bit since 32bit not longer exists. * fix gobject-introspection * v db * revert nasm changes * set MESON_SCRIPT instead of MESON. * v db * apply CR Co-authored-by: Robert Schumacher <[email protected]> * v db Co-authored-by: Alexander Neumann <[email protected]> Co-authored-by: Robert Schumacher <[email protected]>
microsoft · May 25, 2022 · f4de177 · f4de177
1 parent ee0d840
commit f4de177
Show file tree

Hide file tree

Showing 10 changed files with 58 additions and 42 deletions.
diff --git a/ports/gobject-introspection/portfile.cmake b/ports/gobject-introspection/portfile.cmake
@@ -1,11 +1,11 @@
 
-set(GI_MAJOR_MINOR 1.70)
+set(GI_MAJOR_MINOR 1.72)
 set(GI_PATCH 0)
 
 vcpkg_download_distfile(ARCHIVE
     URLS "https://download.gnome.org/sources/gobject-introspection/${GI_MAJOR_MINOR}/gobject-introspection-${GI_MAJOR_MINOR}.${GI_PATCH}.tar.xz"
     FILENAME "gobject-introspection-${GI_MAJOR_MINOR}.${GI_PATCH}.tar.xz"
-    SHA512 216b376ed423f607e36c723dd6b67975dbfb63c253f2d8bd0b3661e3d69f8c8059cf221db8c5260b0262fad1b7d738f3b2e5fbd51fdbc31e40ccb115c209baf0
+    SHA512 b8fba2bd12e93776c55228acf3487bef36ee40b1abdc7f681b827780ac94a8bfa1f59b0c30d60fa5a1fea2f610de78b9e52029f411128067808f17eb6374cdc5
 )
 
 vcpkg_extract_source_archive_ex(
@@ -14,15 +14,15 @@ vcpkg_extract_source_archive_ex(
     PATCHES
         0001-g-ir-tool-template.in.patch
         0002-cross-build.patch
+        python.patch
 )
 
-vcpkg_find_acquire_program(PYTHON3)
 vcpkg_find_acquire_program(FLEX)
 vcpkg_find_acquire_program(BISON)
 
 set(OPTIONS_DEBUG -Dbuild_introspection_data=false)
 set(OPTIONS_RELEASE -Dbuild_introspection_data=true)
-if(NOT HOST_TRIPLET STREQUAL TARGET_TRIPLET AND
+if(VCPKG_CROSSCOMPILING AND
    NOT (CMAKE_HOST_WIN32 AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86"))
     list(APPEND OPTIONS_RELEASE -Dgi_cross_use_prebuilt_gi=true)
 endif()

diff --git a/ports/gobject-introspection/python.patch b/ports/gobject-introspection/python.patch
@@ -0,0 +1,29 @@
+diff --git a/giscanner/meson.build b/giscanner/meson.build
+index e63a5ab78..3d7dc678a 100644
+--- a/giscanner/meson.build
++++ b/giscanner/meson.build
+@@ -97,11 +97,11 @@ giscanner_lib = static_library('giscanner',
+   dependencies: [glib_dep, gobject_dep, gio_dep, gmodule_dep],
+ )
+
+ # https://github.com/mesonbuild/meson/issues/4117
+ if host_machine.system() == 'windows'
++  python_ext_dep = libpython_dep
+-  python_ext_dep = python.dependency()
+ else
++  python_ext_dep = libpython_dep
+-  python_ext_dep = python.dependency().partial_dependency(compile_args: true)
+ endif
+
+ if not python_ext_dep.found()
+diff --git a/meson.build b/meson.build
+index 2a9d68556..cffe9014c 100644
+--- a/meson.build
++++ b/meson.build
+@@ -156,4 +156,5 @@ libffi_dep = dependency('libffi',
+
+ # python headers
+-cc.check_header('Python.h', dependencies: [python.dependency()], required: true)
++libpython_dep = dependency('python-3.10', method : 'pkg-config')
++cc.check_header('Python.h', dependencies: [libpython_dep], required: true)
+
diff --git a/ports/gobject-introspection/vcpkg.json b/ports/gobject-introspection/vcpkg.json
@@ -1,9 +1,9 @@
 {
   "name": "gobject-introspection",
-  "version": "1.70.0",
-  "port-version": 1,
+  "version": "1.72.0",
   "description": "A middleware layer between C libraries (using GObject) and language bindings.",
   "homepage": "https://gi.readthedocs.io/en/latest/",
+  "license": null,
   "supports": "!static & (native | (windows & x86))",
   "dependencies": [
     {

diff --git a/ports/vcpkg-tool-meson/fix_linker_detection.patch b/ports/vcpkg-tool-meson/fix_linker_detection.patch
diff --git a/ports/vcpkg-tool-meson/portfile.cmake b/ports/vcpkg-tool-meson/portfile.cmake
@@ -5,17 +5,17 @@
 set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
 
 set(program MESON)
-set(program_version 0.60.2)
+set(program_version 0.62.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 5e9b709ad0b34d8ac920dff057a5361080c0889b)
+set(ref bb91cea0d66d8d036063dedec1f194d663399cdf)
 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 5fb89c6b81f75825b6f300039db6dae9d907c81403a8ebe30c7426729d5cb3179e30b9b84d6ed756c2aa39ca34ea681afa0c5cd78835a94c43d5ab25e625abd0)
+set(download_sha512 e5888eb35dd4ab5fc0a16143cfbb5a7849f6d705e211a80baf0a8b753e2cf877a4587860a79cad129ec5f3474c12a73558ffe66439b1633d80b8044eceaff2da)
 set(supported_on_unix ON)
 set(version_command --version)
 set(extra_search_args EXACT_VERSION_MATCH)
@@ -46,10 +46,11 @@ if(NOT "${program}")
     file(RENAME "${CURRENT_PACKAGES_DIR}/tools/meson-${ref}" "${CURRENT_PACKAGES_DIR}/tools/meson")
     z_vcpkg_apply_patches(
         SOURCE_PATH "${CURRENT_PACKAGES_DIR}"
-        PATCHES meson-intl.patch
-                fix_linker_detection.patch
+        PATCHES
+            meson-intl.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)
 endif()
 
 z_vcpkg_find_acquire_program_find_internal("${program}"

diff --git a/ports/vcpkg-tool-meson/vcpkg-port-config.cmake b/ports/vcpkg-tool-meson/vcpkg-port-config.cmake
@@ -0,0 +1 @@
+set(SCRIPT_MESON "${CMAKE_CURRENT_LIST_DIR}/../../tools/meson/meson.py")
diff --git a/ports/vcpkg-tool-meson/vcpkg.json b/ports/vcpkg-tool-meson/vcpkg.json
@@ -1,8 +1,8 @@
 {
   "name": "vcpkg-tool-meson",
-  "version": "0.60.2",
-  "port-version": 2,
+  "version": "0.62.1",
   "description": "Meson build system",
   "homepage": "https://github.com/mesonbuild/meson",
+  "license": "Apache-2.0",
   "supports": "native"
 }
diff --git a/versions/baseline.json b/versions/baseline.json
@@ -2589,8 +2589,8 @@
       "port-version": 0
     },
     "gobject-introspection": {
-      "baseline": "1.70.0",
-      "port-version": 1
+      "baseline": "1.72.0",
+      "port-version": 0
     },
     "google-cloud-cpp": {
       "baseline": "1.40.1",
@@ -7377,8 +7377,8 @@
       "port-version": 0
     },
     "vcpkg-tool-meson": {
-      "baseline": "0.60.2",
-      "port-version": 2
+      "baseline": "0.62.1",
+      "port-version": 0
     },
     "vcpkg-tool-mozbuild": {
       "baseline": "3.3",

diff --git a/versions/g-/gobject-introspection.json b/versions/g-/gobject-introspection.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7af27cca9283357e5b7447e5a1c6583afc50c793",
+      "version": "1.72.0",
+      "port-version": 0
+    },
     {
       "git-tree": "a39c3bd1142fd69e6dba29cf3bd4c7e93b049406",
       "version": "1.70.0",

diff --git a/versions/v-/vcpkg-tool-meson.json b/versions/v-/vcpkg-tool-meson.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e35f24d912749fa1de06cb3cf533028e6f363398",
+      "version": "0.62.1",
+      "port-version": 0
+    },
     {
       "git-tree": "6fe7cf1649af5d90c1e88765411a463cac55e99c",
       "version": "0.60.2",
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		set(SCRIPT_MESON "${CMAKE_CURRENT_LIST_DIR}/../../tools/meson/meson.py")