Merge branch 'master' into mingw-vcpkg-testing

.clang-format

@@ -1,7 +1,7 @@
 ---
 # Language
 Language:        Cpp
-Standard:        Cpp11  # Cpp14 and Cpp17 are not supported by clang 11
+Standard:        c++20
 
 # Indentation
 TabWidth:        4

.clang-tidy

@@ -20,7 +20,6 @@ Checks: >
   readability-simplify-boolean-expr
 WarningsAsErrors: ''
 HeaderFilterRegex: '' # don't show errors from headers
-AnalyzeTemporaryDtors: false
 FormatStyle:     none
 User:            user
 CheckOptions:    

.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

@@ -72,15 +72,16 @@ jobs:
         arch: [ x86_64, arm64 ]
         include:
           - arch: x86_64
-            os: macos-12
-            xcode: "13.1"
+            os: macos-13
+            xcode: "15.2"
           - arch: arm64
             os: macos-14
-            xcode: "14.3.1"
+            xcode: "15.4"
     name: macos-${{ matrix.arch }}
     runs-on: ${{ matrix.os }}
     env:
       CMAKE_OPTS: >-
+        -Werror=dev
         -DUSE_WERROR=ON
         -DCMAKE_BUILD_TYPE=RelWithDebInfo
         -DUSE_COMPILE_CACHE=ON
@@ -167,22 +168,24 @@ jobs:
           key: "homebrew-${{ matrix.arch }}\
             -${{ hashFiles('Brewfile.lock.json') }}"
   mingw:
-    strategy:
-      fail-fast: false
-      matrix:
-        #arch: ['32', '64']
-        arch: ['64']
-    name: mingw${{ matrix.arch }}
-    runs-on: ubuntu-22.04
+    name: mingw64
+    runs-on: ubuntu-24.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: Enable POSIX MinGW
+        run: |
+          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
@@ -209,36 +212,35 @@ jobs:
         id: cache-deps
         uses: actions/cache@v3
         with:
-          key: vcpkg-mingw${{ matrix.arch }}-${{ hashFiles('vcpkg.json') }}
+          key: vcpkg-mingw64-${{ hashFiles('vcpkg.json') }}
           restore-keys: |
-            vcpkg-mingw${{ matrix.arch }}-
+            vcpkg-mingw64-
           path: build/vcpkg_installed
       - name: Cache ccache data
         if: ${{ !env.ACT }} # skip during local actions testing
         uses: actions/cache@v3
         with:
-          key: "ccache-${{ github.job }}-${{ matrix.arch }}-${{ github.ref }}\
+          key: "ccache-${{ github.job }}-64-${{ github.ref }}\
             -${{ github.run_id }}"
           restore-keys: |
-            ccache-${{ github.job }}-${{ matrix.arch }}-${{ github.ref }}-
-            ccache-${{ github.job }}-${{ matrix.arch }}-
+            ccache-${{ github.job }}-64-${{ github.ref }}-
+            ccache-${{ github.job }}-64-
           path: ~/.ccache
       - name: Configure
         run: |
           ccache --zero-stats
           cmake -S . \
             -B build \
-            -DCMAKE_TOOLCHAIN_FILE="../cmake/toolchains/MinGW-W64-${{ matrix.arch }}.cmake" \
-            -DVCPKG_TARGET_TRIPLET="${{ env.vcpkg_arch }}-mingw-static" \
-            -DVCPKG_HOST_TRIPLET="${{ env.vcpkg_arch }}-linux" \
+            -DCMAKE_INSTALL_PREFIX=./install \
+            -DCMAKE_TOOLCHAIN_FILE="./cmake/toolchains/MinGW-W64-64.cmake" \
+            -DVCPKG_TARGET_TRIPLET="x64-mingw-static" \
+            -DVCPKG_HOST_TRIPLET="x64-linux" \
             -DVCPKG_MANIFEST_INSTALL="${{ env.should_install_manifest }}" \
             $CMAKE_OPTS
         env:
           #should_install_manifest:
           #  ${{ steps.cache-deps.outputs.cache-hit == 'true' && 'NO' || 'YES' }}
           should_install_manifest: 'YES'
-          vcpkg_arch:
-            ${{ matrix.arch == '32' && 'x86' || 'x64' }}
       - name: Build
         run: cmake --build build
       - name: Package
@@ -247,7 +249,7 @@ jobs:
         if: ${{ !env.ACT }} # skip during local actions testing
         uses: actions/upload-artifact@v4
         with:
