Merge remote-tracking branch 'upstream/2.5'

.github/workflows/build-checks.yml

@@ -160,7 +160,7 @@ jobs:
       - name: "Upload Coverage Report to coveralls.io"
         if: matrix.name == 'coverage'
         continue-on-error: true
-        uses: coverallsapp/[email protected].4
+        uses: coverallsapp/[email protected].6
         with:
           flag-name: ubuntu-24.04
           path-to-lcov: build/lcov.info

CMakeLists.txt

@@ -2880,7 +2880,7 @@ if(KEYFINDER)
     target_link_libraries(mixxx-lib PRIVATE KeyFinder::KeyFinder)
   else()
     # If KeyFinder is built statically, we need FFTW
-    find_package(FFTW REQUIRED)
+    find_package(FFTW3 REQUIRED)
     set(
       KeyFinder_INSTALL_DIR
       "${CMAKE_CURRENT_BINARY_DIR}/lib/keyfinder-install"
@@ -2959,7 +2959,7 @@ if(KEYFINDER)
       PROPERTIES
         IMPORTED_LOCATION "${KeyFinder_INSTALL_DIR}/${KeyFinder_LIBRARY}"
     )
-    target_link_libraries(mixxx-keyfinder INTERFACE FFTW::FFTW)
+    target_link_libraries(mixxx-keyfinder INTERFACE FFTW3::fftw3)
     target_include_directories(
       mixxx-keyfinder
       INTERFACE "${KeyFinder_INSTALL_DIR}/include"
@@ -3344,6 +3344,8 @@ if(Qt_IS_STATIC)
       Qt${QT_VERSION_MAJOR}::QSvgPlugin
       # sqldrivers
       Qt${QT_VERSION_MAJOR}::QSQLiteDriverPlugin
+      # network plugins
+      Qt${QT_VERSION_MAJOR}::QTlsBackendOpenSSLPlugin
   )
 
   if(EMSCRIPTEN)
@@ -3364,10 +3366,19 @@ if(Qt_IS_STATIC)
   if(WIN32)
     target_link_libraries(
       mixxx-lib
-      PRIVATE
-        Qt${QT_VERSION_MAJOR}::QWindowsIntegrationPlugin
-        Qt${QT_VERSION_MAJOR}::QWindowsVistaStylePlugin
+      PRIVATE Qt${QT_VERSION_MAJOR}::QWindowsIntegrationPlugin
     )
+    if(QT_VERSION VERSION_LESS 6.7)
+      target_link_libraries(
+        mixxx-lib
+        PRIVATE Qt${QT_VERSION_MAJOR}::QWindowsVistaStylePlugin
+      )
+    else()
+      target_link_libraries(
+        mixxx-lib
+        PRIVATE Qt${QT_VERSION_MAJOR}::QModernWindowsStylePlugin
+      )
+    endif()
   endif()
 
   if(APPLE)
@@ -3432,6 +3443,15 @@ else()
         applocal
     )
 
+    install(
+      IMPORTED_RUNTIME_ARTIFACTS
+        Qt${QT_VERSION_MAJOR}::QTlsBackendOpenSSLPlugin
+        DESTINATION
+        "${MIXXX_INSTALL_DATADIR}/tls"
+        COMPONENT
+        applocal
+    )
+
     if(QML)
       install(
         IMPORTED_RUNTIME_ARTIFACTS
@@ -3587,14 +3607,25 @@ else()
           COMPONENT
           applocal
       )
