2.6: merge upstream master #150

daschuer · 2025-01-19T08:04:27Z

This is a VCPKG update for our upcoming Mixxx 2.6-beta

I consider these changes significant:

Qt 6.5.3 -> 6.8.1
libusb 1.0.26 -> 1.0.27 (new API)
rubberband 3.3.0 -> 4.0.0 (new API)

I have pinned taglib to 1.13.1 until mixxxdj/mixxx#12790 is fixed

Here is the full list of Updates (* = indirect dependencies)

    ableton-link 3.0.6#1 -> 3.1.2 
  * asio 1.28.1 -> 1.32.0
    benchmark  1.8.3 -> 1.9.1
    egl-registry 2022-09-20 -> 2024-01-25
    ffmpeg[...] 6.0#2 -> 7.1#2
    freetype[brotli,bzip2,core,png,zlib]  2.12.1#4 -> 2.13.3	 
  * harfbuzz[core,freetype] 8.3.0#1 -> 10.2.0
    icu[core,tools] 73.1#2 -> 74.2#4
    liblo 0.31#4 -> 0.32
  * libpng 1.6.45 -> 0.16.4#3
  * libpq[...] 16.0 -> 16.4
    libusb 1.0.26.11791#1 -> 1.0.27#2
    lilv 0.24.10#2 -> 0.24.24#1																   
  * lv2  1.18.2#1-> 1.18.10#1
  * lz4 1.9.4#1 -> 1.10.0
  * mpg123 1.31.3#3 -> 1.32.9#1
    ms-gsl 4.0.0 -> 4.1.0
  * opengl-registry 2022-09-29 -> 2024-02-10#1
  * openssl 3.1.3 -> 3.4.0#1
    opus 1.4 -> 1.5.2
  * pcre2[...] 10.42#2 -> 10.43
  * pkgconf 1.8.0#5-> 2.3.0
    protobuf 3.21.12#1 -> 5.29.2 
    qt5compat[...] 6.5.3 -> 6.8.1
    qtbase[...] 6.5.3#2 -> 6.8.1#1
    qtdeclarative 6.5.3 -> 6.8.1
    qtkeychain-qt6 0.14.1#1 -> 0.14.3
  * qtshadertools  6.5.3 -> 6.8.1
  * qttools[core,designer,linguist] 6.5.3 -> 6.8.1
    qttranslations[core,default-features] 6.5.3 -> 6.8.1
    rubberband 3.3.0 -> 4.0.0
  * serd 0.30.4#2 -> 0.32.2
  * sleef 3.5.1#4 -> 3.7
  * sord 0.16.4#2 -> 0.16.16
    soundtouch  2.3.2#3 -> 2.3.3
  * sqlite3[core,json1] 3.43.1 -> 3.47.2
  * sratom 0.6.4#2 -> 0.6.16#1
    wavpack 5.6.0 -> 5.7.0
  * zlib 1.3 -> 1.3.1
  * zstd 1.5.5#1 -> 1.5.6

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]>

* 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]>

…43234)

Signed-off-by: Vitalii Koshura <[email protected]>

Co-authored-by: Jon <[email protected]>

Thre macos-12 runner is no longer available

JoergAtGithub · 2025-01-19T16:10:42Z

I tried to use it in a local build, but got the following Qt asserts during CMake configuration:

