microsoft · BillyONeal · Mar 11, 2024 · Nov 30, 2022 · Nov 30, 2022 · Dec 2, 2022
diff --git a/ports/glib/libintl.patch b/ports/glib/libintl.patch
@@ -9,7 +9,7 @@ index f44fa2d4e..d465253af 100644
 -libintl_deps = []
 -libintl = dependency('intl', required: false, allow_fallback: false)
 -if libintl.found()
-+libintl = dependency('Intl', method:'cmake', required: true)
++libintl = dependency('intl', required : true)
 +libintl_deps = [libintl]
 +if false
    # libintl supports different threading APIs, which may not

diff --git a/ports/glib/vcpkg.json b/ports/glib/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "glib",
   "version": "2.75.3",
+  "port-version": 1,
   "description": "Portable, general-purpose utility library.",
   "homepage": "https://developer.gnome.org/glib/",
   "license": "LGPL-2.1-or-later",

diff --git a/ports/gobject-introspection/portfile.cmake b/ports/gobject-introspection/portfile.cmake
@@ -15,7 +15,6 @@ vcpkg_extract_source_archive_ex(
         0001-g-ir-tool-template.in.patch
         0002-cross-build.patch
         0003-fix-paths.patch
-        python.patch
 )
 
 vcpkg_find_acquire_program(FLEX)

diff --git a/ports/gobject-introspection/python.patch b/ports/gobject-introspection/python.patch
diff --git a/ports/gobject-introspection/vcpkg.json b/ports/gobject-introspection/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "gobject-introspection",
   "version": "1.72.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "A middleware layer between C libraries (using GObject) and language bindings.",
   "homepage": "https://gi.readthedocs.io/en/latest/",
   "license": null,

diff --git a/ports/thorvg/portfile.cmake b/ports/thorvg/portfile.cmake
@@ -15,9 +15,6 @@ else()
 endif()
 
 if ("tools" IN_LIST FEATURES)
-    if(VCPKG_TARGET_IS_WINDOWS)
-        message(FATAL_ERROR "This feature doesn't support Windows platform")
-    endif()
     list(APPEND BUILD_OPTIONS -Dtools=all)
 endif()
 