-      install(
-        IMPORTED_RUNTIME_ARTIFACTS
-          Qt${QT_VERSION_MAJOR}::QWindowsVistaStylePlugin
-          DESTINATION
-          "${MIXXX_INSTALL_DATADIR}/styles"
-          COMPONENT
-          applocal
-      )
+      if(QT_VERSION VERSION_LESS 6.7)
+        install(
+          IMPORTED_RUNTIME_ARTIFACTS
+            Qt${QT_VERSION_MAJOR}::QWindowsVistaStylePlugin
+            DESTINATION
+            "${MIXXX_INSTALL_DATADIR}/styles"
+            COMPONENT
+            applocal
+        )
+      else()
+        install(
+          IMPORTED_RUNTIME_ARTIFACTS
+            Qt${QT_VERSION_MAJOR}::QModernWindowsStylePlugin
+            DESTINATION
+            "${MIXXX_INSTALL_DATADIR}/styles"
+            COMPONENT
+            applocal
+        )
+      endif()
     endif()
     if(APPLE)
       install(
@@ -4645,6 +4676,11 @@ set(CPACK_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
 
 set(CPACK_DEBIAN_PACKAGE_SECTION "sound")
 set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
+if(QT6)
+  set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "qt6-translations-l10n")
+else()
+  set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "qttranslations5-l10n")
+endif()
 set(CPACK_DEBIAN_PACKAGE_SUGGESTS "pdf-viewer, pulseaudio-utils")
 set(CPACK_DEBIAN_PACKAGE_REPLACES "mixxx-data")
 if(QT6)

cmake/modules/FindChromaprint.cmake

@@ -102,11 +102,11 @@ if(Chromaprint_FOUND)
           PROPERTY INTERFACE_COMPILE_DEFINITIONS CHROMAPRINT_NODLL
         )
       endif()
-      find_package(FFTW REQUIRED)
+      find_package(FFTW3 REQUIRED)
       set_property(
         TARGET Chromaprint::Chromaprint
         APPEND
-        PROPERTY INTERFACE_LINK_LIBRARIES FFTW::FFTW
+        PROPERTY INTERFACE_LINK_LIBRARIES FFTW3::fftw3
       )
     endif()
   endif()

cmake/modules/FindFFTW3.cmake

@@ -0,0 +1,82 @@
+#[=======================================================================[.rst:
+FindFFTW3
+--------
+
+Finds the FFTW3 library.
+
+Imported Targets
+^^^^^^^^^^^^^^^^
+
+This module provides the following imported targets, if found:
+
+``FFTW3::fftw3``
+  The FFTW3 library
+
+Result Variables
+^^^^^^^^^^^^^^^^
+
+This will define the following variables:
+
+``FFTW3_FOUND``
+  True if the system has the FFTW3 library.
+``FFTW3_INCLUDE_DIRS``
+  Include directories needed to use FFTW3.
+``FFTW3_LIBRARIES``
+  Libraries needed to link to FFTW3.
+
+Cache Variables
+^^^^^^^^^^^^^^^
+
+The following cache variables may also be set:
+
+``FFTW3_INCLUDE_DIR``
+  The directory containing ``fftw3.h``.
+``FFTW3_LIBRARY``
+  The path to the FFTW3 library.
+
+#]=======================================================================]
+
+find_package(PkgConfig QUIET)
+if(PkgConfig_FOUND)
+  pkg_check_modules(PC_Fftw3 QUIET fftw3)
+endif()
+
+find_path(FFTW3_INCLUDE_DIR
+  NAMES fftw3.h
+  HINTS ${PC_Fftw3_INCLUDE_DIRS}
+  DOC "FFTW3 include directory")
+mark_as_advanced(FFTW3_INCLUDE_DIR)
+
+find_library(FFTW3_LIBRARY
+  NAMES fftw3 fftw-3.3
+  HINTS ${PC_Fftw3_LIBRARY_DIRS}
+  DOC "FFTW3 library"
+)
+mark_as_advanced(FFTW3_LIBRARY)
+
+if(DEFINED PC_Fftw3_VERSION AND NOT PC_Fftw3_VERSION STREQUAL "")
+  set(FFTW3_VERSION "${PC_Fftw3_VERSION}")
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(
+  FFTW3
+  REQUIRED_VARS FFTW3_LIBRARY FFTW3_INCLUDE_DIR
+  VERSION_VAR FFTW3_VERSION
+)
+
+if(FFTW3_FOUND)
+  set(FFTW3_LIBRARIES "${FFTW3_LIBRARY}")
+  set(FFTW3_INCLUDE_DIRS "${FFTW3_INCLUDE_DIR}")
+  set(FFTW3_DEFINITIONS ${PC_Fftw3_CFLAGS_OTHER})
+
+  if(NOT TARGET FFTW3::fftw3)
+    add_library(FFTW3::fftw3 UNKNOWN IMPORTED)
+    set_target_properties(FFTW3::fftw3
+      PROPERTIES
+        IMPORTED_LOCATION "${FFTW3_LIBRARY}"
+        INTERFACE_COMPILE_OPTIONS "${PC_Fftw3_CFLAGS_OTHER}"
+        INTERFACE_INCLUDE_DIRECTORIES "${FFTW3_INCLUDE_DIR}"
+    )
+  endif()
+endif()