1> [CMake] -- Found Protobuf: D:/mixxx/buildenv/mixxx-deps-2.6-x64-windows-d99ec98/installed/x64-windows/tools/protobuf/protoc.exe (found version "29.2.0") 
1> [CMake] rgbsignal_qml.frag -> rgbsignal_qml.frag.qsb exposed as :/shaders/rgbsignal_qml.frag.qsb
1> [CMake] CMake Warning (dev) at buildenv/mixxx-deps-2.6-x64-windows-d99ec98/installed/x64-windows/share/Qt6Core/Qt6CoreMacros.cmake:3355 (message):
1> [CMake]   Qt policy QTP0004 is not set: You need qmldir files for each extra
1> [CMake]   directory that contains .qml files for your module.  Check
1> [CMake]   https://doc.qt.io/qt-6/qt-cmake-policy-qtp0004.html for policy details.
1> [CMake]   Use the qt_policy command to set the policy and suppress this warning.
1> [CMake] 
1> [CMake] Call Stack (most recent call first):
1> [CMake]   buildenv/mixxx-deps-2.6-x64-windows-d99ec98/installed/x64-windows/share/Qt6Qml/Qt6QmlMacros.cmake:3299 (__qt_internal_setup_policy)
1> [CMake]   buildenv/mixxx-deps-2.6-x64-windows-d99ec98/installed/x64-windows/share/Qt6Qml/Qt6QmlMacros.cmake:896 (qt6_target_qml_sources)
1> [CMake]   buildenv/mixxx-deps-2.6-x64-windows-d99ec98/installed/x64-windows/share/Qt6Qml/Qt6QmlMacros.cmake:1232 (qt6_add_qml_module)
1> [CMake]   CMakeLists.txt:3205 (qt_add_qml_module)
1> [CMake] This warning is for project developers.  Use -Wno-dev to suppress it.
1> [CMake] 
1> [CMake] CMake Warning (dev) at buildenv/mixxx-deps-2.6-x64-windows-d99ec98/installed/x64-windows/share/Qt6Core/Qt6CoreMacros.cmake:3355 (message):
1> [CMake]   Qt policy QTP0004 is not set: You need qmldir files for each extra
1> [CMake]   directory that contains .qml files for your module.  Check
1> [CMake]   https://doc.qt.io/qt-6/qt-cmake-policy-qtp0004.html for policy details.
1> [CMake]   Use the qt_policy command to set the policy and suppress this warning.
1> [CMake] 
1> [CMake] Call Stack (most recent call first):
1> [CMake]   buildenv/mixxx-deps-2.6-x64-windows-d99ec98/installed/x64-windows/share/Qt6Qml/Qt6QmlMacros.cmake:3299 (__qt_internal_setup_policy)
1> [CMake]   buildenv/mixxx-deps-2.6-x64-windows-d99ec98/installed/x64-windows/share/Qt6Qml/Qt6QmlMacros.cmake:896 (qt6_target_qml_sources)
1> [CMake]   buildenv/mixxx-deps-2.6-x64-windows-d99ec98/installed/x64-windows/share/Qt6Qml/Qt6QmlMacros.cmake:1232 (qt6_add_qml_module)
1> [CMake]   CMakeLists.txt:3239 (qt_add_qml_module)
1> [CMake] This warning is for project developers.  Use -Wno-dev to suppress it.
1> [CMake] 
1> [CMake] -- DEBUG_ASSERT statements have been enabled because DEBUG_ASSERTIONS_FATAL is ON.
1> [CMake] CMake Error at buildenv/mixxx-deps-2.6-x64-windows-d99ec98/scripts/buildsystems/vcpkg.cmake:720 (_install):
1> [CMake]   _install IMPORTED_RUNTIME_ARTIFACTS given target
1> [CMake]   "Qt6::QWindowsVistaStylePlugin" which does not exist.
1> [CMake] Call Stack (most recent call first):
1> [CMake]   CMakeLists.txt:3590 (install)
1> [CMake] -- Found rubberband: D:/mixxx/buildenv/mixxx-deps-2.6-x64-windows-d99ec98/installed/x64-windows/lib/rubberband.lib (found version "4.0.0")

JoergAtGithub · 2025-01-19T17:00:16Z

After setting QTP0004 policy and commenting out QWindowsVistaStylePlugin I got a fully working Mixxx build with this buildenv.
There is a new QWindows11Style, but I did not find out how to use it instead of the Vista style. Without styling, the UI looks really outdated - like Win95, but technically everything seems to be displayed correct.

daschuer · 2025-01-19T22:34:42Z

