Merge pull request mixxxdj#16157 from mixxxdj/sync-branch-2.6-to-main

Merge changes from `2.6` into `main`

Author: ronso0

.github/dependabot.yml

@@ -4,4 +4,9 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
-    target-branch: "2.5"
+    target-branch: "2.6"
+  - package-ecosystem: "pre-commit"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    target-branch: "2.6"

.github/workflows/build.yml

@@ -244,10 +244,9 @@ jobs:
         # On windows-11-arm this action installs the x64 version which has unwanted side effects
         if: matrix.os == 'windows-2022'
         with:
-          # This is a workaround for a SSL false positive in cmake 3.26.4
-          # When downloading the manual. 3.21 is required for installing the
-          # ANGLE Dlls via IMPORTED_RUNTIME_ARTIFACTS
-          cmake-version: "3.21.x"
+          # This version of CMake is needed for Wix Toolset >= v4 support,
+          # see: https://cmake.org/cmake/help/latest/cpack_gen/wix.html#variable:CPACK_WIX_VERSION
+          cmake-version: "3.30.x"
 
       - name: "[Windows] Set up MSVC Developer Command Prompt"
         if: runner.os == 'Windows'
@@ -458,13 +457,30 @@ jobs:
           timestamp-digest: SHA256
           timeout: 600
 
-      - name: "[Windows 11 ARM64] Install WiX Toolset3"
-        if: matrix.os == 'windows-11-arm'
+      - name: "[Windows] Sign WiX custom action DLL"
+        env:
+          AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
+        if: runner.os == 'Windows' && env.AZURE_TENANT_ID
+        uses: azure/trusted-signing-action@v1.1.0
+        with:
+          azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+          azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
+          azure-client-secret: ${{ secrets.AZURE_CLIENT_SECRET }}
+          endpoint: https://weu.codesigning.azure.net/
+          trusted-signing-account-name: mixxx
+          certificate-profile-name: mixxx
+          files: ${{ github.workspace }}/build/packaging/wix/mixxxupgradecustomaction.dll
+          file-digest: SHA256
+          timestamp-rfc3161: http://timestamp.acs.microsoft.com
+          timestamp-digest: SHA256
+          timeout: 600
+
+      - name: "[Windows] Install WiX Toolset"
+        if: runner.os == 'Windows'
+        shell: pwsh
         run: |
-          choco install wixtoolset
-          Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1
-          refreshenv
-          echo "WIX=$env:WIX" >> $env:GITHUB_ENV
+          dotnet.exe tool install --global wix --version 6.0.2
+          wix extension add --global WixToolset.UI.wixext/6.0.2
 
       - name: "Package"
         id: package

CMakeLists.txt

@@ -3239,7 +3239,7 @@ option(ENGINEPRIME "Support for library export to Denon Engine Prime" ON)
 if(ENGINEPRIME)
   # libdjinterop does not currently have a stable ABI, so we fetch sources for a specific tag, build here, and link
   # statically.  This situation should be reviewed once libdjinterop hits version 1.x.
-  set(LIBDJINTEROP_VERSION 0.27.0)
+  set(LIBDJINTEROP_VERSION 0.27.1)
   # Look whether an existing installation of libdjinterop matches the required version.
   find_package(DjInterop ${LIBDJINTEROP_VERSION} EXACT CONFIG)
   if(NOT DjInterop_FOUND)
@@ -3302,7 +3302,7 @@ if(ENGINEPRIME)
         "https://github.com/xsco/libdjinterop/archive/refs/tags/${LIBDJINTEROP_VERSION}.tar.gz"
         "https://launchpad.net/~xsco/+archive/ubuntu/djinterop/+sourcefiles/libdjinterop/${LIBDJINTEROP_VERSION}-0ubuntu1/libdjinterop_${LIBDJINTEROP_VERSION}.orig.tar.gz"
       URL_HASH
-        SHA256=c4e73bf3907fd45be1c9767bcd9f367cbb7c279b4fe047bf2216bc92ae3d1668
+        SHA256=4c7393ab70b7c92374557e72c86f650bea73ba50e59f6e5a683c69038cc7ea48
       DOWNLOAD_DIR "${CMAKE_CURRENT_BINARY_DIR}/downloads"
       DOWNLOAD_NAME "libdjinterop-${LIBDJINTEROP_VERSION}.tar.gz"
       PREFIX "libdjinterop-${LIBDJINTEROP_VERSION}"
