Merge remote-tracking branch 'upstream/master' into plugin/WaveAnalyzer

.github/FUNDING.yml

@@ -1 +1,2 @@
+---
 custom: https://lmms.io/get-involved/#donate

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -78,7 +78,8 @@ body:
       label: Screenshots / Minimum Reproducible Project
       description: |
         - Upload any screenshots showing the bug in action.
-        - If possible, also include a .mmp/.mmpz project containing the simplest possible setup needed to reproduce the bug.
+        - If possible, also include a .mmp/.mmpz project containing the simplest possible
+          setup needed to reproduce the bug.
 
         ***Note:** To upload a project file to GitHub, it will need to be placed in a .zip archive.*
   - type: checkboxes

.github/ISSUE_TEMPLATE/config.yml

@@ -1,4 +1,5 @@
+---
 contact_links:
-- name: Get help on Discord
-  url: https://lmms.io/chat/
-  about: Need help? Have a question? Reach out to other LMMS users on our Discord server!
+  - name: Get help on Discord
+    url: https://lmms.io/chat/
+    about: Need help? Have a question? Reach out to other LMMS users on our Discord server!

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -10,7 +10,8 @@ body:
       label: Enhancement Summary
       description: |
         - Briefly describe the enhancement.
-        - Explain why you believe the proposed enhancement to be a good idea, and (if applicable) how it helps overcome a limitation of LMMS you are currently facing.
+        - Explain why you believe the proposed enhancement to be a good idea, and (if applicable) how it helps
+          overcome a limitation of LMMS you are currently facing.
     validations:
       required: true
   - type: textarea

.github/no-response.yml

@@ -1,2 +1,3 @@
+---
 # Label requiring a response
 responseRequiredLabel: "response required"

.github/workflows/build.yml

@@ -8,7 +8,7 @@ jobs:
   linux:
     name: linux
     runs-on: ubuntu-latest
-    container: lmmsci/linux.gcc:18.04
+    container: ghcr.io/lmms/linux.gcc:20.04
     env:
       CMAKE_OPTS: >-
         -DUSE_WERROR=ON
@@ -18,12 +18,8 @@ jobs:
       CCACHE_NOCOMPRESS: 1
       MAKEFLAGS: -j2
     steps:
-      - name: Update and configure Git
-        run: |
-          add-apt-repository ppa:git-core/ppa
-          apt-get update
-          apt-get --yes install git
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"
+      - name: Configure git
+        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
       - name: Check out
         uses: actions/checkout@v3
         with:
@@ -41,8 +37,10 @@ jobs:
         run: |
           ccache --zero-stats
           source /opt/qt5*/bin/qt5*-env.sh || true
-          mkdir build && cd build
-          cmake .. $CMAKE_OPTS -DCMAKE_INSTALL_PREFIX=./install
+          cmake -S . \
+                -B build \
+                -DCMAKE_INSTALL_PREFIX=./install \
+                $CMAKE_OPTS
       - name: Build
         run: cmake --build build
       - name: Run tests
@@ -54,31 +52,43 @@ jobs:
           cmake --build build --target install
           cmake --build build --target appimage
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: linux
           path: build/lmms-*.AppImage
       - name: Trim ccache and print statistics
         run: |
           ccache --cleanup
           echo "[ccache config]"
-          ccache --print-config
+          ccache --show-config
           echo "[ccache stats]"
           ccache --show-stats
         env:
           CCACHE_MAXSIZE: 500M
   macos:
-    name: macos
-    runs-on: macos-12
+    strategy:
+      fail-fast: false
+      matrix:
+        arch: [ x86_64, arm64 ]
+        include:
+          - arch: x86_64
+            os: macos-12
+            xcode: "13.1"
+          - arch: arm64
+            os: macos-14
+            xcode: "14.3.1"
+    name: macos-${{ matrix.arch }}
+    runs-on: ${{ matrix.os }}
     env:
       CMAKE_OPTS: >-
+        -Werror=dev
         -DUSE_WERROR=ON
         -DCMAKE_BUILD_TYPE=RelWithDebInfo
         -DUSE_COMPILE_CACHE=ON
       CCACHE_MAXSIZE: 0
       CCACHE_NOCOMPRESS: 1
       MAKEFLAGS: -j3
-      DEVELOPER_DIR: /Applications/Xcode_13.1.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
     steps:
       - name: Check out
         uses: actions/checkout@v3
