Merge branch 'DISTRHO:main' into add-loginstruments

Author: kawa-sanmyaku

.github/ISSUE_TEMPLATE/bug.yaml

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

.github/workflows/build.yml

@@ -159,12 +159,20 @@ jobs:
   macos:
     strategy:
       matrix:
+        debug: [0, 1]
         target: [universal-10.15]
     runs-on: macos-12
     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
@@ -179,7 +187,7 @@ 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 }}-v${{ env.CACHE_VERSION }}
+          key: macos-${{ matrix.target }}${{ env.TARGET_SUFFIX }}-v${{ env.CACHE_VERSION }}
       - name: Setup dependencies
         run: |
           ./deps/PawPaw/.github/workflows/bootstrap-deps.sh macos-${{ matrix.target }}
@@ -191,7 +199,7 @@ jobs:
         if: steps.cache.outputs.cache-hit == 'true'
         uses: hendrikmuhs/ccache-action@v1.2
         with:
-          key: ccache-macos-${{ matrix.target }}-v${{ env.CACHE_VERSION }}
+          key: ccache-macos-${{ matrix.target }}${{ env.TARGET_SUFFIX }}-v${{ env.CACHE_VERSION }}
       - name: Build macOS (base)
         if: steps.cache.outputs.cache-hit == 'true'
         shell: bash
@@ -215,14 +223,14 @@ 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 }}-${{ github.event.pull_request.number || env.SHA8 }}.pkg
+          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
       - uses: actions/upload-artifact@v4
         with:
-          name: ${{ github.event.repository.name }}-macOS-${{ matrix.target }}-${{ github.event.pull_request.number || env.SHA8 }}
+          name: ${{ github.event.repository.name }}-macOS-${{ matrix.target }}${{ env.TARGET_SUFFIX }}-${{ github.event.pull_request.number || env.SHA8 }}
           path: |
             ${{ github.event.repository.name }}-*.pkg
       - uses: softprops/action-gh-release@v1
-        if: startsWith(github.ref, 'refs/tags/')
+        if: ${{ matrix.debug == '0' && startsWith(github.ref, 'refs/tags/') }}
         with:
           tag_name: ${{ github.ref_name }}
           name: ${{ github.ref_name }}

.gitmodules

@@ -200,6 +200,9 @@
 [submodule "plugins/forsitan-modulare"]
 	path = plugins/forsitan-modulare
 	url = https://github.com/gosub/forsitan-modulare.git
+[submodule "plugins/MUS-X"]
+	path = plugins/MUS-X
+	url = https://github.com/Jojosito/MUS-X.git
 [submodule "plugins/myth-modules"]
 	path = plugins/myth-modules
 	url = https://github.com/Ahineya/vcv-myth-plugin.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.05
+VERSION = 24.09
 
 # --------------------------------------------------------------
 # Build targets

README.md