I have found this:
https://github.com/qt/qtreleasenotes/blob/3ae4edd3ef699c2a4bc0ba426033df879ac44d5d/qt/6.7.0/release-note.md?plain=1#L584

Renaming of QWindowsVistaStylePlugin to QModernWindowsStylePlugin

https://github.com/mayhemheroes/vlc/blob/b58b335b6155f5ccf03e9d4d673f8a2d69ca39c9/modules/gui/qt/plugins.hpp#L68

daschuer · 2025-01-19T22:56:06Z

Please Try: mixxxdj/mixxx#14200

JoergAtGithub · 2025-01-19T23:17:15Z

I had to add

    if(QT_KNOWN_POLICY_QTP0004)
        qt6_policy(SET QTP0004 NEW)
    endif()

at line:
https://github.com/mixxxdj/mixxx/blob/0b888895ee4327a13ec48912a66c991d9aeff283/CMakeLists.txt#L3175
to build with Qt6.8

But I guess the correct fix would be changing the QML directory structure instead - but I'm not familar with this.

daschuer · 2025-01-20T06:10:11Z

It sounds like that it is mandatory to decide how the build system should behave:
https://doc.qt.io/qt-6/qt-cmake-policy-qtp0004.htmlhttps://doc.qt.io/qt-6/qt-cmake-policy-qtp0004.html

For my understanding, we need to mimic the NEW behaviour for older QT builds manually if we want to have it consistently.

daschuer · 2025-01-20T06:15:46Z

For NEW, we need to either change our directory structure or back-port:
qt/qtdeclarative@6314d30
into our build system since our implicit minimum is Qt 6.4 determined by Ubuntu 24.04 Noble and Qt 6.8 will land into a LTS 26.04.

AenBleidd and others added 30 commits December 19, 2024 13:03

