Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[vcpkg-tool-meson] update meson and see what breaks #23717

Merged
merged 14 commits into from
May 25, 2022
Merged

[vcpkg-tool-meson] update meson and see what breaks #23717

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
fc15760
update meson and see what breaks
Mar 22, 2022
3c38ead
include patch again.
Mar 22, 2022
0bb8f6b
Merge remote-tracking branch 'upstream/master' into update_meson_0.62.0
Neumann-A May 23, 2022
0265cf2
update meson to 0.62.1
Neumann-A May 23, 2022
c29feff
remove old patch
Neumann-A May 23, 2022
534248b
move to 64bit since 32bit not longer exists.
Neumann-A May 23, 2022
52c6fae
Merge branch 'fix_nasm' into update_meson_0.62.0
Neumann-A May 23, 2022
6303430
fix gobject-introspection
Neumann-A May 23, 2022
ea8851a
v db
Neumann-A May 23, 2022
0b4fb5f
revert nasm changes
Neumann-A May 23, 2022
4533c5b
set MESON_SCRIPT instead of MESON.
Neumann-A May 23, 2022
8c9005e
v db
Neumann-A May 23, 2022
8c80437
apply CR
Neumann-A May 25, 2022
b1d9fe6
v db
Neumann-A May 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 0 additions & 25 deletions ports/vcpkg-tool-meson/fix_linker_detection.patch
View file
Open in desktop

This file was deleted.

11 changes: 6 additions & 5 deletions ports/vcpkg-tool-meson/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)

set(program MESON)
set(program_version 0.60.2)
set(program_version 0.62.1)
set(program_name meson)
set(search_names meson meson.py)
set(interpreter PYTHON3)
set(apt_package_name "meson")
set(brew_package_name "meson")
set(ref 5e9b709ad0b34d8ac920dff057a5361080c0889b)
set(ref bb91cea0d66d8d036063dedec1f194d663399cdf)
set(paths_to_search "${CURRENT_PACKAGES_DIR}/tools/meson")
set(download_urls "https://github.com/mesonbuild/meson/archive/${ref}.tar.gz")
set(download_filename "meson-${ref}.tar.gz")
set(download_sha512 5fb89c6b81f75825b6f300039db6dae9d907c81403a8ebe30c7426729d5cb3179e30b9b84d6ed756c2aa39ca34ea681afa0c5cd78835a94c43d5ab25e625abd0)
set(download_sha512 e5888eb35dd4ab5fc0a16143cfbb5a7849f6d705e211a80baf0a8b753e2cf877a4587860a79cad129ec5f3474c12a73558ffe66439b1633d80b8044eceaff2da)
set(supported_on_unix ON)
set(version_command --version)
set(extra_search_args EXACT_VERSION_MATCH)
Expand Down Expand Up @@ -46,10 +46,11 @@ if(NOT "${program}")
file(RENAME "${CURRENT_PACKAGES_DIR}/tools/meson-${ref}" "${CURRENT_PACKAGES_DIR}/tools/meson")
z_vcpkg_apply_patches(
SOURCE_PATH "${CURRENT_PACKAGES_DIR}"
PATCHES meson-intl.patch
fix_linker_detection.patch
PATCHES
meson-intl.patch
)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/meson/test cases")
configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-port-config.cmake" @ONLY)
endif()

z_vcpkg_find_acquire_program_find_internal("${program}"
Expand Down
2 changes: 2 additions & 0 deletions ports/vcpkg-tool-meson/vcpkg-port-config.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
vcpkg_find_acquire_program(PYTHON3)
set(MESON "${PYTHON3}" "${CMAKE_CURRENT_LIST_DIR}/../../tools/meson/meson.py")
3 changes: 1 addition & 2 deletions ports/vcpkg-tool-meson/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "vcpkg-tool-meson",
"version": "0.60.2",
"port-version": 2,
"version": "0.62.1",
"description": "Meson build system",
"homepage": "https://github.com/mesonbuild/meson",
"supports": "native"
Expand Down