@@ -175,6 +175,7 @@ At the moment the following 3rd-party modules are provided:
 - [Mog](https://github.com/JustMog/Mog-VCV)
 - [mscHack](https://github.com/mschack/VCV-Rack-Plugins)
 - [MSM](https://github.com/netboy3/MSM-vcvrack-plugin)
+- [MUS-X](https://github.com/Jojosito/MUS-X)
 - [Myth](https://github.com/Ahineya/vcv-myth-plugin)
 - [Nonlinear Circuits](https://github.com/mhetrick/nonlinearcircuits)
 - [Orbits](https://github.com/RareBreeds/Orbits)

carla

@@ -78,6 +78,9 @@ export MACOSX_DEPLOYMENT_TARGET = $(subst -mmacosx-version-min=,,$(filter -mmaco
 CMAKE += -DCMAKE_OSX_DEPLOYMENT_TARGET=$(MACOSX_DEPLOYMENT_TARGET)
 else ifeq ($(CIBUILD),true)
 $(error CI build requires -mmacosx-version-min flag on macOS)
+else
+export MACOSX_DEPLOYMENT_TARGET = 10.15
+CMAKE += -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15
 endif
 CMAKE += -DCMAKE_OSX_SYSROOT="macosx"
 endif

deps/Makefile

@@ -77,7 +77,7 @@ Dependencies for vendored libraries:
 ```
 # common
 sudo pacman -S cmake dbus file fftw libgl liblo libsndfile libx11 libxcursor libxext libxrandr python3
-# nedeed by vendored libraries
+# needed by vendored libraries
 sudo pacman -S wget
 ```
 
@@ -97,10 +97,23 @@ Dependencies for vendored libraries:
 ```
 # common
 sudo apt install cmake libdbus-1-dev libgl1-mesa-dev liblo-dev libfftw3-dev libmagic-dev libsndfile1-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev python3
-# nedeed by vendored libraries
+# needed by vendored libraries
 sudo apt install wget
 ```
 
+### Fedora
+
+At this time, it is only possible to build with vendored libraries.
+
+Dependencies for vendored libraries:
+
+```
+# common
+sudo dnf install cmake dbus file fftw mesa-libGL liblo libsndfile libX11 libXcursor libXext libXrandr python3
+# needed by vendored libraries
+sudo dnf install wget
+```
+
 ## macOS
 
 Installing Xcode and the "Command-Line utilities" add-on is required.  

deps/PawPaw

@@ -47,16 +47,17 @@ 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:
 
  * 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)
- * mscHack (never updated to v2)
- * rackwindows
- * AIDA-X
- * Audio File
- * Audio to CV Pitch converter
- * Carla Plugin Host
- * Ildaeil Host
- * glBars (OpenGL bars visualization, as seen in XMMS and XBMC/Kodi)
- * Text Editor (resizable and with syntax highlight)
- * Host Parameters (24 host-exposed parameters as CV sources)
- * Host Time (play, reset, bar, beat, tick, bar-phase and beat-phase CV sources)
- * Host CV (for the Raw-CV plugin variant, allows direct CV access to/from the DAW)
+ * Rackwindows (never updated to v2)
+ * The DISTRHO collection, including:
+   * AIDA-X
+   * Audio File
+   * Audio to CV Pitch converter
+   * Carla Plugin Host
+   * Ildaeil Host
+   * glBars (OpenGL bars visualization, as seen in XMMS and XBMC/Kodi)
+   * Text Editor (resizable and with syntax highlight)
+   * Host Parameters (24 host-exposed parameters as CV sources)
+   * Host Time (play, reset, bar, beat, tick, bar-phase and beat-phase CV sources)
+   * Host CV (for the Raw-CV plugin variant, allows direct CV access to/from the DAW)

docs/BUILDING.md

@@ -69,6 +69,7 @@ Below follows a list of all code licenses used in Cardinal and linked submodules
 | Mog                     | CC0-1.0                  | |
 | mscHack                 | BSD-3-Clause             | |
 | MSM                     | MIT                      | Repo's [LICENSE-dist.md](https://github.com/netboy3/MSM-vcvrack-plugin/issues/10) includes wrong information |
+| MUS-X                   | GPL-3.0-or-later         | |
 | Myth                    | GPL-3.0-or-later         | |
 | Nonlinear Circuits      | CC0-1.0                  | |
 | Orbits                  | GPL-3.0-or-later         | |
@@ -230,6 +231,7 @@ Below is a list of artwork licenses from plugins
 | MSM/Fonts/DejaVuSansMono.ttf            | Bitstream-Vera   | |
 | MSM/Fonts/Segment7Standard.ttf          | OFL-1.1-RFN      | |
 | MSM/Fonts/Sudo.ttf                      | OFL-1.1-no-RFN   | |
+| MUS-X/*                                 | GPL-3.0-or-later | No artwork specific license provided |
 | Myth/*                                  | GPL-3.0-or-later | No artwork specific license provided |
 | nonlinearcircuits/*                     | CC0-1.0          | No artwork specific license provided |
 | nonlinearcircuits/Audiowide-Regular.ttf | OFL-1.1-RFN      | |

docs/DIFFERENCES.md

@@ -551,7 +551,7 @@ MINIPLUGIN_FILES += BaconPlugs/src/Style.cpp
 # --------------------------------------------------------------
 # Befaco
 
-PLUGIN_FILES += $(filter-out Befaco/src/plugin.cpp,$(wildcard Befaco/src/*.cpp))
+PLUGIN_FILES += $(filter-out Befaco/src/plugin.cpp Befaco/src/MidiThing.cpp,$(wildcard Befaco/src/*.cpp))
 PLUGIN_FILES += $(wildcard Befaco/src/noise-plethora/*/*.cpp)
 
 # modules/types which are present in other plugins
@@ -936,6 +936,11 @@ PLUGIN_FILES += $(filter-out MSM/src/MSM.cpp,$(wildcard MSM/src/*.cpp))
 # modules/types which are present in other plugins
 MSM_CUSTOM = ADSR BlankPanel Delay LFO LowFrequencyOscillator Mult Noise OP VCA VCO sawTable triTable
 
+# --------------------------------------------------------------
+# MUS-X
+
+PLUGIN_FILES += $(filter-out MUS-X/src/plugin.cpp,$(wildcard MUS-X/src/*.cpp))
+
 # --------------------------------------------------------------
 # myth-modules
 
@@ -1307,9 +1312,10 @@ VALLEYAUDIO_CUSTOM_PER_FILE = TempoKnob
 # Voxglitch
 
 PLUGIN_FILES += $(filter-out voxglitch/src/plugin.cpp,$(wildcard voxglitch/src/*.cpp))
+PLUGIN_FILES += voxglitch/src/vgLib-2.0/constants.cpp
 
 # modules/types which are present in other plugins
-VOXGLITCH_CUSTOM = ADSR AudioFile Looper Readout
+VOXGLITCH_CUSTOM = $(DRWAV) ADSR AudioFile Looper Quantizer Random Readout SlewLimiter constants
 VOXGLITCH_CUSTOM_PER_FILE = AudioBuffer GateSequencer Grain SamplePlayer Sequencer SequencerDisplay VoltageSequencer
 
 # --------------------------------------------------------------
@@ -1472,6 +1478,7 @@ RESOURCE_FILES += MindMeldModular/res/ShapeMaster/CommunityShapes
 RESOURCE_FILES += MindMeldModular/res/ShapeMaster/MindMeldPresets
 RESOURCE_FILES += MindMeldModular/res/ShapeMaster/MindMeldShapes
 RESOURCE_FILES += Mog/res
+RESOURCE_FILES += MUS-X/presets
 RESOURCE_FILES += nonlinearcircuits/res
 RESOURCE_FILES += ParableInstruments/res/Neil.png
 RESOURCE_FILES += surgext/build/surge-data/configuration.xml
@@ -2633,6 +2640,13 @@ $(BUILD_DIR)/MSM/%.cpp.o: MSM/%.cpp
 		$(foreach m,$(MSM_CUSTOM),$(call custom_module_names,$(m),MSM)) \
 		-DpluginInstance=pluginInstance__MSM
 
+$(BUILD_DIR)/MUS-X/%.cpp.o: MUS-X/%.cpp
+	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
+	@echo "Compiling $<"
+	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
+		$(foreach m,$(MUS_X_CUSTOM),$(call custom_module_names,$(m),MUS_X)) \
+		-DpluginInstance=pluginInstance__MUS_X
+
 $(BUILD_DIR)/myth-modules/%.cpp.o: myth-modules/%.cpp
 	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
 	@echo "Compiling $<"

docs/LICENSES.md

@@ -762,6 +762,9 @@ extern Model* modelBlankPanel;
 #undef modelVCA
 #undef modelVCO
 
+// MUS-X
+#include "MUS-X/src/plugin.hpp"
+
 // myth-modules
 #include "myth-modules/src/plugin.hpp"
 
@@ -959,6 +962,7 @@ Plugin* pluginInstance__MockbaModular;
 Plugin* pluginInstance__Mog;
 extern Plugin* pluginInstance__mscHack;
 Plugin* pluginInstance__MSM;
+Plugin* pluginInstance__MUS_X;
 Plugin* pluginInstance__myth_modules;
 Plugin* pluginInstance__nonlinearcircuits;
 Plugin* pluginInstance__Orbits;
@@ -1594,9 +1598,13 @@ static void initStatic__Befaco()
         p->addModel(modelMotionMTR);
         p->addModel(modelBurst);
         p->addModel(modelVoltio);
+        p->addModel(modelOctaves);
 #undef modelADSR
 #undef modelMixer
 #undef modelBurst
+
+        // NOTE disabled in Cardinal due to MIDI usage
+        spl.removeModule("MidiThingV2");
     }
 }
 
@@ -2865,6 +2873,30 @@ static void initStatic__MSM()
     }
 }
 
+static void initStatic__MUS_X()
+{
+    Plugin* const p = new Plugin;
+    pluginInstance__MUS_X = p;
+
+    const StaticPluginLoader spl(p, "MUS-X");
+    if (spl.ok())
+    {
+    	p->addModel(musx::modelADSR);
+    	p->addModel(musx::modelDelay);
+    	p->addModel(musx::modelDrift);
+    	p->addModel(musx::modelFilter);
+    	p->addModel(musx::modelLast);
+    	p->addModel(musx::modelLFO);
+    	p->addModel(musx::modelModMatrix);
+    	p->addModel(musx::modelOnePole);
+    	p->addModel(musx::modelOnePoleLP);
+    	p->addModel(musx::modelOscillators);
+    	p->addModel(musx::modelSplitStack);
+    	p->addModel(musx::modelSynth);
+    	p->addModel(musx::modelTuner);
+    }
+}
+
 static void initStatic__myth_modules()
 {
     Plugin* const p = new Plugin;
@@ -3097,6 +3129,7 @@ static void initStatic__Sapphire()
         p->addModel(modelSapphireFrolic);
         p->addModel(modelSapphireGalaxy);
         p->addModel(modelSapphireGlee);
+        p->addModel(modelSapphireGravy);
         p->addModel(modelSapphireHiss);
         p->addModel(modelSapphireMoots);
         p->addModel(modelSapphireNucleus);
@@ -3365,26 +3398,33 @@ static void initStatic__Voxglitch()
     if (spl.ok())
     {
 #define modelLooper modelVoxglitchLooper
-      p->addModel(modelAutobreak);
-      p->addModel(modelByteBeat);
-      p->addModel(modelDigitalProgrammer);
-      p->addModel(modelDigitalSequencer);
-      p->addModel(modelDigitalSequencerXP);
-      p->addModel(modelGlitchSequencer);
-      p->addModel(modelGhosts);
-      p->addModel(modelGrainEngineMK2);
-      p->addModel(modelGrainEngineMK2Expander);
-      p->addModel(modelGrainFx);
-      p->addModel(modelGrooveBox);
-      p->addModel(modelGrooveBoxExpander);
-      p->addModel(modelHazumi);
-      p->addModel(modelLooper);
-      p->addModel(modelRepeater);
-      p->addModel(modelSamplerX8);
-      p->addModel(modelSatanonaut);
-      p->addModel(modelWavBank);
-      p->addModel(modelWavBankMC);
-      p->addModel(modelXY);
+        p->addModel(modelArpSeq);
+        p->addModel(modelAutobreak);
+        p->addModel(modelAutobreakStudio);
+        p->addModel(modelByteBeat);
+        p->addModel(modelDigitalProgrammer);
+        p->addModel(modelDigitalSequencer);
+        p->addModel(modelDigitalSequencerXP);
+        p->addModel(modelDrumRandomizer);
+        p->addModel(modelGlitchSequencer);
+        p->addModel(modelGhosts);
+        p->addModel(modelGrainEngineMK2);
+        p->addModel(modelGrainEngineMK2Expander);
+        p->addModel(modelGrainFx);
+        p->addModel(modelGrooveBox);
+        p->addModel(modelGrooveBoxExpander);
+        p->addModel(modelHazumi);
+        p->addModel(modelOnePoint);
+        p->addModel(modelOneZero);
+        p->addModel(modelLooper);
+        p->addModel(modelNoteDetector);
+        p->addModel(modelRepeater);
+        p->addModel(modelSamplerX8);
+        p->addModel(modelSampler16P);
+        p->addModel(modelSatanonaut);
+        p->addModel(modelWavBank);
+        p->addModel(modelWavBankMC);
+        p->addModel(modelXY);
 #undef modelLooper
     }
 }
@@ -3504,6 +3544,7 @@ void initStaticPlugins()
     initStatic__Mog();
     initStatic__mscHack();
     initStatic__MSM();
+    initStatic__MUS_X();
     initStatic__myth_modules();
     initStatic__nonlinearcircuits();
     initStatic__Orbits();