Skip to content

[tool-meson] Rev vcpkg's meson build#15200

Merged
dan-shaw merged 1 commit intomicrosoft:masterfrom
RichLogan:meson-rev
Jan 14, 2021
Merged

[tool-meson] Rev vcpkg's meson build#15200
dan-shaw merged 1 commit intomicrosoft:masterfrom
RichLogan:meson-rev

Conversation

@RichLogan
Copy link
Copy Markdown
Contributor

@RichLogan RichLogan commented Dec 18, 2020

This is a rev of vcpkg's meson version to fix an upstream regression introduced in #12927 that causes issues with the building of dav1d: #15009.

I'm not a fan of tracking an unreleased version but wanted to fix the existing issue now.

@RichLogan RichLogan mentioned this pull request Dec 18, 2020
Merged
@RichLogan
Copy link
Copy Markdown
Contributor Author

RichLogan commented Dec 18, 2020

Looks like tests are failing due to upstream URL bug in ffmpeg that are present on master too

@Neumann-A
Copy link
Copy Markdown
Contributor

Neumann-A commented Dec 18, 2020

Please move at least up to a9ff308d27da5b64a10b7e95c547a517ac198e24 which fixes an error building glib with meson

@JackBoosY JackBoosY added category:port-update The issue is with a library, which is requesting update new revision category:tool-update The issue is with build tool or build script, which requires update or should be executed correctly requires:author-response labels Dec 21, 2020
@RichLogan
Copy link
Copy Markdown
Contributor Author

RichLogan commented Dec 21, 2020 •
edited
Loading

Sorry it aged somewhat while I was waiting for CLA approval - I've rev'd to latest master as of the last commit

@RichLogan
Copy link
Copy Markdown
Contributor Author

RichLogan commented Dec 30, 2020

@JackBoosY This is updated, rebased and good to go hopefully

@JackBoosY
Copy link
Copy Markdown
Contributor

JackBoosY commented Jan 4, 2021

@JackBoosY This is updated, rebased and good to go hopefully

Sadly, it's not. Please get failure logs here.

@RichLogan
Copy link
Copy Markdown
Contributor Author

RichLogan commented Jan 4, 2021 •
edited
Loading

@JackBoosY I'm not too familiar with these ports but I believe these are possibly CI issues that are rebuilding here due to the change to vcpkg_find_acquire_program. I see that most of these are failing on the master pipeline build as well, but they do build locally. Does the azure pipeline handle python modules in a different way? That seems to account for most of the errors here. I don't think any of these errors are directly related to my change.

@Hoikas
Copy link
Copy Markdown
Contributor

Hoikas commented Jan 4, 2021

@RichLogan There is some discussion about this issue in #15404.

@Hoikas Hoikas mentioned this pull request Jan 5, 2021
Merged
@Hoikas
Copy link
Copy Markdown
Contributor

Hoikas commented Jan 6, 2021

Now that #15221 is merged, this PR should pass after merging the upstream changes.

@RichLogan
Copy link
Copy Markdown
Contributor Author

RichLogan commented Jan 6, 2021 •
edited
Loading

These are all known issues - at a glance cppcms is picking the wrong python version (#15473)? and poppler is missing a openssl dependency? But looks like folks are on it already.

@JackBoosY
Copy link
Copy Markdown
Contributor

JackBoosY commented Jan 7, 2021 •
edited
Loading

cppcms: #15473.
The poppler regression will disappear after re-running the pipeline test, but I will investigate it.

@JackBoosY JackBoosY added the depends:different-pr This PR or Issue depends on a PR which has been filed label Jan 7, 2021
@JackBoosY
Copy link
Copy Markdown
Contributor

JackBoosY commented Jan 7, 2021

/azp run

@JackBoosY JackBoosY removed the depends:different-pr This PR or Issue depends on a PR which has been filed label Jan 7, 2021
@azure-pipelines
Copy link
Copy Markdown

azure-pipelines bot commented Jan 7, 2021

Azure Pipelines successfully started running 1 pipeline(s).

@Hoikas Hoikas mentioned this pull request Jan 7, 2021
Merged
@Neumann-A Neumann-A mentioned this pull request Jan 7, 2021
Merged
3 tasks
@Neumann-A
Copy link
Copy Markdown
Contributor

Neumann-A commented Jan 11, 2021

@RichLogan Meson has been updated to 0.56.2: https://github.com/mesonbuild/meson/releases/tag/0.56.2

@RichLogan
Copy link
Copy Markdown
Contributor Author

RichLogan commented Jan 11, 2021

@Neumann-A I did take a look at that but its quite old in terms of commit history so I don't think it includes the fixes you requested above.

@Neumann-A
Copy link
Copy Markdown
Contributor

Neumann-A commented Jan 11, 2021

@RichLogan Yeah seems like it. So sticking with this version here seems ok.

@RichLogan
Copy link
Copy Markdown
Contributor Author

RichLogan commented Jan 11, 2021

More failures 😞

This glib one seems to be a failing download, but I can't reproduce the failure locally.

@Neumann-A
Copy link
Copy Markdown
Contributor

Neumann-A commented Jan 11, 2021

dont mind download failures. somebody just has to retrigger ci to get rid of them. but first wait until the other finish.

@JackBoosY
Copy link
Copy Markdown
Contributor

JackBoosY commented Jan 12, 2021

I will rerun the failure tests after osx test finish.

@RichLogan
Copy link
Copy Markdown
Contributor Author

RichLogan commented Jan 13, 2021

@JackBoosY This time I think it really is ready 😄

@JackBoosY JackBoosY added the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Jan 13, 2021
@JackBoosY
Copy link
Copy Markdown
Contributor

JackBoosY commented Jan 13, 2021

LGTM.

@Neumann-A Neumann-A mentioned this pull request Jan 13, 2021
Closed
3 tasks
@dan-shaw dan-shaw merged commit fd67439 into microsoft:master Jan 14, 2021
@RichLogan RichLogan deleted the meson-rev branch January 14, 2021 10:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@JackBoosY JackBoosY JackBoosY approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@JackBoosY JackBoosY

Labels

category:port-update The issue is with a library, which is requesting update new revision category:tool-update The issue is with build tool or build script, which requires update or should be executed correctly info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@RichLogan @Neumann-A @JackBoosY @Hoikas @dan-shaw