cmake/modules/FindKeyFinder.cmake

@@ -93,11 +93,11 @@ if(KeyFinder_FOUND)
     )
     is_static_library(KeyFinder_IS_STATIC KeyFinder::KeyFinder)
     if(KeyFinder_IS_STATIC)
-      find_package(FFTW REQUIRED)
+      find_package(FFTW3 REQUIRED)
       set_property(
         TARGET KeyFinder::KeyFinder
         APPEND
-        PROPERTY INTERFACE_LINK_LIBRARIES FFTW::FFTW
+        PROPERTY INTERFACE_LINK_LIBRARIES FFTW3::fftw3
       )
     endif()
   endif()

cmake/modules/Findrubberband.cmake

@@ -97,12 +97,12 @@ if(rubberband_FOUND)
         APPEND
         PROPERTY INTERFACE_LINK_LIBRARIES ${SAMPLERATE_LIBRARY}
       )
-      find_package(FFTW)
+      find_package(FFTW3)
       if(FFTW_FOUND)
         set_property(
           TARGET rubberband::rubberband
           APPEND
-          PROPERTY INTERFACE_LINK_LIBRARIES FFTW::FFTW
+          PROPERTY INTERFACE_LINK_LIBRARIES FFTW3::fftw3
         )
       endif()
       find_package(Sleef)

packaging/debian/control.in

@@ -72,6 +72,7 @@ Package: mixxx
 Section: @CPACK_DEBIAN_PACKAGE_SECTION@
 Architecture: linux-any
 Depends: ${shlibs:Depends}, ${misc:Depends}, @CPACK_DEBIAN_PACKAGE_DEPENDS@
+Recommends: @CPACK_DEBIAN_PACKAGE_RECOMMENDS@
 Suggests: @CPACK_DEBIAN_PACKAGE_SUGGESTS@
 Replaces: mixxx-data
 Description: @CPACK_DEBIAN_PACKAGE_DESCRIPTION_MERGED@

res/controllers/Behringer BCR2000.midi.xml

@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<MixxxControllerPreset schemaVersion="1" mixxxVersion="2.2.3+">
+<MixxxControllerPreset schemaVersion="1" mixxxVersion="2.5.0+">
   <info>
     <name>Behringer BCR2000</name>
     <author>Christian</author>
     <description>Mixxx controller preset for a Behringer B-Control BCR2000 controller.</description>
   </info>
   <controller id="BCR2000">
     <scriptfiles>
-      <file filename="lodash.mixxx.js"/>
       <file filename="midi-components-0.0.js"/>
       <file filename="Behringer-Extension-scripts.js" />
       <file filename="Behringer-BCR2000-preset-scripts.js" />

res/controllers/Behringer DDM4000.midi.xml

@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<MixxxControllerPreset schemaVersion="1" mixxxVersion="2.2.3+">
+<MixxxControllerPreset schemaVersion="1" mixxxVersion="2.5.0+">
   <info>
     <name>Behringer DDM4000</name>
     <author>Christian</author>
     <description>Mixxx controller preset for a Behringer DDM4000 mixer.</description>
   </info>
   <controller id="DDM4000">
     <scriptfiles>
-      <file filename="lodash.mixxx.js" />
       <file filename="midi-components-0.0.js" />
       <file filename="Behringer-Extension-scripts.js" />
       <file filename="Behringer-DDM4000-scripts.js" functionprefix="DDM4000" />