Merge remote-tracking branch 'origin/master' into multi-reverb-support

Author: derselbst

.github/workflows/api_doc_build.yml

@@ -1,13 +1,29 @@
-name: API Doc Build
+name: API Doc & Wiki Build
 
 on:
   push:
     branches:
       - master
+    paths-ignore:
+      - '.azure/**'
+      - '.circleci/**'
+      - '.github/workflows/rendering-regression.yml'
+      - '.github/workflows/linux.yml'
+      - '.github/workflows/ios.yml'
+      - '.github/workflows/sonarcloud.yml'
+      - '.github/workflows/windows.yml'
+      - '.cirrus.yml'
+      - 'README.md'
+
+    workflow_dispatch:
 
 env:
   BUILD_TYPE: Release
 
+concurrency:
+    group: ${{ github.workflow }}-${{ github.ref }}
+    cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-22.04
@@ -36,6 +52,30 @@ jobs:
       working-directory: ${{runner.workspace}}/build
       run: cmake --build . --config $BUILD_TYPE --target doxygen
 
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: "3.13"
+
+    - name: Install zensical
+      run: pip install zensical
+
+    - name: Build
+      run: zensical build --clean
+
+    - name: Publish Wiki to GH Pages Repo
+      uses: JamesIves/github-pages-deploy-action@v4
+      with:
+        folder: ${{runner.workspace}}/fluidsynth/.zensical/wiki/
+        repository-name: FluidSynth/fluidsynth.github.io
+        branch: main
+        ssh-key: ${{ secrets.DEPLOY_API_TOKEN }}
+        target-folder: wiki/
+        clean: true
+        commit-message: Updating wiki from fluidsynth master
+        git-config-name: Zensical Deploy
+        git-config-email: fluid-wiki-deploy@fluidsynth.github.io
+
     - name: Publish API Docs to GH Pages
       uses: JamesIves/github-pages-deploy-action@v4
       with:

.github/workflows/codespell.yml

@@ -17,5 +17,5 @@ jobs:
       - name: Run Codespell
         uses: codespell-project/actions-codespell@v2
         with:
-            ignore_words_list: READD,caf,rin,datas,Claus,lins
+            ignore_words_list: READD,caf,rin,datas,Claus,lins,Capela
             skip: ./.git,*.pdf,./AUTHORS,./THANKS,./contrib

.github/workflows/ios.yml

@@ -6,6 +6,7 @@ on:
     paths-ignore:
       - '.azure/**'
       - '.circleci/**'
+      - '.github/workflows/api_doc_build.yml'
       - '.github/workflows/linux.yml'
       - '.github/workflows/solaris.yml'
       - '.github/workflows/windows.yml'

.github/workflows/linux.yml

@@ -6,6 +6,7 @@ on:
     paths-ignore:
       - '.azure/**'
       - '.circleci/**'
+      - '.github/workflows/api_doc_build.yml'
       - '.github/workflows/sonarcloud.yml'
       - '.github/workflows/solaris.yml'
       - '.github/workflows/windows.yml'

.github/workflows/rendering-regression.yml

@@ -12,10 +12,11 @@ on:
     paths-ignore:
       - '.azure/**'
       - '.circleci/**'
+      - '.github/workflows/api_doc_build.yml'
+      - '.github/workflows/linux.yml'
+      - '.github/workflows/ios.yml'
       - '.github/workflows/sonarcloud.yml'
-      - '.github/workflows/solaris.yml'
       - '.github/workflows/windows.yml'
-      - '.github/workflows/ios.yml'
       - '.cirrus.yml'
       - 'README.md'
 

.github/workflows/solaris.yml

@@ -6,6 +6,7 @@ on:
     paths-ignore:
       - '.azure/**'
       - '.circleci/**'
+      - '.github/workflows/api_doc_build.yml'
       - '.github/workflows/linux.yml'
       - '.github/workflows/ios.yml'
       - '.github/workflows/rendering-regression.yml'

.github/workflows/sonarcloud.yml

@@ -8,6 +8,7 @@ on:
     paths-ignore:
       - '.azure/**'
       - '.circleci/**'
+      - '.github/workflows/api_doc_build.yml'
       - '.github/workflows/linux.yml'
       - '.github/workflows/solaris.yml'
       - '.github/workflows/windows.yml'

.github/workflows/windows.yml

@@ -7,6 +7,7 @@ on:
     paths-ignore:
       - '.azure/**'
       - '.circleci/**'
+      - '.github/workflows/api_doc_build.yml'
       - '.github/workflows/sonarcloud.yml'
       - '.github/workflows/solaris.yml'
       - '.github/workflows/linux.yml'

.gitignore

@@ -42,3 +42,10 @@ install_manifest.txt
 *.pro.user*
 *.user
 *.vscode
+.idea/
+
+# Built docs
+/.zensical/
+/.cache/
+_codeql_build_dir/
+_codeql_detected_source_root

CMakeLists.txt

@@ -47,7 +47,7 @@ set ( PACKAGE "fluidsynth" )
 # FluidSynth package version
 set ( FLUIDSYNTH_VERSION_MAJOR 2 )
 set ( FLUIDSYNTH_VERSION_MINOR 5 )
-set ( FLUIDSYNTH_VERSION_MICRO 3 )
+set ( FLUIDSYNTH_VERSION_MICRO 4 )
 set ( VERSION "${FLUIDSYNTH_VERSION_MAJOR}.${FLUIDSYNTH_VERSION_MINOR}.${FLUIDSYNTH_VERSION_MICRO}" )
 set ( FLUIDSYNTH_VERSION ${VERSION} )
 
@@ -62,7 +62,7 @@ set ( FLUIDSYNTH_VERSION ${VERSION} )
 # This is not exactly the same algorithm as the libtool one, but the results are the same.
 set ( LIB_VERSION_CURRENT 3 )
 set ( LIB_VERSION_AGE 5 )
-set ( LIB_VERSION_REVISION 2 )
+set ( LIB_VERSION_REVISION 3 )
 set ( LIB_VERSION_INFO
       "${LIB_VERSION_CURRENT}.${LIB_VERSION_AGE}.${LIB_VERSION_REVISION}" )
 
@@ -989,9 +989,6 @@ if ( UNIX )
         configure_file ( fluidsynth.service.in
         ${FluidSynth_BINARY_DIR}/fluidsynth.service @ONLY )
 
-        configure_file ( fluidsynth.tmpfiles.in
-        ${FluidSynth_BINARY_DIR}/fluidsynth.tmpfiles @ONLY )
-
         configure_file ( fluidsynth.conf.in
         ${FluidSynth_BINARY_DIR}/fluidsynth.conf @ONLY )