Merge remote-tracking branch 'mixxx/main' into pref-waveform-grouping

ronso0 · Jan 17, 2025 · c038884 · c038884
2 parents 24f7a1d + 7e3aa94
commit c038884
Show file tree

Hide file tree

Showing 296 changed files with 17,017 additions and 4,393 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -4,3 +4,4 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+    target-branch: "2.5"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -318,7 +318,7 @@ jobs:
         env:
           AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
         if: runner.os == 'Windows' && env.AZURE_TENANT_ID
-        uses: azure/[email protected].0
+        uses: azure/[email protected].1
         with:
           azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
           azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
@@ -382,7 +382,7 @@ jobs:
         env:
           AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
         if: runner.os == 'Windows' && env.AZURE_TENANT_ID
-        uses: azure/[email protected].0
+        uses: azure/[email protected].1
         with:
           azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
           azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
@@ -484,7 +484,7 @@ jobs:
 
       - name: "Upload GitHub Actions artifacts"
         if: matrix.artifacts_path != null
-        uses: actions/upload-artifact@v4.4.3
+        uses: actions/upload-artifact@v4.6.0
         with:
           name: ${{ matrix.artifacts_name }}
           path: ${{ matrix.artifacts_path }}

diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
@@ -69,14 +69,14 @@ jobs:
 
       - name: "Upload patch artifact"
         if: failure() && env.UPLOAD_PATCH_FILE != null
-        uses: actions/upload-artifact@v4.4.3
+        uses: actions/upload-artifact@v4.6.0
         with:
           name: ${{ env.UPLOAD_PATCH_FILE }}
           path: ${{ env.UPLOAD_PATCH_FILE }}
 
       - name: "Upload pre-commit.log"
         if: failure() && env.UPLOAD_PATCH_FILE == null
-        uses: actions/upload-artifact@v4.4.3
+        uses: actions/upload-artifact@v4.6.0
         with:
           name: pre-commit.log
           path: /github/home/.cache/pre-commit/pre-commit.log

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -64,7 +64,7 @@ repos:
             "\\W(?:m_p*(?=[A-Z])|m_(?=\\w)|pp*(?=[A-Z])|k(?=[A-Z])|s_(?=\\w))",
             --write-changes,
           ]
-        exclude: ^(packaging/wix/LICENSE.rtf.in|src/dialog/dlgabout\.cpp|.*\.(?:pot?|(?<!\.d\.)ts|wxl|svg))$
+        exclude: ^(packaging/wix/LICENSE.rtf.in|src/dialog/dlgabout\.cpp|res/linux/org\.mixxx\.Mixxx\.desktop|.*\.(?:pot?|(?<!\.d\.)ts|wxl|svg))$
   - repo: https://github.com/pre-commit/mirrors-eslint
     rev: v9.14.0
     hooks:

diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -103,16 +103,16 @@ endif()
 
 if(DEFINED MIXXX_VCPKG_ROOT)
   if(
-    EXISTS "$ENV{MIXXX_VCPKG_ROOT}/overlay/ports"
-    OR NOT EXISTS "$ENV{MIXXX_VCPKG_ROOT}/ports"
+    EXISTS "${MIXXX_VCPKG_ROOT}/overlay/ports"
+    OR NOT EXISTS "${MIXXX_VCPKG_ROOT}/ports"
   )
     # MIXXX_VCPKG_ROOT points to our vcpkg environment
     # and we configure the CMAKE_TOOLCHAIN_FILE and overlays accordingly
-    message(STATUS "Using MIXXX_VCPKG_ROOT: $ENV{MIXXX_VCPKG_ROOT}")
+    message(STATUS "Using MIXXX_VCPKG_ROOT: ${MIXXX_VCPKG_ROOT}")
   else()
     message(
       STATUS
-      "MIXXX_VCPKG_ROOT not correct (missing $ENV{MIXXX_VCPKG_ROOT}/overlay/ports)"
+      "MIXXX_VCPKG_ROOT not correct (missing ${MIXXX_VCPKG_ROOT}/overlay/ports)"
     )
     fatal_error_missing_env()
   endif()
