Upstream merge #43
Merged
Upstream merge #43
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
* [check] Disable tests * version
* [aixlog] Disable examples * Likely not semver * version
* [libcbor] Update to 0.9.0 * version * Fix cmake config * version * remove cmake config * version
* Add vcpkg_tool_release_process documentation. * Add step to check over the bits before submitting to signing, and remove branch name assumptions.
* create port * . * Update cmakerc.json * Update portfile.cmake * Update vcpkg.json * Update cmakerc.json * Update portfile.cmake * Update cmakerc.json Co-authored-by: Billy Robert O'Neal III <[email protected]>
* [jansson] cleanup * version * Roll back version * version * Unsupported on UWP * version * patch * Remove supports * version
* [toolchain windows] set CMAKE_SYSTEM_NAME and CMAKE_SYSTEM_PROCESSOR In specific, I did this for the cpuinfo PR - I realized the reason that cpuinfo doesn't support arm64 windows cross compilation is because we don't set CMAKE_SYSTEM_PROCESSOR. * correctly set CMAKE_CROSSCOMPILING * start fixin libraries * more changes: - gainput: remove line - glog: remove try_run when cross compiling - windows.cmake: set CMAKE_SYSTEM_VERSION * more patches - mapnik: set BOOST_REGEX_HAS_ICU to avoid check_cxx_source_runs - orc: set HAS_PRE_1970 and HAS_POST_2038 for same - seal: change out check_cxx_source_runs for check_cxx_source_compiles * more changes * fix x86-windows * fix qpid-proton, glog * build corrade-rc * fix x64-uwp ports * forgot to _actually_ always build corrade-rc .,. * Replay microsoft#22831 * Dedupe CMAKE_SYSTEM_NAME settings. * Add quotes for corrade_rc_param Co-authored-by: Jack·Boos·Yu <[email protected]> * Update version DB. Co-authored-by: nicole mazzuca <[email protected]> Co-authored-by: Billy Robert O'Neal III <[email protected]> Co-authored-by: Jack·Boos·Yu <[email protected]>
* [osx] set CMAKE_SYSTEM_PROCESSOR from VCPKG_TARGET_ARCHITECTURE on osx * [linux] Set CMAKE_ASM_COMPILER and CMAKE_ASM-ATT_COMPILER in case of crosscompile * [wavpack] migrate to vcpkg_cmake_install * [wavpack] enable arm builds * [wavpack] Add license field to vcpkg.json * [OSX] don't default to 86_64
* Update aricpp to 1.1.2 * Update CI baseline * Mark as header-only, remove vcpkg_copy_pdbs * Update CI baseline Co-authored-by: chausner <[email protected]>
* Updated libunibreak and added config.cmake file * Updated version * Updated the manifest file * updated git-tree * Remove vcpkg-cmake-config dependency * updated version Co-authored-by: Benjamin Oldenburg <[email protected]>
…L and zlib (microsoft#24462) Co-authored-by: Alexander Neumann <[email protected]> Co-authored-by: Alexander Neumann <[email protected]>
…,pqp,smpeg2] Build fixes 2022-04-28 (microsoft#24470) * [libvpx,lmdb,aubio,freetype-gl,intelrdfpmathlib,libbson,libtcod,metis,pqp,smpeg2] Build fixes 2022-04-28 These results are from the most recent CI run: https://dev.azure.com/vcpkg/public/_build/results?buildId=71465 PASSING, REMOVE FROM FAIL LIST: aubio:x64-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). I also did some investigation as to why aubio:arm-uwp didn't pass. Turns out, it's because aubio depends on ffmpeg, which failed to build because it depends on libvpx, which we never fixed for UWP following the VS2022 update. See also https://developercommunity.visualstudio.com/t/MicrosoftVisualStudioComponentVCTool/10002207?space=62&scope=follow&sort=newest PASSING, REMOVE FROM FAIL LIST: freetype-gl:x64-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). I also checked freetype-gl:arm-uwp, but it's blocked by glew which is blocked by opengl which appears to not be a thing on arm. PASSING, REMOVE FROM FAIL LIST: intelrdfpmathlib:x64-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). The arm-uwp version of this emits errors that look like source issues; I blocked arm&windows with a supports expression: D:\buildtrees\intelrdfpmathlib\src\athLib20U2-d2a8954428.clean\LIBRARY\src\bid_functions.h(3113): error C2719: 'x': formal parameter with requested alignment of 16 won't be aligned PASSING, REMOVE FROM FAIL LIST: libbson:arm-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: libbson:x64-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: libtcod:arm-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: libtcod:x64-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: lmdb:x64-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). arm-uwp failed with again what looks like a source issue: mdb.c.obj : error LNK2001: unresolved external symbol __tls_used mdb.c.obj : error LNK2001: unresolved external symbol _mdb_tls_cbp PASSING, REMOVE FROM FAIL LIST: metis:arm-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: metis:x64-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: pqp:arm-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: pqp:x64-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: smpeg2:arm-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: smpeg2:x64-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). I also checked Linux and it says Could NOT find ibverbs (missing: IBVERBS_INCLUDE_DIRS IBVERBS_LIBRARIES) which may be vcpkg's fault so I left that ci.baseline.txt skip alone. REGRESSION: jansson:arm-uwp failed with POST_BUILD_CHECKS_FAILED. If expected, add jansson:arm-uwp=fail to C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: jansson:x64-uwp failed with POST_BUILD_CHECKS_FAILED. If expected, add jansson:x64-uwp=fail to C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt. Already fixed by microsoft#24466 * dos2unix the patch * :dos2unix the other patches too
* [vcpkg toolchain] Fix paths with special characters * fix * Use VERBATIM instead of double quotes
* add license info * update to 2.0.5 * update versions
* Update nuspell to 5.1.0 * Update CI baseline * Fix license * Update CI baseline Co-authored-by: chausner <[email protected]>
* Update mdns to 1.4.2 * Update CI baseline Co-authored-by: chausner <[email protected]>
* Update spectra to 1.0.1 * Update CI baseline Co-authored-by: chausner <[email protected]>
* Update to 10.40 * Drop '-static' suffix for MSVC The suffix breaks pc files. Renaming allowed by maintainer guidelines, to facilitate downstream usage. * Update versions
Discovered in https://dev.azure.com/vcpkg/public/_build/results?buildId=71530 PASSING, REMOVE FROM FAIL LIST: blosc:arm64-windows (C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: corrade:arm-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: corrade:x64-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: libhydrogen:arm64-windows (C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt). REGRESSION: sundials:x64-osx failed with BUILD_FAILED. If expected, add sundials:x64-osx=fail to /Users/vagrant/Data/work/2/s/scripts/azure-pipelines/../ci.baseline.txt. File does not have the expected hash: url : [ https://github.com/LLNL/sundials/archive/v5.8.0.tar.gz ] File path : [ /Users/vagrant/Data/downloads/LLNL-sundials-v5.8.0.tar.gz.98418.part ] Expected hash : [ 30f6a7bddf813634e4266c36331673b52448b719f938f45a4efb6a96cfbeea4fe168fdded89309672b148f8ef8bc05997d838627e828573900ec169a41472372 ] Actual hash : [ 0b11db1b944cfce4672954aceeec3f21253b4f684031f26b8bc0a8b3b12d895e604456bd1f283767812352eb5a9202c5797f612410f654f561ca5565d719bcae ] REGRESSION: brunocodutra-metal:x64-linux failed with BUILD_FAILED. If expected, add brunocodutra-metal:x64-linux=fail to /agent/_work/1/s/scripts/azure-pipelines/../ci.baseline.txt. This was another download failure but may as well update. REGRESSION: plplot:x64-linux failed with BUILD_FAILED. If expected, add plplot:x64-linux=fail to /agent/_work/1/s/scripts/azure-pipelines/../ci.baseline.txt. This was another download failure with every SourceForge mirror giving a different hash O_O. I tried to do an update but it's ... involved for this library so I've separated it.
* [xmlsec] Update to 1.2.34 * x-add-version
* qtwebengine ice fix * move CURRENT_BUILDTREES_DIR only if necessary * version stuff * create tmp dir. * version update Co-authored-by: Alexander Neumann <[email protected]>
…soft#24490) * Updated directx-headers port for v.1.600.10 * Update baseline * Updated directx-headers port for v.1.602.0 * Update baseline * Updated per github-actions bot recommendations * Update baseline * Update versions/d-/directx-headers.json Co-authored-by: Billy O'Neal <[email protected]> Co-authored-by: Billy O'Neal <[email protected]>
…equred additional external libraries are needed (microsoft#24539)
* Add stftpitchshift port * Fix shared library build on Windows * Run vcpkg x-add-version stftpitchshift * Update version database * Just increase the version counter to hopefully fix the vcpkg problem I simply don't understand... 😡 * Now update both sha and version... * Update version database * Fix version database. * Add quotes and modernize cmake helpers. Co-authored-by: Billy Robert O'Neal <[email protected]>
* Update to 7.83.0 * Update curl
* [python3] Bootstrap pip with ${CURRENT_INSTALLED_DIR}
* [python3] Disable ensurepip -- add venv usage instructions
Co-authored-by: Max Khon <[email protected]>
…4677) * Take gperf from vcpkg tool if possible * [gperf] Install binary into tools/gperf/ * Fix kf5codecs gperf bug * Add PREPEND to freetds port * fix gperf for qtwebengine * make gperf modern port Co-authored-by: Robert Schumacher <[email protected]>
* Add boost-multi-array to deps of cgal port * Fix version and formatting of manifest * ./vcpkg x-add-version --all
Co-authored-by: daijunkai <[email protected]>
* boringssl: Add a patch to disable another warning breaking build for VS2022. Filed upstream as https://bugs.chromium.org/p/boringssl/issues/detail?id=495 * Update versions * format portfile.cmake * x-add-version * Update patch, remove -WX and -Werror * x-add-version * update patch's name * x-add-version Co-authored-by: Lily Wang <[email protected]>
Co-authored-by: Cheney-Wang <[email protected]>
…ft#25037) * [b64] Add target include directories and export config.cmake * Use unofficial-b64 Co-authored-by: Cheney-Wang <[email protected]>
* [hdf5] Fix feature parallel on Linux * version * Apply suggestions * version
* [xsimd] Update to 8.1.0 * Add missing license information * Update version
* [qtkeychain] Fix the CMake export target on windows * [qtkeychain-qt6] Fix the CMake export target on windows
* update nethost * bump nethost version * Add CMake exports in an unofficial- namespace https://github.com/microsoft/vcpkg/blob/master/docs/maintainers/maintainer-guide.md#add-cmake-exports-in-an-unofficial--namespace * fix port version and deprecated functions * change nethost version date to version * update usage * add quotes to paths and export targets directly * bump nethost version * [nethost] Only build one flavor * fix build error * bump nethost version Co-authored-by: Robert Schumacher <[email protected]>
* Updated to latest release: https://github.com/libusb/hidapi/releases/tag/hidapi-0.12.0 * Update SHA * SHA = 0 * Overwrite version * SHA512 * version * Removed failing line introduced in microsoft#22320 * version * Added vcpkg_replace_string again, now for libhidapi.cmake instead of hidapi.cmake * x-add-version
* [SDL] enable hidapi * update version Co-authored-by: FrankXie <[email protected]>
They will be reinstalled anyway if they are still required in a later step.
|
It was proved building with the mixxx/main here: https://github.com/daschuer/mixxx/actions/runs/2435110621 @Swiftb0y Can you have a look here? This is a prerequisite for installing ms-gsl here: #44 |
|
I don't really know what I can review here. I don't really know how vcpkg overlays work. I guess this is just simply merging upstream into our overlay? |
|
Yes, mostly + three extra commit for adjusting to the new upstream. |
Swiftb0y
approved these changes
Jun 6, 2022
No, I have only requested @ywwg because he as merged the previous upstream merge. I think you can go ahead and merge. |
|
Can we merge #44 now? |
|
Yes, thank you. |
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 an upstream merge that includes the latest PR for wavpack and arm builds microsoft#21790 and the qtkeychain fix microsoft#25018
This comes also with libflac 1.3.4 and libusb 1.0.26