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.

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

Master merge #71

Merged
merged 459 commits into from
Jun 8, 2023
Merged

Master merge #71

merged 459 commits into from
Jun 8, 2023

Conversation

daschuer
Copy link
Member

@daschuer daschuer commented Jun 1, 2023

This merges from Microsoft's master branch. I have target this to a new 2.5 branch, to not freeze the 2.4 branch in beta phase. This also adds a Qt6 patch that is required to switch to Qt 6 in a follow up PR.

It brings the following changes to the packages we use:

talregev and others added 30 commits May 1, 2023 11:55
…ft#28656)

* Add gz ports

* ci.baseline.txt android.

---------

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* Add pulseaudio feature for fluidsynth

* Add pulseaudio feature definition

* Formatting fix

* Update version

* x-add-version run

* Add pulseaudio feature package manager notice

* vcpkg x-add-version --all
… for Mingw-w64 on Windows (microsoft#31037)

* [ryu] Fix toolchain selection on *nixes. Fix macOS build. Add support for Mingw-w64 on Windows

* Refactor code

* Fix build type handling
* [lionkor-commandline] Update to 2.2.0

* ver
* * update pegtl from 3.2.6 to 3.2.7

* * update version database

---------

Co-authored-by: ian <ian>
* [ebml] copy PDBs

* [matroska] copy PDBs
Fix:  Change /lib/plugin/debug to /debug/lib/plugin
Feat: Change ref to actual tagged version
Fix:  Remove duplicate "remove" file
Fix:  Add WITH_BUILD_ID to MAYBE_UNUSED_VARIABLES

Signed-off-by: Gordon Smith <GordonJSmith@gmail.com>
…icrosoft#31196)

* [directxmesh, directxtex, directxtk(12), uvatalas] Update ports for April 2023 releases

* directxtex port updated upstream with better OpenMP support fix

* OpenMP hotfix for UVAtlas

* Update baseline

* Forgot to update the CMake config file for OpenMP

* CMake fixes made upstream

* Update baseline
In this version some of the issues were solved:
1. No need for dynamic fix patch as it was solved inside the project.
2. CMake configs are installed
* [kissnet] Update version

* Update version database
Signed-off-by: Vitalii Koshura <lestat.de.lionkur@gmail.com>
* Adding BlingFire Package

* Adding updated baseline

* Updating supported platforms

* Fixing up json

* Updating version

* Removing uwp platform

* Updating version

* Updating to commit with cmake config

* Updating blingfire version

* Updating to latest blingfire with fixes for vcpkg

* Updating version
* fix osx override error

* update version

* optimized syntax

* update version

* fix function

* update version
* [angle] Fix crash on macos microsoft#29622

* update version database
* [luasocket] Bump to 3.1.0

* vcpkg x-add-version luasocket
* [indicators] Update to 2.3

* Update [indicators] git-tree
Signed-off-by: Vitalii Koshura <lestat.de.lionkur@gmail.com>
* [node-api-headers] add usage

* port-ver

* .

* .

* Update usage

* Update node-api-headers.json
* [openexr] Update to v3.1.7

* [openexr] Update baseline
dg0yt and others added 16 commits May 31, 2023 12:22
Co-authored-by: Cheney-Wang <850426846@qq.com>
…crosoft#31657)

* [folly]: update to 2023.05.15

* remove no more used patch

* fix mvfst

* fix rsocket

* revert indent

* fix space
* [coolprop] Cleanup

* Fix uwp

* [refprop-headers] Update

* [if97] Avoid encoding warnings

* [msgpack] More boost dependencies

Cf. https://github.com/msgpack/msgpack-c/wiki/install_boost

* [coolprop] Use msgpack endianess

---------

Co-authored-by: Cheney-Wang <850426846@qq.com>
* [magic-enum] Update to v0.9.1

* x-add-version --all
* [kf5parts] New package

* [kf5parts] Apply suggestions from code review

Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>

* [kf5parts] vcpkg x-add-version kf5parts

---------

Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>
* [symengine]  Update version to 0.10.1

* version
* [libpq] Install msys2 autoconf-archive

* Install msys2 zic tool

* Fix zstd patching

* Always build as if cross compiling

* Enable feature client for non-windows

* Cleanup (WIP)

* Cleanup (WIP)

* Update portfile.cmake

* WIP

* WIP

* WIP

* WIP

* [libxslt] Fix pc files

* WIP

* WIP: Test libpq[all]

* WIP

* Update to 15.3

* Move patches

* Revert "WIP: Test libpq[all]"

* Fix install

* Skip import libs for plugins

* Full CI
…ution (microsoft#31749)

* Modify the name of the template solutions

* update version

---------

Co-authored-by: Monica <v-liumonica@microsoft.com>
* [vulkan-headers] Update to 1.3.250

* [vulkan-headers] Update version database
@JoergAtGithub
Copy link
Member

The artifact with the Windows buildlog is missing, this worked before.
grafik

@JoergAtGithub
Copy link
Member

JoergAtGithub commented Jun 3, 2023

Where can I get the BUILDENV_SHA256 for the artifacts? Without I can't test them, since windows_buildenv.bat check for them.
PS: Manual unzipping bypassed this check.

@daschuer
Copy link
Member Author

daschuer commented Jun 3, 2023

The windows_buildenv.bat does not work for GitHub artifacts for a couple of reasons.
I suggest to just replace your vcpkg folder with the one found in the double zipped archive here.

Does this work for you or is executing the bat file mandatory on windows? If this is the case we should fix it in a way that just calling ninja is enough.

For a test using GiHub I maintain a patched bat file here: https://github.com/daschuer/mixxx/tree/vcpkg_update_direct_qt6_1015

I will adjust it to have workflow builds from this branch.

@JoergAtGithub
Copy link
Member

I just downloaded and extracted the zip file manually, adjusted BUILDENV_NAME in windows_buildenv.bat only and executed the bat. Than I could build Mixxx with this buildenv.
BUILDENV_BRANCH and BUILDENV_SHA256 are only needed for the automatic downloading and unzipping.

@JoergAtGithub
Copy link
Member

The buildenv works for me on Windows11 local builds. Only regression is the missing Windows buildlogs artifact here on GitHub.

@daschuer
Copy link
Member Author

daschuer commented Jun 3, 2023

Cool, so you can test this as described?

Is is required to use the bat file on every boot or Is calling ninja from a new CMD.exe sufficient? If not, what is missing? The idea is that everything is chached in the CMakeCache.txt

@JoergAtGithub
Copy link
Member

I never build from command line. Therefore I only need to execute it once to generate the CMakeSettings.json.

@daschuer
Copy link
Member Author

daschuer commented Jun 7, 2023

Here are the artifacts for testing:
https://github.com/daschuer/mixxx/actions/runs/5171761368
A check of an hid mapping would be nice.

@JoergAtGithub
Copy link
Member

Why is the Logfile of the Build for Windows not available in the artifacts? Is this a regression or just a Github Actions hickup?

@daschuer
Copy link
Member Author

daschuer commented Jun 7, 2023

Why is the Logfile of the Build for Windows not available in the artifacts? Is this a regression or just a Github Actions hickup?

This is because no package has been re-build for windows. It was build and cached in a previous workflow run: https://github.com/mixxxdj/vcpkg/actions/runs/5148764979

@JoergAtGithub
Copy link
Member

Thank's for explaining the missing build log file. I shortly tested this buildenv on Windows 11, also with HID controller, and it worked for me. Thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.