@@ -4572,6 +4572,9 @@ if(VINYLCONTROL)
   target_link_libraries(mixxx-lib PRIVATE mixxx-xwax)
 endif()
 
+# rendergraph
+add_subdirectory(src/rendergraph/opengl)
+
 # WavPack audio file support
 find_package(wavpack)
 default_option(WAVPACK "WavPack audio file support" "wavpack_FOUND")
@@ -4702,7 +4705,7 @@ if(NOT CPACK_DEBIAN_PACKAGE_RELEASE)
   set(CPACK_DEBIAN_PACKAGE_RELEASE 1)
 endif()
 
-set(CPACK_DEBIAN_DISTRIBUTION_RELEASES jammy mantic noble oracular)
+set(CPACK_DEBIAN_DISTRIBUTION_RELEASES jammy noble oracular plucky)
 set(CPACK_DEBIAN_SOURCE_DIR ${CMAKE_SOURCE_DIR})
 set(
   CPACK_DEBIAN_UPLOAD_PPA_SCRIPT

diff --git a/COPYING b/COPYING
@@ -1,3 +1,3 @@
-Mixxx is Copyright (C) 2000-2024 by its respective authors. This version
+Mixxx is Copyright (C) 2000-2025 by its respective authors. This version
 of the program is distributed under the General Public License version 2,
 as described in the file LICENSE distributed with the program.
diff --git a/LICENSE b/LICENSE
@@ -1,5 +1,5 @@
 Mixxx 2.6-alpha, Digital DJ'ing software.
-Copyright (C) 2001-2024 Mixxx Development Team
+Copyright (C) 2001-2025 Mixxx Development Team
 
 Mixxx is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/cmake/modules/FindChromaprint.cmake b/cmake/modules/FindChromaprint.cmake
@@ -1,5 +1,5 @@
 # This file is part of Mixxx, Digital DJ'ing software.
-# Copyright (C) 2001-2024 Mixxx Development Team
+# Copyright (C) 2001-2025 Mixxx Development Team
 # Distributed under the GNU General Public Licence (GPL) version 2 or any later
 # later version. See the LICENSE file for details.
 

diff --git a/cmake/modules/FindDjInterop.cmake b/cmake/modules/FindDjInterop.cmake
@@ -1,5 +1,5 @@
 # This file is part of Mixxx, Digital DJ'ing software.
-# Copyright (C) 2001-2024 Mixxx Development Team
+# Copyright (C) 2001-2025 Mixxx Development Team
 # Distributed under the GNU General Public Licence (GPL) version 2 or any later
 # later version. See the LICENSE file for details.
 

diff --git a/cmake/modules/FindEbur128.cmake b/cmake/modules/FindEbur128.cmake
@@ -1,5 +1,5 @@
 # This file is part of Mixxx, Digital DJ'ing software.
-# Copyright (C) 2001-2024 Mixxx Development Team
+# Copyright (C) 2001-2025 Mixxx Development Team
 # Distributed under the GNU General Public Licence (GPL) version 2 or any later
 # later version. See the LICENSE file for details.
 

diff --git a/cmake/modules/FindFFTW.cmake b/cmake/modules/FindFFTW.cmake
@@ -1,5 +1,5 @@
 # This file is part of Mixxx, Digital DJ'ing software.
-# Copyright (C) 2001-2024 Mixxx Development Team
+# Copyright (C) 2001-2025 Mixxx Development Team
 # Distributed under the GNU General Public Licence (GPL) version 2 or any later
 # later version. See the LICENSE file for details.
 

diff --git a/cmake/modules/FindFLAC.cmake b/cmake/modules/FindFLAC.cmake
@@ -1,5 +1,5 @@
 # This file is part of Mixxx, Digital DJ'ing software.
-# Copyright (C) 2001-2024 Mixxx Development Team
+# Copyright (C) 2001-2025 Mixxx Development Team
 # Distributed under the GNU General Public Licence (GPL) version 2 or any later
 # later version. See the LICENSE file for details.
 

diff --git a/cmake/modules/FindG72X.cmake b/cmake/modules/FindG72X.cmake
@@ -1,5 +1,5 @@
 # This file is part of Mixxx, Digital DJ'ing software.
-# Copyright (C) 2001-2024 Mixxx Development Team
+# Copyright (C) 2001-2025 Mixxx Development Team
 # Distributed under the GNU General Public Licence (GPL) version 2 or any later
 # later version. See the LICENSE file for details.
 

diff --git a/cmake/modules/FindGPerfTools.cmake b/cmake/modules/FindGPerfTools.cmake
@@ -1,5 +1,5 @@
 # This file is part of Mixxx, Digital DJ'ing software.
-# Copyright (C) 2001-2024 Mixxx Development Team
+# Copyright (C) 2001-2025 Mixxx Development Team
 # Distributed under the GNU General Public Licence (GPL) version 2 or any later
 # later version. See the LICENSE file for details.
 

diff --git a/cmake/modules/FindHSS1394.cmake b/cmake/modules/FindHSS1394.cmake
@@ -1,5 +1,5 @@
 # This file is part of Mixxx, Digital DJ'ing software.
-# Copyright (C) 2001-2024 Mixxx Development Team
+# Copyright (C) 2001-2025 Mixxx Development Team
 # Distributed under the GNU General Public Licence (GPL) version 2 or any later
 # later version. See the LICENSE file for details.
 

diff --git a/cmake/modules/FindID3Tag.cmake b/cmake/modules/FindID3Tag.cmake
@@ -1,5 +1,5 @@
 # This file is part of Mixxx, Digital DJ'ing software.
-# Copyright (C) 2001-2024 Mixxx Development Team
+# Copyright (C) 2001-2025 Mixxx Development Team
 # Distributed under the GNU General Public Licence (GPL) version 2 or any later
 # later version. See the LICENSE file for details.
 

diff --git a/cmake/modules/FindKeyFinder.cmake b/cmake/modules/FindKeyFinder.cmake
@@ -1,5 +1,5 @@
 # This file is part of Mixxx, Digital DJ'ing software.
-# Copyright (C) 2001-2024 Mixxx Development Team
+# Copyright (C) 2001-2025 Mixxx Development Team
 # Distributed under the GNU General Public Licence (GPL) version 2 or any later
 # later version. See the LICENSE file for details.
 

diff --git a/cmake/modules/FindLibUSB.cmake b/cmake/modules/FindLibUSB.cmake
@@ -1,5 +1,5 @@
 # This file is part of Mixxx, Digital DJ'ing software.
-# Copyright (C) 2001-2024 Mixxx Development Team
+# Copyright (C) 2001-2025 Mixxx Development Team
 # Distributed under the GNU General Public Licence (GPL) version 2 or any later
 # later version. See the LICENSE file for details.
 

diff --git a/cmake/modules/FindLibudev.cmake b/cmake/modules/FindLibudev.cmake
@@ -1,5 +1,5 @@
 # This file is part of Mixxx, Digital DJ'ing software.
-# Copyright (C) 2001-2024 Mixxx Development Team
+# Copyright (C) 2001-2025 Mixxx Development Team
 # Distributed under the GNU General Public Licence (GPL) version 2 or any later
 # later version. See the LICENSE file for details.
 

diff --git a/cmake/modules/FindMAD.cmake b/cmake/modules/FindMAD.cmake
@@ -1,5 +1,5 @@
 # This file is part of Mixxx, Digital DJ'ing software.
-# Copyright (C) 2001-2024 Mixxx Development Team
+# Copyright (C) 2001-2025 Mixxx Development Team
 # Distributed under the GNU General Public Licence (GPL) version 2 or any later
 # later version. See the LICENSE file for details.
 

diff --git a/cmake/modules/FindMP4.cmake b/cmake/modules/FindMP4.cmake
@@ -1,5 +1,5 @@
 # This file is part of Mixxx, Digital DJ'ing software.
-# Copyright (C) 2001-2024 Mixxx Development Team
+# Copyright (C) 2001-2025 Mixxx Development Team
 # Distributed under the GNU General Public Licence (GPL) version 2 or any later
 # later version. See the LICENSE file for details.
 

diff --git a/cmake/modules/FindMP4v2.cmake b/cmake/modules/FindMP4v2.cmake
@@ -1,5 +1,5 @@
 # This file is part of Mixxx, Digital DJ'ing software.
-# Copyright (C) 2001-2024 Mixxx Development Team
+# Copyright (C) 2001-2025 Mixxx Development Team
 # Distributed under the GNU General Public Licence (GPL) version 2 or any later
 # later version. See the LICENSE file for details.
 

diff --git a/cmake/modules/FindModplug.cmake b/cmake/modules/FindModplug.cmake
@@ -1,5 +1,5 @@
 # This file is part of Mixxx, Digital DJ'ing software.
-# Copyright (C) 2001-2024 Mixxx Development Team
+# Copyright (C) 2001-2025 Mixxx Development Team
 # Distributed under the GNU General Public Licence (GPL) version 2 or any later
 # later version. See the LICENSE file for details.
 

diff --git a/cmake/modules/FindOgg.cmake b/cmake/modules/FindOgg.cmake
@@ -1,5 +1,5 @@
 # This file is part of Mixxx, Digital DJ'ing software.
-# Copyright (C) 2001-2024 Mixxx Development Team
+# Copyright (C) 2001-2025 Mixxx Development Team
 # Distributed under the GNU General Public Licence (GPL) version 2 or any later
 # later version. See the LICENSE file for details.
 

diff --git a/cmake/modules/FindOpus.cmake b/cmake/modules/FindOpus.cmake
@@ -1,5 +1,5 @@
 # This file is part of Mixxx, Digital DJ'ing software.
-# Copyright (C) 2001-2024 Mixxx Development Team
+# Copyright (C) 2001-2025 Mixxx Development Team
 # Distributed under the GNU General Public Licence (GPL) version 2 or any later
 # later version. See the LICENSE file for details.
 

diff --git a/cmake/modules/FindOpusFile.cmake b/cmake/modules/FindOpusFile.cmake
@@ -1,5 +1,5 @@
 # This file is part of Mixxx, Digital DJ'ing software.
-# Copyright (C) 2001-2024 Mixxx Development Team
+# Copyright (C) 2001-2025 Mixxx Development Team
 # Distributed under the GNU General Public Licence (GPL) version 2 or any later
 # later version. See the LICENSE file for details.
 

diff --git a/cmake/modules/FindPortAudio.cmake b/cmake/modules/FindPortAudio.cmake
@@ -1,5 +1,5 @@
 # This file is part of Mixxx, Digital DJ'ing software.
-# Copyright (C) 2001-2024 Mixxx Development Team
+# Copyright (C) 2001-2025 Mixxx Development Team
 # Distributed under the GNU General Public Licence (GPL) version 2 or any later
 # later version. See the LICENSE file for details.
 

diff --git a/cmake/modules/FindPortMidi.cmake b/cmake/modules/FindPortMidi.cmake
@@ -1,5 +1,5 @@
 # This file is part of Mixxx, Digital DJ'ing software.
-# Copyright (C) 2001-2024 Mixxx Development Team
+# Copyright (C) 2001-2025 Mixxx Development Team
 # Distributed under the GNU General Public Licence (GPL) version 2 or any later
 # later version. See the LICENSE file for details.
 

diff --git a/cmake/modules/FindShoutidjc.cmake b/cmake/modules/FindShoutidjc.cmake
@@ -1,5 +1,5 @@
 # This file is part of Mixxx, Digital DJ'ing software.
-# Copyright (C) 2001-2024 Mixxx Development Team
+# Copyright (C) 2001-2025 Mixxx Development Team
 # Distributed under the GNU General Public Licence (GPL) version 2 or any later
 # later version. See the LICENSE file for details.
 

diff --git a/cmake/modules/FindSleef.cmake b/cmake/modules/FindSleef.cmake
@@ -1,5 +1,5 @@
 # This file is part of Mixxx, Digital DJ'ing software.
-# Copyright (C) 2001-2024 Mixxx Development Team
+# Copyright (C) 2001-2025 Mixxx Development Team
 # Distributed under the GNU General Public Licence (GPL) version 2 or any later
 # later version. See the LICENSE file for details.
 

diff --git a/cmake/modules/FindSndFile.cmake b/cmake/modules/FindSndFile.cmake
@@ -1,5 +1,5 @@
 # This file is part of Mixxx, Digital DJ'ing software.
-# Copyright (C) 2001-2024 Mixxx Development Team
+# Copyright (C) 2001-2025 Mixxx Development Team
 # Distributed under the GNU General Public Licence (GPL) version 2 or any later
 # later version. See the LICENSE file for details.
 

diff --git a/cmake/modules/FindSoundTouch.cmake b/cmake/modules/FindSoundTouch.cmake
@@ -1,5 +1,5 @@
 # This file is part of Mixxx, Digital DJ'ing software.
-# Copyright (C) 2001-2024 Mixxx Development Team
+# Copyright (C) 2001-2025 Mixxx Development Team
 # Distributed under the GNU General Public Licence (GPL) version 2 or any later
 # later version. See the LICENSE file for details.
 

diff --git a/cmake/modules/FindTagLib.cmake b/cmake/modules/FindTagLib.cmake
@@ -1,5 +1,5 @@
 # This file is part of Mixxx, Digital DJ'ing software.
-# Copyright (C) 2001-2024 Mixxx Development Team
+# Copyright (C) 2001-2025 Mixxx Development Team
 # Distributed under the GNU General Public Licence (GPL) version 2 or any later
 # later version. See the LICENSE file for details.
 

diff --git a/cmake/modules/FindUpower.cmake b/cmake/modules/FindUpower.cmake
@@ -1,5 +1,5 @@
 # This file is part of Mixxx, Digital DJ'ing software.
-# Copyright (C) 2001-2024 Mixxx Development Team
+# Copyright (C) 2001-2025 Mixxx Development Team
 # Distributed under the GNU General Public Licence (GPL) version 2 or any later
 # later version. See the LICENSE file for details.
 

diff --git a/cmake/modules/FindVorbis.cmake b/cmake/modules/FindVorbis.cmake
@@ -1,5 +1,5 @@
 # This file is part of Mixxx, Digital DJ'ing software.
-# Copyright (C) 2001-2024 Mixxx Development Team
+# Copyright (C) 2001-2025 Mixxx Development Team
 # Distributed under the GNU General Public Licence (GPL) version 2 or any later
 # later version. See the LICENSE file for details.
 

diff --git a/cmake/modules/Findhidapi.cmake b/cmake/modules/Findhidapi.cmake
@@ -1,5 +1,5 @@
 # This file is part of Mixxx, Digital DJ'ing software.
-# Copyright (C) 2001-2024 Mixxx Development Team
+# Copyright (C) 2001-2025 Mixxx Development Team
 # Distributed under the GNU General Public Licence (GPL) version 2 or any later
 # later version. See the LICENSE file for details.
 

diff --git a/cmake/modules/Findlilv.cmake b/cmake/modules/Findlilv.cmake
@@ -1,5 +1,5 @@
 # This file is part of Mixxx, Digital DJ'ing software.
-# Copyright (C) 2001-2024 Mixxx Development Team
+# Copyright (C) 2001-2025 Mixxx Development Team
 # Distributed under the GNU General Public Licence (GPL) version 2 or any later
 # later version. See the LICENSE file for details.
 

diff --git a/cmake/modules/Findmp3lame.cmake b/cmake/modules/Findmp3lame.cmake
@@ -1,5 +1,5 @@
 # This file is part of Mixxx, Digital DJ'ing software.
-# Copyright (C) 2001-2024 Mixxx Development Team
+# Copyright (C) 2001-2025 Mixxx Development Team
 # Distributed under the GNU General Public Licence (GPL) version 2 or any later
 # later version. See the LICENSE file for details.
 

diff --git a/cmake/modules/Findrubberband.cmake b/cmake/modules/Findrubberband.cmake
@@ -1,5 +1,5 @@
 # This file is part of Mixxx, Digital DJ'ing software.
-# Copyright (C) 2001-2024 Mixxx Development Team
+# Copyright (C) 2001-2025 Mixxx Development Team
 # Distributed under the GNU General Public Licence (GPL) version 2 or any later
 # later version. See the LICENSE file for details.
 

diff --git a/cmake/modules/Findwavpack.cmake b/cmake/modules/Findwavpack.cmake
@@ -1,5 +1,5 @@
 # This file is part of Mixxx, Digital DJ'ing software.
-# Copyright (C) 2001-2024 Mixxx Development Team
+# Copyright (C) 2001-2025 Mixxx Development Team
 # Distributed under the GNU General Public Licence (GPL) version 2 or any later
 # later version. See the LICENSE file for details.
 

diff --git a/cmake/modules/GitInfo.cmake b/cmake/modules/GitInfo.cmake
@@ -62,7 +62,7 @@ endif()
 # Get the current commit date
 if(NOT GIT_COMMIT_DATE)
   execute_process(
-    COMMAND git show --quiet --format=%cI --date=short
+    COMMAND git show --quiet --format=%cI --date=short --no-show-signature
     WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
     OUTPUT_VARIABLE GIT_COMMIT_DATE
     OUTPUT_STRIP_TRAILING_WHITESPACE

diff --git a/packaging/CPackDebUploadPPA.cmake b/packaging/CPackDebUploadPPA.cmake
@@ -123,10 +123,10 @@ if(DEB_BUILD)
 endif()
 
 foreach(release ${CPACK_DEBIAN_DISTRIBUTION_RELEASES})
-  if(release STREQUAL "bionic")
-    set(CPACK_DEBIAN_PACKAGE_BUILD_DEPENDS_EXTRA "libmp4v2-dev,")
+  if(release STREQUAL "jammy")
+    set(CPACK_DEBIAN_PACKAGE_BUILD_DEPENDS_EXTRA "libqt6shadertools6-dev,")
   else()
-    set(CPACK_DEBIAN_PACKAGE_BUILD_DEPENDS_EXTRA "libavformat-dev,")
+    set(CPACK_DEBIAN_PACKAGE_BUILD_DEPENDS_EXTRA "qt6-shadertools-dev,")
   endif()
 
   configure_file(

diff --git a/packaging/debian/changelog b/packaging/debian/changelog
@@ -1,3 +1,9 @@
+mixxx (2.4.2-1~focal) focal; urgency=medium
+
+  * Build of 2.4.2
+
+ -- RJ Skerry-Ryan <[email protected]>  Tue, 26 Nov 2024 23:29:32 +0000
+
 mixxx (2.4.1-1~focal) focal; urgency=medium
 
   * Build of 2.4.1

diff --git a/packaging/debian/control.in b/packaging/debian/control.in
@@ -23,7 +23,6 @@ Build-Depends: debhelper (>= 11),
                qml6-module-qt-labs-qmlmodels,
                libqt6core5compat6-dev,
                libqt6opengl6-dev,
-               libqt6shadertools6-dev,
                libqt6sql6-sqlite,
                libqt6svg6-dev,
                cmake (>= 3.13),
@@ -34,6 +33,7 @@ Build-Depends: debhelper (>= 11),
                libogg-dev,
                libsndfile1-dev,
                libasound2-dev,
+               libavformat-dev,
                libvorbis-dev,
                libfaad-dev,
                libportmidi-dev,

diff --git a/packaging/debian/copyright b/packaging/debian/copyright
@@ -6,7 +6,7 @@ Source: https://downloads.mixxx.org/
 
 Files: *
 Copyright:
- 2001-2024 Mixxx development team
+ 2001-2025 Mixxx development team
 License: GPL-2+
 
 License: GPL-2+