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 #94

Merged
merged 227 commits into from
Nov 2, 2023
Merged

Master merge #94

merged 227 commits into from
Nov 2, 2023

Conversation

daschuer
Copy link
Member

@daschuer daschuer commented Nov 1, 2023

This merges the current microsoft master branch to 2.5
this is required because soundtouch has changed the hash codes
Following relevant changes are included:

  • libsndfile:x64-windows 1.2.0#2 -> 1.2.2
  • openssl:x64-windows 3.1.3 -> 3.1.4
  • soundtouch:x64-windows 2.3.1#2 -> 2.3.2
  • sqlite3 3.43.0 -> 3.43.1

In my test building Qt 6.6.0 qtdeclarative fails. That's why we have merged the commit before the Qt 6.6 update.
We stick with Qt 6.5.3 LTS for now.

jiayuehua and others added 30 commits October 3, 2023 17:22
From https://dev.azure.com/vcpkg/public/_build/results?buildId=94820

REGRESSION: caffe2:arm64-windows is marked as fail but one dependency is not supported for arm64-windows.
REGRESSION: gtk:x64-windows-static is marked as fail but one dependency is not supported for x64-windows-static.
Fixed by microsoft#33999

REGRESSION: omplapp:arm-neon-android failed with BUILD_FAILED. If expected, add omplapp:arm-neon-android=fail to /vcpkg/scripts/azure-pipelines/../ci.baseline.txt.
Previously blocked by:
PASSING, REMOVE FROM FAIL LIST: assimp:arm-neon-android (/vcpkg/scripts/azure-pipelines/../ci.baseline.txt).
PASSING, REMOVE FROM FAIL LIST: clblast:arm-neon-android (/vcpkg/scripts/azure-pipelines/../ci.baseline.txt).
PASSING, REMOVE FROM FAIL LIST: clblast:arm64-android (/vcpkg/scripts/azure-pipelines/../ci.baseline.txt).
PASSING, REMOVE FROM FAIL LIST: clblast:x64-android (/vcpkg/scripts/azure-pipelines/../ci.baseline.txt).
PASSING, REMOVE FROM FAIL LIST: openvdb:x64-windows-static (C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt).
PASSING, REMOVE FROM FAIL LIST: openvdb:x64-windows-static-md (C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt).
evpobr and others added 19 commits October 24, 2023 09:08
Co-authored-by: Kai Pastor <dg0yt@darc.de>
* [libsbml] Update, port fixes

* [check] Follow VCPKG_LIBRARY_LINKAGE

* [check] Don't install checkmk

* [check] Burn-in dllimport

* [libsbml] Devendor dirent

* [libsbml] Burn-in library linkage

* Finish

* Fix typo

* [libsbml] Shorten patch
* [openvino] support dynamic protobuf

* updated version database
* [wil] Configure only in release mode.

* Update version database.
* [cpp-sort] add new port

* [cpp-sort] fix usage

* [cpp-sort] add new port

* [cpp-sort] fix usage

* [cpp-sort] add new port
Two issues:

* we should get msys2 when building on windows, not targeting windows.
* removed usage of LIBRARY_PATH since it is ignored when cross-compiling [1].

Tested building for android on windows and works fine.

[1]: https://gcc.gnu.org/onlinedocs/gcc/Environment-Variables.html#index-LIBRARY_005fPATH
* [minizip-ng] update to v4.0.1

* [minizip-ng] remove the unnecessary options signing

* [minizip-ng] fix wrong CONFIG_PATH

* [minizip-ng] update versions
Co-authored-by: vzhli17 <v-zhli17@microsoft.com>
* [proxsuite] add new port

* [proxsuite] update version
* [libremidi] Fix install path of the lib file

* update version
* [gts] Enable and fix osx

* [gts] Update manifest

* [gts] Fix version passing

* [gts] Update usage

* [gts] Simplify dll patching

* [gts] Cleanup

* [gts] android builds now

* ignition-common1: fails on osx as on linux
* [mpark-patterns] add new port

* [mpark-patterns] add new port

* [mpark-patterns] add new port

* [mpark-patterns] add new port
@daschuer
Copy link
Member Author

daschuer commented Nov 1, 2023

This looks almost like a compiler bug:

