From 5f36007465100c08e3526cd86c26edb6f41bb029 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 30 Nov 2022 18:10:13 +0100 Subject: [PATCH 01/85] update meson --- ports/vcpkg-tool-meson/portfile.cmake | 6 +++--- ports/vcpkg-tool-meson/vcpkg.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/vcpkg-tool-meson/portfile.cmake b/ports/vcpkg-tool-meson/portfile.cmake index 680083a4591628..0aee2c93a62d05 100644 --- 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.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) diff --git a/ports/vcpkg-tool-meson/vcpkg.json b/ports/vcpkg-tool-meson/vcpkg.json index 70c9690af8578c..7bfe6c7de085eb 100644 --- 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": "0.64.1", "description": "Meson build system", "homepage": "https://github.com/mesonbuild/meson", "license": "Apache-2.0", From 12664f7ba84aae7fb009ce5fe3430c9fe6373436 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 30 Nov 2022 18:10:51 +0100 Subject: [PATCH 02/85] v db --- versions/baseline.json | 2 +- versions/v-/vcpkg-tool-meson.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 99f1323a831598..bb5a43656cbb39 100644 --- a/versions/baseline.json +++ b/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": { diff --git a/versions/v-/vcpkg-tool-meson.json b/versions/v-/vcpkg-tool-meson.json index 742ccaecdb36b2..c4e8fabe552f82 100644 --- a/versions/v-/vcpkg-tool-meson.json +++ b/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", From e8a9ec38ec309aa7039c2b4062189bdeaa333e9e Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 2 Dec 2022 09:47:24 +0100 Subject: [PATCH 03/85] install old python module --- ports/vcpkg-tool-meson/portfile.cmake | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ports/vcpkg-tool-meson/portfile.cmake b/ports/vcpkg-tool-meson/portfile.cmake index 0aee2c93a62d05..cd2f4d1431d92a 100644 --- a/ports/vcpkg-tool-meson/portfile.cmake +++ b/ports/vcpkg-tool-meson/portfile.cmake @@ -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}" @@ -51,6 +57,7 @@ if(NOT "${program}") ) 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}" From d2f214aae8e1cff8a7eeed604f947d2a5b5c0ecd Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 2 Dec 2022 22:04:25 +0100 Subject: [PATCH 04/85] remove automatic python lib linkage. --- ports/vcpkg-tool-meson/portfile.cmake | 1 + .../remove-python-lib-dep.patch | 23 +++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 ports/vcpkg-tool-meson/remove-python-lib-dep.patch diff --git a/ports/vcpkg-tool-meson/portfile.cmake b/ports/vcpkg-tool-meson/portfile.cmake index cd2f4d1431d92a..9052208f4d5080 100644 --- a/ports/vcpkg-tool-meson/portfile.cmake +++ b/ports/vcpkg-tool-meson/portfile.cmake @@ -54,6 +54,7 @@ if(NOT "${program}") SOURCE_PATH "${CURRENT_PACKAGES_DIR}" PATCHES meson-intl.patch + remove-python-lib-dep.patch # to avoid auto linking the wrong python libs for python extensions ) 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) diff --git a/ports/vcpkg-tool-meson/remove-python-lib-dep.patch b/ports/vcpkg-tool-meson/remove-python-lib-dep.patch new file mode 100644 index 00000000000000..1b60a25fba0da2 --- /dev/null +++ b/ports/vcpkg-tool-meson/remove-python-lib-dep.patch @@ -0,0 +1,23 @@ +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 +@@ -534,12 +534,12 @@ class PythonInstallation(ExternalProgramHolder): + new_deps.append(dep) + if not has_pydep: + pydep = self._dependency_method_impl({}) +- if not pydep.found(): +- raise mesonlib.MesonException('Python dependency not found') +- new_deps.append(pydep) +- FeatureNew.single_use('python_installation.extension_module with implicit dependency on python', +- '0.63.0', self.subproject, 'use python_installation.dependency()', +- self.current_node) ++ # if not pydep.found(): ++ # raise mesonlib.MesonException('Python dependency not found') ++ # new_deps.append(pydep) ++ # FeatureNew.single_use('python_installation.extension_module with implicit dependency on python', ++ # '0.63.0', self.subproject, 'use python_installation.dependency()', ++ # self.current_node) + kwargs['dependencies'] = new_deps + + # msys2's python3 has "-cpython-36m.dll", we have to be clever From 9b82b998240555d0689319a8565a678092b74eb6 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 2 Dec 2022 22:09:05 +0100 Subject: [PATCH 05/85] fix patch --- ports/vcpkg-tool-meson/remove-python-lib-dep.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/vcpkg-tool-meson/remove-python-lib-dep.patch b/ports/vcpkg-tool-meson/remove-python-lib-dep.patch index 1b60a25fba0da2..c68a42989fad40 100644 --- a/ports/vcpkg-tool-meson/remove-python-lib-dep.patch +++ b/ports/vcpkg-tool-meson/remove-python-lib-dep.patch @@ -1,7 +1,7 @@ -diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py +diff --git a/tools/meson/mesonbuild/modules/python.py b/tools/meson/mesonbuild/modules/python.py index 84ec524..2789134 100644 ---- a/mesonbuild/modules/python.py -+++ b/mesonbuild/modules/python.py +--- a/tools/meson/mesonbuild/modules/python.py ++++ b/tools/meson/mesonbuild/modules/python.py @@ -534,12 +534,12 @@ class PythonInstallation(ExternalProgramHolder): new_deps.append(dep) if not has_pydep: From deaeb1938946e281b4f9708442a56068b9ebf007 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 5 Dec 2022 13:13:16 +0100 Subject: [PATCH 06/85] fix python dep --- ports/vcpkg-tool-meson/portfile.cmake | 2 +- ports/vcpkg-tool-meson/python-lib-dep.patch | 16 +++++++++++++ .../remove-python-lib-dep.patch | 23 ------------------- 3 files changed, 17 insertions(+), 24 deletions(-) create mode 100644 ports/vcpkg-tool-meson/python-lib-dep.patch delete mode 100644 ports/vcpkg-tool-meson/remove-python-lib-dep.patch diff --git a/ports/vcpkg-tool-meson/portfile.cmake b/ports/vcpkg-tool-meson/portfile.cmake index 9052208f4d5080..2c61a9167f4108 100644 --- a/ports/vcpkg-tool-meson/portfile.cmake +++ b/ports/vcpkg-tool-meson/portfile.cmake @@ -54,7 +54,7 @@ if(NOT "${program}") SOURCE_PATH "${CURRENT_PACKAGES_DIR}" PATCHES meson-intl.patch - remove-python-lib-dep.patch # to avoid auto linking the wrong python libs for python extensions + 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) diff --git a/ports/vcpkg-tool-meson/python-lib-dep.patch b/ports/vcpkg-tool-meson/python-lib-dep.patch new file mode 100644 index 00000000000000..4073c371cf6b22 --- /dev/null +++ b/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)) diff --git a/ports/vcpkg-tool-meson/remove-python-lib-dep.patch b/ports/vcpkg-tool-meson/remove-python-lib-dep.patch deleted file mode 100644 index c68a42989fad40..00000000000000 --- a/ports/vcpkg-tool-meson/remove-python-lib-dep.patch +++ /dev/null @@ -1,23 +0,0 @@ -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 -@@ -534,12 +534,12 @@ class PythonInstallation(ExternalProgramHolder): - new_deps.append(dep) - if not has_pydep: - pydep = self._dependency_method_impl({}) -- if not pydep.found(): -- raise mesonlib.MesonException('Python dependency not found') -- new_deps.append(pydep) -- FeatureNew.single_use('python_installation.extension_module with implicit dependency on python', -- '0.63.0', self.subproject, 'use python_installation.dependency()', -- self.current_node) -+ # if not pydep.found(): -+ # raise mesonlib.MesonException('Python dependency not found') -+ # new_deps.append(pydep) -+ # FeatureNew.single_use('python_installation.extension_module with implicit dependency on python', -+ # '0.63.0', self.subproject, 'use python_installation.dependency()', -+ # self.current_node) - kwargs['dependencies'] = new_deps - - # msys2's python3 has "-cpython-36m.dll", we have to be clever From cb360de2843eebc762097f4721ef75e6701281d4 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 5 Dec 2022 13:14:35 +0100 Subject: [PATCH 07/85] remove python setting so that it can be passed via the portfile if necessary. --- scripts/buildsystems/meson/meson.template.in | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/buildsystems/meson/meson.template.in b/scripts/buildsystems/meson/meson.template.in index 995d39b30cc506..f8c8a3a30fcffc 100644 --- a/scripts/buildsystems/meson/meson.template.in +++ b/scripts/buildsystems/meson/meson.template.in @@ -1,6 +1,5 @@ [binaries] cmake = ['@CMAKE_COMMAND@'] -python = ['@PYTHON3@'] ninja = ['@NINJA@'] pkgconfig= ['@PKGCONFIG@'] @MESON_MT@ From 82ab77adba811f8f8156bf34bde8c053db6a788c Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 5 Dec 2022 13:15:14 +0100 Subject: [PATCH 08/85] remove python patch --- ports/gobject-introspection/portfile.cmake | 1 - ports/gobject-introspection/python.patch | 29 ---------------------- 2 files changed, 30 deletions(-) delete mode 100644 ports/gobject-introspection/python.patch diff --git a/ports/gobject-introspection/portfile.cmake b/ports/gobject-introspection/portfile.cmake index 24458ac628b16f..4186bcea758f0e 100644 --- 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 deleted file mode 100644 index 5a196ae6525319..00000000000000 --- a/ports/gobject-introspection/python.patch +++ /dev/null @@ -1,29 +0,0 @@ -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) - From 6aabafa94034f6e042994dab9e2ff6842940375b Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 5 Dec 2022 15:47:21 +0100 Subject: [PATCH 09/85] Remove old module installation --- ports/vcpkg-tool-meson/portfile.cmake | 7 ------- 1 file changed, 7 deletions(-) diff --git a/ports/vcpkg-tool-meson/portfile.cmake b/ports/vcpkg-tool-meson/portfile.cmake index 2c61a9167f4108..d45064eb3173a6 100644 --- a/ports/vcpkg-tool-meson/portfile.cmake +++ b/ports/vcpkg-tool-meson/portfile.cmake @@ -33,12 +33,6 @@ 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}" @@ -58,7 +52,6 @@ if(NOT "${program}") ) 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}" From d4a693bcf21393214cf6e51e1a51a324d58676ab Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 6 Dec 2022 21:07:32 +0100 Subject: [PATCH 10/85] remove everything except for osx --- scripts/azure-pipelines/azure-pipelines.yml | 54 --------------------- 1 file changed, 54 deletions(-) diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 52237b76fc04fe..96b468ed732ec3 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -13,61 +13,7 @@ parameters: default: 'use default' jobs: -- template: windows/azure-pipelines.yml - parameters: - triplet: x86-windows - jobName: x86_windows - poolName: $(windows-pool) - vcpkgToolSha: ${{ parameters.vcpkgToolSha }} - -- template: windows/azure-pipelines.yml - parameters: - triplet: x64-windows - jobName: x64_windows - poolName: $(windows-pool) - vcpkgToolSha: ${{ parameters.vcpkgToolSha }} - -- template: windows/azure-pipelines.yml - parameters: - triplet: x64-windows-static - jobName: x64_windows_static - poolName: $(windows-pool) - vcpkgToolSha: ${{ parameters.vcpkgToolSha }} - -- template: windows/azure-pipelines.yml - parameters: - triplet: x64-windows-static-md - jobName: x64_windows_static_md - poolName: $(windows-pool) - vcpkgToolSha: ${{ parameters.vcpkgToolSha }} - -- template: windows/azure-pipelines.yml - parameters: - triplet: x64-uwp - jobName: x64_uwp - poolName: $(windows-pool) - vcpkgToolSha: ${{ parameters.vcpkgToolSha }} - -- template: windows/azure-pipelines.yml - parameters: - triplet: arm64-windows - jobName: arm64_windows - poolName: $(windows-pool) - vcpkgToolSha: ${{ parameters.vcpkgToolSha }} - -- template: windows/azure-pipelines.yml - parameters: - triplet: arm-uwp - jobName: arm_uwp - poolName: $(windows-pool) - vcpkgToolSha: ${{ parameters.vcpkgToolSha }} - - template: osx/azure-pipelines.yml parameters: poolName: $(osx-pool) vcpkgToolSha: ${{ parameters.vcpkgToolSha }} - -- template: linux/azure-pipelines.yml - parameters: - poolName: $(linux-pool) - vcpkgToolSha: ${{ parameters.vcpkgToolSha }} From 2a0c322b711fc087f25ce96cee1a068b096f5ec7 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 6 Dec 2022 21:08:55 +0100 Subject: [PATCH 11/85] kill zlib --- ports/zlib/portfile.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/zlib/portfile.cmake b/ports/zlib/portfile.cmake index 450cb2c1915b25..9c9f9ac3582565 100644 --- a/ports/zlib/portfile.cmake +++ b/ports/zlib/portfile.cmake @@ -51,3 +51,5 @@ endif() file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +message(FATAL_ERROR "Kill zlib") \ No newline at end of file From 9e4e1de524d145ba5f20f5d0e335c4c333c95a78 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 6 Dec 2022 21:10:51 +0100 Subject: [PATCH 12/85] use build.x_args --- scripts/cmake/vcpkg_configure_meson.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index c80e818fcf3962..c6048d74acad86 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -102,6 +102,7 @@ function(z_vcpkg_meson_set_flags_variables config_type) set(langlower cpp) endif() set(MESON_${lang_mapping}FLAGS "${langlower}_args = ${${lang}flags}\n") + string(APPEND MESON_${lang_mapping}FLAGS "build.${langlower}_args = ${${lang}flags}\n") set(linker_flags "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_${config_type}}") z_vcpkg_meson_convert_compiler_flags_to_list(linker_flags "${linker_flags}") vcpkg_list(APPEND linker_flags "${libpath}") From 88472692005c3b6357db21314b7bc1544a670667 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 6 Dec 2022 21:23:43 +0100 Subject: [PATCH 13/85] use build. also for the linker --- scripts/cmake/vcpkg_configure_meson.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index c6048d74acad86..ecf678e52f2280 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -108,6 +108,7 @@ function(z_vcpkg_meson_set_flags_variables config_type) vcpkg_list(APPEND linker_flags "${libpath}") z_vcpkg_meson_convert_list_to_python_array(linker_flags ${linker_flags}) string(APPEND MESON_${lang_mapping}FLAGS "${langlower}_link_args = ${linker_flags}") + string(APPEND MESON_${lang_mapping}FLAGS "build.${langlower}_link_args = ${linker_flags}") set(MESON_${lang_mapping}FLAGS "${MESON_${lang_mapping}FLAGS}" PARENT_SCOPE) endforeach() endfunction() From b45ebe1b79055cd2b60c2751655b063b7f027805 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 6 Dec 2022 21:33:28 +0100 Subject: [PATCH 14/85] add missing \n --- scripts/cmake/vcpkg_configure_meson.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index ecf678e52f2280..2479a3bc20723a 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -107,7 +107,7 @@ function(z_vcpkg_meson_set_flags_variables config_type) z_vcpkg_meson_convert_compiler_flags_to_list(linker_flags "${linker_flags}") vcpkg_list(APPEND linker_flags "${libpath}") z_vcpkg_meson_convert_list_to_python_array(linker_flags ${linker_flags}) - string(APPEND MESON_${lang_mapping}FLAGS "${langlower}_link_args = ${linker_flags}") + string(APPEND MESON_${lang_mapping}FLAGS "${langlower}_link_args = ${linker_flags}\n") string(APPEND MESON_${lang_mapping}FLAGS "build.${langlower}_link_args = ${linker_flags}") set(MESON_${lang_mapping}FLAGS "${MESON_${lang_mapping}FLAGS}" PARENT_SCOPE) endforeach() From a8eeebe05e9823f832dc3dde20d85f0f737c17f9 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 5 Jan 2023 13:03:28 +0100 Subject: [PATCH 15/85] update to 1.0 and check python version --- ports/vcpkg-tool-meson/portfile.cmake | 22 +++++++++++++++++++--- ports/vcpkg-tool-meson/vcpkg.json | 2 +- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/ports/vcpkg-tool-meson/portfile.cmake b/ports/vcpkg-tool-meson/portfile.cmake index d45064eb3173a6..8982129344a561 100644 --- 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.64.1) +set(program_version 1.0.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 e000aa11373298c6c07e264d4436b5075210bd11) +set(ref 05f85c79454e206e00c6ced5b6fc25ffcafed39c) 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 a51f799183bdcf309b52487e3b98b7b9a83379c411375369b24fdb1ebd3eedd550b922fe98117040c8033c8b476a12c9e730c67c403efa711802dfdca88c34c8) +set(download_sha512 b4744b9cc28d85d6c7df9199e74fb695930b3af5d065035c6728b5883b5df4faae9ce1dcc0461c3fc28c68d854c6daf4edef5e7e448ba2eabff9fe8e9e4650d9) set(supported_on_unix ON) set(version_command --version) set(extra_search_args EXACT_VERSION_MATCH) @@ -62,3 +62,19 @@ z_vcpkg_find_acquire_program_find_internal("${program}" message(STATUS "Using meson: ${MESON}") file(WRITE "${CURRENT_PACKAGES_DIR}/share/meson/version.txt" "${program_version}") # For vcpkg_find_acquire_program + + +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() \ No newline at end of file diff --git a/ports/vcpkg-tool-meson/vcpkg.json b/ports/vcpkg-tool-meson/vcpkg.json index 7bfe6c7de085eb..ff28dd0f60073e 100644 --- a/ports/vcpkg-tool-meson/vcpkg.json +++ b/ports/vcpkg-tool-meson/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vcpkg-tool-meson", - "version": "0.64.1", + "version": "1.0.0", "description": "Meson build system", "homepage": "https://github.com/mesonbuild/meson", "license": "Apache-2.0", From af4f35497d411f1db8d1b69fa4f55d75f3540b36 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 5 Jan 2023 13:03:48 +0100 Subject: [PATCH 16/85] pass compiler flags via prog variables for sanity checks --- scripts/cmake/vcpkg_configure_meson.cmake | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index 2479a3bc20723a..0b19ec332a77e3 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -34,19 +34,28 @@ function(z_vcpkg_meson_set_proglist_variables config_type) if(VCPKG_DETECTED_CMAKE_${prog}_COMPILER) string(TOUPPER "MESON_${prog}" var_to_set) if(meson_${prog}) - set("${var_to_set}" "${meson_${prog}} = ['${VCPKG_DETECTED_CMAKE_${prog}_COMPILER}']" PARENT_SCOPE) + if(VCPKG_DETECTED_CMAKE_${prog}_FLAGS_${config_type}) + # Need compiler flags in prog vars for sanity check. + z_vcpkg_meson_convert_compiler_flags_to_list(${prog}flags "${VCPKG_DETECTED_CMAKE_${prog}_FLAGS_${config_type}}") + endif() + list(PREPEND ${prog}flags "${VCPKG_DETECTED_CMAKE_${prog}_COMPILER}") + list(FILTER ${prog}flags EXCLUDE REGEX "(-|/)nologo") # Breaks compiler detection otherwise + z_vcpkg_meson_convert_list_to_python_array(${prog}flags ${${prog}flags}) + set("${var_to_set}" "${meson_${prog}} = ${${prog}flags}" PARENT_SCOPE) if (DEFINED VCPKG_DETECTED_CMAKE_${prog}_COMPILER_ID AND NOT VCPKG_DETECTED_CMAKE_${prog}_COMPILER_ID MATCHES "^(GNU|Intel)$") string(TOUPPER "MESON_${prog}_LD" var_to_set) set(${var_to_set} "${meson_${prog}}_ld = ['${VCPKG_DETECTED_CMAKE_LINKER}']" PARENT_SCOPE) endif() - elseif(${prog} MATCHES RC AND VCPKG_DETECTED_CMAKE_RC_FLAGS_${config_type}) - z_vcpkg_meson_convert_compiler_flags_to_list(rc_flags "${VCPKG_DETECTED_CMAKE_RC_FLAGS_${config_type}}") - list(PREPEND rc_flags "${VCPKG_DETECTED_CMAKE_${prog}_COMPILER}") - z_vcpkg_meson_convert_list_to_python_array(rc_flags ${rc_flags}) - set("${var_to_set}" "${meson_${prog}} = ${rc_flags}" PARENT_SCOPE) else() + if(VCPKG_DETECTED_CMAKE_${prog}_FLAGS_${config_type}) + # Need compiler flags in prog vars for sanity check. + z_vcpkg_meson_convert_compiler_flags_to_list(${prog}flags "${VCPKG_DETECTED_CMAKE_${prog}_FLAGS_${config_type}}") + endif() + list(PREPEND ${prog}flags "${VCPKG_DETECTED_CMAKE_${prog}_COMPILER}") + list(FILTER ${prog}flags EXCLUDE REGEX "(-|/)nologo") # Breaks compiler detection otherwise + z_vcpkg_meson_convert_list_to_python_array(${prog}flags ${${prog}flags}) string(TOLOWER "${prog}" proglower) - set("${var_to_set}" "${proglower} = ['${VCPKG_DETECTED_CMAKE_${prog}_COMPILER}']" PARENT_SCOPE) + set("${var_to_set}" "${proglower} = ${${prog}flags}" PARENT_SCOPE) if (DEFINED VCPKG_DETECTED_CMAKE_${prog}_COMPILER_ID AND NOT VCPKG_DETECTED_CMAKE_${prog}_COMPILER_ID MATCHES "^(GNU|Intel)$") string(TOUPPER "MESON_${prog}_LD" var_to_set) set(${var_to_set} "${proglower}_ld = ['${VCPKG_DETECTED_CMAKE_LINKER}']" PARENT_SCOPE) From 406fe9b2f99fae285abfc0891954f628f67491e3 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 5 Jan 2023 16:18:17 +0100 Subject: [PATCH 17/85] reset stuff --- ports/zlib/portfile.cmake | 2 - scripts/azure-pipelines/azure-pipelines.yml | 54 +++++++++++++++++++++ versions/baseline.json | 2 +- versions/v-/vcpkg-tool-meson.json | 5 -- 4 files changed, 55 insertions(+), 8 deletions(-) diff --git a/ports/zlib/portfile.cmake b/ports/zlib/portfile.cmake index 9c9f9ac3582565..450cb2c1915b25 100644 --- a/ports/zlib/portfile.cmake +++ b/ports/zlib/portfile.cmake @@ -51,5 +51,3 @@ endif() file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -message(FATAL_ERROR "Kill zlib") \ No newline at end of file diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index fda00250fdd604..f23b5e7571dd97 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -13,7 +13,61 @@ parameters: default: 'use default' jobs: +- template: windows/azure-pipelines.yml + parameters: + triplet: x86-windows + jobName: x86_windows + poolName: $(windows-pool) + vcpkgToolSha: ${{ parameters.vcpkgToolSha }} + +- template: windows/azure-pipelines.yml + parameters: + triplet: x64-windows + jobName: x64_windows + poolName: $(windows-pool) + vcpkgToolSha: ${{ parameters.vcpkgToolSha }} + +- template: windows/azure-pipelines.yml + parameters: + triplet: x64-windows-static + jobName: x64_windows_static + poolName: $(windows-pool) + vcpkgToolSha: ${{ parameters.vcpkgToolSha }} + +- template: windows/azure-pipelines.yml + parameters: + triplet: x64-windows-static-md + jobName: x64_windows_static_md + poolName: $(windows-pool) + vcpkgToolSha: ${{ parameters.vcpkgToolSha }} + +- template: windows/azure-pipelines.yml + parameters: + triplet: x64-uwp + jobName: x64_uwp + poolName: $(windows-pool) + vcpkgToolSha: ${{ parameters.vcpkgToolSha }} + +- template: windows/azure-pipelines.yml + parameters: + triplet: arm64-windows + jobName: arm64_windows + poolName: $(windows-pool) + vcpkgToolSha: ${{ parameters.vcpkgToolSha }} + +- template: windows/azure-pipelines.yml + parameters: + triplet: arm-uwp + jobName: arm_uwp + poolName: $(windows-pool) + vcpkgToolSha: ${{ parameters.vcpkgToolSha }} + - template: osx/azure-pipelines.yml parameters: poolName: $(osx-pool) vcpkgToolSha: ${{ parameters.vcpkgToolSha }} + +- template: linux/azure-pipelines.yml + parameters: + poolName: $(linux-pool) + vcpkgToolSha: ${{ parameters.vcpkgToolSha }} diff --git a/versions/baseline.json b/versions/baseline.json index 367526a41f3471..78c308eee60e23 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7921,7 +7921,7 @@ "port-version": 0 }, "vcpkg-tool-meson": { - "baseline": "0.64.1", + "baseline": "0.63", "port-version": 0 }, "vcpkg-tool-mozbuild": { diff --git a/versions/v-/vcpkg-tool-meson.json b/versions/v-/vcpkg-tool-meson.json index c4e8fabe552f82..742ccaecdb36b2 100644 --- a/versions/v-/vcpkg-tool-meson.json +++ b/versions/v-/vcpkg-tool-meson.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "7ac7f928585a6a56f706b7a829e768793555d2c2", - "version": "0.64.1", - "port-version": 0 - }, { "git-tree": "bee0cb6c5edf45133ebc9643b86c9c775ab36cfe", "version": "0.63", From 8e87d29000ec889ff2321eb96a534114b87a8b3d Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 5 Jan 2023 17:05:26 +0100 Subject: [PATCH 18/85] remove build. stuff --- scripts/cmake/vcpkg_configure_meson.cmake | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index 0b19ec332a77e3..66c262d050a03f 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -111,13 +111,11 @@ function(z_vcpkg_meson_set_flags_variables config_type) set(langlower cpp) endif() set(MESON_${lang_mapping}FLAGS "${langlower}_args = ${${lang}flags}\n") - string(APPEND MESON_${lang_mapping}FLAGS "build.${langlower}_args = ${${lang}flags}\n") set(linker_flags "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_${config_type}}") z_vcpkg_meson_convert_compiler_flags_to_list(linker_flags "${linker_flags}") vcpkg_list(APPEND linker_flags "${libpath}") z_vcpkg_meson_convert_list_to_python_array(linker_flags ${linker_flags}) string(APPEND MESON_${lang_mapping}FLAGS "${langlower}_link_args = ${linker_flags}\n") - string(APPEND MESON_${lang_mapping}FLAGS "build.${langlower}_link_args = ${linker_flags}") set(MESON_${lang_mapping}FLAGS "${MESON_${lang_mapping}FLAGS}" PARENT_SCOPE) endforeach() endfunction() From d2658d168eca44a58df2654c33e66c55a0533891 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sat, 7 Jan 2023 21:24:59 +0100 Subject: [PATCH 19/85] fix intl ? --- ports/glib/libintl.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/glib/libintl.patch b/ports/glib/libintl.patch index a718e4dfdec3b7..10685ee3961dfe 100644 --- 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) -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 From 4ad2599e74dbc3cab8f90fd269dd42395b30a2f0 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sat, 7 Jan 2023 21:25:20 +0100 Subject: [PATCH 20/85] bump v --- ports/glib/vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/glib/vcpkg.json b/ports/glib/vcpkg.json index 121b18a96ad1b3..b526b4a2d3d055 100644 --- a/ports/glib/vcpkg.json +++ b/ports/glib/vcpkg.json @@ -1,6 +1,7 @@ { "name": "glib", "version": "2.75.1", + "port-version": 1, "description": "Portable, general-purpose utility library.", "homepage": "https://developer.gnome.org/glib/", "license": "LGPL-2.1-or-later", From ae524246b97763431265cda58a8afa549683fd50 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sat, 7 Jan 2023 21:33:35 +0100 Subject: [PATCH 21/85] bump gobject introspection --- ports/gobject-introspection/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/gobject-introspection/vcpkg.json b/ports/gobject-introspection/vcpkg.json index ed8a0fa75f17b3..4229867e8808e0 100644 --- 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, From fd44704a5ba7efc0fd1c0590180a890d2821824f Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sat, 7 Jan 2023 23:12:39 +0100 Subject: [PATCH 22/85] fix thorvg --- ports/thorvg/portfile.cmake | 8 +++----- ports/thorvg/remove-default-options.patch | 12 ++++++++++++ ports/thorvg/vcpkg.json | 6 +++++- 3 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 ports/thorvg/remove-default-options.patch diff --git a/ports/thorvg/portfile.cmake b/ports/thorvg/portfile.cmake index 7df690d976612a..15bfeec5463059 100644 --- a/ports/thorvg/portfile.cmake +++ b/ports/thorvg/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES install-tools.patch + remove-default-options.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -15,9 +16,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 +24,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/remove-default-options.patch b/ports/thorvg/remove-default-options.patch new file mode 100644 index 00000000000000..3f2d9e5cedc3aa --- /dev/null +++ b/ports/thorvg/remove-default-options.patch @@ -0,0 +1,12 @@ +diff --git a/meson.build b/meson.build +index d273a5c35..56197b867 100644 +--- a/meson.build ++++ b/meson.build +@@ -1,6 +1,6 @@ + project('thorvg', + 'cpp', +- default_options : ['buildtype=debugoptimized', 'b_sanitize=none', 'werror=false', 'optimization=s', 'cpp_std=c++14'], ++ default_options : ['cpp_std=c++14'], + version : '0.8.3', + license : 'MIT') + diff --git a/ports/thorvg/vcpkg.json b/ports/thorvg/vcpkg.json index c7244c34633915..bc9d9088e5b4ac 100644 --- a/ports/thorvg/vcpkg.json +++ b/ports/thorvg/vcpkg.json @@ -1,11 +1,14 @@ { "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 @@ -13,7 +16,8 @@ ], "features": { "tools": { - "description": "Build tools" + "description": "Build tools", + "supports": "!windows" } } } From 4d52e120eba359c661a9c03a7cde85608e56b4aa Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sat, 7 Jan 2023 23:15:52 +0100 Subject: [PATCH 23/85] v db --- versions/baseline.json | 8 ++++---- versions/g-/glib.json | 5 +++++ versions/g-/gobject-introspection.json | 5 +++++ versions/t-/thorvg.json | 5 +++++ versions/v-/vcpkg-tool-meson.json | 5 +++++ 5 files changed, 24 insertions(+), 4 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 186f4c1c02606c..d9c07f89f6bf6c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2690,7 +2690,7 @@ }, "glib": { "baseline": "2.75.1", - "port-version": 0 + "port-version": 1 }, "glibmm": { "baseline": "2.74.0", @@ -2742,7 +2742,7 @@ }, "gobject-introspection": { "baseline": "1.72.0", - "port-version": 1 + "port-version": 2 }, "google-cloud-cpp": { "baseline": "2.6.0", @@ -7502,7 +7502,7 @@ }, "thorvg": { "baseline": "0.8.3", - "port-version": 0 + "port-version": 1 }, "threadpool": { "baseline": "0.2.5", @@ -7929,7 +7929,7 @@ "port-version": 0 }, "vcpkg-tool-meson": { - "baseline": "0.63", + "baseline": "1.0.0", "port-version": 0 }, "vcpkg-tool-mozbuild": { diff --git a/versions/g-/glib.json b/versions/g-/glib.json index cde8dc0730acf0..2a3c88ffaf3b1f 100644 --- a/versions/g-/glib.json +++ b/versions/g-/glib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "db33526bed732a5c40ab0f1140a033b06d7f1247", + "version": "2.75.1", + "port-version": 1 + }, { "git-tree": "8f7840ed02d20169b1610123b0f35463c81c523d", "version": "2.75.1", diff --git a/versions/g-/gobject-introspection.json b/versions/g-/gobject-introspection.json index e9f5654798e570..4c95a8ee988d27 100644 --- a/versions/g-/gobject-introspection.json +++ b/versions/g-/gobject-introspection.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1578a870b47a530861ee60d629f5e080a91a23b5", + "version": "1.72.0", + "port-version": 2 + }, { "git-tree": "a74d57d679dac22f5b60c5b7da97cad7ecb3d0fb", "version": "1.72.0", diff --git a/versions/t-/thorvg.json b/versions/t-/thorvg.json index 5d0cb293954d11..033ae6824f7fe8 100644 --- a/versions/t-/thorvg.json +++ b/versions/t-/thorvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "df9374cd718b8fc51256402a22eaf6a4b616d7a0", + "version": "0.8.3", + "port-version": 1 + }, { "git-tree": "0ca8e329f991f2fc88a65508cd83401882aac41c", "version": "0.8.3", diff --git a/versions/v-/vcpkg-tool-meson.json b/versions/v-/vcpkg-tool-meson.json index 742ccaecdb36b2..c3ffaa649a2aee 100644 --- a/versions/v-/vcpkg-tool-meson.json +++ b/versions/v-/vcpkg-tool-meson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eed4af321fcff098837f563e7cc8da24887fcba2", + "version": "1.0.0", + "port-version": 0 + }, { "git-tree": "bee0cb6c5edf45133ebc9643b86c9c775ab36cfe", "version": "0.63", From 99d5587f00c7a8927599f5af47ddaa2093f0541e Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sun, 8 Jan 2023 21:27:25 +0100 Subject: [PATCH 24/85] fix uwp toolchain for meson. --- scripts/toolchains/uwp.cmake | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/scripts/toolchains/uwp.cmake b/scripts/toolchains/uwp.cmake index 9e76d4512dc723..d69a974f988cd3 100644 --- a/scripts/toolchains/uwp.cmake +++ b/scripts/toolchains/uwp.cmake @@ -60,8 +60,8 @@ if(NOT _CMAKE_IN_TRY_COMPILE) # CMake has problems to correctly pass this in the compiler test so probably need special care in get_cmake_vars #set(_vcpkg_winmd_flag "/FU\\\\\"${_vcpkg_vctools}/lib/x86/store/references/platform.winmd\\\\\"") # VS normally passes /ZW for Apps - set(CMAKE_CXX_FLAGS "${_vcpkg_cpp_flags} ${_vcpkg_common_flags} ${_vcpkg_winmd_flag} ${_vcpkg_charset} ${VCPKG_CXX_FLAGS}" CACHE STRING "") - set(CMAKE_C_FLAGS "${_vcpkg_cpp_flags} ${_vcpkg_common_flags} ${_vcpkg_winmd_flag} ${_vcpkg_charset} ${VCPKG_C_FLAGS}" CACHE STRING "") + set(CMAKE_CXX_FLAGS "/TP ${_vcpkg_cpp_flags} ${_vcpkg_common_flags} ${_vcpkg_winmd_flag} ${_vcpkg_charset} ${VCPKG_CXX_FLAGS}" CACHE STRING "") + set(CMAKE_C_FLAGS "/TC ${_vcpkg_cpp_flags} ${_vcpkg_common_flags} ${_vcpkg_winmd_flag} ${_vcpkg_charset} ${VCPKG_C_FLAGS}" CACHE STRING "") set(CMAKE_RC_FLAGS "-c65001 ${_vcpkg_cpp_flags}" CACHE STRING "") unset(_vcpkg_charset) @@ -80,14 +80,17 @@ if(NOT _CMAKE_IN_TRY_COMPILE) if(CMAKE_GENERATOR MATCHES "Ninja") set(additional_exe_flags "/WINMD") # VS Generator chokes on this in the compiler detection endif() - string(APPEND CMAKE_SHARED_LINKER_FLAGS " /MANIFEST:NO /NXCOMPAT /DYNAMICBASE /DEBUG /WINMD:NO /APPCONTAINER /SUBSYSTEM:CONSOLE /MANIFESTUAC:NO ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_RELEASE}") + string(APPEND CMAKE_SHARED_LINKER_FLAGS " /MANIFEST:NO /NXCOMPAT /DYNAMICBASE /DEBUG /WINMD:NO /APPCONTAINER /SUBSYSTEM:CONSOLE /MANIFESTUAC:NO ${VCPKG_LINKER_FLAGS}") + string(APPEND CMAKE_MODULE_LINKER_FLAGS " /MANIFEST:NO /NXCOMPAT /DYNAMICBASE /DEBUG /WINMD:NO /APPCONTAINER /SUBSYSTEM:CONSOLE /MANIFESTUAC:NO ${VCPKG_LINKER_FLAGS}") # VS adds /DEBUG:FULL /TLBID:1. WindowsApp.lib is in CMAKE_C|CXX_STANDARD_LIBRARIES - string(APPEND CMAKE_EXE_LINKER_FLAGS " /MANIFEST:NO /NXCOMPAT /DYNAMICBASE /DEBUG ${additional_exe_flags} /APPCONTAINER /MANIFESTUAC:NO ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_RELEASE}") + string(APPEND CMAKE_EXE_LINKER_FLAGS " /MANIFEST:NO /NXCOMPAT /DYNAMICBASE /DEBUG ${additional_exe_flags} /APPCONTAINER /MANIFESTUAC:NO ${VCPKG_LINKER_FLAGS}") - set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "/DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF " CACHE STRING "") # VS uses /LTCG:incremental - set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF " CACHE STRING "") + set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "/DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF ${VCPKG_LINKER_FLAGS_RELEASE}" CACHE STRING "") # VS uses /LTCG:incremental + set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "/DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF ${VCPKG_LINKER_FLAGS_RELEASE}" CACHE STRING "") # VS uses /LTCG:incremental + set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF ${VCPKG_LINKER_FLAGS_RELEASE}" CACHE STRING "") string(APPEND CMAKE_STATIC_LINKER_FLAGS_DEBUG_INIT " /nologo ") string(APPEND CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT " /nologo ") + string(APPEND CMAKE_MODULE_LINKER_FLAGS_DEBUG_INIT " /nologo ") string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT " /nologo ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_DEBUG} ") endif() endif() From ce09cceae377923cb40266f9d11f425c77ecb0e2 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sun, 8 Jan 2023 22:47:23 +0100 Subject: [PATCH 25/85] meson fixes. --- ports/thorvg/portfile.cmake | 1 - ports/thorvg/remove-default-options.patch | 12 -------- ports/vcpkg-tool-meson/11259.diff | 35 +++++++++++++++++++++++ ports/vcpkg-tool-meson/portfile.cmake | 1 + scripts/cmake/vcpkg_configure_meson.cmake | 2 +- 5 files changed, 37 insertions(+), 14 deletions(-) delete mode 100644 ports/thorvg/remove-default-options.patch create mode 100644 ports/vcpkg-tool-meson/11259.diff diff --git a/ports/thorvg/portfile.cmake b/ports/thorvg/portfile.cmake index 15bfeec5463059..deb07f9436d6ae 100644 --- a/ports/thorvg/portfile.cmake +++ b/ports/thorvg/portfile.cmake @@ -6,7 +6,6 @@ vcpkg_from_github( HEAD_REF master PATCHES install-tools.patch - remove-default-options.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") diff --git a/ports/thorvg/remove-default-options.patch b/ports/thorvg/remove-default-options.patch deleted file mode 100644 index 3f2d9e5cedc3aa..00000000000000 --- a/ports/thorvg/remove-default-options.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/meson.build b/meson.build -index d273a5c35..56197b867 100644 ---- a/meson.build -+++ b/meson.build -@@ -1,6 +1,6 @@ - project('thorvg', - 'cpp', -- default_options : ['buildtype=debugoptimized', 'b_sanitize=none', 'werror=false', 'optimization=s', 'cpp_std=c++14'], -+ default_options : ['cpp_std=c++14'], - version : '0.8.3', - license : 'MIT') - diff --git a/ports/vcpkg-tool-meson/11259.diff b/ports/vcpkg-tool-meson/11259.diff new file mode 100644 index 00000000000000..0a504e38d5f8fd --- /dev/null +++ b/ports/vcpkg-tool-meson/11259.diff @@ -0,0 +1,35 @@ +diff --git a/tools/meson/mesonbuild/backend/ninjabackend.py b/tools/meson/mesonbuild/backend/ninjabackend.py +index c583024d27f..093e2efb1cf 100644 +--- a/tools/meson/mesonbuild/backend/ninjabackend.py ++++ b/tools/meson/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 +@@ -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/portfile.cmake b/ports/vcpkg-tool-meson/portfile.cmake index 8982129344a561..271aabf1391dbd 100644 --- a/ports/vcpkg-tool-meson/portfile.cmake +++ b/ports/vcpkg-tool-meson/portfile.cmake @@ -49,6 +49,7 @@ if(NOT "${program}") PATCHES meson-intl.patch python-lib-dep.patch + 11259.diff ) 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) diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index 66c262d050a03f..a8e9178967303e 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -357,7 +357,7 @@ function(vcpkg_configure_meson) set(meson_input_file_${buildname} "${CURRENT_BUILDTREES_DIR}/meson-${TARGET_TRIPLET}-${suffix_${buildname}}.log") endif() - vcpkg_list(APPEND arg_OPTIONS --buildtype plain --backend ninja --wrap-mode nodownload) + vcpkg_list(APPEND arg_OPTIONS --backend ninja --wrap-mode nodownload -Dbuildtype=plain -Doptimization=plain) z_vcpkg_get_build_and_host_system(MESON_HOST_MACHINE MESON_BUILD_MACHINE IS_CROSS) From 7a62d91853513eb15ede6f1dd13086b5597e11bc Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 9 Jan 2023 07:06:40 +0100 Subject: [PATCH 26/85] remove /TC and /TP flag --- scripts/toolchains/uwp.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/toolchains/uwp.cmake b/scripts/toolchains/uwp.cmake index d69a974f988cd3..35122eb0d18bb8 100644 --- a/scripts/toolchains/uwp.cmake +++ b/scripts/toolchains/uwp.cmake @@ -60,8 +60,8 @@ if(NOT _CMAKE_IN_TRY_COMPILE) # CMake has problems to correctly pass this in the compiler test so probably need special care in get_cmake_vars #set(_vcpkg_winmd_flag "/FU\\\\\"${_vcpkg_vctools}/lib/x86/store/references/platform.winmd\\\\\"") # VS normally passes /ZW for Apps - set(CMAKE_CXX_FLAGS "/TP ${_vcpkg_cpp_flags} ${_vcpkg_common_flags} ${_vcpkg_winmd_flag} ${_vcpkg_charset} ${VCPKG_CXX_FLAGS}" CACHE STRING "") - set(CMAKE_C_FLAGS "/TC ${_vcpkg_cpp_flags} ${_vcpkg_common_flags} ${_vcpkg_winmd_flag} ${_vcpkg_charset} ${VCPKG_C_FLAGS}" CACHE STRING "") + set(CMAKE_CXX_FLAGS "${_vcpkg_cpp_flags} ${_vcpkg_common_flags} ${_vcpkg_winmd_flag} ${_vcpkg_charset} ${VCPKG_CXX_FLAGS}" CACHE STRING "") + set(CMAKE_C_FLAGS "${_vcpkg_cpp_flags} ${_vcpkg_common_flags} ${_vcpkg_winmd_flag} ${_vcpkg_charset} ${VCPKG_C_FLAGS}" CACHE STRING "") set(CMAKE_RC_FLAGS "-c65001 ${_vcpkg_cpp_flags}" CACHE STRING "") unset(_vcpkg_charset) From 680e38e1495c908f91b4e38ca166a1024af52394 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 9 Jan 2023 13:27:49 +0100 Subject: [PATCH 27/85] v db --- versions/t-/thorvg.json | 2 +- versions/v-/vcpkg-tool-meson.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/t-/thorvg.json b/versions/t-/thorvg.json index 033ae6824f7fe8..80b804d49843ab 100644 --- a/versions/t-/thorvg.json +++ b/versions/t-/thorvg.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "df9374cd718b8fc51256402a22eaf6a4b616d7a0", + "git-tree": "ca7dcd44e1d7debb1c5ea4d4d990be8b785822ea", "version": "0.8.3", "port-version": 1 }, diff --git a/versions/v-/vcpkg-tool-meson.json b/versions/v-/vcpkg-tool-meson.json index c3ffaa649a2aee..db788a6149a18b 100644 --- a/versions/v-/vcpkg-tool-meson.json +++ b/versions/v-/vcpkg-tool-meson.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "eed4af321fcff098837f563e7cc8da24887fcba2", + "git-tree": "e94898d89c5fc42476d551f5ff3ab4b7d535b05f", "version": "1.0.0", "port-version": 0 }, From a19f3d080caebbe76a3a0eb43ed635eedb2454b9 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 23 Feb 2023 21:54:46 +0100 Subject: [PATCH 28/85] move meson to DOWNLOADS. move meson scripts into vcpkg-tool-meson --- ports/vcpkg-tool-meson/11259.diff | 6 +- ports/vcpkg-tool-meson/meson-intl.patch | 6 +- ports/vcpkg-tool-meson/portfile.cmake | 84 +--- ports/vcpkg-tool-meson/python-lib-dep.patch | 6 +- .../vcpkg-tool-meson/vcpkg-port-config.cmake | 66 ++- .../vcpkg_configure_meson.cmake | 458 ++++++++++++++++++ .../vcpkg_install_meson.cmake | 71 +++ 7 files changed, 612 insertions(+), 85 deletions(-) create mode 100644 ports/vcpkg-tool-meson/vcpkg_configure_meson.cmake create mode 100644 ports/vcpkg-tool-meson/vcpkg_install_meson.cmake diff --git a/ports/vcpkg-tool-meson/11259.diff b/ports/vcpkg-tool-meson/11259.diff index 0a504e38d5f8fd..d7192be9ddc161 100644 --- a/ports/vcpkg-tool-meson/11259.diff +++ b/ports/vcpkg-tool-meson/11259.diff @@ -1,7 +1,7 @@ -diff --git a/tools/meson/mesonbuild/backend/ninjabackend.py b/tools/meson/mesonbuild/backend/ninjabackend.py +diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index c583024d27f..093e2efb1cf 100644 ---- a/tools/meson/mesonbuild/backend/ninjabackend.py -+++ b/tools/meson/mesonbuild/backend/ninjabackend.py +--- 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 diff --git a/ports/vcpkg-tool-meson/meson-intl.patch b/ports/vcpkg-tool-meson/meson-intl.patch index 614db056d6acfa..5d741d843c09db 100644 --- 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 index 271aabf1391dbd..82598d5f9d2735 100644 --- a/ports/vcpkg-tool-meson/portfile.cmake +++ b/ports/vcpkg-tool-meson/portfile.cmake @@ -2,80 +2,14 @@ # 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 1.0.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 05f85c79454e206e00c6ced5b6fc25ffcafed39c) -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 b4744b9cc28d85d6c7df9199e74fb695930b3af5d065035c6728b5883b5df4faae9ce1dcc0461c3fc28c68d854c6daf4edef5e7e448ba2eabff9fe8e9e4650d9) -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) - -# 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 - python-lib-dep.patch - 11259.diff - ) - 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 - - -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() \ No newline at end of file +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 index 4073c371cf6b22..3a33056d3d6efc 100644 --- a/ports/vcpkg-tool-meson/python-lib-dep.patch +++ b/ports/vcpkg-tool-meson/python-lib-dep.patch @@ -1,7 +1,7 @@ -diff --git a/tools/meson/mesonbuild/modules/python.py b/tools/meson/mesonbuild/modules/python.py +diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py index 84ec524..2789134 100644 ---- a/tools/meson/mesonbuild/modules/python.py -+++ b/tools/meson/mesonbuild/modules/python.py +--- 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) diff --git a/ports/vcpkg-tool-meson/vcpkg-port-config.cmake b/ports/vcpkg-tool-meson/vcpkg-port-config.cmake index 887c4adbec0c8a..d91a7039807eba 100644 --- a/ports/vcpkg-tool-meson/vcpkg-port-config.cmake +++ b/ports/vcpkg-tool-meson/vcpkg-port-config.cmake @@ -1 +1,65 @@ -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(interpreter PYTHON3) +set(apt_package_name "meson") +set(brew_package_name "meson") +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) +set(supported_on_unix ON) +set(version_command --version) +set(extra_search_args EXACT_VERSION_MATCH) + +find_program(SCRIPT_MESON NAMES meson meson.py 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}/meson-${program_version}/meson.py") +endif() + +message(STATUS "Using meson: ${SCRIPT_MESON}") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/meson/version.txt" "${program_version}") # For vcpkg_find_acquire_program \ No newline at end of file diff --git a/ports/vcpkg-tool-meson/vcpkg_configure_meson.cmake b/ports/vcpkg-tool-meson/vcpkg_configure_meson.cmake new file mode 100644 index 00000000000000..42b4ac2175c0c1 --- /dev/null +++ b/ports/vcpkg-tool-meson/vcpkg_configure_meson.cmake @@ -0,0 +1,458 @@ +function(z_vcpkg_meson_set_proglist_variables config_type) + if(VCPKG_TARGET_IS_WINDOWS) + set(proglist MT AR) + else() + set(proglist AR RANLIB STRIP NM OBJDUMP DLLTOOL MT) + endif() + foreach(prog IN LISTS proglist) + if(VCPKG_DETECTED_CMAKE_${prog}) + if(meson_${prog}) + string(TOUPPER "MESON_${meson_${prog}}" var_to_set) + set("${var_to_set}" "${meson_${prog}} = ['${VCPKG_DETECTED_CMAKE_${prog}}']" PARENT_SCOPE) + elseif(${prog} STREQUAL AR AND VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${config_type}) + # Probably need to move AR somewhere else + string(TOLOWER "${prog}" proglower) + z_vcpkg_meson_convert_compiler_flags_to_list(ar_flags "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${config_type}}") + list(PREPEND ar_flags "${VCPKG_DETECTED_CMAKE_${prog}}") + z_vcpkg_meson_convert_list_to_python_array(ar_flags ${ar_flags}) + set("MESON_AR" "${proglower} = ${ar_flags}" PARENT_SCOPE) + else() + string(TOUPPER "MESON_${prog}" var_to_set) + string(TOLOWER "${prog}" proglower) + set("${var_to_set}" "${proglower} = ['${VCPKG_DETECTED_CMAKE_${prog}}']" PARENT_SCOPE) + endif() + endif() + endforeach() + set(compilers "${arg_LANGUAGES}") + if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND compilers RC) + endif() + set(meson_RC windres) + set(meson_Fortran fc) + set(meson_CXX cpp) + foreach(prog IN LISTS compilers) + if(VCPKG_DETECTED_CMAKE_${prog}_COMPILER) + string(TOUPPER "MESON_${prog}" var_to_set) + if(meson_${prog}) + if(VCPKG_DETECTED_CMAKE_${prog}_FLAGS_${config_type}) + # Need compiler flags in prog vars for sanity check. + z_vcpkg_meson_convert_compiler_flags_to_list(${prog}flags "${VCPKG_DETECTED_CMAKE_${prog}_FLAGS_${config_type}}") + endif() + list(PREPEND ${prog}flags "${VCPKG_DETECTED_CMAKE_${prog}_COMPILER}") + list(FILTER ${prog}flags EXCLUDE REGEX "(-|/)nologo") # Breaks compiler detection otherwise + z_vcpkg_meson_convert_list_to_python_array(${prog}flags ${${prog}flags}) + set("${var_to_set}" "${meson_${prog}} = ${${prog}flags}" PARENT_SCOPE) + if (DEFINED VCPKG_DETECTED_CMAKE_${prog}_COMPILER_ID AND NOT VCPKG_DETECTED_CMAKE_${prog}_COMPILER_ID MATCHES "^(GNU|Intel)$") + string(TOUPPER "MESON_${prog}_LD" var_to_set) + set(${var_to_set} "${meson_${prog}}_ld = ['${VCPKG_DETECTED_CMAKE_LINKER}']" PARENT_SCOPE) + endif() + else() + if(VCPKG_DETECTED_CMAKE_${prog}_FLAGS_${config_type}) + # Need compiler flags in prog vars for sanity check. + z_vcpkg_meson_convert_compiler_flags_to_list(${prog}flags "${VCPKG_DETECTED_CMAKE_${prog}_FLAGS_${config_type}}") + endif() + list(PREPEND ${prog}flags "${VCPKG_DETECTED_CMAKE_${prog}_COMPILER}") + list(FILTER ${prog}flags EXCLUDE REGEX "(-|/)nologo") # Breaks compiler detection otherwise + z_vcpkg_meson_convert_list_to_python_array(${prog}flags ${${prog}flags}) + string(TOLOWER "${prog}" proglower) + set("${var_to_set}" "${proglower} = ${${prog}flags}" PARENT_SCOPE) + if (DEFINED VCPKG_DETECTED_CMAKE_${prog}_COMPILER_ID AND NOT VCPKG_DETECTED_CMAKE_${prog}_COMPILER_ID MATCHES "^(GNU|Intel)$") + string(TOUPPER "MESON_${prog}_LD" var_to_set) + set(${var_to_set} "${proglower}_ld = ['${VCPKG_DETECTED_CMAKE_LINKER}']" PARENT_SCOPE) + endif() + endif() + endif() + endforeach() +endfunction() + +function(z_vcpkg_meson_convert_compiler_flags_to_list out_var compiler_flags) + string(REPLACE ";" [[\;]] tmp_var "${compiler_flags}") + string(REGEX REPLACE [=[( +|^)((\"(\\"|[^"])+"|\\"|\\ |[^ ])+)]=] ";\\2" tmp_var "${tmp_var}") + vcpkg_list(POP_FRONT tmp_var) # The first element is always empty due to the above replacement + list(TRANSFORM tmp_var STRIP) # Strip leading trailing whitespaces from each element in the list. + set("${out_var}" "${tmp_var}" PARENT_SCOPE) +endfunction() + +function(z_vcpkg_meson_convert_list_to_python_array out_var) + z_vcpkg_function_arguments(flag_list 1) + vcpkg_list(REMOVE_ITEM flag_list "") # remove empty elements if any + vcpkg_list(JOIN flag_list "', '" flag_list) + set("${out_var}" "['${flag_list}']" PARENT_SCOPE) +endfunction() + +# Generates the required compiler properties for meson +function(z_vcpkg_meson_set_flags_variables config_type) + if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + set(libpath_flag /LIBPATH:) + else() + set(libpath_flag -L) + endif() + if(config_type STREQUAL "DEBUG") + set(path_suffix "/debug") + else() + set(path_suffix "") + endif() + + set(includepath "-I${CURRENT_INSTALLED_DIR}/include") + set(libpath "${libpath_flag}${CURRENT_INSTALLED_DIR}${path_suffix}/lib") + + foreach(lang IN LISTS arg_LANGUAGES) + z_vcpkg_meson_convert_compiler_flags_to_list(${lang}flags "${VCPKG_DETECTED_CMAKE_${lang}_FLAGS_${config_type}}") + if(lang MATCHES "^(C|CXX)$") + vcpkg_list(APPEND ${lang}flags "${includepath}") + endif() + z_vcpkg_meson_convert_list_to_python_array(${lang}flags ${${lang}flags}) + set(lang_mapping "${lang}") + if(lang STREQUAL "Fortran") + set(lang_mapping "FC") + endif() + string(TOLOWER "${lang_mapping}" langlower) + if(lang STREQUAL "CXX") + set(langlower cpp) + endif() + set(MESON_${lang_mapping}FLAGS "${langlower}_args = ${${lang}flags}\n") + set(linker_flags "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_${config_type}}") + z_vcpkg_meson_convert_compiler_flags_to_list(linker_flags "${linker_flags}") + vcpkg_list(APPEND linker_flags "${libpath}") + z_vcpkg_meson_convert_list_to_python_array(linker_flags ${linker_flags}) + string(APPEND MESON_${lang_mapping}FLAGS "${langlower}_link_args = ${linker_flags}\n") + set(MESON_${lang_mapping}FLAGS "${MESON_${lang_mapping}FLAGS}" PARENT_SCOPE) + endforeach() +endfunction() + +function(z_vcpkg_get_build_and_host_system build_system host_system is_cross) #https://mesonbuild.com/Cross-compilation.html + set(build_unknown FALSE) + if(CMAKE_HOST_WIN32) + if(DEFINED ENV{PROCESSOR_ARCHITEW6432}) + set(build_arch $ENV{PROCESSOR_ARCHITEW6432}) + else() + set(build_arch $ENV{PROCESSOR_ARCHITECTURE}) + endif() + if(build_arch MATCHES "(amd|AMD)64") + set(build_cpu_fam x86_64) + set(build_cpu x86_64) + elseif(build_arch MATCHES "(x|X)86") + set(build_cpu_fam x86) + set(build_cpu i686) + elseif(build_arch MATCHES "^(ARM|arm)64$") + set(build_cpu_fam aarch64) + set(build_cpu armv8) + elseif(build_arch MATCHES "^(ARM|arm)$") + set(build_cpu_fam arm) + set(build_cpu armv7hl) + else() + if(NOT DEFINED VCPKG_MESON_CROSS_FILE OR NOT DEFINED VCPKG_MESON_NATIVE_FILE) + message(WARNING "Unsupported build architecture ${build_arch}! Please set VCPKG_MESON_(CROSS|NATIVE)_FILE to a meson file containing the build_machine entry!") + endif() + set(build_unknown TRUE) + endif() + elseif(CMAKE_HOST_UNIX) + # at this stage, CMAKE_HOST_SYSTEM_PROCESSOR is not defined + execute_process( + COMMAND uname -m + OUTPUT_VARIABLE MACHINE + OUTPUT_STRIP_TRAILING_WHITESPACE + COMMAND_ERROR_IS_FATAL ANY) + + # Show real machine architecture to visually understand whether we are in a native Apple Silicon terminal or running under Rosetta emulation + debug_message("Machine: ${MACHINE}") + + if(MACHINE MATCHES "arm64|aarch64") + set(build_cpu_fam aarch64) + set(build_cpu armv8) + elseif(MACHINE MATCHES "armv7h?l") + set(build_cpu_fam arm) + set(build_cpu ${MACHINE}) + elseif(MACHINE MATCHES "x86_64|amd64") + set(build_cpu_fam x86_64) + set(build_cpu x86_64) + elseif(MACHINE MATCHES "x86|i686") + set(build_cpu_fam x86) + set(build_cpu i686) + elseif(MACHINE MATCHES "i386") + set(build_cpu_fam x86) + set(build_cpu i386) + elseif(MACHINE MATCHES "loongarch64") + set(build_cpu_fam loongarch64) + set(build_cpu loongarch64) + else() + # https://github.com/mesonbuild/meson/blob/master/docs/markdown/Reference-tables.md#cpu-families + if(NOT DEFINED VCPKG_MESON_CROSS_FILE OR NOT DEFINED VCPKG_MESON_NATIVE_FILE) + message(WARNING "Unhandled machine: ${MACHINE}! Please set VCPKG_MESON_(CROSS|NATIVE)_FILE to a meson file containing the build_machine entry!") + endif() + set(build_unknown TRUE) + endif() + else() + if(NOT DEFINED VCPKG_MESON_CROSS_FILE OR NOT DEFINED VCPKG_MESON_NATIVE_FILE) + message(WARNING "Failed to detect the build architecture! Please set VCPKG_MESON_(CROSS|NATIVE)_FILE to a meson file containing the build_machine entry!") + endif() + set(build_unknown TRUE) + endif() + + set(build "[build_machine]\n") # Machine the build is performed on + string(APPEND build "endian = 'little'\n") + if(WIN32) + string(APPEND build "system = 'windows'\n") + elseif(DARWIN) + string(APPEND build "system = 'darwin'\n") + elseif(CYGWIN) + string(APPEND build "system = 'cygwin'\n") + elseif(UNIX) + string(APPEND build "system = 'linux'\n") + else() + set(build_unknown TRUE) + endif() + + if(DEFINED build_cpu_fam) + string(APPEND build "cpu_family = '${build_cpu_fam}'\n") + endif() + if(DEFINED build_cpu) + string(APPEND build "cpu = '${build_cpu}'") + endif() + if(NOT build_unknown) + set(${build_system} "${build}" PARENT_SCOPE) + endif() + + set(host_unkown FALSE) + if(VCPKG_TARGET_ARCHITECTURE MATCHES "(amd|AMD|x|X)64") + set(host_cpu_fam x86_64) + set(host_cpu x86_64) + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "(x|X)86") + set(host_cpu_fam x86) + set(host_cpu i686) + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "^(ARM|arm)64$") + set(host_cpu_fam aarch64) + set(host_cpu armv8) + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "^(ARM|arm)$") + set(host_cpu_fam arm) + set(host_cpu armv7hl) + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "loongarch64") + set(host_cpu_fam loongarch64) + set(host_cpu loongarch64) + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "wasm32") + set(host_cpu_fam wasm32) + set(host_cpu wasm32) + else() + if(NOT DEFINED VCPKG_MESON_CROSS_FILE OR NOT DEFINED VCPKG_MESON_NATIVE_FILE) + message(WARNING "Unsupported target architecture ${VCPKG_TARGET_ARCHITECTURE}! Please set VCPKG_MESON_(CROSS|NATIVE)_FILE to a meson file containing the host_machine entry!" ) + endif() + set(host_unkown TRUE) + endif() + + set(host "[host_machine]\n") # host=target in vcpkg. + string(APPEND host "endian = 'little'\n") + if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_TARGET_IS_MINGW OR VCPKG_TARGET_IS_UWP) + set(meson_system_name "windows") + else() + string(TOLOWER "${VCPKG_CMAKE_SYSTEM_NAME}" meson_system_name) + endif() + string(APPEND host "system = '${meson_system_name}'\n") + string(APPEND host "cpu_family = '${host_cpu_fam}'\n") + string(APPEND host "cpu = '${host_cpu}'") + if(NOT host_unkown) + set(${host_system} "${host}" PARENT_SCOPE) + endif() + + if(NOT build_cpu_fam MATCHES "${host_cpu_fam}" + OR VCPKG_TARGET_IS_ANDROID OR VCPKG_TARGET_IS_IOS OR VCPKG_TARGET_IS_UWP + OR (VCPKG_TARGET_IS_MINGW AND NOT WIN32)) + set(${is_cross} TRUE PARENT_SCOPE) + endif() +endfunction() + +function(z_vcpkg_meson_setup_extra_windows_variables config_type) + ## b_vscrt + if(VCPKG_CRT_LINKAGE STREQUAL "static") + set(crt_type "mt") + else() + set(crt_type "md") + endif() + if(config_type STREQUAL "DEBUG") + set(crt_type "${crt_type}d") + endif() + set(MESON_VSCRT_LINKAGE "b_vscrt = '${crt_type}'" PARENT_SCOPE) + ## winlibs + separate_arguments(c_winlibs NATIVE_COMMAND "${VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES}") + separate_arguments(cpp_winlibs NATIVE_COMMAND "${VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES}") + z_vcpkg_meson_convert_list_to_python_array(c_winlibs ${c_winlibs}) + z_vcpkg_meson_convert_list_to_python_array(cpp_winlibs ${cpp_winlibs}) + set(MESON_WINLIBS "c_winlibs = ${c_winlibs}\n") + string(APPEND MESON_WINLIBS "cpp_winlibs = ${cpp_winlibs}") + set(MESON_WINLIBS "${MESON_WINLIBS}" PARENT_SCOPE) +endfunction() + +function(z_vcpkg_meson_setup_variables config_type) + set(meson_var_list VSCRT_LINKAGE WINLIBS MT AR RC C C_LD CXX CXX_LD OBJC OBJC_LD OBJCXX OBJCXX_LD FC FC_LD WINDRES CFLAGS CXXFLAGS OBJCFLAGS OBJCXXFLAGS FCFLAGS SHARED_LINKER_FLAGS) + foreach(var IN LISTS meson_var_list) + set(MESON_${var} "") + endforeach() + + if(VCPKG_TARGET_IS_WINDOWS) + z_vcpkg_meson_setup_extra_windows_variables("${config_type}") + endif() + + z_vcpkg_meson_set_proglist_variables("${config_type}") + z_vcpkg_meson_set_flags_variables("${config_type}") + + foreach(var IN LISTS meson_var_list) + set(MESON_${var} "${MESON_${var}}" PARENT_SCOPE) + endforeach() +endfunction() + +function(vcpkg_configure_meson) + # parse parameters such that semicolons in options arguments to COMMAND don't get erased + cmake_parse_arguments(PARSE_ARGV 0 arg + "NO_PKG_CONFIG" + "SOURCE_PATH" + "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;LANGUAGES;ADDITIONAL_BINARIES;ADDITIONAL_NATIVE_BINARIES;ADDITIONAL_CROSS_BINARIES" + ) + + if(NOT arg_LANGUAGES) + set(arg_LANGUAGES C CXX) + endif() + + if(DEFINED arg_ADDITIONAL_NATIVE_BINARIES OR DEFINED arg_ADDITIONAL_CROSS_BINARIES) + message(WARNING "Options ADDITIONAL_(NATIVE|CROSS)_BINARIES have been deprecated. Only use ADDITIONAL_BINARIES!") + endif() + + vcpkg_list(APPEND arg_ADDITIONAL_BINARIES ${arg_ADDITIONAL_NATIVE_BINARIES} ${arg_ADDITIONAL_CROSS_BINARIES}) + vcpkg_list(REMOVE_DUPLICATES arg_ADDITIONAL_BINARIES) + vcpkg_list(JOIN arg_ADDITIONAL_BINARIES "\n" MESON_ADDITIONAL_BINARIES) + + file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + + if(NOT VCPKG_CHAINLOAD_TOOLCHAIN_FILE) + z_vcpkg_select_default_vcpkg_chainload_toolchain() + endif() + z_vcpkg_get_cmake_vars(cmake_vars_file) + debug_message("Including cmake vars from: ${cmake_vars_file}") + include("${cmake_vars_file}") + + vcpkg_find_acquire_program(MESON) + + get_filename_component(CMAKE_PATH "${CMAKE_COMMAND}" DIRECTORY) + vcpkg_add_to_path("${CMAKE_PATH}" PREPEND) # Make CMake invokeable for Meson + + vcpkg_find_acquire_program(PYTHON3) + get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) + vcpkg_add_to_path("${PYTHON3_DIR}") + + vcpkg_find_acquire_program(NINJA) + get_filename_component(NINJA_PATH ${NINJA} DIRECTORY) + vcpkg_add_to_path(PREPEND "${NINJA_PATH}") # Prepend to use the correct ninja. + + set(buildtypes "") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + set(buildname "DEBUG") + vcpkg_list(APPEND buildtypes "${buildname}") + set(path_suffix_${buildname} "debug/") + set(suffix_${buildname} "dbg") + set(meson_input_file_${buildname} "${CURRENT_BUILDTREES_DIR}/meson-${TARGET_TRIPLET}-${suffix_${buildname}}.log") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + set(buildname "RELEASE") + vcpkg_list(APPEND buildtypes "${buildname}") + set(path_suffix_${buildname} "") + set(suffix_${buildname} "rel") + set(meson_input_file_${buildname} "${CURRENT_BUILDTREES_DIR}/meson-${TARGET_TRIPLET}-${suffix_${buildname}}.log") + endif() + + vcpkg_list(APPEND arg_OPTIONS --backend ninja --wrap-mode nodownload -Dbuildtype=plain -Doptimization=plain) + + z_vcpkg_get_build_and_host_system(MESON_HOST_MACHINE MESON_BUILD_MACHINE IS_CROSS) + + if(IS_CROSS) + # VCPKG_CROSSCOMPILING is not used since it regresses a lot of ports in x64-windows-x triplets + # For consistency this should proably be changed in the future? + vcpkg_list(APPEND arg_OPTIONS --native "${SCRIPTS}/buildsystems/meson/none.txt") + vcpkg_list(APPEND arg_OPTIONS_DEBUG --cross "${meson_input_file_DEBUG}") + vcpkg_list(APPEND arg_OPTIONS_RELEASE --cross "${meson_input_file_RELEASE}") + else() + vcpkg_list(APPEND arg_OPTIONS_DEBUG --native "${meson_input_file_DEBUG}") + vcpkg_list(APPEND arg_OPTIONS_RELEASE --native "${meson_input_file_RELEASE}") + endif() + + # User provided cross/native files + if(VCPKG_MESON_NATIVE_FILE) + vcpkg_list(APPEND arg_OPTIONS_RELEASE --native "${VCPKG_MESON_NATIVE_FILE}") + endif() + if(VCPKG_MESON_NATIVE_FILE_RELEASE) + vcpkg_list(APPEND arg_OPTIONS_RELEASE --native "${VCPKG_MESON_NATIVE_FILE_RELEASE}") + endif() + if(VCPKG_MESON_NATIVE_FILE_DEBUG) + vcpkg_list(APPEND arg_OPTIONS_DEBUG --native "${VCPKG_MESON_NATIVE_FILE_DEBUG}") + endif() + if(VCPKG_MESON_CROSS_FILE) + vcpkg_list(APPEND arg_OPTIONS_RELEASE --cross "${VCPKG_MESON_CROSS_FILE}") + endif() + if(VCPKG_MESON_CROSS_FILE_RELEASE) + vcpkg_list(APPEND arg_OPTIONS_RELEASE --cross "${VCPKG_MESON_CROSS_FILE_RELEASE}") + endif() + if(VCPKG_MESON_CROSS_FILE_DEBUG) + vcpkg_list(APPEND arg_OPTIONS_DEBUG --cross "${VCPKG_MESON_CROSS_FILE_DEBUG}") + endif() + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(MESON_DEFAULT_LIBRARY shared) + else() + set(MESON_DEFAULT_LIBRARY static) + endif() + + vcpkg_list(APPEND arg_OPTIONS --libdir lib) # else meson install into an architecture describing folder + vcpkg_list(APPEND arg_OPTIONS_DEBUG -Ddebug=true --prefix "${CURRENT_PACKAGES_DIR}/debug" --includedir ../include) + vcpkg_list(APPEND arg_OPTIONS_RELEASE -Ddebug=false --prefix "${CURRENT_PACKAGES_DIR}") + + # select meson cmd-line options + if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_list(APPEND arg_OPTIONS_DEBUG "-Dcmake_prefix_path=['${CURRENT_INSTALLED_DIR}/debug','${CURRENT_INSTALLED_DIR}','${CURRENT_INSTALLED_DIR}/share']") + vcpkg_list(APPEND arg_OPTIONS_RELEASE "-Dcmake_prefix_path=['${CURRENT_INSTALLED_DIR}','${CURRENT_INSTALLED_DIR}/debug','${CURRENT_INSTALLED_DIR}/share']") + else() + vcpkg_list(APPEND arg_OPTIONS_DEBUG "-Dcmake_prefix_path=['${CURRENT_INSTALLED_DIR}/debug','${CURRENT_INSTALLED_DIR}']") + vcpkg_list(APPEND arg_OPTIONS_RELEASE "-Dcmake_prefix_path=['${CURRENT_INSTALLED_DIR}','${CURRENT_INSTALLED_DIR}/debug']") + endif() + + # Allow overrides / additional configuration variables from triplets + if(DEFINED VCPKG_MESON_CONFIGURE_OPTIONS) + vcpkg_list(APPEND arg_OPTIONS ${VCPKG_MESON_CONFIGURE_OPTIONS}) + endif() + if(DEFINED VCPKG_MESON_CONFIGURE_OPTIONS_RELEASE) + vcpkg_list(APPEND arg_OPTIONS_RELEASE ${VCPKG_MESON_CONFIGURE_OPTIONS_RELEASE}) + endif() + if(DEFINED VCPKG_MESON_CONFIGURE_OPTIONS_DEBUG) + vcpkg_list(APPEND arg_OPTIONS_DEBUG ${VCPKG_MESON_CONFIGURE_OPTIONS_DEBUG}) + endif() + + # configure build + foreach(buildtype IN LISTS buildtypes) + message(STATUS "Configuring ${TARGET_TRIPLET}-${suffix_${buildtype}}") + file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}") + #setting up PKGCONFIG + if(NOT arg_NO_PKG_CONFIG) + if ("${buildtype}" STREQUAL "DEBUG") + z_vcpkg_setup_pkgconfig_path(BASE_DIRS "${CURRENT_INSTALLED_DIR}/debug") + else() + z_vcpkg_setup_pkgconfig_path(BASE_DIRS "${CURRENT_INSTALLED_DIR}") + endif() + endif() + + z_vcpkg_meson_setup_variables(${buildtype}) + configure_file("${SCRIPTS}/buildsystems/meson/meson.template.in" "${meson_input_file_${buildtype}}" @ONLY) + + vcpkg_execute_required_process( + COMMAND ${MESON} ${arg_OPTIONS} ${arg_OPTIONS_${buildtype}} ${arg_SOURCE_PATH} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}" + LOGNAME config-${TARGET_TRIPLET}-${suffix_${buildtype}} + SAVE_LOG_FILES + meson-logs/meson-log.txt + meson-info/intro-dependencies.json + meson-logs/install-log.txt + ) + + message(STATUS "Configuring ${TARGET_TRIPLET}-${suffix_${buildtype}} done") + + if(NOT arg_NO_PKG_CONFIG) + z_vcpkg_restore_pkgconfig_path() + endif() + endforeach() +endfunction() diff --git a/ports/vcpkg-tool-meson/vcpkg_install_meson.cmake b/ports/vcpkg-tool-meson/vcpkg_install_meson.cmake new file mode 100644 index 00000000000000..5971aefd9042a7 --- /dev/null +++ b/ports/vcpkg-tool-meson/vcpkg_install_meson.cmake @@ -0,0 +1,71 @@ +function(vcpkg_install_meson) + cmake_parse_arguments(PARSE_ARGV 0 arg "ADD_BIN_TO_PATH" "" "") + + vcpkg_find_acquire_program(NINJA) + unset(ENV{DESTDIR}) # installation directory was already specified with '--prefix' option + + if(VCPKG_TARGET_IS_OSX) + vcpkg_backup_env_variables(VARS SDKROOT MACOSX_DEPLOYMENT_TARGET) + set(ENV{SDKROOT} "${VCPKG_DETECTED_CMAKE_OSX_SYSROOT}") + set(ENV{MACOSX_DEPLOYMENT_TARGET} "${VCPKG_DETECTED_CMAKE_OSX_DEPLOYMENT_TARGET}") + endif() + + foreach(buildtype IN ITEMS "debug" "release") + if(DEFINED VCPKG_BUILD_TYPE AND NOT VCPKG_BUILD_TYPE STREQUAL buildtype) + continue() + endif() + + if(buildtype STREQUAL "debug") + set(short_buildtype "dbg") + else() + set(short_buildtype "rel") + endif() + + message(STATUS "Package ${TARGET_TRIPLET}-${short_buildtype}") + if(arg_ADD_BIN_TO_PATH) + vcpkg_backup_env_variables(VARS PATH) + if(buildtype STREQUAL "debug") + vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/debug/bin") + else() + vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/bin") + endif() + endif() + vcpkg_execute_required_process( + COMMAND "${NINJA}" install -v + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${short_buildtype}" + LOGNAME package-${TARGET_TRIPLET}-${short_buildtype} + ) + if(arg_ADD_BIN_TO_PATH) + vcpkg_restore_env_variables(VARS PATH) + endif() + endforeach() + + vcpkg_list(SET renamed_libs) + if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL static AND NOT VCPKG_TARGET_IS_MINGW) + # Meson names all static libraries lib.a which basically breaks the world + file(GLOB_RECURSE gen_libraries "${CURRENT_PACKAGES_DIR}*/**/lib*.a") + foreach(gen_library IN LISTS gen_libraries) + get_filename_component(libdir "${gen_library}" DIRECTORY) + get_filename_component(libname "${gen_library}" NAME) + string(REGEX REPLACE ".a$" ".lib" fixed_librawname "${libname}") + string(REGEX REPLACE "^lib" "" fixed_librawname "${fixed_librawname}") + file(RENAME "${gen_library}" "${libdir}/${fixed_librawname}") + # For cmake fixes. + string(REGEX REPLACE ".a$" "" origin_librawname "${libname}") + string(REGEX REPLACE ".lib$" "" fixed_librawname "${fixed_librawname}") + vcpkg_list(APPEND renamed_libs ${fixed_librawname}) + set(${librawname}_old ${origin_librawname}) + set(${librawname}_new ${fixed_librawname}) + endforeach() + file(GLOB_RECURSE cmake_files "${CURRENT_PACKAGES_DIR}*/*.cmake") + foreach(cmake_file IN LISTS cmake_files) + foreach(current_lib IN LISTS renamed_libs) + vcpkg_replace_string("${cmake_file}" "${${current_lib}_old}" "${${current_lib}_new}") + endforeach() + endforeach() + endif() + + if(VCPKG_TARGET_IS_OSX) + vcpkg_restore_env_variables(VARS SDKROOT MACOSX_DEPLOYMENT_TARGET) + endif() +endfunction() From 72e237c2df8e659a095ed82cdae954895785efe3 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 23 Feb 2023 22:31:07 +0100 Subject: [PATCH 29/85] write version in helper port --- ports/vcpkg-tool-meson/portfile.cmake | 2 ++ ports/vcpkg-tool-meson/vcpkg-port-config.cmake | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/vcpkg-tool-meson/portfile.cmake b/ports/vcpkg-tool-meson/portfile.cmake index 82598d5f9d2735..2e0fb841d5a0b4 100644 --- a/ports/vcpkg-tool-meson/portfile.cmake +++ b/ports/vcpkg-tool-meson/portfile.cmake @@ -12,4 +12,6 @@ file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg_configure_meson.cmake" "${CMAKE_CURRENT_LIST_DIR}/11259.diff" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/meson/version.txt" "${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/vcpkg-port-config.cmake b/ports/vcpkg-tool-meson/vcpkg-port-config.cmake index d91a7039807eba..56d265cbef215e 100644 --- a/ports/vcpkg-tool-meson/vcpkg-port-config.cmake +++ b/ports/vcpkg-tool-meson/vcpkg-port-config.cmake @@ -62,4 +62,3 @@ if(NOT SCRIPT_MESON) endif() message(STATUS "Using meson: ${SCRIPT_MESON}") -file(WRITE "${CURRENT_PACKAGES_DIR}/share/meson/version.txt" "${program_version}") # For vcpkg_find_acquire_program \ No newline at end of file From a184de57017a0ed5802781c9f63a3d1d02ed94a7 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 24 Feb 2023 09:37:08 +0100 Subject: [PATCH 30/85] set meson script path correctly --- ports/vcpkg-tool-meson/vcpkg-port-config.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/vcpkg-tool-meson/vcpkg-port-config.cmake b/ports/vcpkg-tool-meson/vcpkg-port-config.cmake index 56d265cbef215e..e5c353dfb53223 100644 --- a/ports/vcpkg-tool-meson/vcpkg-port-config.cmake +++ b/ports/vcpkg-tool-meson/vcpkg-port-config.cmake @@ -58,7 +58,7 @@ if(NOT SCRIPT_MESON) "${CMAKE_CURRENT_LIST_DIR}/python-lib-dep.patch" "${CMAKE_CURRENT_LIST_DIR}/11259.diff" ) - set(SCRIPT_MESON "${DOWNLOADS}/meson-${program_version}/meson.py") + set(SCRIPT_MESON "${DOWNLOADS}/tools/meson-${program_version}/meson.py") endif() message(STATUS "Using meson: ${SCRIPT_MESON}") From 3239e103c1ac94b67e583629b4bf2842cd0e1298 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 24 Feb 2023 09:53:59 +0100 Subject: [PATCH 31/85] remove unnecessary variables --- ports/vcpkg-tool-meson/vcpkg-port-config.cmake | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/ports/vcpkg-tool-meson/vcpkg-port-config.cmake b/ports/vcpkg-tool-meson/vcpkg-port-config.cmake index e5c353dfb53223..ffbd2b6c536079 100644 --- a/ports/vcpkg-tool-meson/vcpkg-port-config.cmake +++ b/ports/vcpkg-tool-meson/vcpkg-port-config.cmake @@ -23,19 +23,13 @@ set(program MESON) set(program_version 1.0.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 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) -set(supported_on_unix ON) -set(version_command --version) -set(extra_search_args EXACT_VERSION_MATCH) -find_program(SCRIPT_MESON NAMES meson meson.py PATHS "${path_to_search}" NO_DEFAULT_PATH) # NO_DEFAULT_PATH due top patching +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 From f2869e1cbcb49cf6584b779f660a469216cab38c Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 24 Feb 2023 09:54:13 +0100 Subject: [PATCH 32/85] move port configs after common definitions. --- scripts/ports.cmake | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/ports.cmake b/scripts/ports.cmake index c9bb4eda089954..f7ebd8f2ae1a5b 100644 --- a/scripts/ports.cmake +++ b/scripts/ports.cmake @@ -129,18 +129,18 @@ if(CMD STREQUAL "BUILD") include("${CMAKE_TRIPLET_FILE}") + set(HOST_TRIPLET "${_HOST_TRIPLET}") + set(CURRENT_HOST_INSTALLED_DIR "${_VCPKG_INSTALLED_DIR}/${HOST_TRIPLET}" CACHE PATH "Location of packages installed for the host") + + set(TRIPLET_SYSTEM_ARCH "${VCPKG_TARGET_ARCHITECTURE}") + include("${SCRIPTS}/cmake/vcpkg_common_definitions.cmake") + if (DEFINED VCPKG_PORT_CONFIGS) foreach(VCPKG_PORT_CONFIG IN LISTS VCPKG_PORT_CONFIGS) include("${VCPKG_PORT_CONFIG}") endforeach() endif() - set(HOST_TRIPLET "${_HOST_TRIPLET}") - set(CURRENT_HOST_INSTALLED_DIR "${_VCPKG_INSTALLED_DIR}/${HOST_TRIPLET}" CACHE PATH "Location to install final packages for the host") - - set(TRIPLET_SYSTEM_ARCH "${VCPKG_TARGET_ARCHITECTURE}") - include("${SCRIPTS}/cmake/vcpkg_common_definitions.cmake") - set(Z_VCPKG_ERROR_LOG_COLLECTION_FILE "${CURRENT_BUILDTREES_DIR}/error-logs-${TARGET_TRIPLET}.txt") file(REMOVE "${Z_VCPKG_ERROR_LOG_COLLECTION_FILE}") From 5d22ad8ac11e0c3cb715101035fb8914af025f65 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 24 Feb 2023 21:58:00 +0100 Subject: [PATCH 33/85] fix find_acquire_program --- scripts/cmake/vcpkg_find_acquire_program.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index a18077356895fc..9821362cc0e510 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -342,7 +342,7 @@ function(vcpkg_find_acquire_program program) set(extra_search_args EXACT_VERSION_MATCH) if(EXISTS "${CURRENT_HOST_INSTALLED_DIR}/share/meson/version.txt") file(READ "${CURRENT_HOST_INSTALLED_DIR}/share/meson/version.txt" program_version) - set(paths_to_search "${CURRENT_HOST_INSTALLED_DIR}/tools/meson") + set(paths_to_search "${DOWNLOADS}/tools/meson-${program_version};${CURRENT_HOST_INSTALLED_DIR}/tools/meson") else() # Old behavior set(program_version 0.58.1) set(ref aeda7f249c4a5dbbecc52e44f382246a2377b5b0) From 5ef061330fa0ef015dcba561f2fb920474d4fe8e Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 2 Mar 2023 08:52:41 +0100 Subject: [PATCH 34/85] v db --- versions/baseline.json | 2 +- versions/v-/vcpkg-tool-meson.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 4666413b3efa0d..0c6988dc39a80a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8121,7 +8121,7 @@ "port-version": 1 }, "vcpkg-tool-meson": { - "baseline": "0.63", + "baseline": "1.0.0", "port-version": 0 }, "vcpkg-tool-mozbuild": { diff --git a/versions/v-/vcpkg-tool-meson.json b/versions/v-/vcpkg-tool-meson.json index db788a6149a18b..0e315b89028489 100644 --- a/versions/v-/vcpkg-tool-meson.json +++ b/versions/v-/vcpkg-tool-meson.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "e94898d89c5fc42476d551f5ff3ab4b7d535b05f", + "git-tree": "7e8b9800c819a27bf4b881783403bcd8f009aed3", "version": "1.0.0", "port-version": 0 }, From f2ca091db13306d5380f4c8b4e5913f0f9e82b36 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 2 Mar 2023 22:45:02 +0100 Subject: [PATCH 35/85] v db --- versions/baseline.json | 6 +++--- versions/g-/glib.json | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 0c6988dc39a80a..bc4419b6c451d1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2766,7 +2766,7 @@ }, "glib": { "baseline": "2.75.3", - "port-version": 0 + "port-version": 1 }, "glibmm": { "baseline": "2.74.0", @@ -2818,7 +2818,7 @@ }, "gobject-introspection": { "baseline": "1.72.0", - "port-version": 1 + "port-version": 2 }, "google-cloud-cpp": { "baseline": "2.8.0", @@ -7690,7 +7690,7 @@ }, "thorvg": { "baseline": "0.8.3", - "port-version": 0 + "port-version": 1 }, "threadpool": { "baseline": "0.2.5", diff --git a/versions/g-/glib.json b/versions/g-/glib.json index 91f96951d81cd6..25bfe50a867370 100644 --- a/versions/g-/glib.json +++ b/versions/g-/glib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fcc7d1102a99fd520a5fa6f383346cc05b1d9429", + "version": "2.75.3", + "port-version": 1 + }, { "git-tree": "787197c9431b9d1f8a5436aeca0fd1155d26c83b", "version": "2.75.3", From 799fc5dd4582f0fba8c220ecee4b7f6a7d7b9549 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 24 Mar 2023 08:17:05 +0100 Subject: [PATCH 36/85] use separate arguments in script --- ports/vcpkg-tool-meson/vcpkg_configure_meson.cmake | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/ports/vcpkg-tool-meson/vcpkg_configure_meson.cmake b/ports/vcpkg-tool-meson/vcpkg_configure_meson.cmake index 42b4ac2175c0c1..b94aac54b2118e 100644 --- a/ports/vcpkg-tool-meson/vcpkg_configure_meson.cmake +++ b/ports/vcpkg-tool-meson/vcpkg_configure_meson.cmake @@ -66,11 +66,9 @@ function(z_vcpkg_meson_set_proglist_variables config_type) endfunction() function(z_vcpkg_meson_convert_compiler_flags_to_list out_var compiler_flags) - string(REPLACE ";" [[\;]] tmp_var "${compiler_flags}") - string(REGEX REPLACE [=[( +|^)((\"(\\"|[^"])+"|\\"|\\ |[^ ])+)]=] ";\\2" tmp_var "${tmp_var}") - vcpkg_list(POP_FRONT tmp_var) # The first element is always empty due to the above replacement - list(TRANSFORM tmp_var STRIP) # Strip leading trailing whitespaces from each element in the list. - set("${out_var}" "${tmp_var}" PARENT_SCOPE) + separate_arguments(cmake_list NATIVE_COMMAND "${compiler_flags}") + list(TRANSFORM cmake_list REPLACE ";" [[\\;]]) + set("${out_var}" "${cmake_list}" PARENT_SCOPE) endfunction() function(z_vcpkg_meson_convert_list_to_python_array out_var) From 17c480fb9dc1472b6638d3eeef0c7ae5460462ff Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 24 Mar 2023 08:17:40 +0100 Subject: [PATCH 37/85] v db --- versions/baseline.json | 8 ++++---- versions/g-/glib.json | 5 +++++ versions/v-/vcpkg-tool-meson.json | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index bb7795279fdd87..4073ca6d523e9d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2786,7 +2786,7 @@ }, "glib": { "baseline": "2.76.0", - "port-version": 0 + "port-version": 1 }, "glibmm": { "baseline": "2.74.0", @@ -2838,7 +2838,7 @@ }, "gobject-introspection": { "baseline": "1.72.0", - "port-version": 1 + "port-version": 2 }, "google-cloud-cpp": { "baseline": "2.8.0", @@ -7766,7 +7766,7 @@ }, "thorvg": { "baseline": "0.8.3", - "port-version": 0 + "port-version": 1 }, "threadpool": { "baseline": "0.2.5", @@ -8197,7 +8197,7 @@ "port-version": 1 }, "vcpkg-tool-meson": { - "baseline": "0.63", + "baseline": "1.0.0", "port-version": 0 }, "vcpkg-tool-mozbuild": { diff --git a/versions/g-/glib.json b/versions/g-/glib.json index 639dcbf6de1622..bb46b73cfefc4f 100644 --- a/versions/g-/glib.json +++ b/versions/g-/glib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "344154c32ab336729b9df3c4caac2c6ff1dd571f", + "version": "2.76.0", + "port-version": 1 + }, { "git-tree": "d0f2655ee0af323897720bb9aaf48bc08073b98c", "version": "2.76.0", diff --git a/versions/v-/vcpkg-tool-meson.json b/versions/v-/vcpkg-tool-meson.json index 0e315b89028489..716e56e8805246 100644 --- a/versions/v-/vcpkg-tool-meson.json +++ b/versions/v-/vcpkg-tool-meson.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "7e8b9800c819a27bf4b881783403bcd8f009aed3", + "git-tree": "f96ae6f3c73df752191575a05e258ea8475a1078", "version": "1.0.0", "port-version": 0 }, From eccdc491485b3b702b70ec04eca9f62eec7042c7 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 30 Mar 2023 12:15:34 +0200 Subject: [PATCH 38/85] v db --- versions/baseline.json | 8 ++++---- versions/g-/glib.json | 5 +++++ versions/t-/thorvg.json | 5 +++++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 882b96610ac752..e57c0af137fd8f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2798,7 +2798,7 @@ }, "glib": { "baseline": "2.76.0", - "port-version": 1 + "port-version": 2 }, "glibmm": { "baseline": "2.74.0", @@ -2850,7 +2850,7 @@ }, "gobject-introspection": { "baseline": "1.72.0", - "port-version": 1 + "port-version": 2 }, "google-cloud-cpp": { "baseline": "2.8.0", @@ -7786,7 +7786,7 @@ }, "thorvg": { "baseline": "0.8.4", - "port-version": 0 + "port-version": 1 }, "threadpool": { "baseline": "0.2.5", @@ -8221,7 +8221,7 @@ "port-version": 1 }, "vcpkg-tool-meson": { - "baseline": "0.63", + "baseline": "1.0.0", "port-version": 0 }, "vcpkg-tool-mozbuild": { diff --git a/versions/g-/glib.json b/versions/g-/glib.json index b31633e66d2392..e43011b1c111e8 100644 --- a/versions/g-/glib.json +++ b/versions/g-/glib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c294e163f1cf209cb5ee1286a452d778ced6dd1a", + "version": "2.76.0", + "port-version": 2 + }, { "git-tree": "e08d2fbb65a5c4cb8a38c83726b35fe5f89dc785", "version": "2.76.0", diff --git a/versions/t-/thorvg.json b/versions/t-/thorvg.json index 12671bba96af19..9dd8b75e844dd9 100644 --- a/versions/t-/thorvg.json +++ b/versions/t-/thorvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0c4a07d5c7074e56a8d5d603afa8b0808b452893", + "version": "0.8.4", + "port-version": 1 + }, { "git-tree": "09d722c7f2cb784d571af9a6f46abb83aa907d2b", "version": "0.8.4", From 31767b250151739a780adfa79d2e2f48b0802082 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 19 Apr 2023 11:26:38 +0200 Subject: [PATCH 39/85] v db --- versions/baseline.json | 8 ++++---- versions/g-/glib.json | 5 +++++ versions/g-/gobject-introspection.json | 5 +++++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 3b9fc93a936820..82e599bcad6a21 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2814,7 +2814,7 @@ }, "glib": { "baseline": "2.76.1", - "port-version": 0 + "port-version": 1 }, "glibmm": { "baseline": "2.76.0", @@ -2866,7 +2866,7 @@ }, "gobject-introspection": { "baseline": "1.72.0", - "port-version": 3 + "port-version": 4 }, "google-cloud-cpp": { "baseline": "2.9.0", @@ -7822,7 +7822,7 @@ }, "thorvg": { "baseline": "0.8.4", - "port-version": 0 + "port-version": 1 }, "threadpool": { "baseline": "0.2.5", @@ -8261,7 +8261,7 @@ "port-version": 1 }, "vcpkg-tool-meson": { - "baseline": "0.63", + "baseline": "1.0.0", "port-version": 0 }, "vcpkg-tool-mozbuild": { diff --git a/versions/g-/glib.json b/versions/g-/glib.json index 7b962de67072bb..3459441baa3e76 100644 --- a/versions/g-/glib.json +++ b/versions/g-/glib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a41e1ae065ed37520e958df52a55ad97ffed2a78", + "version": "2.76.1", + "port-version": 1 + }, { "git-tree": "c44e4f3f2265fbdb713b8fecc8dd15418d99021e", "version": "2.76.1", diff --git a/versions/g-/gobject-introspection.json b/versions/g-/gobject-introspection.json index 45f3f66d2259bc..bac89e6781e771 100644 --- a/versions/g-/gobject-introspection.json +++ b/versions/g-/gobject-introspection.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3760927346142ac9635e14d2f64f304e899bbeaf", + "version": "1.72.0", + "port-version": 4 + }, { "git-tree": "47ab422de57e980b1294daf095a942d3ea36ae98", "version": "1.72.0", From 75fbc496716824bb5010c712f4b69bfa58c9fec0 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sun, 23 Apr 2023 00:25:58 +0200 Subject: [PATCH 40/85] only copy pdb if it exists --- ports/libnice-gst/portfile.cmake | 4 ++-- ports/libnice-gst/vcpkg.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/libnice-gst/portfile.cmake b/ports/libnice-gst/portfile.cmake index 3c75ae3bebc968..afb1f73277d0af 100644 --- a/ports/libnice-gst/portfile.cmake +++ b/ports/libnice-gst/portfile.cmake @@ -65,7 +65,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/plugins/gstreamer") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/${CMAKE_SHARED_LIBRARY_PREFIX}gstnice${CMAKE_SHARED_LIBRARY_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/plugins/gstreamer/${CMAKE_SHARED_LIBRARY_PREFIX}gstnice${CMAKE_SHARED_LIBRARY_SUFFIX}") - if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_TARGET_IS_WINDOWS AND EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/gstnice.pdb") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/gstnice.pdb" "${CURRENT_PACKAGES_DIR}/debug/plugins/gstreamer/gstnice.pdb") else() @@ -78,7 +78,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/plugins/gstreamer") file(RENAME "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/${CMAKE_SHARED_LIBRARY_PREFIX}gstnice${CMAKE_SHARED_LIBRARY_SUFFIX}" "${CURRENT_PACKAGES_DIR}/plugins/gstreamer/${CMAKE_SHARED_LIBRARY_PREFIX}gstnice${CMAKE_SHARED_LIBRARY_SUFFIX}") - if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_TARGET_IS_WINDOWS AND EXISTS "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/gstnice.pdb") file(RENAME "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/gstnice.pdb" "${CURRENT_PACKAGES_DIR}/plugins/gstreamer/gstnice.pdb") else() diff --git a/ports/libnice-gst/vcpkg.json b/ports/libnice-gst/vcpkg.json index 56e825b323ee92..c419e7c302e153 100644 --- a/ports/libnice-gst/vcpkg.json +++ b/ports/libnice-gst/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libnice-gst", "version": "0.1.21", - "port-version": 1, + "port-version": 2, "description": "Gstreamer Libnice plugins.", "homepage": "https://nice.freedesktop.org", "license": "LGPL-2.1-only AND MPL-1.1", From 8b7b054badde7fbbafaf34b635035d1cbdfced6d Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sun, 23 Apr 2023 00:26:59 +0200 Subject: [PATCH 41/85] update to 1.1.0 and fix options detection --- ports/vcpkg-tool-meson/11259.diff | 35 ------------------- ports/vcpkg-tool-meson/portfile.cmake | 2 -- ports/vcpkg-tool-meson/python-lib-dep.patch | 16 --------- .../vcpkg-tool-meson/vcpkg-port-config.cmake | 9 +++-- ports/vcpkg-tool-meson/vcpkg.json | 2 +- 5 files changed, 5 insertions(+), 59 deletions(-) delete mode 100644 ports/vcpkg-tool-meson/11259.diff delete mode 100644 ports/vcpkg-tool-meson/python-lib-dep.patch diff --git a/ports/vcpkg-tool-meson/11259.diff b/ports/vcpkg-tool-meson/11259.diff deleted file mode 100644 index d7192be9ddc161..00000000000000 --- a/ports/vcpkg-tool-meson/11259.diff +++ /dev/null @@ -1,35 +0,0 @@ -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 -@@ -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/portfile.cmake b/ports/vcpkg-tool-meson/portfile.cmake index 2e0fb841d5a0b4..dd62d583750750 100644 --- a/ports/vcpkg-tool-meson/portfile.cmake +++ b/ports/vcpkg-tool-meson/portfile.cmake @@ -8,8 +8,6 @@ configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" "${CURRENT_PA 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}") file(WRITE "${CURRENT_PACKAGES_DIR}/share/meson/version.txt" "${VERSION}") # For vcpkg_find_acquire_program diff --git a/ports/vcpkg-tool-meson/python-lib-dep.patch b/ports/vcpkg-tool-meson/python-lib-dep.patch deleted file mode 100644 index 3a33056d3d6efc..00000000000000 --- a/ports/vcpkg-tool-meson/python-lib-dep.patch +++ /dev/null @@ -1,16 +0,0 @@ -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 index ffbd2b6c536079..481593a56d9aba 100644 --- a/ports/vcpkg-tool-meson/vcpkg-port-config.cmake +++ b/ports/vcpkg-tool-meson/vcpkg-port-config.cmake @@ -20,14 +20,14 @@ endif() # Setup meson: set(program MESON) -set(program_version 1.0.0) +set(program_version 1.1.0) set(program_name meson) set(search_names meson meson.py) -set(ref 05f85c79454e206e00c6ced5b6fc25ffcafed39c) +set(ref ae163a3f3e0ccdcbea97c8ad0e78f087925646b9) 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) +set(download_sha512 1bc5be2dc3a26b811bbeaf8f8b8d14900a00975a2e50f2f4b3da4da067114268fd5da76d9365a811d2dcdc8c63bae9adc08f743954ca4e8cf8c49bba36973490) find_program(SCRIPT_MESON NAMES ${search_names} PATHS "${path_to_search}" NO_DEFAULT_PATH) # NO_DEFAULT_PATH due top patching @@ -49,9 +49,8 @@ if(NOT SCRIPT_MESON) 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" ) + vcpkg_replace_string("${DOWNLOADS}/tools/meson-${program_version}/mesonbuild/cmake/toolchain.py" "arg.startswith('/')" "arg.startswith(('/','-'))") set(SCRIPT_MESON "${DOWNLOADS}/tools/meson-${program_version}/meson.py") endif() diff --git a/ports/vcpkg-tool-meson/vcpkg.json b/ports/vcpkg-tool-meson/vcpkg.json index ff28dd0f60073e..4697c6d062ad77 100644 --- a/ports/vcpkg-tool-meson/vcpkg.json +++ b/ports/vcpkg-tool-meson/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vcpkg-tool-meson", - "version": "1.0.0", + "version": "1.1.0", "description": "Meson build system", "homepage": "https://github.com/mesonbuild/meson", "license": "Apache-2.0", From bd921102e671721dfb5c9b09d57334a1456d6346 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 3 May 2023 09:12:10 +0200 Subject: [PATCH 42/85] v db --- versions/baseline.json | 6 +++--- versions/g-/glib.json | 5 +++++ versions/l-/libnice-gst.json | 5 +++++ versions/v-/vcpkg-tool-meson.json | 5 +++++ 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 7de0c4b5f4c1a3..95b0611d18c382 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2822,7 +2822,7 @@ }, "glib": { "baseline": "2.76.1", - "port-version": 1 + "port-version": 2 }, "glibmm": { "baseline": "2.76.0", @@ -4278,7 +4278,7 @@ }, "libnice-gst": { "baseline": "0.1.21", - "port-version": 1 + "port-version": 2 }, "libnoise": { "baseline": "1.0.0", @@ -8309,7 +8309,7 @@ "port-version": 1 }, "vcpkg-tool-meson": { - "baseline": "1.0.0", + "baseline": "1.1.0", "port-version": 0 }, "vcpkg-tool-mozbuild": { diff --git a/versions/g-/glib.json b/versions/g-/glib.json index 4964168fe324d1..cab033d961b5fd 100644 --- a/versions/g-/glib.json +++ b/versions/g-/glib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2f555e1244a39e8fbb2a3cf7489e6ebea6c65594", + "version": "2.76.1", + "port-version": 2 + }, { "git-tree": "82258d825872b8c0987fe62b759b7602edbed17b", "version": "2.76.1", diff --git a/versions/l-/libnice-gst.json b/versions/l-/libnice-gst.json index bcea36ed84e89e..bfa3168cebfaf7 100644 --- a/versions/l-/libnice-gst.json +++ b/versions/l-/libnice-gst.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "80319f41c3d0af229cab51ac83dac7d957f6ca7e", + "version": "0.1.21", + "port-version": 2 + }, { "git-tree": "9ea8f77a4a4f70cceb4d65650ee5de24e14e8190", "version": "0.1.21", diff --git a/versions/v-/vcpkg-tool-meson.json b/versions/v-/vcpkg-tool-meson.json index 716e56e8805246..912c595c4d3eae 100644 --- a/versions/v-/vcpkg-tool-meson.json +++ b/versions/v-/vcpkg-tool-meson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fe33d1a1ea0d85a399b200a1d5e99bfbc9d4387a", + "version": "1.1.0", + "port-version": 0 + }, { "git-tree": "f96ae6f3c73df752191575a05e258ea8475a1078", "version": "1.0.0", From b23d7177970ac10630aa1e74670d74c6686ca1fd Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 3 May 2023 15:23:44 +0200 Subject: [PATCH 43/85] fix libnice-gst build --- ports/libnice-gst/portfile.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ports/libnice-gst/portfile.cmake b/ports/libnice-gst/portfile.cmake index afb1f73277d0af..309c40435154f4 100644 --- a/ports/libnice-gst/portfile.cmake +++ b/ports/libnice-gst/portfile.cmake @@ -68,7 +68,8 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) if(VCPKG_TARGET_IS_WINDOWS AND EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/gstnice.pdb") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/gstnice.pdb" "${CURRENT_PACKAGES_DIR}/debug/plugins/gstreamer/gstnice.pdb") - else() + endif() + if(NOT VCPKG_TARGET_IS_WINDOWS) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib") endif() @@ -81,7 +82,8 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) if(VCPKG_TARGET_IS_WINDOWS AND EXISTS "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/gstnice.pdb") file(RENAME "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/gstnice.pdb" "${CURRENT_PACKAGES_DIR}/plugins/gstreamer/gstnice.pdb") - else() + endif() + if(NOT VCPKG_TARGET_IS_WINDOWS) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") endif() From 6ea37865f4453bc81222d2025d775ee7df6c486e Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 3 May 2023 15:23:54 +0200 Subject: [PATCH 44/85] v db --- versions/l-/libnice-gst.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libnice-gst.json b/versions/l-/libnice-gst.json index bfa3168cebfaf7..5606bc47731e9e 100644 --- a/versions/l-/libnice-gst.json +++ b/versions/l-/libnice-gst.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "80319f41c3d0af229cab51ac83dac7d957f6ca7e", + "git-tree": "5717d4a14d624eb0ab8c68be995322f51f8f3545", "version": "0.1.21", "port-version": 2 }, From 974b25e3f76973c9de264225a5e611bc7c43cca0 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 3 May 2023 21:31:43 +0200 Subject: [PATCH 45/85] re-add python dep patch --- ports/vcpkg-tool-meson/adjust-python-dep.patch | 16 ++++++++++++++++ ports/vcpkg-tool-meson/portfile.cmake | 1 + ports/vcpkg-tool-meson/vcpkg-port-config.cmake | 1 + 3 files changed, 18 insertions(+) create mode 100644 ports/vcpkg-tool-meson/adjust-python-dep.patch diff --git a/ports/vcpkg-tool-meson/adjust-python-dep.patch b/ports/vcpkg-tool-meson/adjust-python-dep.patch new file mode 100644 index 00000000000000..a401ffb637a92a --- /dev/null +++ b/ports/vcpkg-tool-meson/adjust-python-dep.patch @@ -0,0 +1,16 @@ +diff --git a/mesonbuild/dependencies/python.py b/mesonbuild/dependencies/python.py +index 14386f9..1b8dd36 100644 +--- a/mesonbuild/dependencies/python.py ++++ b/mesonbuild/dependencies/python.py +@@ -369,10 +369,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)) + else: + candidates.append(functools.partial(PkgConfigDependency, 'python3', env, kwargs)) + diff --git a/ports/vcpkg-tool-meson/portfile.cmake b/ports/vcpkg-tool-meson/portfile.cmake index dd62d583750750..6eb88e1119ed31 100644 --- a/ports/vcpkg-tool-meson/portfile.cmake +++ b/ports/vcpkg-tool-meson/portfile.cmake @@ -8,6 +8,7 @@ configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" "${CURRENT_PA 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}/adjust-python-dep.patch" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(WRITE "${CURRENT_PACKAGES_DIR}/share/meson/version.txt" "${VERSION}") # For vcpkg_find_acquire_program diff --git a/ports/vcpkg-tool-meson/vcpkg-port-config.cmake b/ports/vcpkg-tool-meson/vcpkg-port-config.cmake index 481593a56d9aba..7979d20055b811 100644 --- a/ports/vcpkg-tool-meson/vcpkg-port-config.cmake +++ b/ports/vcpkg-tool-meson/vcpkg-port-config.cmake @@ -49,6 +49,7 @@ if(NOT SCRIPT_MESON) SOURCE_PATH "${path_to_search}" PATCHES "${CMAKE_CURRENT_LIST_DIR}/meson-intl.patch" + "${CMAKE_CURRENT_LIST_DIR}/adjust-python-dep.patch" ) vcpkg_replace_string("${DOWNLOADS}/tools/meson-${program_version}/mesonbuild/cmake/toolchain.py" "arg.startswith('/')" "arg.startswith(('/','-'))") set(SCRIPT_MESON "${DOWNLOADS}/tools/meson-${program_version}/meson.py") From 81e67cd809654f9d36addabc833226ac8bf7b4fe Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 3 May 2023 21:32:12 +0200 Subject: [PATCH 46/85] v db --- versions/v-/vcpkg-tool-meson.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/v-/vcpkg-tool-meson.json b/versions/v-/vcpkg-tool-meson.json index 912c595c4d3eae..2b369e51e96dec 100644 --- a/versions/v-/vcpkg-tool-meson.json +++ b/versions/v-/vcpkg-tool-meson.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "fe33d1a1ea0d85a399b200a1d5e99bfbc9d4387a", + "git-tree": "a8a41ebcf685add9ae9b8dc353af07573a196b1e", "version": "1.1.0", "port-version": 0 }, From a7c734b1ca2791357ace2ed5fdde98d3eb1aadb2 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 4 May 2023 16:54:36 +0200 Subject: [PATCH 47/85] Fix x86 builds --- ports/gobject-introspection/portfile.cmake | 10 +++++++--- ports/gobject-introspection/vcpkg.json | 4 ++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ports/gobject-introspection/portfile.cmake b/ports/gobject-introspection/portfile.cmake index ebbace2d11c3b5..3431bcee00dbe5 100644 --- a/ports/gobject-introspection/portfile.cmake +++ b/ports/gobject-introspection/portfile.cmake @@ -21,10 +21,13 @@ 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(VCPKG_CROSSCOMPILING AND - NOT (CMAKE_HOST_WIN32 AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")) +if(VCPKG_CROSSCOMPILING) list(APPEND OPTIONS_RELEASE -Dgi_cross_use_prebuilt_gi=true) + list(APPEND OPTIONS_RELEASE -Dbuild_introspection_data=false) + # g-ir-scanner is not correctly setup for the cross build and + # fails to correctly link against x86 libs (uses x64 instead) +else() + list(APPEND OPTIONS_RELEASE -Dbuild_introspection_data=true) endif() vcpkg_configure_meson( @@ -39,6 +42,7 @@ vcpkg_configure_meson( g-ir-annotation-tool='${CURRENT_HOST_INSTALLED_DIR}/tools/gobject-introspection/g-ir-annotation-tool' g-ir-compiler='${CURRENT_HOST_INSTALLED_DIR}/tools/gobject-introspection/g-ir-compiler${VCPKG_HOST_EXECUTABLE_SUFFIX}' g-ir-scanner='${CURRENT_HOST_INSTALLED_DIR}/tools/gobject-introspection/g-ir-scanner' + python='${CURRENT_HOST_INSTALLED_DIR}/tools/python3/python${VCPKG_HOST_EXECUTABLE_SUFFIX}' ) vcpkg_host_path_list(APPEND ENV{PKG_CONFIG_PATH} "${CURRENT_INSTALLED_DIR}/lib/pkgconfig") diff --git a/ports/gobject-introspection/vcpkg.json b/ports/gobject-introspection/vcpkg.json index 783866dbd8eb58..78d3bfc5a950ac 100644 --- a/ports/gobject-introspection/vcpkg.json +++ b/ports/gobject-introspection/vcpkg.json @@ -24,6 +24,10 @@ "host": true }, "python3", + { + "name": "python3", + "host": true + }, { "name": "vcpkg-tool-meson", "host": true From c271a93a49cd80504a5a59395f8b7ae008f12271 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 4 May 2023 16:54:54 +0200 Subject: [PATCH 48/85] v db --- versions/g-/gobject-introspection.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/g-/gobject-introspection.json b/versions/g-/gobject-introspection.json index bac89e6781e771..2184ae900e21ee 100644 --- a/versions/g-/gobject-introspection.json +++ b/versions/g-/gobject-introspection.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "3760927346142ac9635e14d2f64f304e899bbeaf", + "git-tree": "4369027268b969ed6f6ad72f0dc21770fdc2dae3", "version": "1.72.0", "port-version": 4 }, From 825f5d46665545ef88ff8d2844fb6225d29a7289 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 9 May 2023 12:02:54 +0200 Subject: [PATCH 49/85] remove double version --- versions/v-/vcpkg-tool-meson.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/versions/v-/vcpkg-tool-meson.json b/versions/v-/vcpkg-tool-meson.json index 2b369e51e96dec..4e813488d739ac 100644 --- a/versions/v-/vcpkg-tool-meson.json +++ b/versions/v-/vcpkg-tool-meson.json @@ -5,11 +5,6 @@ "version": "1.1.0", "port-version": 0 }, - { - "git-tree": "f96ae6f3c73df752191575a05e258ea8475a1078", - "version": "1.0.0", - "port-version": 0 - }, { "git-tree": "bee0cb6c5edf45133ebc9643b86c9c775ab36cfe", "version": "0.63", From 93c96ead8cf68aa7d2708ad5fcdf59cef4a464c8 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 12 May 2023 00:17:00 +0200 Subject: [PATCH 50/85] revert uwp changes since they are not necessary here --- scripts/toolchains/uwp.cmake | 5 ----- 1 file changed, 5 deletions(-) diff --git a/scripts/toolchains/uwp.cmake b/scripts/toolchains/uwp.cmake index ff288196b92b5c..4656108782b8d1 100644 --- a/scripts/toolchains/uwp.cmake +++ b/scripts/toolchains/uwp.cmake @@ -71,18 +71,13 @@ if(NOT _CMAKE_IN_TRY_COMPILE) set(additional_exe_flags "/WINMD") # VS Generator chokes on this in the compiler detection endif() string(APPEND CMAKE_SHARED_LINKER_FLAGS " /MANIFEST:NO /NXCOMPAT /DYNAMICBASE /DEBUG /WINMD:NO /APPCONTAINER /SUBSYSTEM:CONSOLE /MANIFESTUAC:NO ${VCPKG_LINKER_FLAGS}") - string(APPEND CMAKE_MODULE_LINKER_FLAGS " /MANIFEST:NO /NXCOMPAT /DYNAMICBASE /DEBUG /WINMD:NO /APPCONTAINER /SUBSYSTEM:CONSOLE /MANIFESTUAC:NO ${VCPKG_LINKER_FLAGS}") - # VS adds /DEBUG:FULL /TLBID:1. WindowsApp.lib is in CMAKE_C|CXX_STANDARD_LIBRARIES string(APPEND CMAKE_EXE_LINKER_FLAGS " /MANIFEST:NO /NXCOMPAT /DYNAMICBASE /DEBUG ${additional_exe_flags} /APPCONTAINER /MANIFESTUAC:NO ${VCPKG_LINKER_FLAGS}") set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "/DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF ${VCPKG_LINKER_FLAGS_RELEASE}" CACHE STRING "") # VS uses /LTCG:incremental - set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "/DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF ${VCPKG_LINKER_FLAGS_RELEASE}" CACHE STRING "") # VS uses /LTCG:incremental - set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF ${VCPKG_LINKER_FLAGS_RELEASE}" CACHE STRING "") string(APPEND CMAKE_STATIC_LINKER_FLAGS_DEBUG_INIT " /nologo ") string(APPEND CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT " /nologo ") - string(APPEND CMAKE_MODULE_LINKER_FLAGS_DEBUG_INIT " /nologo ") string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT " /nologo ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_DEBUG} ") endif() endif() From 82c40ac7686defe513b7858716179dd4dbdfc15e Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 1 Jan 2024 20:43:38 +0100 Subject: [PATCH 51/85] upgrade to 1.3.1 --- ports/vcpkg-tool-meson/meson-intl.patch | 4 ++-- ports/vcpkg-tool-meson/vcpkg-port-config.cmake | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/vcpkg-tool-meson/meson-intl.patch b/ports/vcpkg-tool-meson/meson-intl.patch index 8997249ae57ee7..8f2a029de556f4 100644 --- a/ports/vcpkg-tool-meson/meson-intl.patch +++ b/ports/vcpkg-tool-meson/meson-intl.patch @@ -1,9 +1,9 @@ diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py --- a/mesonbuild/dependencies/misc.py +++ b/mesonbuild/dependencies/misc.py -@@ -610,7 +610,8 @@ iconv_factory = DependencyFactory( +@@ -593,7 +593,8 @@ iconv_factory = DependencyFactory( - intl_factory = DependencyFactory( + packages['intl'] = intl_factory = DependencyFactory( 'intl', + [DependencyMethods.BUILTIN, DependencyMethods.SYSTEM, DependencyMethods.CMAKE], + cmake_name='Intl', diff --git a/ports/vcpkg-tool-meson/vcpkg-port-config.cmake b/ports/vcpkg-tool-meson/vcpkg-port-config.cmake index cdb56513cef465..fae043fdf423c9 100644 --- a/ports/vcpkg-tool-meson/vcpkg-port-config.cmake +++ b/ports/vcpkg-tool-meson/vcpkg-port-config.cmake @@ -27,7 +27,7 @@ set(ref 110642dd7337347d0278451a1df11efd93d8ed8a) 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 0) +set(download_sha512 4b84dd946160bc2e773a2478a3b7de2eba9f38b8650453242c7655aa12dde393c4bf1eee4d3d9986dd9c22d96d913de916f43a36cda61f0399c622ca6afe248f) find_program(SCRIPT_MESON NAMES ${search_names} PATHS "${path_to_search}" NO_DEFAULT_PATH) # NO_DEFAULT_PATH due top patching From 1bd9b1f889311213c80e4cd7ea0aed3e8b139fb1 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 1 Jan 2024 20:46:28 +0100 Subject: [PATCH 52/85] port version --- ports/thorvg/vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/thorvg/vcpkg.json b/ports/thorvg/vcpkg.json index cc45c146ae301e..e2325ef20e44f2 100644 --- a/ports/thorvg/vcpkg.json +++ b/ports/thorvg/vcpkg.json @@ -1,6 +1,7 @@ { "name": "thorvg", "version": "0.11.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", From aff2a24cb5e06c2b0c33d6762cb48ee334ac799e Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 1 Jan 2024 21:51:55 +0100 Subject: [PATCH 53/85] - fix path - use tmp path for patching - test extraction + patches in vcpkg-tool-meson --- ports/vcpkg-tool-meson/portfile.cmake | 2 ++ ...remove-freebsd-pcfile-specialization.patch | 23 +++++++++++-------- .../vcpkg-tool-meson/vcpkg-port-config.cmake | 12 ++++++---- 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/ports/vcpkg-tool-meson/portfile.cmake b/ports/vcpkg-tool-meson/portfile.cmake index 933b5d9bf20be3..a4f2b99b82baa5 100644 --- a/ports/vcpkg-tool-meson/portfile.cmake +++ b/ports/vcpkg-tool-meson/portfile.cmake @@ -16,3 +16,5 @@ file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg_configure_meson.cmake" file(WRITE "${CURRENT_PACKAGES_DIR}/share/meson/version.txt" "${VERSION}") # For vcpkg_find_acquire_program file(INSTALL "${VCPKG_ROOT_DIR}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +include("${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-port-config.cmake") \ No newline at end of file diff --git a/ports/vcpkg-tool-meson/remove-freebsd-pcfile-specialization.patch b/ports/vcpkg-tool-meson/remove-freebsd-pcfile-specialization.patch index c5e9e0f4f6dcc7..dafee8f1a00640 100644 --- a/ports/vcpkg-tool-meson/remove-freebsd-pcfile-specialization.patch +++ b/ports/vcpkg-tool-meson/remove-freebsd-pcfile-specialization.patch @@ -1,17 +1,20 @@ --- a/mesonbuild/modules/pkgconfig.py +++ b/mesonbuild/modules/pkgconfig.py -@@ -583,12 +583,8 @@ class PkgConfigModule(ExtensionModule): +@@ -702,15 +702,8 @@ class PkgConfigModule(ExtensionModule): pcfile = filebase + '.pc' - pkgroot = pkgroot_name = kwargs.get('install_dir', default_install_dir) + pkgroot = pkgroot_name = kwargs['install_dir'] or default_install_dir if pkgroot is None: -- if mesonlib.is_freebsd(): -- pkgroot = os.path.join(state.environment.coredata.get_option(mesonlib.OptionKey('prefix')), 'libdata', 'pkgconfig') -- pkgroot_name = os.path.join('{prefix}', 'libdata', 'pkgconfig') -- else: -- pkgroot = os.path.join(state.environment.coredata.get_option(mesonlib.OptionKey('libdir')), 'pkgconfig') -- pkgroot_name = os.path.join('{libdir}', 'pkgconfig') +- if mesonlib.is_freebsd(): +- pkgroot = os.path.join(_as_str(state.environment.coredata.get_option(mesonlib.OptionKey('prefix'))), 'libdata', 'pkgconfig') +- pkgroot_name = os.path.join('{prefix}', 'libdata', 'pkgconfig') +- elif mesonlib.is_haiku(): +- pkgroot = os.path.join(_as_str(state.environment.coredata.get_option(mesonlib.OptionKey('prefix'))), 'develop', 'lib', 'pkgconfig') +- pkgroot_name = os.path.join('{prefix}', 'develop', 'lib', 'pkgconfig') +- else: +- pkgroot = os.path.join(_as_str(state.environment.coredata.get_option(mesonlib.OptionKey('libdir'))), 'pkgconfig') +- pkgroot_name = os.path.join('{libdir}', 'pkgconfig') + pkgroot = os.path.join(state.environment.coredata.get_option(mesonlib.OptionKey('libdir')), 'pkgconfig') + pkgroot_name = os.path.join('{libdir}', 'pkgconfig') - if not isinstance(pkgroot, str): - raise mesonlib.MesonException('Install_dir must be a string.') + relocatable = state.get_option('relocatable', module='pkgconfig') self._generate_pkgconfig_file(state, deps, subdirs, name, description, url, + version, pcfile, conflicts, variables, diff --git a/ports/vcpkg-tool-meson/vcpkg-port-config.cmake b/ports/vcpkg-tool-meson/vcpkg-port-config.cmake index fae043fdf423c9..b44190fef69640 100644 --- a/ports/vcpkg-tool-meson/vcpkg-port-config.cmake +++ b/ports/vcpkg-tool-meson/vcpkg-port-config.cmake @@ -38,20 +38,22 @@ if(NOT SCRIPT_MESON) FILENAME "${download_filename}" ) - file(MAKE_DIRECTORY "${path_to_search}/../") + file(REMOVE_RECURSE "${path_to_search}-tmp/../") + file(MAKE_DIRECTORY "${path_to_search}-tmp/../") file(ARCHIVE_EXTRACT INPUT "${archive_path}" - DESTINATION "${path_to_search}/../" + DESTINATION "${path_to_search}-tmp/../" #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}" + SOURCE_PATH "${path_to_search}-tmp/../meson-${ref}/" PATCHES "${CMAKE_CURRENT_LIST_DIR}/meson-intl.patch" "${CMAKE_CURRENT_LIST_DIR}/adjust-python-dep.patch" "${CMAKE_CURRENT_LIST_DIR}/remove-freebsd-pcfile-specialization.patch" ) + file(REMOVE_RECURSE "${path_to_search}-tmp/../meson-${ref}/test cases/") + file(RENAME "${path_to_search}-tmp/../meson-${ref}" "${path_to_search}") + vcpkg_replace_string("${DOWNLOADS}/tools/meson-${program_version}/mesonbuild/cmake/toolchain.py" "arg.startswith('/')" "arg.startswith(('/','-'))") set(SCRIPT_MESON "${DOWNLOADS}/tools/meson-${program_version}/meson.py") endif() From 9ebd174570f2fe9fd1a5b229de71b4892ecf0771 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 3 Jan 2024 23:45:27 +0100 Subject: [PATCH 54/85] Make meson in downloads more robust by having a calculated hash in the search path --- ports/vcpkg-tool-meson/adjust-args.patch | 12 ++++++ .../vcpkg-tool-meson/adjust-python-dep.patch | 38 +++++++++++++++++-- ports/vcpkg-tool-meson/portfile.cmake | 23 ++++++++++- .../vcpkg-tool-meson/vcpkg-port-config.cmake | 14 ++++--- 4 files changed, 75 insertions(+), 12 deletions(-) create mode 100644 ports/vcpkg-tool-meson/adjust-args.patch diff --git a/ports/vcpkg-tool-meson/adjust-args.patch b/ports/vcpkg-tool-meson/adjust-args.patch new file mode 100644 index 00000000000000..2aea109c19248e --- /dev/null +++ b/ports/vcpkg-tool-meson/adjust-args.patch @@ -0,0 +1,12 @@ +diff --git a/mesonbuild/cmake/toolchain.py b/mesonbuild/cmake/toolchain.py +index abf2cf6..477629e 100644 +--- a/mesonbuild/cmake/toolchain.py ++++ b/mesonbuild/cmake/toolchain.py +@@ -204,6 +204,6 @@ 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('-') diff --git a/ports/vcpkg-tool-meson/adjust-python-dep.patch b/ports/vcpkg-tool-meson/adjust-python-dep.patch index a401ffb637a92a..115ccbbe52f08b 100644 --- a/ports/vcpkg-tool-meson/adjust-python-dep.patch +++ b/ports/vcpkg-tool-meson/adjust-python-dep.patch @@ -1,16 +1,46 @@ diff --git a/mesonbuild/dependencies/python.py b/mesonbuild/dependencies/python.py -index 14386f9..1b8dd36 100644 ---- a/mesonbuild/dependencies/python.py +index 38e3d5f..6427980 100644 +--- a/mesonbuild/dependencies/python.py +++ b/mesonbuild/dependencies/python.py -@@ -369,10 +369,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', +@@ -208,7 +208,8 @@ class PythonSystemDependency(SystemDependency, _PythonDependencyBase): + # compile args ++ verdot = self.variables.get('py_version_short') + inc_paths = mesonlib.OrderedSet([ + self.variables.get('INCLUDEPY'), +- self.paths.get('include'), ++ self.paths.get('include') + f'/../../../include/python${verdot}', + self.paths.get('platinclude')]) + + self.compile_args += ['-I' + path for path in inc_paths if path] +@@ -279,9 +279,9 @@ class PythonSystemDependency(SystemDependency, _PythonDependencyBase): + else: + libpath = Path(f'python{vernum}.dll') + else: + if limited_api: + vernum = vernum[0] +- libpath = Path('libs') / f'python{vernum}.lib' ++ libpath = Path('libs') / f'..' / f'..' / f'..' / f'lib' / f'python{vernum}.lib' + # For a debug build, pyconfig.h may force linking with + # pythonX_d.lib (see meson#10776). This cannot be avoided + # and won't work unless we also have a debug build of +@@ -296,6 +296,8 @@ class PythonSystemDependency(SystemDependency, _PythonDependencyBase): + vscrt = self.env.coredata.options[mesonlib.OptionKey('b_vscrt')].value + if vscrt in {'mdd', 'mtd', 'from_buildtype', 'static_from_buildtype'}: + vscrt_debug = True ++ if is_debug_build: ++ libpath = Path('libs') / f'..' / f'..' / f'..' / f'debug/lib' / f'python{vernum}_d.lib' + if is_debug_build and vscrt_debug and not self.variables.get('Py_DEBUG'): + mlog.warning(textwrap.dedent('''\ + Using a debug build type with MSVC or an MSVC-compatible compiler +@@ -390,10 +390,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)) ++ candidates.append(functools.partial(PythonPkgConfigDependency, 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)) else: candidates.append(functools.partial(PkgConfigDependency, 'python3', env, kwargs)) diff --git a/ports/vcpkg-tool-meson/portfile.cmake b/ports/vcpkg-tool-meson/portfile.cmake index a4f2b99b82baa5..20912a3499dfe8 100644 --- a/ports/vcpkg-tool-meson/portfile.cmake +++ b/ports/vcpkg-tool-meson/portfile.cmake @@ -4,17 +4,36 @@ set(VCPKG_POLICY_CMAKE_HELPER_PORT enabled) +set(files + vcpkg.json + portfile.cmake + vcpkg-port-config.cmake + vcpkg_configure_meson.cmake + vcpkg_install_meson.cmake + meson-intl.patch + adjust-python-dep.patch + adjust-args.patch + remove-freebsd-pcfile-specialization.patch +) + +set(MESON_PATH_HASH "") +foreach(to_hash IN LISTS files) + file(SHA1 ${CMAKE_CURRENT_LIST_DIR}/${to_hash} to_append) + string(APPEND MESON_PATH_HASH "${to_append}") +endforeach() +string(SHA512 MESON_PATH_HASH "${MESON_PATH_HASH}") + configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-port-config.cmake" @ONLY) file(COPY "${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}/adjust-python-dep.patch" + "${CMAKE_CURRENT_LIST_DIR}/adjust-args.patch" "${CMAKE_CURRENT_LIST_DIR}/remove-freebsd-pcfile-specialization.patch" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") - file(WRITE "${CURRENT_PACKAGES_DIR}/share/meson/version.txt" "${VERSION}") # For vcpkg_find_acquire_program -file(INSTALL "${VCPKG_ROOT_DIR}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${VCPKG_ROOT_DIR}/LICENSE.txt") include("${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-port-config.cmake") \ No newline at end of file diff --git a/ports/vcpkg-tool-meson/vcpkg-port-config.cmake b/ports/vcpkg-tool-meson/vcpkg-port-config.cmake index b44190fef69640..79929e30699e0d 100644 --- a/ports/vcpkg-tool-meson/vcpkg-port-config.cmake +++ b/ports/vcpkg-tool-meson/vcpkg-port-config.cmake @@ -18,13 +18,16 @@ else() message(STATUS "Found Python version '${python_ver} at ${PYTHON3}'") endif() +set(meson_path_hash @MESON_PATH_HASH@) +string(SUBSTRING "${meson_path_hash}" 0 6 meson_short_hash) + # Setup meson: set(program MESON) set(program_version @VERSION@) set(program_name meson) set(search_names meson meson.py) set(ref 110642dd7337347d0278451a1df11efd93d8ed8a) -set(path_to_search "${DOWNLOADS}/tools/meson-${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 4b84dd946160bc2e773a2478a3b7de2eba9f38b8650453242c7655aa12dde393c4bf1eee4d3d9986dd9c22d96d913de916f43a36cda61f0399c622ca6afe248f) @@ -47,15 +50,14 @@ if(NOT SCRIPT_MESON) z_vcpkg_apply_patches( SOURCE_PATH "${path_to_search}-tmp/../meson-${ref}/" PATCHES + "${CMAKE_CURRENT_LIST_DIR}/adjust-args.patch" "${CMAKE_CURRENT_LIST_DIR}/meson-intl.patch" "${CMAKE_CURRENT_LIST_DIR}/adjust-python-dep.patch" "${CMAKE_CURRENT_LIST_DIR}/remove-freebsd-pcfile-specialization.patch" ) - file(REMOVE_RECURSE "${path_to_search}-tmp/../meson-${ref}/test cases/") - file(RENAME "${path_to_search}-tmp/../meson-${ref}" "${path_to_search}") - - vcpkg_replace_string("${DOWNLOADS}/tools/meson-${program_version}/mesonbuild/cmake/toolchain.py" "arg.startswith('/')" "arg.startswith(('/','-'))") - set(SCRIPT_MESON "${DOWNLOADS}/tools/meson-${program_version}/meson.py") + file(COPY "${path_to_search}-tmp/../meson-${ref}/meson.py" "${path_to_search}-tmp/../meson-${ref}/mesonbuild" DESTINATION "${path_to_search}") + file(REMOVE_RECURSE "${path_to_search}-tmp/../meson-${ref}") + set(SCRIPT_MESON "${path_to_search}/meson.py") endif() message(STATUS "Using meson: ${SCRIPT_MESON}") From 4e01a947cd0617cc855f3f125b5ea8c029efb4db Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 3 Jan 2024 23:46:19 +0100 Subject: [PATCH 55/85] v --- versions/baseline.json | 4 ++-- versions/v-/vcpkg-tool-meson.json | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index d20ea4f53b468d..95b547208ab0dc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8877,8 +8877,8 @@ "port-version": 1 }, "vcpkg-tool-meson": { - "baseline": "0.63", - "port-version": 1 + "baseline": "1.3.1", + "port-version": 0 }, "vcpkg-tool-mozbuild": { "baseline": "4.0.2", diff --git a/versions/v-/vcpkg-tool-meson.json b/versions/v-/vcpkg-tool-meson.json index 8ab8416f1e9e4e..7b316ff75dab82 100644 --- a/versions/v-/vcpkg-tool-meson.json +++ b/versions/v-/vcpkg-tool-meson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ff1ab831586e9e6834affff8ab315344096289d3", + "version": "1.3.1", + "port-version": 0 + }, { "git-tree": "d4234634624fc778e5d80db63cf53bac8587ebb9", "version": "0.63", From fc41c6add40fec6311d1477d96d51a68e5c74459 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 4 Jan 2024 10:04:28 +0100 Subject: [PATCH 56/85] add missing meson dependency to libnice --- ports/libnice/vcpkg.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ports/libnice/vcpkg.json b/ports/libnice/vcpkg.json index 200ad1d2a46fa0..08eb6e886c4a1c 100644 --- a/ports/libnice/vcpkg.json +++ b/ports/libnice/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libnice", "version": "0.1.21", - "port-version": 1, + "port-version": 2, "description": "Libnice is an implementation of the IETF's Interactive Connectivity Establishment (ICE) standard (RFC 5245) and the Session Traversal Utilities for NAT (STUN) standard (RFC 5389).", "homepage": "https://nice.freedesktop.org", "license": "LGPL-2.1-only AND MPL-1.1", @@ -13,6 +13,10 @@ "host": true, "default-features": false }, + { + "name": "vcpkg-tool-meson", + "host": true + } "openssl" ] } From 11ad785bdfcac52289172282aca20b56c4175743 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 4 Jan 2024 10:05:11 +0100 Subject: [PATCH 57/85] try meson version 1.2.3 - 1.3.1 breaks transitive deps in gdk-pixbuf --- ports/vcpkg-tool-meson/adjust-python-dep.patch | 4 +--- ports/vcpkg-tool-meson/vcpkg-port-config.cmake | 4 ++-- ports/vcpkg-tool-meson/vcpkg.json | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ports/vcpkg-tool-meson/adjust-python-dep.patch b/ports/vcpkg-tool-meson/adjust-python-dep.patch index 115ccbbe52f08b..1e15f2ed37e277 100644 --- a/ports/vcpkg-tool-meson/adjust-python-dep.patch +++ b/ports/vcpkg-tool-meson/adjust-python-dep.patch @@ -12,12 +12,10 @@ index 38e3d5f..6427980 100644 self.paths.get('platinclude')]) self.compile_args += ['-I' + path for path in inc_paths if path] -@@ -279,9 +279,9 @@ class PythonSystemDependency(SystemDependency, _PythonDependencyBase): +@@ -279,7 +279,7 @@ class PythonSystemDependency(SystemDependency, _PythonDependencyBase): else: libpath = Path(f'python{vernum}.dll') else: - if limited_api: - vernum = vernum[0] - libpath = Path('libs') / f'python{vernum}.lib' + libpath = Path('libs') / f'..' / f'..' / f'..' / f'lib' / f'python{vernum}.lib' # For a debug build, pyconfig.h may force linking with diff --git a/ports/vcpkg-tool-meson/vcpkg-port-config.cmake b/ports/vcpkg-tool-meson/vcpkg-port-config.cmake index 79929e30699e0d..e92c14ce6df1d8 100644 --- a/ports/vcpkg-tool-meson/vcpkg-port-config.cmake +++ b/ports/vcpkg-tool-meson/vcpkg-port-config.cmake @@ -26,11 +26,11 @@ set(program MESON) set(program_version @VERSION@) set(program_name meson) set(search_names meson meson.py) -set(ref 110642dd7337347d0278451a1df11efd93d8ed8a) +set(ref 84e437179da05db10aa2457322c54f4ec8be61f1) 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 4b84dd946160bc2e773a2478a3b7de2eba9f38b8650453242c7655aa12dde393c4bf1eee4d3d9986dd9c22d96d913de916f43a36cda61f0399c622ca6afe248f) +set(download_sha512 5f75af79bd6e05461a7e426487c77b5600bc94eed3184a26d4deed1ef960e28b889208e1b039e67606b8290321e0b5184227a476a25dd72a4f99c41ecfb37b8c) 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 index 8498548dc83729..827ef28a1bc92e 100644 --- a/ports/vcpkg-tool-meson/vcpkg.json +++ b/ports/vcpkg-tool-meson/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vcpkg-tool-meson", - "version": "1.3.1", + "version": "1.2.3", "description": "Meson build system", "homepage": "https://github.com/mesonbuild/meson", "license": "Apache-2.0", From 9617237aa5734a281138fd199f94eba89c272b14 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 4 Jan 2024 10:28:27 +0100 Subject: [PATCH 58/85] back to 1.1.1 --- ports/vcpkg-tool-meson/meson-intl.patch | 2 +- ports/vcpkg-tool-meson/vcpkg-port-config.cmake | 4 ++-- ports/vcpkg-tool-meson/vcpkg.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/vcpkg-tool-meson/meson-intl.patch b/ports/vcpkg-tool-meson/meson-intl.patch index 8f2a029de556f4..93dd00221a922b 100644 --- a/ports/vcpkg-tool-meson/meson-intl.patch +++ b/ports/vcpkg-tool-meson/meson-intl.patch @@ -3,7 +3,7 @@ diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py +++ b/mesonbuild/dependencies/misc.py @@ -593,7 +593,8 @@ iconv_factory = DependencyFactory( - packages['intl'] = intl_factory = DependencyFactory( + intl_factory = DependencyFactory( 'intl', + [DependencyMethods.BUILTIN, DependencyMethods.SYSTEM, DependencyMethods.CMAKE], + cmake_name='Intl', diff --git a/ports/vcpkg-tool-meson/vcpkg-port-config.cmake b/ports/vcpkg-tool-meson/vcpkg-port-config.cmake index e92c14ce6df1d8..d7196ffa2831b2 100644 --- a/ports/vcpkg-tool-meson/vcpkg-port-config.cmake +++ b/ports/vcpkg-tool-meson/vcpkg-port-config.cmake @@ -26,11 +26,11 @@ set(program MESON) set(program_version @VERSION@) set(program_name meson) set(search_names meson meson.py) -set(ref 84e437179da05db10aa2457322c54f4ec8be61f1) +set(ref 0266440992769d39266e600a310871fbbb276fdd) 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 5f75af79bd6e05461a7e426487c77b5600bc94eed3184a26d4deed1ef960e28b889208e1b039e67606b8290321e0b5184227a476a25dd72a4f99c41ecfb37b8c) +set(download_sha512 6b8e83480f6659056af5323faa0bca9d848f8371b547951a801fd43dd585daaea65f3cace53d97e0dafbc7b8f1c2541d734b4366a9990ab83bb8a5fe9c99cbd2) 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 index 827ef28a1bc92e..0af791cace20b0 100644 --- a/ports/vcpkg-tool-meson/vcpkg.json +++ b/ports/vcpkg-tool-meson/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vcpkg-tool-meson", - "version": "1.2.3", + "version": "1.1.1", "description": "Meson build system", "homepage": "https://github.com/mesonbuild/meson", "license": "Apache-2.0", From b50f2137287e232d3ae3d94ce9055ea3a224cef1 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sat, 13 Jan 2024 13:17:03 +0100 Subject: [PATCH 59/85] add missing , --- ports/libnice/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/libnice/vcpkg.json b/ports/libnice/vcpkg.json index 08eb6e886c4a1c..60ed4779de8b73 100644 --- a/ports/libnice/vcpkg.json +++ b/ports/libnice/vcpkg.json @@ -16,7 +16,7 @@ { "name": "vcpkg-tool-meson", "host": true - } + }, "openssl" ] } From c575c2252d98652f04a3758284bc41244eaae54c Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sat, 13 Jan 2024 13:17:47 +0100 Subject: [PATCH 60/85] format --- ports/libnice/vcpkg.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/libnice/vcpkg.json b/ports/libnice/vcpkg.json index 60ed4779de8b73..481ec1367d0e09 100644 --- a/ports/libnice/vcpkg.json +++ b/ports/libnice/vcpkg.json @@ -13,10 +13,10 @@ "host": true, "default-features": false }, + "openssl", { "name": "vcpkg-tool-meson", "host": true - }, - "openssl" + } ] } From ed362374d16878be954d982bd9770f2b35fa64c9 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sat, 13 Jan 2024 13:18:01 +0100 Subject: [PATCH 61/85] v db --- versions/baseline.json | 14 +++++++------- versions/g-/glib.json | 5 +++++ versions/g-/gobject-introspection.json | 5 +++++ versions/l-/libnice-gst.json | 5 +++++ versions/l-/libnice.json | 5 +++++ versions/t-/thorvg.json | 5 +++++ versions/v-/vcpkg-tool-meson.json | 5 +++++ 7 files changed, 37 insertions(+), 7 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index f2932131fc2ba1..09677deb3d9b19 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3002,7 +3002,7 @@ }, "glib": { "baseline": "2.78.1", - "port-version": 0 + "port-version": 1 }, "glibmm": { "baseline": "2.76.0", @@ -3054,7 +3054,7 @@ }, "gobject-introspection": { "baseline": "1.72.0", - "port-version": 6 + "port-version": 7 }, "google-cloud-cpp": { "baseline": "2.19.0", @@ -4578,11 +4578,11 @@ }, "libnice": { "baseline": "0.1.21", - "port-version": 1 + "port-version": 2 }, "libnice-gst": { "baseline": "0.1.21", - "port-version": 3 + "port-version": 4 }, "libnoise": { "baseline": "1.0.0", @@ -8414,7 +8414,7 @@ }, "thorvg": { "baseline": "0.11.3", - "port-version": 0 + "port-version": 1 }, "threadpool": { "baseline": "0.2.5", @@ -8877,8 +8877,8 @@ "port-version": 1 }, "vcpkg-tool-meson": { - "baseline": "0.63", - "port-version": 2 + "baseline": "1.1.1", + "port-version": 0 }, "vcpkg-tool-mozbuild": { "baseline": "4.0.2", diff --git a/versions/g-/glib.json b/versions/g-/glib.json index 4309342c1775a7..b2b292cb7385f9 100644 --- a/versions/g-/glib.json +++ b/versions/g-/glib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "131ca6a725132bc781ce237b46a459a9c852a5eb", + "version": "2.78.1", + "port-version": 1 + }, { "git-tree": "6c91a4d4382d4d271d13397214c536389fd4a122", "version": "2.78.1", diff --git a/versions/g-/gobject-introspection.json b/versions/g-/gobject-introspection.json index 5c5ac27213a6d0..848933a61cd2f1 100644 --- a/versions/g-/gobject-introspection.json +++ b/versions/g-/gobject-introspection.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "32e28ed3d33af4b8f0883728b6221c9715df7486", + "version": "1.72.0", + "port-version": 7 + }, { "git-tree": "aa7163808411a8ff5641022957909a6d681cea69", "version": "1.72.0", diff --git a/versions/l-/libnice-gst.json b/versions/l-/libnice-gst.json index d33bcc193e0001..11efbdb39560d6 100644 --- a/versions/l-/libnice-gst.json +++ b/versions/l-/libnice-gst.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a52e002d8bd6340ff16d0a927082af3482fbc4e6", + "version": "0.1.21", + "port-version": 4 + }, { "git-tree": "0454363efa550f5437e9bafac810b425ad2cef12", "version": "0.1.21", diff --git a/versions/l-/libnice.json b/versions/l-/libnice.json index 192231bbab0005..c27e963baef387 100644 --- a/versions/l-/libnice.json +++ b/versions/l-/libnice.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "98e1017e7d819e11ff75512079e67378196d1314", + "version": "0.1.21", + "port-version": 2 + }, { "git-tree": "752ea02df5a3ae83ff67c4bfcfc34e9570cc27f9", "version": "0.1.21", diff --git a/versions/t-/thorvg.json b/versions/t-/thorvg.json index a04fb4389cf406..270297c9f4faea 100644 --- a/versions/t-/thorvg.json +++ b/versions/t-/thorvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cd4c82e46cb88a5df286478b258b6a90a1b9b654", + "version": "0.11.3", + "port-version": 1 + }, { "git-tree": "d1d0212fb939be388b501f845991c03a56213ef8", "version": "0.11.3", diff --git a/versions/v-/vcpkg-tool-meson.json b/versions/v-/vcpkg-tool-meson.json index f2e9f80dd33623..8dc53346e9f5d5 100644 --- a/versions/v-/vcpkg-tool-meson.json +++ b/versions/v-/vcpkg-tool-meson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "37fe6890ffa2d52ca59b4cfae65f74a111fba9f7", + "version": "1.1.1", + "port-version": 0 + }, { "git-tree": "3f6f5419cfc743a85e4f1fb1b582d4728b79c1e2", "version": "0.63", From 6052354026d15be7b03ab20a6018580fb31259c1 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 22 Jan 2024 22:55:04 +0100 Subject: [PATCH 62/85] back to 1.3.1 with fix for gdk-pixbuf --- ports/gdk-pixbuf/fix-static-deps.patch | 12 ++ ports/gdk-pixbuf/portfile.cmake | 2 +- ports/gdk-pixbuf/vcpkg.json | 2 +- .../vcpkg-tool-meson/adjust-python-dep.patch | 4 +- ports/vcpkg-tool-meson/meson-intl.patch | 2 +- ports/vcpkg-tool-meson/meson.template.in | 41 ++++++ ports/vcpkg-tool-meson/portfile.cmake | 2 + .../vcpkg-tool-meson/vcpkg-port-config.cmake | 126 +++++++++--------- ports/vcpkg-tool-meson/vcpkg.json | 2 +- .../vcpkg_configure_meson.cmake | 4 +- 10 files changed, 127 insertions(+), 70 deletions(-) create mode 100644 ports/gdk-pixbuf/fix-static-deps.patch create mode 100644 ports/vcpkg-tool-meson/meson.template.in diff --git a/ports/gdk-pixbuf/fix-static-deps.patch b/ports/gdk-pixbuf/fix-static-deps.patch new file mode 100644 index 00000000000000..693f11db6bea6c --- /dev/null +++ b/ports/gdk-pixbuf/fix-static-deps.patch @@ -0,0 +1,12 @@ +diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build +index d7aa127b48..c313dc272d 100644 +--- a/gdk-pixbuf/meson.build ++++ b/gdk-pixbuf/meson.build +@@ -214,6 +214,7 @@ gdkpixbuf = library('gdk_pixbuf-2.0', + dependencies: [ + gdk_pixbuf_deps, + included_loaders_deps, ++ loaders_deps + ], + install: true) + diff --git a/ports/gdk-pixbuf/portfile.cmake b/ports/gdk-pixbuf/portfile.cmake index 91544e90fc2629..4f95131b61c985 100644 --- a/ports/gdk-pixbuf/portfile.cmake +++ b/ports/gdk-pixbuf/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} vcpkg_from_gitlab( GITLAB_URL https://gitlab.gnome.org/ OUT_SOURCE_PATH SOURCE_PATH @@ -10,6 +9,7 @@ vcpkg_from_gitlab( fix_build_error_windows.patch loaders-cache.patch use-libtiff-4-pkgconfig.patch + fix-static-deps.patch ) if("introspection" IN_LIST FEATURES) diff --git a/ports/gdk-pixbuf/vcpkg.json b/ports/gdk-pixbuf/vcpkg.json index 9caa47cee92523..88634b7ced5add 100644 --- a/ports/gdk-pixbuf/vcpkg.json +++ b/ports/gdk-pixbuf/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gdk-pixbuf", "version": "2.42.10", - "port-version": 2, + "port-version": 3, "description": "Image loading library.", "homepage": "https://gitlab.gnome.org/GNOME/gdk-pixbuf", "license": "LGPL-2.1-or-later", diff --git a/ports/vcpkg-tool-meson/adjust-python-dep.patch b/ports/vcpkg-tool-meson/adjust-python-dep.patch index 1e15f2ed37e277..115ccbbe52f08b 100644 --- a/ports/vcpkg-tool-meson/adjust-python-dep.patch +++ b/ports/vcpkg-tool-meson/adjust-python-dep.patch @@ -12,10 +12,12 @@ index 38e3d5f..6427980 100644 self.paths.get('platinclude')]) self.compile_args += ['-I' + path for path in inc_paths if path] -@@ -279,7 +279,7 @@ class PythonSystemDependency(SystemDependency, _PythonDependencyBase): +@@ -279,9 +279,9 @@ class PythonSystemDependency(SystemDependency, _PythonDependencyBase): else: libpath = Path(f'python{vernum}.dll') else: + if limited_api: + vernum = vernum[0] - libpath = Path('libs') / f'python{vernum}.lib' + libpath = Path('libs') / f'..' / f'..' / f'..' / f'lib' / f'python{vernum}.lib' # For a debug build, pyconfig.h may force linking with diff --git a/ports/vcpkg-tool-meson/meson-intl.patch b/ports/vcpkg-tool-meson/meson-intl.patch index 93dd00221a922b..8f2a029de556f4 100644 --- a/ports/vcpkg-tool-meson/meson-intl.patch +++ b/ports/vcpkg-tool-meson/meson-intl.patch @@ -3,7 +3,7 @@ diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py +++ b/mesonbuild/dependencies/misc.py @@ -593,7 +593,8 @@ iconv_factory = DependencyFactory( - intl_factory = DependencyFactory( + packages['intl'] = intl_factory = DependencyFactory( 'intl', + [DependencyMethods.BUILTIN, DependencyMethods.SYSTEM, DependencyMethods.CMAKE], + cmake_name='Intl', diff --git a/ports/vcpkg-tool-meson/meson.template.in b/ports/vcpkg-tool-meson/meson.template.in new file mode 100644 index 00000000000000..d0fd45d3f21ef7 --- /dev/null +++ b/ports/vcpkg-tool-meson/meson.template.in @@ -0,0 +1,41 @@ +[binaries] +cmake = ['@CMAKE_COMMAND@'] +ninja = ['@NINJA@'] +pkg-config= ['@PKGCONFIG@'] +@MESON_MT@ +@MESON_AR@ +@MESON_RC@ +@MESON_C@ +@MESON_C_LD@ +@MESON_CXX@ +@MESON_CXX_LD@ +@MESON_OBJC@ +@MESON_OBJC_LD@ +@MESON_OBJCPP@ +@MESON_OBJCPP_LD@ +@MESON_FC@ +@MESON_FC_LD@ +@MESON_WINDRES@ +@MESON_ADDITIONAL_BINARIES@ +[properties] +cmake_toolchain_file = '@SCRIPTS@/buildsystems/vcpkg.cmake' +[cmake] +VCPKG_TARGET_TRIPLET = '@TARGET_TRIPLET@' +VCPKG_HOST_TRIPLET = '@_HOST_TRIPLET@' +VCPKG_CHAINLOAD_TOOLCHAIN_FILE = '@VCPKG_CHAINLOAD_TOOLCHAIN_FILE@' +VCPKG_CRT_LINKAGE = '@VCPKG_CRT_LINKAGE@' +_VCPKG_INSTALLED_DIR = '@_VCPKG_INSTALLED_DIR@' +@MESON_HOST_MACHINE@ +@MESON_BUILD_MACHINE@ +[built-in options] +default_library = '@MESON_DEFAULT_LIBRARY@' +werror = false +@MESON_CFLAGS@ +@MESON_CXXFLAGS@ +@MESON_FCFLAGS@ +@MESON_OBJCFLAGS@ +@MESON_OBJCPPFLAGS@ +# b_vscrt +@MESON_VSCRT_LINKAGE@ +# c_winlibs/cpp_winlibs +@MESON_WINLIBS@ \ No newline at end of file diff --git a/ports/vcpkg-tool-meson/portfile.cmake b/ports/vcpkg-tool-meson/portfile.cmake index 20912a3499dfe8..8198b6877e3ef0 100644 --- a/ports/vcpkg-tool-meson/portfile.cmake +++ b/ports/vcpkg-tool-meson/portfile.cmake @@ -14,6 +14,7 @@ set(files adjust-python-dep.patch adjust-args.patch remove-freebsd-pcfile-specialization.patch + meson.template.in ) set(MESON_PATH_HASH "") @@ -30,6 +31,7 @@ file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg_configure_meson.cmake" "${CMAKE_CURRENT_LIST_DIR}/adjust-python-dep.patch" "${CMAKE_CURRENT_LIST_DIR}/adjust-args.patch" "${CMAKE_CURRENT_LIST_DIR}/remove-freebsd-pcfile-specialization.patch" + "${CMAKE_CURRENT_LIST_DIR}/meson.template.in" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(WRITE "${CURRENT_PACKAGES_DIR}/share/meson/version.txt" "${VERSION}") # For vcpkg_find_acquire_program diff --git a/ports/vcpkg-tool-meson/vcpkg-port-config.cmake b/ports/vcpkg-tool-meson/vcpkg-port-config.cmake index d7196ffa2831b2..890f4792963071 100644 --- a/ports/vcpkg-tool-meson/vcpkg-port-config.cmake +++ b/ports/vcpkg-tool-meson/vcpkg-port-config.cmake @@ -1,63 +1,63 @@ -# 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() - -set(meson_path_hash @MESON_PATH_HASH@) -string(SUBSTRING "${meson_path_hash}" 0 6 meson_short_hash) - -# Setup meson: -set(program MESON) -set(program_version @VERSION@) -set(program_name meson) -set(search_names meson meson.py) -set(ref 0266440992769d39266e600a310871fbbb276fdd) -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 6b8e83480f6659056af5323faa0bca9d848f8371b547951a801fd43dd585daaea65f3cace53d97e0dafbc7b8f1c2541d734b4366a9990ab83bb8a5fe9c99cbd2) - -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(REMOVE_RECURSE "${path_to_search}-tmp/../") - file(MAKE_DIRECTORY "${path_to_search}-tmp/../") - file(ARCHIVE_EXTRACT INPUT "${archive_path}" - DESTINATION "${path_to_search}-tmp/../" - #PATTERNS "**/mesonbuild/*" "**/*.py" - ) - z_vcpkg_apply_patches( - SOURCE_PATH "${path_to_search}-tmp/../meson-${ref}/" - PATCHES - "${CMAKE_CURRENT_LIST_DIR}/adjust-args.patch" - "${CMAKE_CURRENT_LIST_DIR}/meson-intl.patch" - "${CMAKE_CURRENT_LIST_DIR}/adjust-python-dep.patch" - "${CMAKE_CURRENT_LIST_DIR}/remove-freebsd-pcfile-specialization.patch" - ) - file(COPY "${path_to_search}-tmp/../meson-${ref}/meson.py" "${path_to_search}-tmp/../meson-${ref}/mesonbuild" DESTINATION "${path_to_search}") - file(REMOVE_RECURSE "${path_to_search}-tmp/../meson-${ref}") - set(SCRIPT_MESON "${path_to_search}/meson.py") -endif() - -message(STATUS "Using meson: ${SCRIPT_MESON}") +# 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() + +set(meson_path_hash @MESON_PATH_HASH@) +string(SUBSTRING "${meson_path_hash}" 0 6 meson_short_hash) + +# Setup meson: +set(program MESON) +set(program_version @VERSION@) +set(program_name meson) +set(search_names meson meson.py) +set(ref 110642dd7337347d0278451a1df11efd93d8ed8a) +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 4b84dd946160bc2e773a2478a3b7de2eba9f38b8650453242c7655aa12dde393c4bf1eee4d3d9986dd9c22d96d913de916f43a36cda61f0399c622ca6afe248f) + +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(REMOVE_RECURSE "${path_to_search}-tmp/../") + file(MAKE_DIRECTORY "${path_to_search}-tmp/../") + file(ARCHIVE_EXTRACT INPUT "${archive_path}" + DESTINATION "${path_to_search}-tmp/../" + #PATTERNS "**/mesonbuild/*" "**/*.py" + ) + z_vcpkg_apply_patches( + SOURCE_PATH "${path_to_search}-tmp/../meson-${ref}/" + PATCHES + "${CMAKE_CURRENT_LIST_DIR}/adjust-args.patch" + "${CMAKE_CURRENT_LIST_DIR}/meson-intl.patch" + "${CMAKE_CURRENT_LIST_DIR}/adjust-python-dep.patch" + "${CMAKE_CURRENT_LIST_DIR}/remove-freebsd-pcfile-specialization.patch" + ) + file(COPY "${path_to_search}-tmp/../meson-${ref}/meson.py" "${path_to_search}-tmp/../meson-${ref}/mesonbuild" DESTINATION "${path_to_search}") + file(REMOVE_RECURSE "${path_to_search}-tmp/../meson-${ref}") + set(SCRIPT_MESON "${path_to_search}/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 index 0af791cace20b0..8498548dc83729 100644 --- a/ports/vcpkg-tool-meson/vcpkg.json +++ b/ports/vcpkg-tool-meson/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vcpkg-tool-meson", - "version": "1.1.1", + "version": "1.3.1", "description": "Meson build system", "homepage": "https://github.com/mesonbuild/meson", "license": "Apache-2.0", diff --git a/ports/vcpkg-tool-meson/vcpkg_configure_meson.cmake b/ports/vcpkg-tool-meson/vcpkg_configure_meson.cmake index b94aac54b2118e..b6131a6359e0dc 100644 --- a/ports/vcpkg-tool-meson/vcpkg_configure_meson.cmake +++ b/ports/vcpkg-tool-meson/vcpkg_configure_meson.cmake @@ -28,7 +28,7 @@ function(z_vcpkg_meson_set_proglist_variables config_type) list(APPEND compilers RC) endif() set(meson_RC windres) - set(meson_Fortran fc) + set(meson_Fortran fortran) set(meson_CXX cpp) foreach(prog IN LISTS compilers) if(VCPKG_DETECTED_CMAKE_${prog}_COMPILER) @@ -435,7 +435,7 @@ function(vcpkg_configure_meson) endif() z_vcpkg_meson_setup_variables(${buildtype}) - configure_file("${SCRIPTS}/buildsystems/meson/meson.template.in" "${meson_input_file_${buildtype}}" @ONLY) + configure_file("${CMAKE_CURRENT_FUNCTION_LIST_DIR}/meson.template.in" "${meson_input_file_${buildtype}}" @ONLY) vcpkg_execute_required_process( COMMAND ${MESON} ${arg_OPTIONS} ${arg_OPTIONS_${buildtype}} ${arg_SOURCE_PATH} From 3e588958545a0b814fb809795f3fe4978883b0f0 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 22 Jan 2024 22:57:12 +0100 Subject: [PATCH 63/85] v db --- versions/baseline.json | 18 +++++++++--------- versions/g-/gdk-pixbuf.json | 5 +++++ versions/l-/libnice.json | 2 +- versions/t-/thorvg.json | 5 +++++ versions/v-/vcpkg-tool-meson.json | 5 +++++ 5 files changed, 25 insertions(+), 10 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 393957085518fa..89e182a913aaf5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2294,7 +2294,7 @@ }, "drogon": { "baseline": "1.9.2", - "port-version": 0 + "port-version": 0 }, "dstorage": { "baseline": "1.2.2", @@ -2910,7 +2910,7 @@ }, "gdk-pixbuf": { "baseline": "2.42.10", - "port-version": 2 + "port-version": 3 }, "gemmlowp": { "baseline": "2021-09-28", @@ -3018,7 +3018,7 @@ }, "glib": { "baseline": "2.78.1", - "port-version": 0 + "port-version": 1 }, "glibmm": { "baseline": "2.76.0", @@ -3070,7 +3070,7 @@ }, "gobject-introspection": { "baseline": "1.72.0", - "port-version": 6 + "port-version": 7 }, "google-cloud-cpp": { "baseline": "2.20.0", @@ -4602,11 +4602,11 @@ }, "libnice": { "baseline": "0.1.21", - "port-version": 1 + "port-version": 2 }, "libnice-gst": { "baseline": "0.1.21", - "port-version": 3 + "port-version": 4 }, "libnick": { "baseline": "2024.1.5", @@ -8466,7 +8466,7 @@ }, "thorvg": { "baseline": "0.12.1", - "port-version": 0 + "port-version": 1 }, "threadpool": { "baseline": "0.2.5", @@ -8929,8 +8929,8 @@ "port-version": 1 }, "vcpkg-tool-meson": { - "baseline": "0.63", - "port-version": 2 + "baseline": "1.3.1", + "port-version": 0 }, "vcpkg-tool-mozbuild": { "baseline": "4.0.2", diff --git a/versions/g-/gdk-pixbuf.json b/versions/g-/gdk-pixbuf.json index 8addc98cf40b61..09e5937ade88de 100644 --- a/versions/g-/gdk-pixbuf.json +++ b/versions/g-/gdk-pixbuf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "155d642e94235b73e42125201d552211161a4e65", + "version": "2.42.10", + "port-version": 3 + }, { "git-tree": "3dc0bb4b0113c8043f2ed716694303d1bdc08d88", "version": "2.42.10", diff --git a/versions/l-/libnice.json b/versions/l-/libnice.json index c27e963baef387..e07a26278a45d2 100644 --- a/versions/l-/libnice.json +++ b/versions/l-/libnice.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "98e1017e7d819e11ff75512079e67378196d1314", + "git-tree": "e727ccac25d95c7a8e43a944407c80a1a071c581", "version": "0.1.21", "port-version": 2 }, diff --git a/versions/t-/thorvg.json b/versions/t-/thorvg.json index 3bef73b6c2ce89..9dc7af05656180 100644 --- a/versions/t-/thorvg.json +++ b/versions/t-/thorvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3268f3ca33dc333073105440c3507f03845929f1", + "version": "0.12.1", + "port-version": 1 + }, { "git-tree": "e76612a36df3034ad703e603692ae10c9ca315e1", "version": "0.12.1", diff --git a/versions/v-/vcpkg-tool-meson.json b/versions/v-/vcpkg-tool-meson.json index 8dc53346e9f5d5..089186744b5b69 100644 --- a/versions/v-/vcpkg-tool-meson.json +++ b/versions/v-/vcpkg-tool-meson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "da533968329db2407b37e762f76a8f9615ef9bd9", + "version": "1.3.1", + "port-version": 0 + }, { "git-tree": "37fe6890ffa2d52ca59b4cfae65f74a111fba9f7", "version": "1.1.1", From 68d18cb972ed2444e9c1a8b5050749c268474aa0 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 23 Jan 2024 19:28:16 +0100 Subject: [PATCH 64/85] add meson dependency --- ports/libadwaita/vcpkg.json | 6 +++++- ports/libnice-gst/vcpkg.json | 8 ++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ports/libadwaita/vcpkg.json b/ports/libadwaita/vcpkg.json index 8f1f5d229dc1d8..473d97fd854345 100644 --- a/ports/libadwaita/vcpkg.json +++ b/ports/libadwaita/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libadwaita", "version": "1.3.2", - "port-version": 1, + "port-version": 2, "description": "Building blocks for modern GNOME applications", "homepage": "https://gnome.pages.gitlab.gnome.org/libadwaita", "license": "LGPL-2.1-or-later", @@ -15,6 +15,10 @@ { "name": "sassc", "host": true + }, + { + "name": "vcpkg-tool-meson", + "host": true } ] } diff --git a/ports/libnice-gst/vcpkg.json b/ports/libnice-gst/vcpkg.json index e6990065ceda02..aad431da28b0a1 100644 --- a/ports/libnice-gst/vcpkg.json +++ b/ports/libnice-gst/vcpkg.json @@ -1,13 +1,17 @@ { "name": "libnice-gst", "version": "0.1.21", - "port-version": 4, + "port-version": 3, "description": "Gstreamer Libnice plugins.", "homepage": "https://nice.freedesktop.org", "license": "LGPL-2.1-only AND MPL-1.1", "supports": "!xbox", "dependencies": [ "gstreamer", - "libnice" + "libnice", + { + "name": "vcpkg-tool-meson", + "host": true + } ] } From a51bfce645d204a4b24ba2f407eceff99cb30399 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 23 Jan 2024 19:29:29 +0100 Subject: [PATCH 65/85] fix port version --- ports/libnice-gst/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/libnice-gst/vcpkg.json b/ports/libnice-gst/vcpkg.json index aad431da28b0a1..bab00750029c94 100644 --- a/ports/libnice-gst/vcpkg.json +++ b/ports/libnice-gst/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libnice-gst", "version": "0.1.21", - "port-version": 3, + "port-version": 4, "description": "Gstreamer Libnice plugins.", "homepage": "https://nice.freedesktop.org", "license": "LGPL-2.1-only AND MPL-1.1", From 3ee7b5b168802eb71e0ffee40da76b04a65df86f Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 23 Jan 2024 19:29:52 +0100 Subject: [PATCH 66/85] v db --- versions/baseline.json | 4 ++-- versions/g-/gobject-introspection.json | 5 +++++ versions/l-/libadwaita.json | 5 +++++ versions/l-/libnice-gst.json | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 89e182a913aaf5..00bf825ad3af64 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3070,7 +3070,7 @@ }, "gobject-introspection": { "baseline": "1.72.0", - "port-version": 7 + "port-version": 8 }, "google-cloud-cpp": { "baseline": "2.20.0", @@ -4082,7 +4082,7 @@ }, "libadwaita": { "baseline": "1.3.2", - "port-version": 1 + "port-version": 2 }, "libaes-siv": { "baseline": "2020-10-15", diff --git a/versions/g-/gobject-introspection.json b/versions/g-/gobject-introspection.json index f87d5c78eb339d..89c610a58f8025 100644 --- a/versions/g-/gobject-introspection.json +++ b/versions/g-/gobject-introspection.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a79249743886d0325fa6ba7dea173c6d3a7b6d40", + "version": "1.72.0", + "port-version": 8 + }, { "git-tree": "9d0cfb4e7056136db4c9def1e64b88b7417dc0e8", "version": "1.72.0", diff --git a/versions/l-/libadwaita.json b/versions/l-/libadwaita.json index 511a4a2d49e3f9..e84bf7e5dcd31c 100644 --- a/versions/l-/libadwaita.json +++ b/versions/l-/libadwaita.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "96910a2e41ab111c5bc26611f533a44dd760be35", + "version": "1.3.2", + "port-version": 2 + }, { "git-tree": "ed0c59fcd97bfea68ea94baf161a1c9e6d5c673d", "version": "1.3.2", diff --git a/versions/l-/libnice-gst.json b/versions/l-/libnice-gst.json index 11efbdb39560d6..5d3002a1f38af3 100644 --- a/versions/l-/libnice-gst.json +++ b/versions/l-/libnice-gst.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "a52e002d8bd6340ff16d0a927082af3482fbc4e6", + "git-tree": "3717f8377e0dbac46191136366973c45a623850f", "version": "0.1.21", "port-version": 4 }, From 8898e385a86d62e997424215c0706abd6e6d158d Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 23 Jan 2024 20:20:39 +0100 Subject: [PATCH 67/85] remove version.txt --- ports/vcpkg-tool-meson/portfile.cmake | 2 -- 1 file changed, 2 deletions(-) diff --git a/ports/vcpkg-tool-meson/portfile.cmake b/ports/vcpkg-tool-meson/portfile.cmake index 8198b6877e3ef0..eeb25badd4355d 100644 --- a/ports/vcpkg-tool-meson/portfile.cmake +++ b/ports/vcpkg-tool-meson/portfile.cmake @@ -34,8 +34,6 @@ file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg_configure_meson.cmake" "${CMAKE_CURRENT_LIST_DIR}/meson.template.in" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(WRITE "${CURRENT_PACKAGES_DIR}/share/meson/version.txt" "${VERSION}") # For vcpkg_find_acquire_program - vcpkg_install_copyright(FILE_LIST "${VCPKG_ROOT_DIR}/LICENSE.txt") include("${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-port-config.cmake") \ No newline at end of file From bd8ac3f2657b98010bea1b88c98aa75cc006f403 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 24 Jan 2024 18:47:27 +0100 Subject: [PATCH 68/85] add dep --- ports/libxcvt/vcpkg.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/libxcvt/vcpkg.json b/ports/libxcvt/vcpkg.json index 0037a0ff88f20c..bc7bcd5785f05b 100644 --- a/ports/libxcvt/vcpkg.json +++ b/ports/libxcvt/vcpkg.json @@ -1,8 +1,15 @@ { "name": "libxcvt", "version": "0.1.2", + "port-version": 1, "description": "A library providing a standalone version of the X server implementation of the VESA CVT standard timing modelines generator.", "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxcvt", "license": null, - "supports": "!windows" + "supports": "!windows", + "dependencies": [ + { + "name": "vcpkg-tool-meson", + "host": true + } + ] } From e87d06ec51ca5968ff93c92f138c647987c32e4b Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 24 Jan 2024 18:48:10 +0100 Subject: [PATCH 69/85] v db --- versions/baseline.json | 2 +- versions/l-/libxcvt.json | 5 +++++ versions/v-/vcpkg-tool-meson.json | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 00bf825ad3af64..37536009744d6f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5078,7 +5078,7 @@ }, "libxcvt": { "baseline": "0.1.2", - "port-version": 0 + "port-version": 1 }, "libxdamage": { "baseline": "1.1.5", diff --git a/versions/l-/libxcvt.json b/versions/l-/libxcvt.json index a64f62e11ceae8..6e6cc25dc8b302 100644 --- a/versions/l-/libxcvt.json +++ b/versions/l-/libxcvt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2d0f2580b3ae5c31631891387f581c241da5410d", + "version": "0.1.2", + "port-version": 1 + }, { "git-tree": "b0c69bbf0c5c3c7ccecaac73ae1f8e828133c72b", "version": "0.1.2", diff --git a/versions/v-/vcpkg-tool-meson.json b/versions/v-/vcpkg-tool-meson.json index 089186744b5b69..ce967bf3aac2eb 100644 --- a/versions/v-/vcpkg-tool-meson.json +++ b/versions/v-/vcpkg-tool-meson.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "da533968329db2407b37e762f76a8f9615ef9bd9", + "git-tree": "df8342e4736ddefff2ea47612b91d77049ceb071", "version": "1.3.1", "port-version": 0 }, From 54f252efb4d5ed348aef21b527bbb9a3f49641f6 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 24 Jan 2024 18:49:13 +0100 Subject: [PATCH 70/85] remove 1.1.1 from db --- versions/v-/vcpkg-tool-meson.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/versions/v-/vcpkg-tool-meson.json b/versions/v-/vcpkg-tool-meson.json index ce967bf3aac2eb..b533a83627b45f 100644 --- a/versions/v-/vcpkg-tool-meson.json +++ b/versions/v-/vcpkg-tool-meson.json @@ -5,11 +5,6 @@ "version": "1.3.1", "port-version": 0 }, - { - "git-tree": "37fe6890ffa2d52ca59b4cfae65f74a111fba9f7", - "version": "1.1.1", - "port-version": 0 - }, { "git-tree": "3f6f5419cfc743a85e4f1fb1b582d4728b79c1e2", "version": "0.63", From 9bbcdef181f4e324e24e2d0b1e7f570455827525 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 30 Jan 2024 01:39:31 +0100 Subject: [PATCH 71/85] adjust python3 for mesa? --- ports/mesa/portfile.cmake | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ports/mesa/portfile.cmake b/ports/mesa/portfile.cmake index d2f25670dd6fcd..d7b68c551f3000 100644 --- a/ports/mesa/portfile.cmake +++ b/ports/mesa/portfile.cmake @@ -18,6 +18,10 @@ vcpkg_from_gitlab( x_vcpkg_get_python_packages(PYTHON_VERSION "3" OUT_PYTHON_VAR "PYTHON3" PACKAGES setuptools mako) +message(STATUS "PYTHON3:${PYTHON3}") + +set(PYTHON3 "${PYTHON3}" CACHE STRING "" FORCE) + vcpkg_find_acquire_program(FLEX) get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY) vcpkg_add_to_path(PREPEND "${FLEX_DIR}") @@ -103,6 +107,8 @@ vcpkg_configure_meson( #-D egl-lib-suffix=_mesa -Dbuild-tests=false ${MESA_OPTIONS} + ADDITIONAL_BINARIES + pytho=['${PYTHON3}','-I'] ) vcpkg_install_meson() vcpkg_fixup_pkgconfig() From 1173ecd386942ab83423339de3cf0d6a18647b29 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 30 Jan 2024 09:15:16 +0100 Subject: [PATCH 72/85] Fix typo and add python dir to path --- ports/mesa/portfile.cmake | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ports/mesa/portfile.cmake b/ports/mesa/portfile.cmake index d7b68c551f3000..b1504dc7f9e6e3 100644 --- a/ports/mesa/portfile.cmake +++ b/ports/mesa/portfile.cmake @@ -19,9 +19,11 @@ vcpkg_from_gitlab( x_vcpkg_get_python_packages(PYTHON_VERSION "3" OUT_PYTHON_VAR "PYTHON3" PACKAGES setuptools mako) message(STATUS "PYTHON3:${PYTHON3}") - set(PYTHON3 "${PYTHON3}" CACHE STRING "" FORCE) +get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) +vcpkg_add_to_path(PREPEND "${PYTHON3_DIR}") + vcpkg_find_acquire_program(FLEX) get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY) vcpkg_add_to_path(PREPEND "${FLEX_DIR}") @@ -108,7 +110,8 @@ vcpkg_configure_meson( -Dbuild-tests=false ${MESA_OPTIONS} ADDITIONAL_BINARIES - pytho=['${PYTHON3}','-I'] + python=['${PYTHON3}','-I'] + python3=['${PYTHON3}','-I'] ) vcpkg_install_meson() vcpkg_fixup_pkgconfig() From e6e19d488cba94b6fddce7649966ccf48c04cbc0 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 30 Jan 2024 10:55:18 +0100 Subject: [PATCH 73/85] cleanup --- ports/mesa/portfile.cmake | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ports/mesa/portfile.cmake b/ports/mesa/portfile.cmake index b1504dc7f9e6e3..4be8e5936bcc7d 100644 --- a/ports/mesa/portfile.cmake +++ b/ports/mesa/portfile.cmake @@ -17,10 +17,6 @@ vcpkg_from_gitlab( ) x_vcpkg_get_python_packages(PYTHON_VERSION "3" OUT_PYTHON_VAR "PYTHON3" PACKAGES setuptools mako) - -message(STATUS "PYTHON3:${PYTHON3}") -set(PYTHON3 "${PYTHON3}" CACHE STRING "" FORCE) - get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) vcpkg_add_to_path(PREPEND "${PYTHON3_DIR}") From 0b00d59885122ff519eeead6a5c81819e6a1360b Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 30 Jan 2024 10:55:42 +0100 Subject: [PATCH 74/85] bump version --- ports/mesa/vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/mesa/vcpkg.json b/ports/mesa/vcpkg.json index dbf67a89b777fb..08ccaecd5682f2 100644 --- a/ports/mesa/vcpkg.json +++ b/ports/mesa/vcpkg.json @@ -1,6 +1,7 @@ { "name": "mesa", "version": "23.2.1", + "port-version": 1, "description": "Mesa - The 3D Graphics Library", "homepage": "https://www.mesa3d.org/", "license": "MIT AND BSL-1.0 AND SGI-B-2.0", From 1fd28240df5826943029787f1a849183623acea3 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 30 Jan 2024 10:56:00 +0100 Subject: [PATCH 75/85] v db --- versions/baseline.json | 2 +- versions/m-/mesa.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index dea04e09c1f841..b956cea1fdf5e3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5566,7 +5566,7 @@ }, "mesa": { "baseline": "23.2.1", - "port-version": 0 + "port-version": 1 }, "meschach": { "baseline": "1.2b", diff --git a/versions/m-/mesa.json b/versions/m-/mesa.json index 2832dbd483a946..abae0575c9cc2e 100644 --- a/versions/m-/mesa.json +++ b/versions/m-/mesa.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cf4f628acb3c66d2c99544f1acd2a76f576f3f4b", + "version": "23.2.1", + "port-version": 1 + }, { "git-tree": "3f318339b0c26814bbd53fce78471f1a95fdfe0d", "version": "23.2.1", From e4b8cbe5027fa9e0e0652ac202bd90668ce512aa Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 7 Feb 2024 23:27:57 +0100 Subject: [PATCH 76/85] v db --- versions/baseline.json | 22 +++++++++++----------- versions/g-/glib.json | 5 +++++ 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index efa6be20b8c14f..bfc61a65e9204d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2922,7 +2922,7 @@ }, "gdk-pixbuf": { "baseline": "2.42.10", - "port-version": 2 + "port-version": 3 }, "gemmlowp": { "baseline": "2021-09-28", @@ -3030,7 +3030,7 @@ }, "glib": { "baseline": "2.78.4", - "port-version": 0 + "port-version": 1 }, "glibmm": { "baseline": "2.76.0", @@ -3082,7 +3082,7 @@ }, "gobject-introspection": { "baseline": "1.72.0", - "port-version": 7 + "port-version": 8 }, "google-cloud-cpp": { "baseline": "2.21.0", @@ -4098,7 +4098,7 @@ }, "libadwaita": { "baseline": "1.3.2", - "port-version": 1 + "port-version": 2 }, "libaes-siv": { "baseline": "2020-10-15", @@ -4618,11 +4618,11 @@ }, "libnice": { "baseline": "0.1.21", - "port-version": 1 + "port-version": 2 }, "libnice-gst": { "baseline": "0.1.21", - "port-version": 3 + "port-version": 4 }, "libnick": { "baseline": "2024.2.1", @@ -5094,7 +5094,7 @@ }, "libxcvt": { "baseline": "0.1.2", - "port-version": 0 + "port-version": 1 }, "libxdamage": { "baseline": "1.1.5", @@ -5578,7 +5578,7 @@ }, "mesa": { "baseline": "23.2.1", - "port-version": 0 + "port-version": 1 }, "meschach": { "baseline": "1.2b", @@ -8490,7 +8490,7 @@ }, "thorvg": { "baseline": "0.12.1", - "port-version": 0 + "port-version": 1 }, "threadpool": { "baseline": "0.2.5", @@ -8953,8 +8953,8 @@ "port-version": 1 }, "vcpkg-tool-meson": { - "baseline": "0.63", - "port-version": 2 + "baseline": "1.3.1", + "port-version": 0 }, "vcpkg-tool-mozbuild": { "baseline": "4.0.2", diff --git a/versions/g-/glib.json b/versions/g-/glib.json index 99b01e585b3da6..6bd0221ea64b0b 100644 --- a/versions/g-/glib.json +++ b/versions/g-/glib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d73077209c5fcb5a0340baf7d8ba76d128c1ab27", + "version": "2.78.4", + "port-version": 1 + }, { "git-tree": "d67b03e0a09ec580d051b79321b03182c0030c5f", "version": "2.78.4", From a5efc83c8e18b62597cd3eb6c2d3dd3d7438bb8f Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 9 Feb 2024 11:40:37 +0100 Subject: [PATCH 77/85] Fix xcb-util-errors --- ports/xcb-proto/portfile.cmake | 6 ++++-- ports/xcb-proto/vcpkg.json | 2 +- ports/xcb-util-errors/fix_python.patch | 11 +++++++++++ ports/xcb-util-errors/vcpkg.json | 1 + 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/ports/xcb-proto/portfile.cmake b/ports/xcb-proto/portfile.cmake index e79eb88d833184..11cdfc0dabf68a 100644 --- a/ports/xcb-proto/portfile.cmake +++ b/ports/xcb-proto/portfile.cmake @@ -36,12 +36,14 @@ vcpkg_configure_make( AUTOCONFIG OPTIONS ac_cv_path_PYTHON='${PYTHON3}' - am_cv_python_pyexecdir=\\\${prefix}/tools/python3/site-packages - am_cv_python_pythondir=\\\${prefix}/tools/python3/site-packages + am_cv_python_pyexecdir=\\\${prefix}/${PYTHON3_SITE} + am_cv_python_pythondir=\\\${prefix}/${PYTHON3_SITE} ) vcpkg_install_make() vcpkg_fixup_pkgconfig() +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/xcb-proto.pc" "\${pc_sysrootdir}" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/xcb-proto.pc" "\${pc_sysrootdir}" "") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/xcb-proto/vcpkg.json b/ports/xcb-proto/vcpkg.json index a78735d9e210ef..24100f36c7fb7d 100644 --- a/ports/xcb-proto/vcpkg.json +++ b/ports/xcb-proto/vcpkg.json @@ -1,7 +1,7 @@ { "name": "xcb-proto", "version": "1.14.1", - "port-version": 1, + "port-version": 2, "description": "XML-XCB protocol descriptions used by libxcb for the X11 protocol & extensions", "homepage": "https://xcb.freedesktop.org/", "license": "X11-distribute-modifications-variant", diff --git a/ports/xcb-util-errors/fix_python.patch b/ports/xcb-util-errors/fix_python.patch index e6cba0939bb9d7..649062c614e9f7 100644 --- a/ports/xcb-util-errors/fix_python.patch +++ b/ports/xcb-util-errors/fix_python.patch @@ -18,3 +18,14 @@ index 94d7d57fe..022d4003e 100644 parseFile(input_file) assert xproto != None +diff --git a//Makefile.am b//Makefile.am +index bdf4a3071..de897ac57 100644 +--- a//Makefile.am ++++ b//Makefile.am +@@ -37,5 +37,5 @@ tests_test_LDADD = libxcb-errors.la $(XCB_LIBS) + CLEANFILES = src/extensions.c + + src/extensions.c: src/extensions.py +- $(AM_V_GEN)$(PYTHON) $(srcdir)/src/extensions.py $@.tmp ${XCBPROTO_XCBINCLUDEDIR}/*.xml && \ ++ $(AM_V_GEN)$(PYTHON) $(srcdir)/src/extensions.py $@.tmp '${XCBPROTO_XCBINCLUDEDIR}/*.xml' && \ + mv $@.tmp $@ diff --git a/ports/xcb-util-errors/vcpkg.json b/ports/xcb-util-errors/vcpkg.json index 8202f6fcefb36f..57ea925fd67d1a 100644 --- a/ports/xcb-util-errors/vcpkg.json +++ b/ports/xcb-util-errors/vcpkg.json @@ -1,6 +1,7 @@ { "name": "xcb-util-errors", "version": "1.0.1", + "port-version": 1, "description": "XCB utility library that gives human readable names to error, event, & request codes.", "homepage": "https://xcb.freedesktop.org/", "license": null, From cd536979bb84ec01ae734ff0a65c72e93b4a8652 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 9 Feb 2024 11:40:58 +0100 Subject: [PATCH 78/85] v db --- versions/baseline.json | 4 ++-- versions/x-/xcb-proto.json | 5 +++++ versions/x-/xcb-util-errors.json | 5 +++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index bfc61a65e9204d..19afdd887dc950 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9298,7 +9298,7 @@ }, "xcb-proto": { "baseline": "1.14.1", - "port-version": 1 + "port-version": 2 }, "xcb-render-util": { "baseline": "0.3.10", @@ -9310,7 +9310,7 @@ }, "xcb-util-errors": { "baseline": "1.0.1", - "port-version": 0 + "port-version": 1 }, "xcb-util-m4": { "baseline": "2022-01-24", diff --git a/versions/x-/xcb-proto.json b/versions/x-/xcb-proto.json index 94c00710d45d51..a2ebb29082568e 100644 --- a/versions/x-/xcb-proto.json +++ b/versions/x-/xcb-proto.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2e84d8b933e1fa1b60af29631443a510e2acd24e", + "version": "1.14.1", + "port-version": 2 + }, { "git-tree": "f2eac40d0f3ae01205792344a254ac956e0adcd2", "version": "1.14.1", diff --git a/versions/x-/xcb-util-errors.json b/versions/x-/xcb-util-errors.json index fc7319e54a9667..54ab5c642bde67 100644 --- a/versions/x-/xcb-util-errors.json +++ b/versions/x-/xcb-util-errors.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "60d2ef798c6ff2382cc0b1131fe1633a8255a86c", + "version": "1.0.1", + "port-version": 1 + }, { "git-tree": "b4f1619f7e94fe694b69d8021d6864e0d0369ce8", "version": "1.0.1", From 2babb21ab9c438a21cfa8446f3a93b1cd242a341 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 29 Feb 2024 09:02:17 +0100 Subject: [PATCH 79/85] update to 1.3.2 --- ports/vcpkg-tool-meson/vcpkg-port-config.cmake | 4 ++-- ports/vcpkg-tool-meson/vcpkg.json | 2 +- versions/v-/vcpkg-tool-meson.json | 5 ----- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/ports/vcpkg-tool-meson/vcpkg-port-config.cmake b/ports/vcpkg-tool-meson/vcpkg-port-config.cmake index 890f4792963071..959055ea016ae2 100644 --- a/ports/vcpkg-tool-meson/vcpkg-port-config.cmake +++ b/ports/vcpkg-tool-meson/vcpkg-port-config.cmake @@ -26,11 +26,11 @@ set(program MESON) set(program_version @VERSION@) set(program_name meson) set(search_names meson meson.py) -set(ref 110642dd7337347d0278451a1df11efd93d8ed8a) +set(ref 614d436232d3a86518164cbe2b8af12db3bde009) 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 4b84dd946160bc2e773a2478a3b7de2eba9f38b8650453242c7655aa12dde393c4bf1eee4d3d9986dd9c22d96d913de916f43a36cda61f0399c622ca6afe248f) +set(download_sha512 c087da0113e76501fff66e68ac9ef7aede5e6672f1dc7201608cce9e5e1d202d3f4bf92beec1a5e4e8169f6ed1cedbb44b57ede2753437a61a13578de8d22040) 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 index 8498548dc83729..b4d24a4ebd557a 100644 --- a/ports/vcpkg-tool-meson/vcpkg.json +++ b/ports/vcpkg-tool-meson/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vcpkg-tool-meson", - "version": "1.3.1", + "version": "1.3.2", "description": "Meson build system", "homepage": "https://github.com/mesonbuild/meson", "license": "Apache-2.0", diff --git a/versions/v-/vcpkg-tool-meson.json b/versions/v-/vcpkg-tool-meson.json index b533a83627b45f..f2e9f80dd33623 100644 --- a/versions/v-/vcpkg-tool-meson.json +++ b/versions/v-/vcpkg-tool-meson.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "df8342e4736ddefff2ea47612b91d77049ceb071", - "version": "1.3.1", - "port-version": 0 - }, { "git-tree": "3f6f5419cfc743a85e4f1fb1b582d4728b79c1e2", "version": "0.63", From 811a333fdb68f41cad2835ddd51549f183214de7 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 29 Feb 2024 09:02:33 +0100 Subject: [PATCH 80/85] v db --- versions/baseline.json | 2 +- versions/v-/vcpkg-tool-meson.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 78995f4a96b66a..d3e0a94f720e5f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8981,7 +8981,7 @@ "port-version": 1 }, "vcpkg-tool-meson": { - "baseline": "1.3.1", + "baseline": "1.3.2", "port-version": 0 }, "vcpkg-tool-mozbuild": { diff --git a/versions/v-/vcpkg-tool-meson.json b/versions/v-/vcpkg-tool-meson.json index f2e9f80dd33623..ca5b94d633912c 100644 --- a/versions/v-/vcpkg-tool-meson.json +++ b/versions/v-/vcpkg-tool-meson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ce845663903304a00ff7e93d283ea55ae096b72f", + "version": "1.3.2", + "port-version": 0 + }, { "git-tree": "3f6f5419cfc743a85e4f1fb1b582d4728b79c1e2", "version": "0.63", From 7fc8fc4b9e9bce49db464ad267500da411d6edfa Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sat, 9 Mar 2024 00:22:40 +0100 Subject: [PATCH 81/85] adjust to z_vcpkg_setup_pkgconfig_path change --- ports/vcpkg-tool-meson/vcpkg_configure_meson.cmake | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ports/vcpkg-tool-meson/vcpkg_configure_meson.cmake b/ports/vcpkg-tool-meson/vcpkg_configure_meson.cmake index b6131a6359e0dc..013d7f9c8d948d 100644 --- a/ports/vcpkg-tool-meson/vcpkg_configure_meson.cmake +++ b/ports/vcpkg-tool-meson/vcpkg_configure_meson.cmake @@ -427,11 +427,7 @@ function(vcpkg_configure_meson) file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}") #setting up PKGCONFIG if(NOT arg_NO_PKG_CONFIG) - if ("${buildtype}" STREQUAL "DEBUG") - z_vcpkg_setup_pkgconfig_path(BASE_DIRS "${CURRENT_INSTALLED_DIR}/debug") - else() - z_vcpkg_setup_pkgconfig_path(BASE_DIRS "${CURRENT_INSTALLED_DIR}") - endif() + z_vcpkg_setup_pkgconfig_path(CONFIG "${buildtype}") endif() z_vcpkg_meson_setup_variables(${buildtype}) From 5df1477e470d1c1388957276af3d65aae174816a Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sat, 9 Mar 2024 00:22:58 +0100 Subject: [PATCH 82/85] v db --- versions/v-/vcpkg-tool-meson.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/v-/vcpkg-tool-meson.json b/versions/v-/vcpkg-tool-meson.json index ca5b94d633912c..fc498441de5876 100644 --- a/versions/v-/vcpkg-tool-meson.json +++ b/versions/v-/vcpkg-tool-meson.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "ce845663903304a00ff7e93d283ea55ae096b72f", + "git-tree": "7b3bad7cb3eec367da9a8f2c6593b25e00720c66", "version": "1.3.2", "port-version": 0 }, From 372a52c7652105942b702920eab02c4cbddbe885 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sat, 9 Mar 2024 10:38:46 +0100 Subject: [PATCH 83/85] restore python in the old template --- scripts/buildsystems/meson/meson.template.in | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/buildsystems/meson/meson.template.in b/scripts/buildsystems/meson/meson.template.in index f8c8a3a30fcffc..995d39b30cc506 100644 --- a/scripts/buildsystems/meson/meson.template.in +++ b/scripts/buildsystems/meson/meson.template.in @@ -1,5 +1,6 @@ [binaries] cmake = ['@CMAKE_COMMAND@'] +python = ['@PYTHON3@'] ninja = ['@NINJA@'] pkgconfig= ['@PKGCONFIG@'] @MESON_MT@ From 9b363473478efe6a7b62f970a807d43bc26bd82d Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sat, 9 Mar 2024 11:43:28 +0100 Subject: [PATCH 84/85] remove sysroot adjustmnet in xcb-proto --- ports/xcb-proto/portfile.cmake | 2 -- 1 file changed, 2 deletions(-) diff --git a/ports/xcb-proto/portfile.cmake b/ports/xcb-proto/portfile.cmake index 11cdfc0dabf68a..61284a586f14f3 100644 --- a/ports/xcb-proto/portfile.cmake +++ b/ports/xcb-proto/portfile.cmake @@ -42,8 +42,6 @@ vcpkg_configure_make( vcpkg_install_make() vcpkg_fixup_pkgconfig() -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/xcb-proto.pc" "\${pc_sysrootdir}" "") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/xcb-proto.pc" "\${pc_sysrootdir}" "") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") From ed2ffa9975bce9527b1b39d109aeb56c3fd72c66 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sat, 9 Mar 2024 11:43:48 +0100 Subject: [PATCH 85/85] v db --- versions/x-/xcb-proto.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/x-/xcb-proto.json b/versions/x-/xcb-proto.json index a2ebb29082568e..5767d243d932b1 100644 --- a/versions/x-/xcb-proto.json +++ b/versions/x-/xcb-proto.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "2e84d8b933e1fa1b60af29631443a510e2acd24e", + "git-tree": "927edbd82a8d7801673d5fd3e9f9144d86884801", "version": "1.14.1", "port-version": 2 },