@@ -5386,6 +5386,8 @@ set(
   "${CMAKE_CURRENT_SOURCE_DIR}/packaging/CPackDebInstall.cmake"
 )
 
+# Use WiX toolset version >= 4.0 for building Windows installers.
+set(CPACK_WIX_VERSION 4)
 set(CPACK_WIX_UPGRADE_GUID "921DC99C-4DCF-478D-B950-50685CB9E6BE")
 set(
   CPACK_WIX_LICENSE_RTF
@@ -5424,6 +5426,24 @@ if(WIN32)
     )
   endif()
 
+  # Build the custom action DLL for cross-scope upgrade detection.
+  # Old Mixxx (<=2.5) was installed per-user due to a CPack bug (CMP0172).
+  # The standard FindRelatedProducts skips per-user products when the
+  # current install is per-machine.  The custom action calls scope-agnostic
+  # MsiEnumRelatedProducts() to detect and mark the old installation for
+  # removal by RemoveExistingProducts.
+  add_subdirectory(packaging/wix)
+  set(CPACK_WIX_INSTALL_SCOPE "perMachine")
+  file(
+    GENERATE OUTPUT
+    "${CMAKE_CURRENT_BINARY_DIR}/packaging/wix/MixxxUpgradePatch.xml"
+    INPUT "${CMAKE_CURRENT_SOURCE_DIR}/packaging/wix/MixxxUpgradePatch.xml.in"
+  )
+  set(
+    CPACK_WIX_PATCH_FILE
+    "${CMAKE_CURRENT_BINARY_DIR}/packaging/wix/MixxxUpgradePatch.xml"
+  )
+
   # uses CMAKE_PROJECT_VERSION
   configure_file(packaging/wix/LICENSE.rtf.in packaging/wix/LICENSE.rtf @ONLY)
 endif()

packaging/flatpak/modules/libdjinterop.yaml

@@ -4,8 +4,8 @@ config-opts:
   - -DCMAKE_BUILD_TYPE=RelWithDebInfo
 sources:
   - type: archive
-    url: https://github.com/xsco/libdjinterop/archive/refs/tags/0.27.0.tar.gz
-    sha256: c4e73bf3907fd45be1c9767bcd9f367cbb7c279b4fe047bf2216bc92ae3d1668
+    url: https://github.com/xsco/libdjinterop/archive/refs/tags/0.27.1.tar.gz
+    sha256: 4c7393ab70b7c92374557e72c86f650bea73ba50e59f6e5a683c69038cc7ea48
     x-checker-data:
       type: anitya
       project-id: 374896

packaging/wix/CMakeLists.txt

@@ -0,0 +1,13 @@
+# Custom action DLL for WiX installer upgrade detection.
+# Finds old Mixxx installations with CPACK_WIX_INSTALL_SCOPE "none"
+# that the standard FindRelatedProducts action skips due to scope mismatch.
+if(WIN32)
+  add_library(mixxxupgradecustomaction SHARED mixxxupgradecustomaction.cpp)
+  target_link_libraries(mixxxupgradecustomaction PRIVATE msi)
+  set_target_properties(
+    mixxxupgradecustomaction
+    PROPERTIES
+      RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/packaging/wix"
+      PREFIX ""
+  )
+endif()

packaging/wix/MixxxUpgradePatch.xml.in

@@ -0,0 +1,31 @@
+<CPackWiXPatch>
+  <!--
+    Cross-scope upgrade detection for Mixxx.
+
+    Old Mixxx (<=2.5.5) installers had InstallScope=NONE (mixture of per-user and per-machine)
+    due to a CPack bug (see CMake policy CMP0172). New installers (>= 2.6.0) are per-machine.
+    The standard FindRelatedProducts skips per-user products when the current
+    install is per-machine, leaving the old version behind.
+
+    This custom action DLL calls MsiEnumRelatedProducts() which is
+    scope-agnostic, and sets WIX_UPGRADE_DETECTED so RemoveExistingProducts
+    can clean up the old installation.
+  -->
+  <CPackWiXFragment Id="#PRODUCT">
+    <Binary Id="mixxxupgradecustomaction"
+            SourceFile="$<TARGET_FILE:mixxxupgradecustomaction>" />
+
+    <CustomAction Id="FindAllRelatedMixxxInstallations"
+                  BinaryRef="mixxxupgradecustomaction"
+                  DllEntry="FindAllRelatedMixxxInstallations"
+                  Execute="firstSequence" />
+
+    <InstallExecuteSequence>
+      <Custom Action="FindAllRelatedMixxxInstallations" Before="FindRelatedProducts" />
+    </InstallExecuteSequence>
+
+    <InstallUISequence>
+      <Custom Action="FindAllRelatedMixxxInstallations" Before="FindRelatedProducts" />
+    </InstallUISequence>
+  </CPackWiXFragment>
+</CPackWiXPatch>