@@ -88,19 +98,21 @@ jobs:
       - name: Clean up Homebrew download cache
         run: rm -rf ~/Library/Caches/Homebrew/downloads
       - name: Restore Homebrew download cache
+        id: cache-homebrew
         uses: actions/cache/restore@v3
         with:
           key: n/a - only restore from restore-keys
           restore-keys: |
-            homebrew-
+            homebrew-${{ matrix.arch }}-
           path: ~/Library/Caches/Homebrew/downloads
       - name: Cache ccache data
         uses: actions/cache@v3
         with:
-          key: ccache-${{ github.job }}-${{ github.ref }}-${{ github.run_id }}
+          key: "ccache-${{ github.job }}-${{ matrix.arch }}-${{ github.ref }}\
+            -${{ github.run_id }}"
           restore-keys: |
-            ccache-${{ github.job }}-${{ github.ref }}-
-            ccache-${{ github.job }}-
+            ccache-${{ github.job }}-${{ matrix.arch }}-${{ github.ref }}-
+            ccache-${{ github.job }}-${{ matrix.arch }}-
           path: ~/Library/Caches/ccache
       - name: Install dependencies
         run: |
@@ -118,7 +130,8 @@ jobs:
           cmake -S . \
                 -B build \
                 -DCMAKE_INSTALL_PREFIX="../target" \
-                -DCMAKE_PREFIX_PATH="$(brew --prefix qt5)" \
+                -DCMAKE_PREFIX_PATH="$(brew --prefix qt@5)" \
+                -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }} \
                 $CMAKE_OPTS \
                 -DUSE_WERROR=OFF
       - name: Build
@@ -132,9 +145,9 @@ jobs:
           cmake --build build --target install
           cmake --build build --target dmg
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: macos
+          name: macos-${{ matrix.arch }}
           path: build/lmms-*.dmg
       - name: Trim ccache and print statistics
         run: |
@@ -146,33 +159,40 @@ jobs:
         env:
           CCACHE_MAXSIZE: 500MB
       - name: Save Homebrew download cache
+        if: ${{ steps.cache-homebrew.outputs.cache-matched-key != env.key }}
         uses: actions/cache/save@v3
         with:
-          key: homebrew-${{ hashFiles('Brewfile.lock.json') }}
+          key: ${{ env.key }} 
           path: ~/Library/Caches/Homebrew/downloads
+        env:
+          key: "homebrew-${{ matrix.arch }}\
+            -${{ hashFiles('Brewfile.lock.json') }}"
   mingw:
     strategy:
       fail-fast: false
       matrix:
         arch: ['32', '64']
     name: mingw${{ matrix.arch }}
     runs-on: ubuntu-latest
-    container: lmmsci/linux.mingw${{ matrix.arch }}:18.04
+    container: ghcr.io/lmms/linux.mingw:20.04
     env:
       CMAKE_OPTS: >-
+        -Werror=dev
         -DUSE_WERROR=ON
         -DCMAKE_BUILD_TYPE=RelWithDebInfo
         -DUSE_COMPILE_CACHE=ON
       CCACHE_MAXSIZE: 0
       CCACHE_NOCOMPRESS: 1
       MAKEFLAGS: -j2
     steps:
-      - name: Update and configure Git
+      - name: Enable POSIX MinGW
         run: |
-          add-apt-repository ppa:git-core/ppa
-          apt-get update
-          apt-get --yes install git
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"
+          update-alternatives --set i686-w64-mingw32-gcc /usr/bin/i686-w64-mingw32-gcc-posix
+          update-alternatives --set i686-w64-mingw32-g++ /usr/bin/i686-w64-mingw32-g++-posix
+          update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix
+          update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix
+      - name: Configure git
+        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
       - name: Check out
         uses: actions/checkout@v3
         with:
@@ -190,22 +210,25 @@ jobs:
       - name: Configure
         run: |
           ccache --zero-stats
-          mkdir build && cd build
-          ../cmake/build_win${{ matrix.arch }}.sh
+          cmake -S . \
+                -B build \
+                -DCMAKE_INSTALL_PREFIX=./install \
+                -DCMAKE_TOOLCHAIN_FILE="./cmake/toolchains/MinGW-W64-${{ matrix.arch }}.cmake" \
+                $CMAKE_OPTS
       - name: Build
         run: cmake --build build
       - name: Package
         run: cmake --build build --target package
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: mingw${{ matrix.arch }}
           path: build/lmms-*.exe
       - name: Trim ccache and print statistics
         run: |
           ccache --cleanup
           echo "[ccache config]"
