From b524948d79d75b24914055c1661ce384cb4bfaad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Tue, 20 Jun 2023 21:27:45 +0200 Subject: [PATCH 01/10] Update CMake to 3.21, the minimum for qt6 --- .github/workflows/build.yml | 2 +- CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 826ad138c4f..c78622cf871 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -187,7 +187,7 @@ jobs: with: # This should always match the minimum required version in # our CMakeLists.txt - cmake-version: "3.19.x" + cmake-version: "3.21.x" - name: "[Windows] Set up MSVC Developer Command Prompt" if: runner.os == 'Windows' diff --git a/CMakeLists.txt b/CMakeLists.txt index 114b232c45c..eb90eee91bc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.16) +cmake_minimum_required(VERSION 3.21) # CMAKE_CXX_COMPILER_ID: Distinguish between "AppleClang" and "Clang" if(POLICY CMP0025) From 5f19118a74a67a651e373e8c50d7bb0e8dd62f59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Thu, 24 Aug 2023 07:29:29 +0200 Subject: [PATCH 02/10] Adjust CMAKE_OSX_DEPLOYMENT_TARGET for QT6 --- CMakeLists.txt | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index eb90eee91bc..090b2003b40 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -154,25 +154,19 @@ if(APPLE) message(FATAL_ERROR "'xcode-select -v' failed with '${XCODE_SELECT_RESULT}'. You may need to install Xcode and run 'sudo xcode-select --install'.") endif() - if(QT6) - # Minimum macOS version supported by Qt 6 - set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15 CACHE STRING "Minimum macOS version the build will be able to run on") - if(NOT VCPKG_TARGET_TRIPLET) - set(VCPKG_TARGET_TRIPLET "x64-osx-min1012") - endif() + if(VCPKG_TARGET_TRIPLET STREQUAL "arm64-osx-min1100") + # Minimum macOS version for arm64 Support + set(CMAKE_OSX_DEPLOYMENT_TARGET 11.0 CACHE STRING "Minimum macOS version the build will be able to run on") + set(CMAKE_OSX_ARCHITECTURES arm64 CACHE STRING "The target architecture") + set(CMAKE_SYSTEM_PROCESSOR arm64 CACHE STRING "The target system processor") + set(CMAKE_SYSTEM_NAME Darwin CACHE STRING "Setting this enables CMAKE_CROSSCOMPILE") else() - if(VCPKG_TARGET_TRIPLET STREQUAL "arm64-osx-min1100") - # Minimum macOS version for arm64 Support - set(CMAKE_OSX_DEPLOYMENT_TARGET 11.0 CACHE STRING "Minimum macOS version the build will be able to run on") - set(CMAKE_OSX_ARCHITECTURES arm64 CACHE STRING "The target achritecture") - set(CMAKE_SYSTEM_PROCESSOR arm64 CACHE STRING "The target system processor") - set(CMAKE_SYSTEM_NAME Darwin CACHE STRING "Setting this enables CMAKE_CROSSCOMPILE") + if(QT6) + # Minimum macOS version supported by Qt 6 + set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15 CACHE STRING "Minimum macOS version the build will be able to run on") else() # Minimum macOS version supported by Qt 5.12 set(CMAKE_OSX_DEPLOYMENT_TARGET 10.12 CACHE STRING "Minimum macOS version the build will be able to run on") - if(NOT VCPKG_TARGET_TRIPLET) - set(VCPKG_TARGET_TRIPLET "x64-osx-min1012") - endif() # Needed for deployment target < 10.14 add_compile_options(-fno-aligned-allocation) endif() From 6e2c3b2632f075ea5a028eb8131a529658df113d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Tue, 20 Jun 2023 21:34:57 +0200 Subject: [PATCH 03/10] Adjust the path for installing the Qt6 translations --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 090b2003b40..972a074bee4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2612,8 +2612,8 @@ if(APPLE OR WIN32) endif() get_filename_component(QT_TRANSLATIONS ${QT_TRANSLATION_FILE} DIRECTORY) install( - DIRECTORY "${QT_TRANSLATIONS}" - DESTINATION "${MIXXX_INSTALL_DATADIR}" + DIRECTORY "${QT_TRANSLATIONS}/" + DESTINATION "${MIXXX_INSTALL_DATADIR}/translations" # QT 5 translations have been separated into several files, and most of the qt_xx.qm files # contain just shortcuts to load the qtbase, qtmultimedia etc files. FILES_MATCHING REGEX From 13e62ce760aad2489521a36c0ccdeffce2cbd7f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Tue, 20 Jun 2023 21:47:25 +0200 Subject: [PATCH 04/10] Manually install Qt PlugIns with Qt6 --- CMakeLists.txt | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 972a074bee4..74aac1336b6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2496,10 +2496,51 @@ if(Qt_IS_STATIC) Qt${QT_VERSION_MAJOR}::QMacStylePlugin ) endif() +else() + if(QT6 AND (WIN32 OR APPLE)) + # Qt6 does not automatically install plugins like in Qt 5 + + install(IMPORTED_RUNTIME_ARTIFACTS + # platform plugins + Qt${QT_VERSION_MAJOR}::QOffscreenIntegrationPlugin + Qt${QT_VERSION_MAJOR}::QMinimalIntegrationPlugin + DESTINATION "${MIXXX_INSTALL_DATADIR}/platforms" + RUNTIME_DEPENDENCY_SET mixxx) + + install(IMPORTED_RUNTIME_ARTIFACTS + Qt${QT_VERSION_MAJOR}::QGifPlugin + Qt${QT_VERSION_MAJOR}::QICOPlugin + Qt${QT_VERSION_MAJOR}::QJpegPlugin + Qt${QT_VERSION_MAJOR}::QSvgPlugin + DESTINATION "${MIXXX_INSTALL_DATADIR}/imageformats" + RUNTIME_DEPENDENCY_SET mixxx) + + install(IMPORTED_RUNTIME_ARTIFACTS + Qt${QT_VERSION_MAJOR}::QSQLiteDriverPlugin + DESTINATION "${MIXXX_INSTALL_DATADIR}/sqldrivers" + RUNTIME_DEPENDENCY_SET mixxx) + if(WIN32) + install(IMPORTED_RUNTIME_ARTIFACTS Qt${QT_VERSION_MAJOR}::QWindowsIntegrationPlugin + DESTINATION "${MIXXX_INSTALL_DATADIR}/platforms" + RUNTIME_DEPENDENCY_SET mixxx + COMPONENT applocal) + install(IMPORTED_RUNTIME_ARTIFACTS Qt${QT_VERSION_MAJOR}::QWindowsVistaStylePlugin + DESTINATION "${MIXXX_INSTALL_DATADIR}/styles" + RUNTIME_DEPENDENCY_SET mixxx) + endif() + if(APPLE) + install(IMPORTED_RUNTIME_ARTIFACTS Qt${QT_VERSION_MAJOR}::QCocoaIntegrationPlugin + DESTINATION "${MIXXX_INSTALL_DATADIR}/platforms" + RUNTIME_DEPENDENCY_SET mixxx + COMPONENT applocal) + install(IMPORTED_RUNTIME_ARTIFACTS Qt${QT_VERSION_MAJOR}::QMacStylePlugin + DESTINATION "${MIXXX_INSTALL_DATADIR}/styles" + RUNTIME_DEPENDENCY_SET mixxx) + endif() + endif() endif() - if(APPLE) if(Qt_IS_STATIC OR QT6) target_link_libraries(mixxx-lib PRIVATE From 346350fd7fb9ad05ded92da652ca0a888417da6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Tue, 20 Jun 2023 21:52:34 +0200 Subject: [PATCH 05/10] Copy Qt PlugIns to the output directory. Other DLLs are copied via VCPKG_APPLOCAL_DEPS --- CMakeLists.txt | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 74aac1336b6..d58efd4515f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2505,7 +2505,8 @@ else() Qt${QT_VERSION_MAJOR}::QOffscreenIntegrationPlugin Qt${QT_VERSION_MAJOR}::QMinimalIntegrationPlugin DESTINATION "${MIXXX_INSTALL_DATADIR}/platforms" - RUNTIME_DEPENDENCY_SET mixxx) + RUNTIME_DEPENDENCY_SET mixxx + COMPONENT applocal) install(IMPORTED_RUNTIME_ARTIFACTS Qt${QT_VERSION_MAJOR}::QGifPlugin @@ -2513,12 +2514,14 @@ else() Qt${QT_VERSION_MAJOR}::QJpegPlugin Qt${QT_VERSION_MAJOR}::QSvgPlugin DESTINATION "${MIXXX_INSTALL_DATADIR}/imageformats" - RUNTIME_DEPENDENCY_SET mixxx) + RUNTIME_DEPENDENCY_SET mixxx + COMPONENT applocal) install(IMPORTED_RUNTIME_ARTIFACTS Qt${QT_VERSION_MAJOR}::QSQLiteDriverPlugin DESTINATION "${MIXXX_INSTALL_DATADIR}/sqldrivers" - RUNTIME_DEPENDENCY_SET mixxx) + RUNTIME_DEPENDENCY_SET mixxx + COMPONENT applocal) if(WIN32) install(IMPORTED_RUNTIME_ARTIFACTS Qt${QT_VERSION_MAJOR}::QWindowsIntegrationPlugin @@ -2527,7 +2530,8 @@ else() COMPONENT applocal) install(IMPORTED_RUNTIME_ARTIFACTS Qt${QT_VERSION_MAJOR}::QWindowsVistaStylePlugin DESTINATION "${MIXXX_INSTALL_DATADIR}/styles" - RUNTIME_DEPENDENCY_SET mixxx) + RUNTIME_DEPENDENCY_SET mixxx + COMPONENT applocal) endif() if(APPLE) install(IMPORTED_RUNTIME_ARTIFACTS Qt${QT_VERSION_MAJOR}::QCocoaIntegrationPlugin @@ -2536,8 +2540,13 @@ else() COMPONENT applocal) install(IMPORTED_RUNTIME_ARTIFACTS Qt${QT_VERSION_MAJOR}::QMacStylePlugin DESTINATION "${MIXXX_INSTALL_DATADIR}/styles" - RUNTIME_DEPENDENCY_SET mixxx) + RUNTIME_DEPENDENCY_SET mixxx + COMPONENT applocal) endif() + + add_custom_command( + TARGET mixxx POST_BUILD + COMMAND "${CMAKE_COMMAND}" -DCOMPONENT=applocal -DCMAKE_INSTALL_PREFIX="${CMAKE_CURRENT_BINARY_DIR}" -P cmake_install.cmake) endif() endif() From 1520e2ecf8de3cb1299c3b996698d23b2e0ca73e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Tue, 20 Jun 2023 22:08:30 +0200 Subject: [PATCH 06/10] Move Ubuntu workflow builds to Qt6 --- .github/workflows/build.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c78622cf871..472c295ccd2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,10 +15,11 @@ jobs: fail-fast: false matrix: include: - - name: Ubuntu 22.04 (gcc) + - name: Ubuntu 22.04 os: ubuntu-22.04 cmake_args: >- -DWARNINGS_FATAL=ON + -DQT6=ON -DBULK=ON -DFFMPEG=ON -DLOCALECOMPARE=ON @@ -30,17 +31,18 @@ jobs: compiler_cache: ccache compiler_cache_path: ~/.ccache cpack_generator: DEB - buildenv_basepath: /home/runner/buildenv + buildenv_basepath: /home/runner/buildenv_qt6.sh buildenv_script: tools/debian_buildenv.sh artifacts_name: Ubuntu 22.04 DEB artifacts_path: build/*.deb artifacts_slug: ubuntu-jammy qt_qpa_platform: offscreen - - name: Ubuntu 22.04 (Qt 6.2, gcc) + - name: Ubuntu 22.04 (QML) os: ubuntu-22.04 cmake_args: >- -DWARNINGS_FATAL=ON -DQT6=ON + -DQML=ON -DBULK=ON -DFFMPEG=ON -DLOCALECOMPARE=ON From 16efa4e82be6cb4d49eb5f86a0d295fb3520aef6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Tue, 20 Jun 2023 22:11:46 +0200 Subject: [PATCH 07/10] Remove debian_buildenv.sh for Qt5 --- .github/workflows/build-checks.yml | 3 + .github/workflows/build.yml | 4 +- tools/debian_buildenv.sh | 13 ++-- tools/debian_buildenv_qt6.sh | 117 ----------------------------- 4 files changed, 12 insertions(+), 125 deletions(-) delete mode 100755 tools/debian_buildenv_qt6.sh diff --git a/.github/workflows/build-checks.yml b/.github/workflows/build-checks.yml index 868ff89c020..63b882387f5 100644 --- a/.github/workflows/build-checks.yml +++ b/.github/workflows/build-checks.yml @@ -37,6 +37,7 @@ jobs: cmake \ -DCMAKE_BUILD_TYPE=Debug \ -DWARNINGS_FATAL=ON \ + -DQT6=ON \ -DOPTIMIZE=off \ -DBATTERY=ON \ -DBROADCAST=ON \ @@ -65,6 +66,7 @@ jobs: -DCMAKE_BUILD_TYPE=Debug \ -DCLANG_TIDY=clang-tidy \ -DWARNINGS_FATAL=ON \ + -DQT6=ON \ -DBATTERY=ON \ -DBROADCAST=ON \ -DBULK=ON \ @@ -91,6 +93,7 @@ jobs: cmake \ -DCMAKE_BUILD_TYPE=Debug \ -DOPTIMIZE=off \ + -DQT6=ON \ -DCOVERAGE=ON \ -DWARNINGS_FATAL=OFF \ -DDEBUG_ASSERTIONS_FATAL=OFF \ diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 472c295ccd2..d4707db5200 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,7 @@ jobs: compiler_cache: ccache compiler_cache_path: ~/.ccache cpack_generator: DEB - buildenv_basepath: /home/runner/buildenv_qt6.sh + buildenv_basepath: /home/runner/buildenv.sh buildenv_script: tools/debian_buildenv.sh artifacts_name: Ubuntu 22.04 DEB artifacts_path: build/*.deb @@ -55,7 +55,7 @@ jobs: compiler_cache_path: ~/.ccache cpack_generator: DEB buildenv_basepath: /home/runner/buildenv - buildenv_script: tools/debian_buildenv_qt6.sh + buildenv_script: tools/debian_buildenv.sh artifacts_name: Ubuntu 22.04 Qt6 DEB artifacts_path: build/*.deb artifacts_slug: ubuntu-jammy diff --git a/tools/debian_buildenv.sh b/tools/debian_buildenv.sh index f0d6ce12066..2c1c79750eb 100755 --- a/tools/debian_buildenv.sh +++ b/tools/debian_buildenv.sh @@ -67,6 +67,7 @@ case "$1" in libflac-dev \ libgmock-dev \ libgtest-dev \ + libgl1-mesa-dev \ libhidapi-dev \ libid3tag0-dev \ liblilv-dev \ @@ -78,10 +79,10 @@ case "$1" in libopusfile-dev \ libportmidi-dev \ libprotobuf-dev \ - libqt5opengl5-dev \ - libqt5sql5-sqlite \ - libqt5svg5-dev \ - libqt5x11extras5-dev \ + libqt6core5compat6-dev\ + libqt6opengl6-dev \ + libqt6sql6-sqlite \ + libqt6svg6-dev \ librubberband-dev \ libshout-idjc-dev \ libsndfile1-dev \ @@ -97,8 +98,8 @@ case "$1" in markdown \ portaudio19-dev \ protobuf-compiler \ - qt5keychain-dev \ - qtdeclarative5-dev \ + qtkeychain-qt6-dev \ + qt6-declarative-dev \ qml-module-qtquick-controls \ qml-module-qtquick-controls2 \ qml-module-qt-labs-qmlmodels \ diff --git a/tools/debian_buildenv_qt6.sh b/tools/debian_buildenv_qt6.sh deleted file mode 100755 index 6bd739dd773..00000000000 --- a/tools/debian_buildenv_qt6.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/bin/bash -# This script works with Debian, Ubuntu, and derivatives. -# shellcheck disable=SC1091 -set -o pipefail - -case "$1" in - name) - echo "No build environment name required for Debian based distros." >&2 - echo "This script installs the build dependencies via apt using the \"setup\" option." >&2 - ;; - - setup) - source /etc/lsb-release 2>/dev/null - case "${DISTRIB_CODENAME}" in - bionic) # Ubuntu 18.04 LTS - PACKAGES_EXTRA=( - libmp4v2-dev - ) - ;; - *) # libmp4v2 was removed from Debian 10 & Ubuntu 20.04 due to lack of maintenance, so use FFMPEG instead - PACKAGES_EXTRA=( - libavformat-dev - ) - esac - - sudo apt-get update - - # If jackd2 is installed as per dpkg database, install libjack-jackd2-dev. - # This avoids a package deadlock, resulting in jackd2 being removed, and jackd1 being installed, - # to satisfy portaudio19-dev's need for a jackd dev package. In short, portaudio19-dev needs a - # jackd dev library, so let's give it one.. - if [ "$(dpkg-query -W -f='${Status}' jackd2 2>/dev/null | grep -c "ok installed")" -eq 1 ]; - then - sudo apt-get install libjack-jackd2-dev; - fi - - # Install a faster linker. Prefer mold, fall back to lld - if apt-cache show mold 2>%1 >/dev/null; - then - sudo apt-get install -y --no-install-recommends mold - else - if apt-cache show lld 2>%1 >/dev/null; - then - sudo apt-get install -y --no-install-recommends lld - fi - fi - - sudo apt-get install -y --no-install-recommends -- \ - ccache \ - cmake \ - clazy \ - clang-tidy \ - debhelper \ - devscripts \ - docbook-to-man \ - dput \ - fonts-open-sans \ - fonts-ubuntu \ - g++ \ - lcov \ - libbenchmark-dev \ - libchromaprint-dev \ - libdistro-info-perl \ - libebur128-dev \ - libfaad-dev \ - libfftw3-dev \ - libflac-dev \ - libgl1-mesa-dev \ - libgmock-dev \ - libgtest-dev \ - libhidapi-dev \ - libid3tag0-dev \ - liblilv-dev \ - libmad0-dev \ - libmodplug-dev \ - libmp3lame-dev \ - libmsgsl-dev \ - libopus-dev \ - libopusfile-dev \ - libportmidi-dev \ - libprotobuf-dev \ - libqt6core5compat6-dev\ - libqt6opengl6-dev \ - libqt6sql6-sqlite \ - libqt6svg6-dev \ - librubberband-dev \ - libshout-idjc-dev \ - libsndfile1-dev \ - libsoundtouch-dev \ - libsqlite3-dev \ - libssl-dev \ - libtag1-dev \ - libudev-dev \ - libupower-glib-dev \ - libusb-1.0-0-dev \ - libwavpack-dev \ - lv2-dev \ - markdown \ - portaudio19-dev \ - protobuf-compiler \ - qtkeychain-qt6-dev \ - qt6-declarative-dev \ - qml-module-qtquick-controls \ - qml-module-qtquick-controls2 \ - qml-module-qt-labs-qmlmodels \ - qml-module-qtquick-shapes \ - "${PACKAGES_EXTRA[@]}" - ;; - *) - echo "Usage: $0 [options]" - echo "" - echo "options:" - echo " help Displays this help." - echo " name Displays the name of the required build environment." - echo " setup Installs the build environment." - ;; -esac From 858997479b7f4590037994ca634173e7c6c995d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Wed, 23 Aug 2023 07:33:27 +0200 Subject: [PATCH 08/10] Move Windows and macOS workflows to Qt6 --- .github/workflows/build.yml | 9 ++++++--- tools/macos_buildenv.sh | 20 +++++++------------- tools/windows_buildenv.bat | 8 ++++---- 3 files changed, 17 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d4707db5200..5eba3e3cb96 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -68,9 +68,10 @@ jobs: -DHSS1394=ON -DMACOS_BUNDLE=ON -DMODPLUG=ON + -DQT6=ON -DWAVPACK=ON - -DVCPKG_TARGET_TRIPLET=x64-osx-min1012 - -DVCPKG_DEFAULT_HOST_TRIPLET=x64-osx-min1012 + -DVCPKG_TARGET_TRIPLET=x64-osx-min1015 + -DVCPKG_DEFAULT_HOST_TRIPLET=x64-osx-min1015 # TODO: Fix this broken test on macOS ctest_args: --exclude-regex DirectoryDAOTest.relocateDirectory cpack_generator: DragNDrop @@ -90,9 +91,10 @@ jobs: -DHSS1394=ON -DMACOS_BUNDLE=ON -DMODPLUG=ON + -DQT6=ON -DWAVPACK=ON -DVCPKG_TARGET_TRIPLET=arm64-osx-min1100 - -DVCPKG_DEFAULT_HOST_TRIPLET=x64-osx-min1012 + -DVCPKG_DEFAULT_HOST_TRIPLET=x64-osx-min1015 # TODO: Fix this broken test on macOS crosscompile: true cpack_generator: DragNDrop @@ -119,6 +121,7 @@ jobs: -DMAD=ON -DMEDIAFOUNDATION=ON -DMODPLUG=ON + -DQT6=ON -DWAVPACK=ON cc: cl cxx: cl diff --git a/tools/macos_buildenv.sh b/tools/macos_buildenv.sh index d7900646da8..bf9b7be5322 100755 --- a/tools/macos_buildenv.sh +++ b/tools/macos_buildenv.sh @@ -20,24 +20,18 @@ THIS_SCRIPT_NAME=${BASH_SOURCE[0]} [ -z "$THIS_SCRIPT_NAME" ] && THIS_SCRIPT_NAME=$0 if [ -n "${BUILDENV_ARM64}" ]; then - if [ -n "${BUILDENV_RELEASE}" ]; then - BUILDENV_BRANCH="2.5-rel" - BUILDENV_NAME="mixxx-deps-rel-2.5-arm64-osx-min1100-c9e5580" - BUILDENV_SHA256="1dacff9e73e0267142e16a0d3836000c36cafeb2eeabdbece07db8e339995879" - else - BUILDENV_BRANCH="2.5" - BUILDENV_NAME="mixxx-deps-2.5-arm64-osx-min1100-35a3f01" - BUILDENV_SHA256="e0b951f55d496ec5ca4799073b9cc36619057998dceb118c5895ebe08e44669f" - fi + BUILDENV_BRANCH="2.5-rel" + BUILDENV_NAME="mixxx-deps-rel-2.5-arm64-osx-min1100-dea32d0" + BUILDENV_SHA256="6c7a810d99bcd032167447fb4e692bd1b70b9453e17c175be1e872613eee1259" else if [ -n "${BUILDENV_RELEASE}" ]; then BUILDENV_BRANCH="2.5-rel" - BUILDENV_NAME="mixxx-deps-rel-2.5-x64-osx-min1012-c9e5580" - BUILDENV_SHA256="23b6d7a99c231c68bf852503e41ce5029f193fc6ed7c2d92341c00c2df935a7c" + BUILDENV_NAME="mixxx-deps-rel-2.5-x64-osx-min1015-dea32d0" + BUILDENV_SHA256="bf9d4d34e08bc9412b99c333bdc20131603ab05a50f637ac8d3eaa7a4395d451" else BUILDENV_BRANCH="2.5" - BUILDENV_NAME="mixxx-deps-2.5-x64-osx-min1012-35a3f01" - BUILDENV_SHA256="c28b7fa37321bec2fad5bdeaabae054ba9c8dd85a16b25fc4c7fa2e97f8b40da" + BUILDENV_NAME="mixxx-deps-2.5-x64-osx-min1015-dea32d0" + BUILDENV_SHA256="94ec9f688ea2d80ae1722bc8a94457a33e6e7efea8afdef3a11589113974a5a0" fi fi diff --git a/tools/windows_buildenv.bat b/tools/windows_buildenv.bat index ffe34cdd724..3f0e13e081e 100644 --- a/tools/windows_buildenv.bat +++ b/tools/windows_buildenv.bat @@ -22,12 +22,12 @@ IF NOT DEFINED INSTALL_ROOT ( IF DEFINED BUILDENV_RELEASE ( SET BUILDENV_BRANCH=2.5-rel - SET BUILDENV_NAME=mixxx-deps-rel-2.5-x64-windows-c9e5580 - SET BUILDENV_SHA256=85e4d7410ba01ab61e5ef609bd92779267eddee7e235557208d7cf602f49dc5f + SET BUILDENV_NAME=mixxx-deps-rel-2.5-x64-windows-dea32d0 + SET BUILDENV_SHA256=23cb9232c7154273c0c1f6110ac64eb4b620bf37d8cdab1b37ae711b5e6ed8a7 ) ELSE ( SET BUILDENV_BRANCH=2.5 - SET BUILDENV_NAME=mixxx-deps-2.5-x64-windows-35a3f01 - SET BUILDENV_SHA256=6cc95b57dbb8a3e91037dc2d9cf81cbd82602d441a1f5f4a8313bae9a0bace87 + SET BUILDENV_NAME=mixxx-deps-2.5-x64-windows-dea32d0 + SET BUILDENV_SHA256=16f83e732a2c7518b9c3e36034df4130e42c971ba009f0a9abbbe8eb126e6f55 ) IF "%~1"=="" ( From 9cd5fdac094ebc181323929e82d51d9c0b604230 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Wed, 30 Aug 2023 00:42:29 +0200 Subject: [PATCH 09/10] fix: Disable installation of ANGLE DLLs for Qt6 ANGLE is no longer included in Qt6. See . --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d58efd4515f..62a7e9df2fe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1796,7 +1796,7 @@ if(MSVC) ) endif() -if(WIN32) +if(WIN32 AND NOT QT6) # Qt 5 loads these ANGLE DLLs at runtime if the graphics driver is blocklisted. # Qt does not link these and vcpkg does not build them as a dependency of Qt, # so copy them manually. From afdef35b6b79f0280f9de39624114424978c92fa Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Wed, 30 Aug 2023 15:47:17 +0200 Subject: [PATCH 10/10] ci: Temporarily disable broken tests due to Qt6 switch on Windows --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5eba3e3cb96..e5df45c7c69 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -126,7 +126,7 @@ jobs: cc: cl cxx: cl # TODO: Fix these broken tests on Windows - ctest_args: --exclude-regex '^AutoDJProcessorTest.*$' + ctest_args: --exclude-regex '^(AutoDJProcessorTest.*|CoverArtCacheTest\.loadCoverFromFile.*|CoverArtUtilTest\.extractEmbeddedCover|CoverArtUtilTest\.searchImage|TrackUpdateTest\.parseModified.*)$' cpack_generator: WIX compiler_cache: sccache compiler_cache_path: C:\Users\runneradmin\AppData\Local\Mozilla\sccache\cache