packaging/wix/mixxxupgradecustomaction.cpp

@@ -0,0 +1,48 @@
+// Custom Action DLL to find Mixxx installations regardless of install scope.
+// The standard MSI FindRelatedProducts skips per-user installs when the
+// current install is per-machine. This includes the mismatch generated by
+// CPACK_WIX_INSTALL_SCOPE "none".
+// This MsiEnumRelatedProducts() has no such filter.
+
+// clang-format off
+// windows.h must precede msi.h (defines UINT, WINAPI, etc.)
+#include <windows.h>
+#include <msi.h>
+#include <msiquery.h>
+// clang-format on
+
+#pragma comment(lib, "msi.lib")
+
+namespace {
+// MSI GUIDs are exactly 38 chars (incl curly brackets, dashes and the null terminator):
+// {XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}
+constexpr DWORD kMsiGuidBufferSize = 39;
+
+// Mixxx Upgrade GUID — same as CPACK_WIX_UPGRADE_GUID
+constexpr wchar_t kMixxxUpgradeCode[] = L"{921DC99C-4DCF-478D-B950-50685CB9E6BE}";
+} // namespace
+
+extern "C"
+        __declspec(dllexport) UINT __stdcall FindAllRelatedMixxxInstallations(
+                MSIHANDLE hInstall) {
+    // Get our own ProductCode so we don't mark ourselves for removal.
+    wchar_t productCode[kMsiGuidBufferSize] = {};
+    DWORD productCodeLen = kMsiGuidBufferSize;
+    MsiGetPropertyW(hInstall, L"ProductCode", productCode, &productCodeLen);
+
+    // Enumerate ALL products with our UpgradeCode (scope-agnostic).
+    wchar_t relatedProduct[kMsiGuidBufferSize] = {};
+    DWORD index = 0;
+    while (MsiEnumRelatedProductsW(kMixxxUpgradeCode, 0, index, relatedProduct) == ERROR_SUCCESS) {
+        if (wcscmp(relatedProduct, productCode) != 0) {
+            // Found an older/different installation — mark it for upgrade removal.
+            MsiSetPropertyW(hInstall, L"WIX_UPGRADE_DETECTED", relatedProduct);
+            MsiSetPropertyW(hInstall, L"MIGRATE", relatedProduct);
+            MsiSetPropertyW(hInstall, L"UPGRADINGPRODUCTCODE", relatedProduct);
+            break; // Typically only one old installation exists
+        }
+        ++index;
+    }
+
+    return ERROR_SUCCESS;
+}

src/coreservices.cpp

@@ -679,7 +679,8 @@ void CoreServices::initialize(QApplication* pApp) {
         QString fd = QFileDialog::getExistingDirectory(nullptr,
                 tr("Choose music library directory"),
                 QStandardPaths::writableLocation(
-                        QStandardPaths::MusicLocation));
+                        QStandardPaths::MusicLocation),
+                QFileDialog::ShowDirsOnly);
 #endif
         // request to add directory to database.
         if (!fd.isEmpty() && m_pLibrary->requestAddDir(fd)) {

src/engine/controls/bpmcontrol.cpp

@@ -601,7 +601,8 @@ double BpmControl::calcSyncAdjustment(bool userTweakingSync) {
         adjustment = 1.0;
         // When updating the user offset, make sure to remove the existing offset or else it
         // will get double-applied.
-        m_dUserOffset.setValue(error + curUserOffset);
+        double offset = std::fmod(error + curUserOffset, 1.0f);
+        m_dUserOffset.setValue(offset);
     } else {
         // Threshold above which we do sync adjustment.
         const double kErrorThreshold = 0.01;

src/library/export/dlglibraryexport.cpp

@@ -222,7 +222,10 @@ void DlgLibraryExport::browseExportDirectory() {
             m_pConfig->getValue(ConfigKey("[Library]", kLastDirConfigItemName),
                     QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation));
     const auto exportDirectory = QFileDialog::getExistingDirectory(
-            nullptr, tr("Export Library To"), lastExportDirectory);
+            nullptr,
+            tr("Export Library To"),
+            lastExportDirectory,
+            QFileDialog::ShowDirsOnly);
     if (exportDirectory.isEmpty()) {
         return;
     }