forked from microsoft/vcpkg
-
Notifications
You must be signed in to change notification settings - Fork 6
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
2.6: merge upstream master #150
Open
daschuer
wants to merge
3,695
commits into
mixxxdj:2.6
Choose a base branch
from
daschuer:master_merge
base: 2.6
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
+123,027
−69,136
Conversation
This file contains 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
Signed-off-by: Vitalii Koshura <[email protected]>
Co-authored-by: Jon <[email protected]>
…deflate (microsoft#42694) Co-authored-by: JonLiu1993 <[email protected]>
Co-authored-by: Mengna-Li <[email protected]>
Co-authored-by: Monica <[email protected]>
Co-authored-by: Monica <[email protected]>
Signed-off-by: Tal Regev <[email protected]>
* [vcpkg-scripts] Update msys2 * Don't update to pkgconf 2.0 * Missed SHA * Limit CI * [vcpkg_find_acquire_program] Update PKGCONFIG to 2.1.0 * Update msys2 * Fixup * Revert "Limit CI" This reverts commit aa27037. * Fix PKGCONFIG program version * Add x64 pkgconf
* Limit CI * Update msys2 * Declare msys packages for pkgconfig and fortran... ... with explicit DEPS and PROVIDES, instead of using DIRECT_PACKAGES. This change makes it possible to notice changed dependencies in `vcpkg-ci-msys2` update checks. (Current case: zstd.) It also enables reuse of general declarations from `vcpkg_acquire_msys` in specialized cases (`vpckg_find_fortran`). Last not least, using the the Z_DECLARE_EXTRA_PACKAGES_COMMAND simplifies the implementation of `vcpkg-ci-msys2`, in particular for checks across platform boundaries. * Revert "Limit CI"
Fix gmp regression. Fixes microsoft#36639. Fixes microsoft#36651.
msys2-runtime no longer supports Windows 7 since version 3.5. msys2-runtime-3.4 is the replacement for user who cannot upgrade. YMMV. autoconf-wrapper is not updated, cf. microsoft#36774. pkgconf is not updated, waiting for 2.2.
Co-authored-by: Monica <[email protected]>
Signed-off-by: Ilya Lavrenov <[email protected]>
Signed-off-by: Vitalii Koshura <[email protected]>
Co-authored-by: Jon <[email protected]>
Thre macos-12 runner is no longer available
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This is a VCPKG update for our upcoming Mixxx 2.6-beta
I consider these changes significant:
I have pinned taglib to 1.13.1 until mixxxdj/mixxx#12790 is fixed
Here is the full list of Updates (* = indirect dependencies)