Merge remote-tracking branch 'upstream/main' into abletonlink2

JoergAtGithub · Dec 28, 2024 · 29f7a1f · 29f7a1f
2 parents f142616 + f0ce199
commit 29f7a1f
Show file tree

Hide file tree

Showing 645 changed files with 36,026 additions and 35,946 deletions.
diff --git a/.cmakelintrc b/.cmakelintrc
@@ -0,0 +1 @@
+filter=-linelength,-convention/filename,-package/stdargs
diff --git a/.codespellignorelines b/.codespellignorelines
@@ -4,24 +4,24 @@
                  pInOut, pInOut,
         CSAMPLE* pInOut,
     CSAMPLE* pInOut,
-void EnginePregain::process(CSAMPLE* pInOut, const int iBufferSize) {
-void EngineDelay::process(CSAMPLE* pInOut, const int iBufferSize) {
+void EnginePregain::process(CSAMPLE* pInOut, const std::size_t bufferSize) {
+void EngineDelay::process(CSAMPLE* pInOut, const std::size_t bufferSize) {
         pInOut[i] = (CSAMPLE) processSample(fbuf1, (double) pInOut[i]);
         pInOut[i + 1] = (CSAMPLE) processSample(fbuf2, (double) pInOut[i + 1]);
             m_pDelayBuffer[m_iDelayPos] = pInOut[i];
             pInOut[i] = m_pDelayBuffer[iDelaySourcePos];
-        SampleUtil::applyRampingGain(&pInOut[0], m_fPrevGain, 0, iBufferSize / 2);
-        SampleUtil::applyRampingGain(&pInOut[iBufferSize / 2], 0, totalGain, iBufferSize / 2);
-        SampleUtil::applyRampingGain(pInOut, m_fPrevGain, totalGain, iBufferSize);
-        SampleUtil::applyGain(pInOut, totalGain, iBufferSize);
-    void process(CSAMPLE* pInOut, const int iBufferSize) override;
-    void process(CSAMPLE* pInOut, const int iBufferSize);
-    virtual void process(CSAMPLE* pInOut, const int iBufferSize);
+        SampleUtil::applyRampingGain(&pInOut[0], m_fPrevGain, 0, bufferSize / 2);
+        SampleUtil::applyRampingGain(&pInOut[bufferSize / 2], 0, totalGain, bufferSize / 2);
+        SampleUtil::applyRampingGain(pInOut, m_fPrevGain, totalGain, bufferSize);
+        SampleUtil::applyGain(pInOut, totalGain, bufferSize);
+    void process(CSAMPLE* pInOut, const std::size_t bufferSize) override;
+    void process(CSAMPLE* pInOut, const std::size_t bufferSize);
+    virtual void process(CSAMPLE* pInOut, const std::size_t bufferSize);
                 "CSAMPLE_GAIN gain%(i)din, CSAMPLE_GAIN gain%(i)dout"
                 "gain%(i)dout == CSAMPLE_GAIN_ZERO) {"
                     "pSrc%(i)d, gain%(i)din, gain%(i)dout" % {"i": j}
                 "(gain%(i)dout - gain%(i)din) / (iNumSamples / 2);"
-    MOCK_METHOD(void, process, (CSAMPLE * pInOut, const int iBufferSize), (override));
+    MOCK_METHOD(void, process, (CSAMPLE * pInOut, const std::size_t bufferSize), (override));
     const QString kName3 = QStringLiteral("I'm blue, da ba dee");
     float m_k2vg; // IIF factor
     float m_k2vgNew; // IIF factor
@@ -71,6 +71,6 @@ void EngineEffectsDelay::process(CSAMPLE* pInOut,
     // Source: FIPS 180-4 Secure Hash Standard (SHS)
         // ALAC/CAF has been added in version 1.0.26
         QStringLiteral("caf"),
-void EngineFilter::process(CSAMPLE* pInOut, const int iBufferSize)
+void EngineFilter::process(CSAMPLE* pInOut, const size_t bufferSize)
     // Note(RRyan/Max Linke):
     // https://github.com/codders/libshout/blob/a17fb84671d3732317b0353d7281cc47e2df6cf6/src/timing/timing.c
diff --git a/.eslintignore b/.eslintignore
diff --git a/.eslintrc.json b/.eslintrc.json
diff --git a/.gersemirc b/.gersemirc
@@ -0,0 +1 @@
+indent: 2
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-checks.yml b/.github/workflows/build-checks.yml
@@ -21,11 +21,17 @@ jobs:
           - name: clazy
           - name: clang-tidy
           - name: coverage
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: ${{ matrix.name }}
     steps:
       - name: Check out repository
-        uses: actions/[email protected]
+        uses: actions/[email protected]
+      - name: Add clazy PPA
+        if: matrix.name == 'clazy'
+        # Ubuntu2404 comes with v1.11, which is too old for the Qt6.4 shipped with Ubuntu 24.04
+        run: |
+          sudo add-apt-repository ppa:daschuer/clazy
+          sudo apt update
       - name: Install build dependencies
         run: tools/debian_buildenv.sh setup
       - name: Create build directory
@@ -34,6 +40,7 @@ jobs:
         if: matrix.name == 'clazy'
         # Disable optimizations as workaround for Clang 9 bug: https://bugs.llvm.org/show_bug.cgi?id=45034
         run: |
+          clazy --version
           cmake \
             -DCMAKE_BUILD_TYPE=Debug \
             -DWARNINGS_FATAL=ON \
@@ -61,6 +68,8 @@ jobs:
           CXX: clazy
       - name: Configure (clang-tidy)
         if: matrix.name == 'clang-tidy'
+        # Our code contains the use of infinity(), which Clang >= 18 reports
+        # as error, if you compile with -fast-math
         run: |
           cmake \
             -DCMAKE_BUILD_TYPE=Debug \
@@ -81,6 +90,7 @@ jobs:
             -DMAD=ON \
             -DMODPLUG=ON \
             -DWAVPACK=ON \
+            -DCMAKE_CXX_FLAGS="-Wno-nan-infinity-disabled" \
             ..
         working-directory: build
         env:
@@ -116,13 +126,6 @@ jobs:
         working-directory: build
       - name: Set up problem matcher
         uses: ammaraskar/[email protected]
-      # Work around https://github.com/actions/runner-images/issues/8659
-      - name: "Remove GCC 13 from runner image (workaround)"
-        shell: bash
-        run: |
-          sudo rm -f /etc/apt/sources.list.d/ubuntu-toolchain-r-ubuntu-test-jammy.list
-          sudo apt-get update
-          sudo apt-get install -y --allow-downgrades libc6=2.35* libc6-dev=2.35* libstdc++6=12.3.0-1ubuntu1~22.04 libgcc-s1=12.3.0-1ubuntu1~22.04
       - name: Build
         # Do not abort on errors and build/check the whole project
         run: cmake --build . -j $(nproc) -- --keep-going
@@ -159,6 +162,6 @@ jobs:
         continue-on-error: true
         uses: coverallsapp/[email protected]
         with:
-          flag-name: ubuntu-22.04
+          flag-name: ubuntu-24.04
           path-to-lcov: build/lcov.info
           github-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,8 +15,8 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: Ubuntu 22.04
-            os: ubuntu-22.04
+          - name: Ubuntu 24.04
+            os: ubuntu-24.04
             cmake_args: >-
               -DQT6=ON
               -DQML=ON
@@ -34,12 +34,12 @@ jobs:
             cpack_generator: DEB
             buildenv_basepath: /home/runner/buildenv
             buildenv_script: tools/debian_buildenv.sh
-            artifacts_name: Ubuntu 22.04 Qt6 DEB
+            artifacts_name: Ubuntu 24.04 Qt6 DEB
             artifacts_path: build/*.deb
             artifacts_slug: ubuntu-jammy
             qt_qpa_platform: offscreen
-          - name: macOS 12 x64
-            os: macos-12
+          - name: macOS 13 x64
+            os: macos-13
             cmake_args: >-
               -DBULK=ON
               -DCOREAUDIO=ON
@@ -63,8 +63,8 @@ jobs:
             artifacts_path: build/*.dmg
             artifacts_slug: macos-macosintel
             qt_qpa_platform: offscreen
-          - name: macOS 12 arm64
-            os: macos-12
+          - name: macOS 13 arm64
+            os: macos-13
             cmake_args: >-
               -DBULK=ON
               -DCOREAUDIO=ON
@@ -121,7 +121,6 @@ jobs:
 
     env:
       # macOS codesigning
-      APPLE_CODESIGN_IDENTITY: EF241CF990A9BE5477438AEE1F308F76F33FD100
       MACOS_CODESIGN_CERTIFICATE_P12_BASE64: ${{ secrets.MACOS_CODESIGN_CERTIFICATE_P12_BASE64 }}
       MACOS_CODESIGN_CERTIFICATE_PASSWORD: ${{ secrets.MACOS_CODESIGN_CERTIFICATE_PASSWORD }}
 
@@ -134,7 +133,7 @@ jobs:
       artifact-windows-win64: ${{ steps.prepare_deploy.outputs.artifact-windows-win64 }}
     steps:
       - name: "Check out repository"
-        uses: actions/[email protected].1
+        uses: actions/[email protected].2
         with:
           # This is necessary for making `git describe` work.
           fetch-depth: 0
@@ -152,7 +151,7 @@ jobs:
 
       - name: "[macOS] Set up cmake"
         uses: jwlawson/[email protected]
-        # Ubuntu 22.04 should use the CMake version from the repos.
+        # Ubuntu 24.04 should use the CMake version from the repos.
         if: runner.os == 'macOS'
         with:
           # This should always match the minimum required version in
@@ -161,7 +160,7 @@ jobs:
 
       - name: "[Windows] Set up cmake"
         uses: jwlawson/[email protected]
-        # Ubuntu 22.04 should use the CMake version from the repos.
+        # Ubuntu 24.04 should use the CMake version from the repos.
         if: runner.os == 'Windows'
         with:
           # This is a workaround for a SSL false positive in cmake 3.26.4
@@ -201,12 +200,15 @@ jobs:
           security unlock-keychain -p mixxx Mixxx.keychain
           security import ~/certificate.p12 -k Mixxx.keychain \
             -P "${MACOS_CODESIGN_CERTIFICATE_PASSWORD}" -A
+          security find-certificate -a -Z Mixxx.keychain
+          APPLE_CODESIGN_IDENTITY="$(security find-certificate -a -Z Mixxx.keychain | grep ^SHA-1 | cut -d " " -f3 | uniq)"
           security set-key-partition-list -S "apple-tool:,apple:" -k mixxx Mixxx.keychain
           # Add keychain to search list
           security list-keychains -s Mixxx.keychain
           # Prevent keychain access from timing out
           security set-keychain-settings Mixxx.keychain
           echo "CMAKE_ARGS_EXTRA=${CMAKE_ARGS_EXTRA} -DAPPLE_CODESIGN_IDENTITY=${APPLE_CODESIGN_IDENTITY}" >> "${GITHUB_ENV}"
+          echo "APPLE_CODESIGN_IDENTITY=${APPLE_CODESIGN_IDENTITY}" >> $GITHUB_ENV
 
       - name: "[macOS/Linux] Set up build environment"
         if: matrix.buildenv_script != null && runner.os != 'Windows'
@@ -333,8 +335,17 @@ jobs:
 
       - name: "Package"
         if: matrix.cpack_generator != null
-        run: cpack -G ${{ matrix.cpack_generator }} -V
-        working-directory: build
+        # Use retry loop to work around a race condition on macOS causing
+        # 'Resource busy' errors with 'hdiutil'. See
+        # https://github.com/actions/runner-images/issues/7522
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 30
+          max_attempts: 12
+          retry_wait_seconds: 1
+          command: |
+            cd build
+            cpack -G ${{ matrix.cpack_generator }} -V
 
       - name: "[Ubuntu] Import PPA GPG key"
         if: startsWith(matrix.os, 'ubuntu') && env.RRYAN_AT_MIXXX_DOT_ORG_GPG_PRIVATE_KEY != null
@@ -344,7 +355,7 @@ jobs:
 
       - name: "Package for PPA"
         # No need to do the PPA build for both Ubuntu versions
-        if: matrix.name == 'Ubuntu 22.04'
+        if: matrix.name == 'Ubuntu 24.04'
         run: |
           if [[ "${{ github.ref }}" == "refs/heads/main" ]] && [[ "${{ github.repository }}" == "mixxxdj/mixxx" ]]; then
             CPACK_ARGS="-D DEB_UPLOAD_PPA=ppa:mixxx/nightlies"
@@ -489,7 +500,7 @@ jobs:
     if: always() && github.repository == 'mixxxdj/mixxx'
     steps:
       - name: "Check out repository"
-        uses: actions/[email protected].1
+        uses: actions/[email protected].2
         with:
           fetch-depth: 0
 

diff --git a/.github/workflows/git.yaml b/.github/workflows/git.yaml
@@ -7,6 +7,6 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/[email protected].1
+      - uses: actions/[email protected].2
       - name: Block Fixup Commit Merge
         uses: 13rac1/[email protected]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		filter=-linelength,-convention/filename,-package/stdargs