Merge branch 'main' into add-loginstruments

Author: kawa-sanmyaku

.github/ISSUE_TEMPLATE/bug.yaml

@@ -5,7 +5,7 @@ body:
     id: version
     attributes:
       label: Version
-      value: "24.09"
+      value: "24.12"
     validations:
       required: true
   - type: dropdown

.github/workflows/build.yml

@@ -3,7 +3,7 @@ name: build
 on: [push, pull_request]
 
 env:
-  CACHE_VERSION: 10
+  CACHE_VERSION: 11
   CARDINAL_UNDER_WINE: 1
   CIBUILD: true
   DEBIAN_FRONTEND: noninteractive
@@ -143,7 +143,7 @@ jobs:
           # multiple jobs for building carla, deps and plugins
           make DEBUG=true carla deps dgl plugins resources -j $(nproc)
           # single job for final build stage, otherwise we might get killed due to OOM
-          make DEBUG=true HAVE_PULSEAUDIO=false clap lv2 vst2 vst3 -j 1
+          make DEBUG=true HAVE_PULSEAUDIO=false jack -j 1
       - name: Set sha8
         id: slug
         run: echo "SHA8=$(echo ${{ github.sha }} | cut -c1-8)" >> $GITHUB_ENV
@@ -157,22 +157,11 @@ jobs:
             *.tar.xz
 
   macos:
-    strategy:
-      matrix:
-        debug: [0, 1]
-        target: [universal-10.15]
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
-      - name: Set debug or release
-        shell: bash
-        run: |
-          if [ "${{ matrix.debug }}" -eq 1 ]; then
-            echo "TARGET_SUFFIX=-debug" >> $GITHUB_ENV
-            echo "PAWPAW_DEBUG=1" >> $GITHUB_ENV
-          fi
       - name: Set up cache
         id: cache
         uses: actions/cache@v4
@@ -187,32 +176,32 @@ jobs:
             src/Rack/dep/libarchive-3.4.3
             src/Rack/dep/libsamplerate-0.1.9
             src/Rack/dep/zstd-1.4.5
-          key: macos-${{ matrix.target }}${{ env.TARGET_SUFFIX }}-v${{ env.CACHE_VERSION }}
+          key: macos-universal-v${{ env.CACHE_VERSION }}
       - name: Setup dependencies
         run: |
-          ./deps/PawPaw/.github/workflows/bootstrap-deps.sh macos-${{ matrix.target }}
+          ./deps/PawPaw/.github/workflows/bootstrap-deps.sh macos-universal-10.15
       - name: Build extra dependencies
         run: |
           export PATH="/usr/local/opt/ccache/libexec:${PATH}"
-          ./deps/PawPaw/bootstrap-cardinal.sh macos-${{ matrix.target }} && ./deps/PawPaw/.cleanup.sh macos-${{ matrix.target }}
+          ./deps/PawPaw/bootstrap-cardinal.sh macos-universal-10.15 && ./deps/PawPaw/.cleanup.sh macos-universal-10.15
       - name: Set up ccache
         if: steps.cache.outputs.cache-hit == 'true'
         uses: hendrikmuhs/ccache-action@v1.2
         with:
-          key: ccache-macos-${{ matrix.target }}${{ env.TARGET_SUFFIX }}-v${{ env.CACHE_VERSION }}
+          key: ccache-macos-universal-v${{ env.CACHE_VERSION }}
       - name: Build macOS (base)
         if: steps.cache.outputs.cache-hit == 'true'
         shell: bash
         run: |
           export PATH="/usr/local/opt/ccache/libexec:${PATH}"
-          source deps/PawPaw/local.env macos-${{ matrix.target }}
+          source deps/PawPaw/local.env macos-universal-10.15
           make features
-          make NOOPT=true -j $(sysctl -n hw.logicalcpu)
+          make NOOPT=true ${MAKE_ARGS} -j $(sysctl -n hw.logicalcpu)
       - name: Build macOS (packaging)
         if: steps.cache.outputs.cache-hit == 'true'
         shell: bash
         run: |
-          source deps/PawPaw/local.env macos-${{ matrix.target }}
+          source deps/PawPaw/local.env macos-universal-10.15
           ./utils/create-macos-installer.sh
       - name: Set sha8 (non-release)
         if: startsWith(github.ref, 'refs/tags/') != true
@@ -223,10 +212,10 @@ jobs:
       - name: Rename macOS bundle
         if: steps.cache.outputs.cache-hit == 'true'
         run: |