@@ -26,10 +23,10 @@ vcpkg_configure_meson(
     OPTIONS
         ${BUILD_OPTIONS}
         # see ${SOURCE_PATH}/meson_options.txt
-        -Dengines=sw
+        -Dengines=['sw']
         -Dloaders=all
         -Dsavers=tvg
-        -Dvector=true
+        -Dvector=true # This assumes AVX
         -Dbindings=capi
         -Dtests=false
         -Dexamples=false

diff --git a/ports/thorvg/vcpkg.json b/ports/thorvg/vcpkg.json
@@ -1,19 +1,23 @@
 {
   "name": "thorvg",
   "version": "0.8.3",
+  "port-version": 1,
   "description": "ThorVG is a platform-independent portable library for drawing vector-based scenes and animations",
   "homepage": "https://www.thorvg.org",
   "license": "MIT",
   "supports": "!(arm & uwp)",
   "dependencies": [
+    "libjpeg-turbo",
+    "libpng",
     {
       "name": "vcpkg-tool-meson",
       "host": true
     }
   ],
   "features": {
     "tools": {
-      "description": "Build tools"
+      "description": "Build tools",
+      "supports": "!windows"
     }
   }
 }
diff --git a/ports/vcpkg-tool-meson/11259.diff b/ports/vcpkg-tool-meson/11259.diff
@@ -0,0 +1,35 @@
+diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
+index c583024d27f..093e2efb1cf 100644
+--- a/mesonbuild/backend/ninjabackend.py
++++ b/mesonbuild/backend/ninjabackend.py
+@@ -512,8 +512,8 @@ def detect_vs_dep_prefix(self, tempfilename):
+         for compiler in self.environment.coredata.compilers.host.values():
+             # Have to detect the dependency format
+
+-            # IFort on windows is MSVC like, but doesn't have /showincludes
+-            if compiler.language == 'fortran':
++            # IFort / masm on windows is MSVC like, but doesn't have /showincludes
++            if compiler.language in {'fortran', 'masm'}:
+                 continue
+             if compiler.id == 'pgi' and mesonlib.is_windows():
+                 # for the purpose of this function, PGI doesn't act enough like MSVC
+@@ -523,8 +523,9 @@ def detect_vs_dep_prefix(self, tempfilename):
+         else:
+             # None of our compilers are MSVC, we're done.
+             return open(tempfilename, 'a', encoding='utf-8')
++        filebase = 'incdetect.' + compilers.lang_suffixes[compiler.language][0]
+         filename = os.path.join(self.environment.get_scratch_dir(),
+-                                'incdetect.c')
++                                filebase)
+         with open(filename, 'w', encoding='utf-8') as f:
+             f.write(dedent('''\
+                 #include<stdio.h>
+@@ -536,7 +537,7 @@ def detect_vs_dep_prefix(self, tempfilename):
+         # Python strings leads to failure. We _must_ do this detection
+         # in raw byte mode and write the result in raw bytes.
+         pc = subprocess.Popen(compiler.get_exelist() +
+-                              ['/showIncludes', '/c', 'incdetect.c'],
++                              ['/showIncludes', '/c', filebase],
+                               cwd=self.environment.get_scratch_dir(),
+                               stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+         (stdout, stderr) = pc.communicate()
diff --git a/ports/vcpkg-tool-meson/meson-intl.patch b/ports/vcpkg-tool-meson/meson-intl.patch
@@ -1,7 +1,7 @@
-diff --git a/tools/meson/mesonbuild/dependencies/misc.py b/tools/meson/mesonbuild/dependencies/misc.py
+diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py
 index 537af1f89..43d7febf2 100644
---- a/tools/meson/mesonbuild/dependencies/misc.py
-+++ b/tools/meson/mesonbuild/dependencies/misc.py
+--- a/mesonbuild/dependencies/misc.py
++++ b/mesonbuild/dependencies/misc.py
 @@ -610,7 +610,8 @@ iconv_factory = DependencyFactory(
 
  intl_factory = DependencyFactory(

diff --git a/ports/vcpkg-tool-meson/portfile.cmake b/ports/vcpkg-tool-meson/portfile.cmake
@@ -2,62 +2,16 @@
 # In the future, it is expected that this port acquires and installs Meson.
 # Currently is used in ports that call vcpkg_find_acquire_program(MESON) in order to force rebuilds.
 
-set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+set(VCPKG_POLICY_CMAKE_HELPER_PORT enabled)
 
-set(program MESON)
-set(program_version 0.63.0)
-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(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(supported_on_unix ON)
-set(version_command --version)
-set(extra_search_args EXACT_VERSION_MATCH)
+configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-port-config.cmake" @ONLY)
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg_configure_meson.cmake"
+             "${CMAKE_CURRENT_LIST_DIR}/vcpkg_install_meson.cmake"
+             "${CMAKE_CURRENT_LIST_DIR}/meson-intl.patch"
+             "${CMAKE_CURRENT_LIST_DIR}/python-lib-dep.patch"
+             "${CMAKE_CURRENT_LIST_DIR}/11259.diff"
+             DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 
-vcpkg_find_acquire_program(PYTHON3)
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/meson/version.txt" "${VERSION}") # For vcpkg_find_acquire_program
 
-# Reenable if no patching of meson is required within vcpkg
-# z_vcpkg_find_acquire_program_find_external("${program}"
-#    ${extra_search_args}
-#    PROGRAM_NAME "${program_name}"
-#    MIN_VERSION "${program_version}"
-#    INTERPRETER "${interpreter}"
-#    NAMES ${search_names}
-#    VERSION_COMMAND ${version_command}
-# )
-
-if(NOT "${program}")
-    vcpkg_download_distfile(archive_path
-        URLS ${download_urls}
-        SHA512 "${download_sha512}"
-        FILENAME "${download_filename}"
-    )
-    file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools")
-    vcpkg_execute_in_download_mode(
-                        COMMAND "${CMAKE_COMMAND}" -E tar xzf "${archive_path}"
-                        WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools"
-                    )
-    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
-    )
-    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}"
-    INTERPRETER "${interpreter}"
-    PATHS ${paths_to_search}
-    NAMES ${search_names}
-)
-
-message(STATUS "Using meson: ${MESON}")
-file(WRITE "${CURRENT_PACKAGES_DIR}/share/meson/version.txt" "${program_version}") # For vcpkg_find_acquire_program
+file(INSTALL "${VCPKG_ROOT_DIR}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/vcpkg-tool-meson/python-lib-dep.patch b/ports/vcpkg-tool-meson/python-lib-dep.patch
@@ -0,0 +1,16 @@
+diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
+index 84ec524..2789134 100644
+--- a/mesonbuild/modules/python.py
++++ b/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))
diff --git a/ports/vcpkg-tool-meson/vcpkg-port-config.cmake b/ports/vcpkg-tool-meson/vcpkg-port-config.cmake
@@ -1 +1,58 @@
-set(SCRIPT_MESON "${CMAKE_CURRENT_LIST_DIR}/../../tools/meson/meson.py")
+# Overwrite builtin scripts
+include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_configure_meson.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_install_meson.cmake")
+
+# Check required python version
+vcpkg_find_acquire_program(PYTHON3)
+vcpkg_execute_required_process(COMMAND "${PYTHON3}" --version
+            WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}"
+            LOGNAME "python3-version-${TARGET_TRIPLET}")
+
+file(READ "${CURRENT_BUILDTREES_DIR}/python3-version-${TARGET_TRIPLET}-out.log" version_contents)
+string(REGEX MATCH [[[0-9]+\.[0-9]+\.[0-9]+]] python_ver "${version_contents}")
+
+set(min_required 3.7)
+if(python_ver VERSION_LESS "${min_required}")
+    message(FATAL_ERROR "Found Python version '${python_ver} at ${PYTHON3}' is insufficient for meson. meson requires at least version '${min_required}'")
+else()
+    message(STATUS "Found Python version '${python_ver} at ${PYTHON3}'")
+endif()
+
+# Setup meson:
+set(program MESON)
+set(program_version 1.0.0)
+set(program_name meson)
+set(search_names meson meson.py)
+set(ref 05f85c79454e206e00c6ced5b6fc25ffcafed39c)
+set(path_to_search "${DOWNLOADS}/tools/meson-${program_version}")
+set(download_urls "https://github.com/mesonbuild/meson/archive/${ref}.tar.gz")
+set(download_filename "meson-${ref}.tar.gz")
+set(download_sha512 b4744b9cc28d85d6c7df9199e74fb695930b3af5d065035c6728b5883b5df4faae9ce1dcc0461c3fc28c68d854c6daf4edef5e7e448ba2eabff9fe8e9e4650d9)
+
+find_program(SCRIPT_MESON NAMES ${search_names} PATHS "${path_to_search}" NO_DEFAULT_PATH) # NO_DEFAULT_PATH due top patching
+
+if(NOT SCRIPT_MESON)
+    vcpkg_download_distfile(archive_path
+        URLS ${download_urls}
+        SHA512 "${download_sha512}"
+        FILENAME "${download_filename}"
+
+    )
+    file(MAKE_DIRECTORY "${path_to_search}/../")
+    file(ARCHIVE_EXTRACT INPUT "${archive_path}"
+        DESTINATION "${path_to_search}/../"
+        #PATTERNS "**/mesonbuild/*" "**/*.py"
+        )
+    file(REMOVE_RECURSE "${path_to_search}/../meson-${ref}/test cases/")
+    file(RENAME "${path_to_search}/../meson-${ref}" "${path_to_search}")
+    z_vcpkg_apply_patches(
+        SOURCE_PATH "${path_to_search}"
+        PATCHES
+            "${CMAKE_CURRENT_LIST_DIR}/meson-intl.patch"
+            "${CMAKE_CURRENT_LIST_DIR}/python-lib-dep.patch"
+            "${CMAKE_CURRENT_LIST_DIR}/11259.diff"
+    )
+    set(SCRIPT_MESON "${DOWNLOADS}/tools/meson-${program_version}/meson.py")
+endif()
+
+message(STATUS "Using meson: ${SCRIPT_MESON}")
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": "0.63",
+  "version": "1.0.0",
   "description": "Meson build system",
   "homepage": "https://github.com/mesonbuild/meson",
   "license": "Apache-2.0",