[sentry-native] update to 0.7.17 (microsoft#42776)

8c9c81c

Signed-off-by: Vitalii Koshura <[email protected]>

[libnick] Update to 2024.12.0 (microsoft#42766)

b6ed02f

[glaze] update to 4.2.0 (microsoft#42763)

13409aa

[utf8-range] update to 5.29.1 (microsoft#42752)

a3ff43d

Co-authored-by: Jon <[email protected]>

[shiva] Delist (microsoft#42711)

54f4adb

[lilv] Fix dependencies, tools (microsoft#42770)

99070cf

[physx] Update to version 5.5.0 (microsoft#42764)

14ff626

[poco] Update version to 1.14.0 (microsoft#42751)

38bf1ef

[zix] Sanitize (microsoft#42772)

1bf29ad

[cppmicroservices] update and devendor stuff (microsoft#42720)

cf454fe

[directx12-agility] add message for compliance (microsoft#42797)

3f92cf1

[gz-common5] Add include <chrono> for system_clock (microsoft#42635)

d18ed2b

[ffmpeg] add implicit link libs (microsoft#42676) (microsoft#42677)

5a1b13c

[openfbx] Miniz dep was removed in latest version and replaced by lib…

8e78590

…deflate (microsoft#42694) Co-authored-by: JonLiu1993 <[email protected]>

[usd] update to 24.11 (microsoft#41864)

6de717b

[casadi] Deindex. (microsoft#42773)

1f65d84

[yalantinglibs] Bump to 0.3.11 (microsoft#42815)

9790589

[orange-math] new port (microsoft#42756)

4c71f15

Co-authored-by: Mengna-Li <[email protected]>

[vincentlaucsb-csv-parser] Bump to 2.3.0 (microsoft#42814)

7ba6833

[glslang] Bump to 15.1.0 (microsoft#42812)

14dad0d

[xsimd] Bump to 13.1.0 (microsoft#42811)

11627a2

[gazebo] Fix dependencies and update (microsoft#42807)

faa3c0a

Co-authored-by: Monica <[email protected]>

[mongo-cxx-driver] update to 4.0.0 (microsoft#42805)

6eab0a7

[bshoshany-thread-pool] Updated to v5.0.0 (microsoft#42803)

5c425b4

[vcpkg baseline][g2o] Update to 2024-12-14 (microsoft#42753)

d940c1b

[aom] Update to 3.11.0 (microsoft#41125)

8476a6d

[juce] Fix cross builds, cleanup (microsoft#42615)

4fcf123

Patch Tuesday for December 2024 (microsoft#42749)

f06267d

[nyan-lang] Bump to 0.3.1 (microsoft#42879)

6731052

[allegro5] Update to 5.2.10.0 (microsoft#42878)

0ab0ae3

Co-authored-by: Monica <[email protected]>

dg0yt and others added 22 commits January 15, 2025 08:35

[vcpkg scripts] Rollback msys2 autoconf 2.71 (microsoft#36774)

e1ea8fd

Fix gmp regression. Fixes microsoft#36639. Fixes microsoft#36651.

[vcpkg scripts] Update msys2 (microsoft#39088)

924e165

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.

[scripts] Update msys2 packages (microsoft#41665)

023e906

[nng] Update to 1.10.0 (microsoft#43277)

12e2bbe

[x-plane] Fix download address (microsoft#43272)

1afbd4a

Co-authored-by: Monica <[email protected]>

[libgwenhywfar] Update to 5.12.0 (microsoft#43216)

6e3cfdf

[openvino] 2024.5.0 update (microsoft#43053)

3ebdcf4

Signed-off-by: Ilya Lavrenov <[email protected]>

[libtorch] Include <chrono> for high_resolution_clock (microsoft#…

e1118ae

…43234)

[sentry-native] update to 0.7.18 (microsoft#43262)

7a67a2d

Signed-off-by: Vitalii Koshura <[email protected]>

[mosquitto] update version to 2.0.20 (microsoft#43256)

6220088

Co-authored-by: Jon <[email protected]>

Update to Xcode 14.2 and move to GitHub workflow runner macos-13

2e5f563

Thre macos-12 runner is no longer available

Update workflow actions

6d4eb5e

Merge remote-tracking branch 'microsoft/master' into master_merge

08a1e5e

Install autoconf and automake fir ICU on macOS

f237153

[dbus] move to overlay

7452494

[dbus] use -DDBUS_SESSION_SOCKET_DIR=/tmp fixing microsoft#40031

d31f2ec

[libusb] Remove from overlay, upstream has included the changes

6b19fb8

[protobuf] copy and replace overlay form upstream

8ea3bc3

[protobuf] Set visibility flags to hidden in case of static builds

5891866

[taglib] Copy Version 1.13.1 to overlay

81d86ff

Merge remote-tracking branch 'mixxxdj/2.6' into master_merge

2d1a15c

daschuer mentioned this pull request Jan 20, 2025

Qt 6.8: Set qt6_policy(SET QTP0004 OLD) mixxxdj/mixxx#14204

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

2.6: merge upstream master #150

2.6: merge upstream master #150

daschuer commented Jan 19, 2025 •

edited

Loading

JoergAtGithub commented Jan 19, 2025

JoergAtGithub commented Jan 19, 2025

daschuer commented Jan 19, 2025

daschuer commented Jan 19, 2025

JoergAtGithub commented Jan 19, 2025

daschuer commented Jan 20, 2025

daschuer commented Jan 20, 2025

2.6: merge upstream master #150

Are you sure you want to change the base?

2.6: merge upstream master #150

Conversation

daschuer commented Jan 19, 2025 • edited Loading

JoergAtGithub commented Jan 19, 2025

JoergAtGithub commented Jan 19, 2025

daschuer commented Jan 19, 2025

daschuer commented Jan 19, 2025

JoergAtGithub commented Jan 19, 2025

daschuer commented Jan 20, 2025

daschuer commented Jan 20, 2025

daschuer commented Jan 19, 2025 •

edited

Loading