-          ccache --print-config
+          ccache --show-config
           echo "[ccache stats]"
           ccache --show-stats
         env:
@@ -218,7 +241,6 @@ jobs:
     name: msvc-${{ matrix.arch }}
     runs-on: windows-2019
     env:
-      qt-version: '5.15.2'
       CCACHE_MAXSIZE: 0
       CCACHE_NOCOMPRESS: 1
     steps:
@@ -238,30 +260,31 @@ jobs:
       - name: Cache ccache data
         uses: actions/cache@v3
         with:
+          # yamllint disable rule:line-length
           key: "ccache-${{ github.job }}-${{ matrix.arch }}-${{ github.ref }}\
             -${{ github.run_id }}"
           restore-keys: |
             ccache-${{ github.job }}-${{ matrix.arch }}-${{ github.ref }}-
             ccache-${{ github.job }}-${{ matrix.arch }}-
           path: ~\AppData\Local\ccache
+          # yamllint enable rule:line-length
       - name: Install tools
         run: choco install ccache
-      - name: Install 64-bit Qt
-        if: matrix.arch == 'x64'
-        uses: jurplel/install-qt-action@b3ea5275e37b734d027040e2c7fe7a10ea2ef946
-        with:
-          version: ${{ env.qt-version }}
-          arch: win64_msvc2019_64
-          archives: qtbase qtsvg qttools
-          cache: true
-      - name: Install 32-bit Qt
+      - name: Install Qt
         uses: jurplel/install-qt-action@b3ea5275e37b734d027040e2c7fe7a10ea2ef946
         with:
-          version: ${{ env.qt-version }}
-          arch: win32_msvc2019
+          version: '5.15.2'
+          arch: |-
+            ${{
+              fromJSON('
+                {
+                  "x86": "win32_msvc2019",
+                  "x64": "win64_msvc2019_64"
+                }
+              ')[matrix.arch]
+            }}
           archives: qtbase qtsvg qttools
           cache: true
-          set-env: ${{ matrix.arch == 'x86' }}
       - name: Set up build environment
         uses: ilammy/msvc-dev-cmd@cec98b9d092141f74527d0afa6feb2af698cfe89
         with:
@@ -274,8 +297,10 @@ jobs:
             -B build `
             -G Ninja `
             --toolchain C:/vcpkg/scripts/buildsystems/vcpkg.cmake `
+            -Werror=dev `
             -DCMAKE_BUILD_TYPE=RelWithDebInfo `
             -DUSE_COMPILE_CACHE=ON `
+            -DUSE_WERROR=ON `
             -DVCPKG_TARGET_TRIPLET="${{ matrix.arch }}-windows" `
             -DVCPKG_HOST_TRIPLET="${{ matrix.arch }}-windows" `
             -DVCPKG_MANIFEST_INSTALL="${{ env.should_install_manifest }}"
@@ -291,7 +316,7 @@ jobs:
       - name: Package
         run: cmake --build build --target package
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: msvc-${{ matrix.arch }}
           path: build\lmms-*.exe

.github/workflows/checks.yml

@@ -31,3 +31,10 @@ jobs:
             $(find "./cmake/" -type f -name '*.sh' -o -name "*.sh.in") \
             doc/bash-completion/lmms \
             buildtools/update_locales
+  yamllint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out
+        uses: actions/checkout@v3
+      - name: Run yamllint
+        run: for i in $(git ls-files '*.yml'); do yamllint $i; done

.gitignore

@@ -1,5 +1,5 @@
-/build
-/target
+/build/
+/target/
 .*.sw?
 .DS_Store
 *~

.gitmodules

@@ -25,9 +25,6 @@
 [submodule "src/3rdparty/weakjack/weakjack"]
 	path = src/3rdparty/weakjack/weakjack
 	url = https://github.com/x42/weakjack.git
-[submodule "src/3rdparty/mingw-std-threads"]
-	path = src/3rdparty/mingw-std-threads
-	url = https://github.com/meganz/mingw-std-threads.git
 [submodule "doc/wiki"]
 	path = doc/wiki
 	url = https://github.com/lmms/lmms.wiki.git

.yamllint

@@ -0,0 +1,3 @@
+rules:
+  line-length:
+    max: 120  # be conforming to LMMS coding rules