-
Notifications
You must be signed in to change notification settings - Fork 7.7k
[vcpkg-tool-meson] Update meson to a more recent version #28084
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.
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
Merged
Billy O'Neal (BillyONeal)
merged 123 commits into
microsoft:master
from
Neumann-A:update_meson_to_0.64.1
Mar 11, 2024
Merged
Changes from 4 commits
Commits
Show all changes
123 commits
Select commit
Hold shift + click to select a range
5f36007
update meson
Neumann-A 12664f7
v db
Neumann-A e8a9ec3
install old python module
Neumann-A d2f214a
remove automatic python lib linkage.
Neumann-A 9b82b99
fix patch
Neumann-A deaeb19
fix python dep
Neumann-A cb360de
remove python setting so that it can be passed via the portfile if ne…
Neumann-A 82ab77a
remove python patch
Neumann-A 6aabafa
Remove old module installation
Neumann-A 034a5da
Merge remote-tracking branch 'upstream/master' into update_meson_to_0…
Neumann-A d4a693b
remove everything except for osx
Neumann-A 2a0c322
kill zlib
Neumann-A 9e4e1de
use build.x_args
Neumann-A 8847269
use build. also for the linker
Neumann-A b45ebe1
add missing \n
Neumann-A a8eeebe
update to 1.0 and check python version
Neumann-A af4f354
pass compiler flags via prog variables for sanity checks
Neumann-A 1373c84
Merge remote-tracking branch 'upstream/master' into update_meson_to_0…
Neumann-A 406fe9b
reset stuff
Neumann-A 8e87d29
remove build. stuff
Neumann-A 1b8c4f5
Merge remote-tracking branch 'upstream/master' into update_meson_to_0…
Neumann-A d2658d1
fix intl ?
Neumann-A 4ad2599
bump v
Neumann-A ae52424
bump gobject introspection
Neumann-A fd44704
fix thorvg
Neumann-A 4d52e12
v db
Neumann-A 99d5587
fix uwp toolchain for meson.
Neumann-A ce09cce
meson fixes.
Neumann-A 7a62d91
remove /TC and /TP flag
Neumann-A 4b6e09f
Merge remote-tracking branch 'upstream/master' into update_meson_to_0…
Neumann-A 680e38e
v db
Neumann-A 390f8b3
Merge remote-tracking branch 'upstream/master' into update_meson_to_0…
Neumann-A 37bd521
Merge remote-tracking branch 'upstream/master' into update_meson_to_0…
Neumann-A a19f3d0
move meson to DOWNLOADS.
Neumann-A 72e237c
write version in helper port
Neumann-A 6f75017
Merge remote-tracking branch 'upstream/master' into update_meson_to_0…
Neumann-A a184de5
set meson script path correctly
Neumann-A 3239e10
remove unnecessary variables
Neumann-A f2869e1
move port configs after common definitions.
Neumann-A 5d22ad8
fix find_acquire_program
Neumann-A aa7cdf0
Merge branch 'update_meson_to_0.64.1' of https://github.com/Neumann-A…
Neumann-A ff2d520
Merge remote-tracking branch 'upstream/master' into update_meson_to_0…
Neumann-A 5aab89d
Merge branch 'microsoft:master' into update_meson_to_0.64.1
Neumann-A bcd8cb9
Merge branch 'microsoft:master' into update_meson_to_0.64.1
Neumann-A dccaca3
Merge branch 'master' of https://github.com/microsoft/vcpkg into upda…
LilyWangLL 036efc6
Merge branch 'microsoft:master' into update_meson_to_0.64.1
Neumann-A d8b2ecf
Merge remote-tracking branch 'upstream/master' into update_meson_to_0…
Neumann-A 5ef0613
v db
Neumann-A f2ca091
v db
Neumann-A f97db09
Merge branch 'microsoft:master' into update_meson_to_0.64.1
Neumann-A 3c1e2e2
Merge remote-tracking branch 'upstream/master' into update_meson_to_0…
Neumann-A 799fc5d
use separate arguments in script
Neumann-A 17c480f
v db
Neumann-A 9b705cf
Merge branch 'microsoft:master' into update_meson_to_0.64.1
Neumann-A c3080ec
Merge remote-tracking branch 'upstream/master' into update_meson_to_0…
Neumann-A eccdc49
v db
Neumann-A 4253c22
Merge branch 'microsoft:master' into update_meson_to_0.64.1
Neumann-A ae83875
Merge remote-tracking branch 'upstream/master' into update_meson_to_0…
Neumann-A 31767b2
v db
Neumann-A 96e45d0
Merge branch 'master' into update_meson_to_0.64.1
Neumann-A 75fbc49
only copy pdb if it exists
Neumann-A 8b7b054
update to 1.1.0 and fix options detection
Neumann-A 116cba6
Merge remote-tracking branch 'upstream/master' into update_meson_to_0…
Neumann-A bd92110
v db
Neumann-A b23d717
fix libnice-gst build
Neumann-A 6ea3786
v db
Neumann-A 974b25e
re-add python dep patch
Neumann-A 81e67cd
v db
Neumann-A a7c734b
Fix x86 builds
Neumann-A c271a93
v db
Neumann-A 825f5d4
remove double version
Neumann-A 8a08729
Merge remote-tracking branch 'upstream/master' into update_meson_to_0…
Neumann-A 93c96ea
revert uwp changes since they are not necessary here
Neumann-A a2b7069
Merge remote-tracking branch 'upstream/master' into update_meson_to_0…
Neumann-A 82c40ac
upgrade to 1.3.1
Neumann-A 1bd9b1f
port version
Neumann-A aff2a24
- fix path
Neumann-A 9ebd174
Make meson in downloads more robust by having a calculated hash in th…
Neumann-A 4e01a94
v
Neumann-A 130d4d0
Merge remote-tracking branch 'upstream/master' into update_meson_to_0…
Neumann-A fc41c6a
add missing meson dependency to libnice
Neumann-A 11ad785
try meson version 1.2.3 - 1.3.1 breaks transitive deps in gdk-pixbuf
Neumann-A 9617237
back to 1.1.1
Neumann-A dfbceeb
Merge branch 'microsoft:master' into update_meson_to_0.64.1
Neumann-A b50f213
add missing ,
Neumann-A c575c22
format
Neumann-A ed36237
v db
Neumann-A 839f1d3
Merge branch 'update_meson_to_0.64.1' of https://github.com/Neumann-A…
Neumann-A 4859873
Merge branch 'microsoft:master' into update_meson_to_0.64.1
Neumann-A 779b34a
Merge remote-tracking branch 'upstream/master' into update_meson_to_0…
Neumann-A 6052354
back to 1.3.1 with fix for gdk-pixbuf
Neumann-A d8c42eb
Merge branch 'update_meson_to_0.64.1' of https://github.com/Neumann-A…
Neumann-A 3e58895
v db
Neumann-A fee4d29
Merge remote-tracking branch 'upstream/master' into update_meson_to_0…
Neumann-A 68d18cb
add meson dependency
Neumann-A a51bfce
fix port version
Neumann-A 3ee7b5b
v db
Neumann-A 8898e38
remove version.txt
Neumann-A bd8ac3f
add dep
Neumann-A e87d06e
v db
Neumann-A 2e67bac
Merge remote-tracking branch 'upstream/master' into update_meson_to_0…
Neumann-A 54f252e
remove 1.1.1 from db
Neumann-A 7f60154
Merge branch 'microsoft:master' into update_meson_to_0.64.1
Neumann-A 9bbcdef
adjust python3 for mesa?
Neumann-A 83694f8
Merge branch 'update_meson_to_0.64.1' of https://github.com/Neumann-A…
Neumann-A 1173ecd
Fix typo and add python dir to path
Neumann-A e6e19d4
cleanup
Neumann-A 0b00d59
bump version
Neumann-A 1fd2824
v db
Neumann-A fb349d7
Merge remote-tracking branch 'upstream/master' into update_meson_to_0…
Neumann-A e4b8cbe
v db
Neumann-A a5efc83
Fix xcb-util-errors
Neumann-A cd53697
v db
Neumann-A e494f63
Merge branch 'microsoft:master' into update_meson_to_0.64.1
Neumann-A d3c0db0
Merge remote-tracking branch 'upstream/master' into update_meson_to_0…
Neumann-A 2babb21
update to 1.3.2
Neumann-A 811a333
v db
Neumann-A e3ab038
Merge remote-tracking branch 'upstream/master' into update_meson_to_0…
Neumann-A 7fc8fc4
adjust to z_vcpkg_setup_pkgconfig_path change
Neumann-A 5df1477
v db
Neumann-A 372a52c
restore python in the old template
Neumann-A 9b36347
remove sysroot adjustmnet in xcb-proto
Neumann-A ed2ffa9
v db
Neumann-A File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.