/Applications/Xcode_12.4.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/c++ -DGL_SILENCE_DEPRECATION -DQT_ASCII_CAST_WARNINGS -DQT_BUILDING_QT -DQT_BUILD_QMLCOMPILER_LIB -DQT_CORE_LIB -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_UP_TO=0x050000 -DQT_EXPLICIT_QFILE_CONSTRUCTION_FROM_PATH -DQT_LEAN_HEADERS=1 -DQT_MOC_COMPAT -DQT_NETWORK_LIB -DQT_NO_AS_CONST -DQT_NO_AS_CONST=1 -DQT_NO_CAST_TO_ASCII -DQT_NO_EXCEPTIONS -DQT_NO_JAVA_STYLE_ITERATORS -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_NO_QEXCHANGE -DQT_QMLINTEGRATION_LIB -DQT_QML_LIB -DQT_USE_QSTRINGBUILDER -DQT_WARN_DEPRECATED_UP_TO=0x070000 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -I/Users/runner/mixxx-vcpkg/buildtrees/qtdeclarative/x64-osx-min1015-dbg/src/qmlcompiler/QmlCompiler_autogen/include -I/Users/runner/mixxx-vcpkg/buildtrees/qtdeclarative/x64-osx-min1015-dbg/include -I/Users/runner/mixxx-vcpkg/buildtrees/qtdeclarative/x64-osx-min1015-dbg/include/QtQmlCompiler -I/Users/runner/mixxx-vcpkg/buildtrees/qtdeclarative/src/here-src-6-1fc1828d71.clean/src/qmlcompiler -I/Users/runner/mixxx-vcpkg/buildtrees/qtdeclarative/x64-osx-min1015-dbg/src/qmlcompiler -I/Users/runner/mixxx-vcpkg/buildtrees/qtdeclarative/x64-osx-min1015-dbg/include/QtQmlCompiler/6.6.0 -I/Users/runner/mixxx-vcpkg/buildtrees/qtdeclarative/x64-osx-min1015-dbg/include/QtQmlCompiler/6.6.0/QtQmlCompiler -I/Users/runner/mixxx-vcpkg/buildtrees/qtdeclarative/x64-osx-min1015-dbg/include/QtQml -I/Users/runner/mixxx-vcpkg/buildtrees/qtdeclarative/x64-osx-min1015-dbg/include/QtQmlIntegration -I/Users/runner/mixxx-vcpkg/buildtrees/qtdeclarative/src/here-src-6-1fc1828d71.clean/src/qmlintegration -I/Users/runner/mixxx-vcpkg/buildtrees/qtdeclarative/x64-osx-min1015-dbg/src/qmlintegration -I/Users/runner/mixxx-vcpkg/buildtrees/qtdeclarative/x64-osx-min1015-dbg/src/qml -I/Users/runner/mixxx-vcpkg/buildtrees/qtdeclarative/x64-osx-min1015-dbg/include/QtQml/6.6.0 -I/Users/runner/mixxx-vcpkg/buildtrees/qtdeclarative/x64-osx-min1015-dbg/include/QtQml/6.6.0/QtQml -isystem /Users/runner/mixxx-vcpkg/installed/x64-osx-min1015/include/Qt6/QtCore -isystem /Users/runner/mixxx-vcpkg/installed/x64-osx-min1015/include/Qt6 -isystem /Users/runner/mixxx-vcpkg/installed/x64-osx-min1015/share/Qt6/mkspecs/macx-clang -isystem /Users/runner/mixxx-vcpkg/installed/x64-osx-min1015/include/Qt6/QtNetwork -isystem /Users/runner/mixxx-vcpkg/installed/x64-osx-min1015/include/Qt6/QtCore/6.6.0 -isystem /Users/runner/mixxx-vcpkg/installed/x64-osx-min1015/include/Qt6/QtCore/6.6.0/QtCore -fPIC -g -std=c++17 -arch x86_64 -isysroot /Applications/Xcode_12.4.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.1.sdk -mmacosx-version-min=10.15 -fPIC -fvisibility=hidden -fvisibility-inlines-hidden -Wall -Wextra -fno-exceptions -fPIC -ffunction-sections -fdata-sections -fapplication-extension -Winvalid-pch -Xarch_x86_64 -include/Users/runner/mixxx-vcpkg/buildtrees/qtdeclarative/x64-osx-min1015-dbg/src/qmlcompiler/CMakeFiles/QmlCompiler.dir/cmake_pch_x86_64.hxx -MD -MT src/qmlcompiler/CMakeFiles/QmlCompiler.dir/qqmlsa.cpp.o -MF src/qmlcompiler/CMakeFiles/QmlCompiler.dir/qqmlsa.cpp.o.d -o src/qmlcompiler/CMakeFiles/QmlCompiler.dir/qqmlsa.cpp.o -c /Users/runner/mixxx-vcpkg/buildtrees/qtdeclarative/src/here-src-6-1fc1828d71.clean/src/qmlcompiler/qqmlsa.cpp
/Users/runner/mixxx-vcpkg/buildtrees/qtdeclarative/src/here-src-6-1fc1828d71.clean/src/qmlcompiler/qqmlsa.cpp:401:22: warning: loop variable '[key, value]' is always a copy because the range of type 'QtPrivate::QKeyValueRange<const QMultiHash<QString, QQmlJSMetaMethod> &>' does not return a reference [-Wrange-loop-analysis]
    for (const auto &[key, value] : hash.asKeyValueRange()) {
                     ^
/Users/runner/mixxx-vcpkg/buildtrees/qtdeclarative/src/here-src-6-1fc1828d71.clean/src/qmlcompiler/qqmlsa.cpp:401:10: note: use non-reference type 'std::__1::pair<const QString &, const QQmlJSMetaMethod &>'
    for (const auto &[key, value] : hash.asKeyValueRange()) {
         ^~~~~~~~~~~~~~~~~~~~~~~~~~
/Users/runner/mixxx-vcpkg/buildtrees/qtdeclarative/src/here-src-6-1fc1828d71.clean/src/qmlcompiler/qqmlsa.cpp:537:82: error: expected the class name after '~' to name a destructor
    (*reinterpret_cast<QQmlJSScope::ConstPtr *>(m_data)).QQmlJSScope::ConstPtr::~ConstPtr();
                                                                                 ^
/Users/runner/mixxx-vcpkg/buildtrees/qtdeclarative/src/here-src-6-1fc1828d71.clean/src/qmlcompiler/qqmlsa.cpp:740:22: warning: loop variable '[key, value]' is always a copy because the range of type 'QtPrivate::QKeyValueRange<const QMultiHash<QString, QQmlJSMetaPropertyBinding> &>' does not return a reference [-Wrange-loop-analysis]
    for (const auto &[key, value] : hash.asKeyValueRange()) {
                     ^
/Users/runner/mixxx-vcpkg/buildtrees/qtdeclarative/src/here-src-6-1fc1828d71.clean/src/qmlcompiler/qqmlsa.cpp:740:10: note: use non-reference type 'std::__1::pair<const QString &, const QQmlJSMetaPropertyBinding &>'
    for (const auto &[key, value] : hash.asKeyValueRange()) {
         ^~~~~~~~~~~~~~~~~~~~~~~~~~
2 warnings and 1 error generated.

@JoergAtGithub
Copy link
Member

Can you say something about this "compiler bug", and how you fixed the failing build?

@daschuer
Copy link
Member Author

daschuer commented Nov 2, 2023

I have just picked a upstream commit before the qt 6.6 update.
It is probably anyway a good idea to not update to 6.6.0 and stick with the LTS 6.5 for the Mixxx 2.5 release.

Since Xcode 12.4 is not official supported by QT I have set up an Xcode 13 build here:
https://github.com/daschuer/vcpkg/actions/runs/6731105295
It fails as well.

I will file a Qt bug.

@daschuer
Copy link
Member Author

daschuer commented Nov 2, 2023

This is ready for merge.

@JoergAtGithub
Copy link
Member

Ok, that explains it to me. Let's merge this now - we can later decide, if we update again or not. Thank you!
Please adust the versions in the PR description to what is finally in this PR.

@JoergAtGithub JoergAtGithub merged commit a00d1f7 into mixxxdj:2.5 Nov 2, 2023
2 checks passed
@daschuer
Copy link
Member Author

daschuer commented Nov 3, 2023

It was a compiler bug: Xcode 13.2.1 is able to build Qt 6.6.0
https://github.com/daschuer/vcpkg/actions/runs/6742997739

But anyway lets stick with the LTS Qt version

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.