-          mv ${{ github.event.repository.name }}-macOS.pkg ${{ github.event.repository.name }}-macOS-${{ matrix.target }}${{ env.TARGET_SUFFIX }}-${{ github.event.pull_request.number || env.SHA8 }}.pkg
+          mv ${{ github.event.repository.name }}-macOS.pkg ${{ github.event.repository.name }}-macOS-universal-${{ github.event.pull_request.number || env.SHA8 }}.pkg
       - uses: actions/upload-artifact@v4
         with:
-          name: ${{ github.event.repository.name }}-macOS-${{ matrix.target }}${{ env.TARGET_SUFFIX }}-${{ github.event.pull_request.number || env.SHA8 }}
+          name: ${{ github.event.repository.name }}-macOS-universal-${{ github.event.pull_request.number || env.SHA8 }}
           path: |
             ${{ github.event.repository.name }}-*.pkg
       - uses: softprops/action-gh-release@v1

.gitmodules

@@ -259,4 +259,7 @@
 	url = https://github.com/CardinalModules/JUCE.git
 [submodule "plugins/rcm-modules"]
 	path = plugins/rcm-modules
-	url = https://github.com/Rcomian/rcm-modules.git
+	url = https://github.com/Rcomian/rcm-modules.git
+[submodule "plugins/admiral"]
+	path = plugins/admiral
+	url = https://github.com/wapiflapi/admiral.git

Makefile

@@ -15,7 +15,7 @@ include $(ROOT)/Makefile.base.mk
 # src/CardinalPlugin.cpp `getVersion`
 # utils/macOS/Info_{JACK,Native}.plist
 # .github/ISSUE_TEMPLATE/bug.yaml src/CardinalCommon.cpp src/CardinalPlugin.cpp utils/macOS/Info_{JACK,Native}.plist
-VERSION = 24.09
+VERSION = 24.12
 
 # --------------------------------------------------------------
 # Build targets

README.md

@@ -122,6 +122,7 @@ At the moment the following 3rd-party modules are provided:
 - [21kHz](https://github.com/netboy3/21kHz-rack-plugins)
 - [8Mode](https://github.com/8Mode/8Mode-VCV_Modules)
 - [Aaron Static](https://github.com/aaronstatic/AaronStatic_modules)
+- [Admiral](https://github.com/wapiflapi/admiral)
 - [alef's bits](https://github.com/alefnull/alefsbits)
 - [AlgoritmArte](https://github.com/algoritmarte/AlgoritmarteVCVPlugin)
 - [Amalgamated Harmonics](https://github.com/jhoar/AmalgamatedHarmonics)

carla

@@ -165,7 +165,7 @@ ifeq ($(shell uname -s),Darwin)
 ifeq ($(CIBUILD),true)
 DEP_MAKE += SHA256SUM="shasum5.30 -a 256"
 else
-DEP_MAKE += SHA256SUM="shasum5.30 -a 256"
+DEP_MAKE += SHA256SUM="shasum5.34 -a 256"
 endif
 endif
 

deps/Makefile

@@ -46,6 +46,7 @@ Bellow follows a list of features comparing the official plugin to Cardinal.
 
 Additionally, Cardinal contains the following built-in modules not present in the official plugin or standalone:
 
+ * Admiral (never updated to v2)
  * Aria Salvatrice modules (except Arcane related modules, due to their online requirement)
  * Arable Instruments and Parable Instruments (never updated to v2)
  * Mog (never updated to v2)

deps/PawPaw

@@ -16,6 +16,7 @@ Below follows a list of all code licenses used in Cardinal and linked submodules
 | 21kHz                   | MIT                      | |
 | 8Mode                   | BSD-3-Clause             | |
 | Aaron Static            | MIT                      | |
+| admiral                 | MIT                      | |
 | alef's bits             | GPL-3.0-or-later         | |
 | AlgoritmArte            | GPL-3.0-or-later         | |
 | Amalgamated Harmonics   | BSD-3-Clause             | |

docs/DIFFERENCES.md

@@ -1,5 +1,6 @@
 {
   "version": "2.1.2",
+  "zoom": 1.0,
   "modules": [
     {
       "id": 1184757612963547,

docs/LICENSES.md

@@ -1,10 +1,6 @@
 {
   "version": "2.1.2",
   "zoom": 0.82074141502380371,
-  "gridOffset": [
-    -44.997005462646484,
-    -0.079142682254314423
-  ],
   "modules": [
     {
       "id": 3538881790933672,