Browse Source

Remove atelier, more licensing stuff

Signed-off-by: falkTX <falktx@falktx.com>
tags/22.02
falkTX 3 years ago
parent
commit
bd8b97f428
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
7 changed files with 3 additions and 57 deletions
  1. +0
    -3
      .gitmodules
  2. +1
    -5
      README.md
  3. +2
    -16
      doc/LICENSES.md
  4. +0
    -1
      plugins/Atelier
  5. +0
    -27
      plugins/Makefile
  6. +0
    -5
      plugins/plugins.cpp
  7. BIN
      src/MOD/CardinalFX.lv2/modgui/documentation.pdf

+ 0
- 3
.gitmodules View File

@@ -61,9 +61,6 @@
[submodule "carla"]
path = carla
url = https://github.com/falkTX/Carla.git
[submodule "plugins/Atelier"]
path = plugins/Atelier
url = https://github.com/Xenakios/Atelier.git
[submodule "plugins/mscHack"]
path = plugins/mscHack
url = https://github.com/CardinalModules/mscHack.git


+ 1
- 5
README.md View File

@@ -2,7 +2,7 @@

*Cardinal, the Rack!*

A free and open-source virtual modular synthesizer plugin,
Cardinal is a free and open-source virtual modular synthesizer plugin,
available as JACK standalone and LV2, VST2 and VST3 audio plugin for FreeBSD, Linux, macOS and Windows.
It is based on the popular [VCV Rack](https://vcvrack.com/) but with a focus on being a fully self-contained plugin version.

@@ -126,10 +126,6 @@ At the moment the following 3rd-party modules are provided:
- ZetaCarinae
- ZZC

Potentially coming soon, currently sorting out license situation:
- Atelier
- Fundamental

Additionally Cardinal provides its own modules for DAW/Host automation, time position and internal plugin hosting.

### Module restrictions


+ 2
- 16
doc/LICENSES.md View File

@@ -48,14 +48,7 @@ Bellow follows a list of all code licenses used in Cardinal and linked submodule
| Sonus Modular | GPL-3.0-or-later | |
| Valley | GPL-3.0-or-later | |
| ZetaCarinae | GPL-3.0-or-later | |

Bellow follows a list of code licenses from potentially coming modules.

| Name | License(s) | Pending reason |
|-------------------------|-----------------------|----------------|
| Atelier | GPL-3.0-or-later | Custom artwork license, needs permission request |
| Fundamental | GPL-3.0-or-later | CC-ND without permission for runtime mode, panels need to be redone |
| ZZC | GPL-3.0-or-later | Artwork license terms unclear |
| ZZC | GPL-3.0-or-later | |

## ARTWORK / PANEL LICENSES

@@ -124,7 +117,7 @@ Below is a list of artwork licenses from plugins
| LittleUtils/fonts/CooperHewitt-*.ttf | OFL-1.1-RFN | |
| LittleUtils/fonts/Overpass-*.ttf | OFL-1.1-RFN | |
| LittleUtils/fonts/RobotoMono-*.ttf | Apache-2.0 | |
| LomasModules/* | GPL-3.0-or-later | No artwork specific license provided, see [LomasModules#26](https://github.com/LomasModules/LomasModules/issues/26) |
| LomasModules/* | GPL-3.0-or-later | [Same license as source code](https://github.com/LomasModules/LomasModules/issues/26) |
| LomasModules/Fonts/FiraMono-Bold.ttf | OFL-1.1-RFN | |
| LyraeModules/* | CC-BY-NC-SA-4.0 | |
| MindMeld/* | CC-BY-NC-ND-4.0 | |
@@ -148,13 +141,6 @@ Below is a list of artwork licenses from plugins
| ZZC/fonts/DSEG/* | OFL-1.1-RFN | |
| ZZC/fonts/Nunito/* | OFL-1.1-RFN | |

Bellow follows a list of artwork licenses from potentially coming plugins.

| Name | License(s) | Additional notes |
|-----------------------------------------|------------------|------------------|
| Atelier/* | Custom | Copyright © Pyer 2020, used and distributed with permission (TODO ask for it) |
| Fundamental/* | CC-BY-NC-ND-4.0 | |

### Rack

Below is a list of artwork licenses from Rack


+ 0
- 1
plugins/Atelier

@@ -1 +0,0 @@
Subproject commit b84dea414c3a2bac231d1c5b837c3003d60a6446

+ 0
- 27
plugins/Makefile View File

@@ -263,22 +263,6 @@ PLUGIN_FILES += AriaModules/src/Undular.cpp
# modules/types which are present in other plugins
ARIA_CUSTOM = Blank

# --------------------------------------------------------------
# Atelier

# PLUGIN_FILES += Atelier/src/Palette.cpp
# PLUGIN_FILES += Atelier/eurorack/stmlib/dsp/atan.cc
# PLUGIN_FILES += Atelier/eurorack/stmlib/dsp/units.cc
# PLUGIN_FILES += Atelier/eurorack/stmlib/utils/random.cc
# PLUGIN_FILES += $(wildcard Atelier/eurorack/plaits/dsp/*.cc)
# PLUGIN_FILES += $(wildcard Atelier/eurorack/plaits/dsp/engine/*.cc)
# PLUGIN_FILES += $(wildcard Atelier/eurorack/plaits/dsp/speech/*.cc)
# PLUGIN_FILES += $(wildcard Atelier/eurorack/plaits/dsp/physical_modelling/*.cc)
# PLUGIN_FILES += Atelier/eurorack/plaits/resources.cc
#
# # modules/types which are present in other plugins
# ATELIER_CUSTOM = plaits stmlib

# --------------------------------------------------------------
# AudibleInstruments

@@ -1067,17 +1051,6 @@ $(BUILD_DIR)/AriaModules/%.cpp.o: AriaModules/%.cpp
-DpluginInstance=pluginInstance__Aria \
-Wno-cast-function-type

$(BUILD_DIR)/Atelier/%.o: Atelier/%
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<"
$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
$(foreach m,$(ATELIER_CUSTOM),$(call custom_module_names,$(m),Atelier)) \
-DpluginInstance=pluginInstance__Atelier \
-DTEST \
-IAtelier/eurorack \
-Wno-sign-compare \
-Wno-unused-local-typedefs

$(BUILD_DIR)/AudibleInstruments/%.o: AudibleInstruments/%
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<"


+ 0
- 5
plugins/plugins.cpp View File

@@ -60,11 +60,6 @@ extern Model* modelUndular;
extern Model* modelBlank;
#undef modelBlank

// Atelier
/*
#include "Atelier/src/plugin.hpp"
*/

// AudibleInstruments
#include "AudibleInstruments/src/plugin.hpp"



BIN
src/MOD/CardinalFX.lv2/modgui/documentation.pdf View File


Loading…
Cancel
Save