-          name: mingw${{ matrix.arch }}
+          name: mingw64
           path: build/lmms-*.exe
       - name: Trim ccache and print statistics
         run: |
@@ -264,11 +266,7 @@ jobs:
           echo "Build failed. Dropping into an interactive shell."
           tail -f /dev/null
   msvc:
-    strategy:
-      fail-fast: false
-      matrix:
-        arch: ['x86', 'x64']
-    name: msvc-${{ matrix.arch }}
+    name: msvc-x64
     runs-on: windows-2019
     env:
       CCACHE_MAXSIZE: 0
@@ -279,44 +277,44 @@ jobs:
         with:
           fetch-depth: 0
           submodules: recursive
+      - name: Update vcpkg (TEMPORARY)
+        run: |
+          cd $env:VCPKG_INSTALLATION_ROOT
+          git pull
+          .\bootstrap-vcpkg.bat
+        shell: pwsh
       - name: Cache vcpkg dependencies
         id: cache-deps
         uses: actions/cache@v3
         with:
-          key: vcpkg-${{ matrix.arch }}-${{ hashFiles('vcpkg.json') }}
+          key: vcpkg-x64-${{ hashFiles('vcpkg.json') }}
           restore-keys: |
-            vcpkg-${{ matrix.arch }}-
+            vcpkg-x64-
           path: build\vcpkg_installed
       - name: Cache ccache data
         uses: actions/cache@v3
         with:
-          key: "ccache-${{ github.job }}-${{ matrix.arch }}-${{ github.ref }}\
+          # yamllint disable rule:line-length
+          key: "ccache-${{ github.job }}-x64-${{ github.ref }}\
             -${{ github.run_id }}"
           restore-keys: |
-            ccache-${{ github.job }}-${{ matrix.arch }}-${{ github.ref }}-
-            ccache-${{ github.job }}-${{ matrix.arch }}-
+            ccache-${{ github.job }}-x64-${{ github.ref }}-
+            ccache-${{ github.job }}-x64-
           path: ~\AppData\Local\ccache
+          # yamllint enable rule:line-length
       - name: Install tools
         run: choco install ccache
       - name: Install Qt
         uses: jurplel/install-qt-action@b3ea5275e37b734d027040e2c7fe7a10ea2ef946
         with:
           version: '5.15.2'
-          arch: |-
-            ${{
-              fromJSON('
-                {
-                  "x86": "win32_msvc2019",
-                  "x64": "win64_msvc2019_64"
-                }
-              ')[matrix.arch]
-            }}
+          arch: "win64_msvc2019_64"
           archives: qtbase qtsvg qttools
           cache: true
       - name: Set up build environment
         uses: ilammy/msvc-dev-cmd@cec98b9d092141f74527d0afa6feb2af698cfe89
         with:
-          arch: ${{ matrix.arch }}
+          arch: x64
       - name: Configure
         run: |
           ccache --zero-stats
@@ -325,11 +323,12 @@ 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_TARGET_TRIPLET="x64-windows" `
+            -DVCPKG_HOST_TRIPLET="x64-windows" `
             -DVCPKG_MANIFEST_INSTALL="${{ env.should_install_manifest }}"
         env:
           should_install_manifest:
@@ -345,7 +344,7 @@ jobs:
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: msvc-${{ matrix.arch }}
+          name: msvc-x64
           path: build\lmms-*.exe
       - name: Trim ccache and print statistics
         run: |

.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

.gitmodules

@@ -16,6 +16,7 @@
 [submodule "plugins/Xpressive/exprtk"]
 	path = plugins/Xpressive/exprtk
 	url = https://github.com/ArashPartow/exprtk
+	branch = release
 [submodule "plugins/LadspaEffect/swh/ladspa"]
 	path = plugins/LadspaEffect/swh/ladspa
 	url = https://github.com/swh/ladspa
@@ -25,9 +26,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

.tx/config

@@ -3,9 +3,8 @@ host = https://www.transifex.com
 minimum_perc = 51
 #Need to finish at least 51% before merging back
 
-[lmms.lmms]
+[o:lmms:p:lmms:r:lmms]
 file_filter = data/locale/<lang>.ts
 source_file = data/locale/en.ts
 source_lang = en
-type = QT
-
+type        = QT

.yamllint

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

Brewfile

@@ -13,7 +13,7 @@ brew "libsoundio"
 brew "libvorbis"
 brew "lilv"
 brew "lv2"
-brew "pkg-config"
+brew "pkgconf"
 brew "portaudio"
 brew "qt@5"
 brew "sdl2"