Skip to content

Commit

Permalink
merge main
Browse files Browse the repository at this point in the history
  • Loading branch information
dromer committed Feb 25, 2022
2 parents 5e2867b + 28383ef commit c886aad
Show file tree
Hide file tree
Showing 22 changed files with 424 additions and 27 deletions.
18 changes: 18 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,24 @@
[submodule "plugins/Orbits"]
path = plugins/Orbits
url = [email protected]:RareBreeds/Orbits.git
[submodule "plugins/stocaudio"]
path = plugins/stocaudio
url = https://github.com/aptrn/stocaudio-modules.git
[submodule "plugins/CatroModulo"]
path = plugins/CatroModulo
url = https://github.com/catronomix/catro-modulo.git
[submodule "plugins/LilacLoop"]
path = plugins/LilacLoop
url = https://github.com/grough/lilac-loop-vcv.git
[submodule "plugins/kocmoc"]
path = plugins/kocmoc
url = https://github.com/janne808/kocmoc-rack-modules.git
[submodule "plugins/PathSet"]
path = plugins/PathSet
url = https://github.com/patheros/PathSetModules.git
[submodule "plugins/Dintree"]
path = plugins/Dintree
url = https://github.com/hires/Dintree-Virtual.git
[submodule "plugins/StarlingVia"]
path = plugins/StarlingVia
url = https://github.com/starlingcode/Via-for-Rack.git
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,10 @@ At the moment the following 3rd-party modules are provided:
- Befaco
- Bidoo
- Bogaudio
- Catro/Modulo
- cf
- ChowDSP
- Dintree Virtual
- DrumKit
- E-Series
- ExpertSleepers Encoders
Expand All @@ -129,7 +131,9 @@ At the moment the following 3rd-party modules are provided:
- ihtsyn
- Impromptu
- JW-Modules
- kocmoc
- LifeFormModular
- Lilac Loop
- Little Utils
- Lomas Modules
- Lyrae Modules
Expand All @@ -139,11 +143,13 @@ At the moment the following 3rd-party modules are provided:
- Mog
- mscHack
- Orbits
- Path Set
- Prism
- rackwindows
- repelzen
- Sonus Modular
- Starling Via
- stocaudio
- Substation Opensource
- Valley
- ZetaCarinae
Expand Down
4 changes: 2 additions & 2 deletions deps/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ BASE_FLAGS += -I../include/mingw-compat
BASE_FLAGS += -I../include/mingw-std-threads
endif

BUILD_C_FLAGS += -fno-finite-math-only
BUILD_CXX_FLAGS += -fno-finite-math-only
BUILD_C_FLAGS += -fno-finite-math-only -fno-strict-aliasing
BUILD_CXX_FLAGS += -fno-finite-math-only -fno-strict-aliasing

# Rack code is not tested for this flag, unset it
BUILD_CXX_FLAGS += -U_GLIBCXX_ASSERTIONS -Wp,-U_GLIBCXX_ASSERTIONS
Expand Down
15 changes: 14 additions & 1 deletion docs/LICENSES.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

While Cardinal itself is licensed under GPLv3+, some modules/plugins used by it are not.
And since Cardinal builds the entire Rack and modules as a static library,
the more restrictive of the **code licenses** will apply to the final binary.
the more restrictive of the **code licenses** will apply to the final binary.

Bellow follows a list of all code licenses used in Cardinal and linked submodules.

Expand All @@ -25,8 +25,10 @@ Bellow follows a list of all code licenses used in Cardinal and linked submodule
| Befaco | GPL-3.0-or-later | |
| Bidoo | GPL-3.0-or-later | |
| Bogaudio | GPL-3.0-or-later | |
| Catro/Modulo | BSD-3-Clause | |
| cf | BSD-3-Clause | |
| ChowDSP | GPL-3.0-or-later | |
| Dintree | GPL-3.0-or-later | |
| DrumKit | CC0-1.0 | |
| E-Series | GPL-3.0-or-later | |
| ExpertSleepers Encoders | MIT | |
Expand All @@ -40,7 +42,9 @@ Bellow follows a list of all code licenses used in Cardinal and linked submodule
| ihtsyn | GPL-3.0-or-later | |
| Impromptu | GPL-3.0-or-later | |
| JW-Modules | BSD-3-Clause | |
| kocmoc | GPL-3.0-or-later | |
| LifeFormModular | MIT | |
| Lilac Loop | GPL-3.0-or-later | |
| Little Utils | EUPL-1.2 | |
| Lomas Modules | GPL-3.0-or-later | |
| Lyrae Modules | GPL-3.0-or-later | |
Expand All @@ -50,11 +54,13 @@ Bellow follows a list of all code licenses used in Cardinal and linked submodule
| Mog | CC0-1.0 | |
| mscHack | BSD-3-Clause | |
| Orbits | GPL-3.0-or-later | |
| Path Set | GPL-3.0-or-later | |
| Prism | BSD-3-Clause | |
| Rackwindows | MIT | |
| repelzen | GPL-3.0-or-later | |
| Sonus Modular | GPL-3.0-or-later | |
| Starling Via | MIT | |
| stocaudio | GPL-3.0-or-later | |
| Substation Opensource | BSD-3-Clause-Attribution | Need to check full compatibility with GPLv3+ |
| Valley | GPL-3.0-or-later | |
| ZetaCarinae | GPL-3.0-or-later | |
Expand Down Expand Up @@ -105,12 +111,15 @@ Below is a list of artwork licenses from plugins
| BogaudioModules/fonts/inconsolata*.ttf | OFL-1.1-no-RFN | |
| Cardinal/* | CC0-1.0 | |
| Cardinal/Miku/Miku.png | CC-BY-NC-3.0 | https://piapro.net/intl/en_for_creators.html |
| CatroModulo/* | BSD-3-Clause | No artwork specific license provided |
| CatroModulo/Segment7Standard.ttf | OFL-1.1-RFN | |
| cf/* | BSD-3-Clause | No artwork specific license provided |
| cf/DejaVuSansMono.ttf | Bitstream-Vera | |
| cf/Segment7Standard.ttf | OFL-1.1-RFN | |
| cf/VT323-Regular.ttf | OFL-1.1-no-RFN | |
| ChowDSP/* | GPL-3.0-or-later | Same license as source code |
| ChowDSP/fonts/RobotoCondensed-*.ttf | Apache-2.0 | |
| Dintree/* | GPL-3.0-or-later | No artwork specific license provided |
| DrumKit/* | CC0-1.0 | |
| DrumKit/component/NovaMono.ttf | OFL-1.1-RFN | |
| E-Series/* | Custom | Copyright © Synthesis Technology, [used and distributed with permission](LICENSE-PERMISSIONS.md#eseries-paul-schreiber--synthtech) |
Expand All @@ -129,7 +138,9 @@ Below is a list of artwork licenses from plugins
| ImpromptuModular/res/comp/complib/* | CC-BY-NC-4.0 | |
| JW-Modules/* | BSD-3-Clause | No artwork specific license provided |
| JW-Modules/DejaVuSansMono.ttf | Bitstream-Vera | Unused in Cardinal |
| kocmoc/* | GPL-3.0-or-later | No artwork specific license provided |
| LifeFormModular/* | MIT | No artwork specific license provided |
| LilacLoop/* | GPL-3.0-or-later | No artwork specific license provided |
| LittleUtils/* | EUPL-1.2 | Same license as source code |
| LittleUtils/fonts/CooperHewitt-*.ttf | OFL-1.1-RFN | |
| LittleUtils/fonts/Overpass-*.ttf | OFL-1.1-RFN | |
Expand All @@ -149,12 +160,14 @@ Below is a list of artwork licenses from plugins
| mscHack/* | BSD-3-Clause | No artwork specific license provided, see [mschack#108](https://github.com/mschack/VCV-Rack-Plugins/issues/108) |
| Orbits/* | CC-BY-NC-ND-4.0 | |
| Orbits/fonts/ShareTechMono-Regular.ttf | OFL-1.1-RFN | |
| PathSet/* | GPL-3.0-or-later | No artwork specific license provided |
| Prism/* | CC-BY-SA-4.0 | |
| Prism/RobotoCondensed-Regular.ttf | Apache-2.0 | |
| Rackwindows/* | MIT | [Same license as source code](https://github.com/n0jo/rackwindows/issues/15) |
| repelzen/* | CC-BY-SA-4.0 | |
| sonusmodular/* | GPL-3.0-or-later | [Same license as source code](https://gitlab.com/sonusdept/sonusmodular/-/issues/14) |
| StarlingVia/* | MIT | No artwork specific license provided |
| stocaudio/* | GPL-3.0-or-later | No artwork specific license provided |
| substation-opensource/* | BSD-3-Clause-Attribution | No artwork specific license provided |
| ValleyAudio/* | GPL-3.0-or-later | [Same license as source code](https://github.com/ValleyAudio/ValleyRackFree/issues/73) |
| ValleyAudio/din1451alt.ttf | CC-BY-3.0-DE | |
Expand Down
4 changes: 3 additions & 1 deletion include/mingw-compat/Shlobj.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* DISTRHO Cardinal Plugin
* Copyright (C) 2021 Filipe Coelho <[email protected]>
* Copyright (C) 2021-2022 Filipe Coelho <[email protected]>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
Expand All @@ -15,4 +15,6 @@
* For a full copy of the GNU General Public License see the LICENSE file.
*/

#pragma once

#include <shlobj.h>
4 changes: 3 additions & 1 deletion include/mingw-compat/Shlwapi.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* DISTRHO Cardinal Plugin
* Copyright (C) 2021 Filipe Coelho <[email protected]>
* Copyright (C) 2021-2022 Filipe Coelho <[email protected]>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
Expand All @@ -15,4 +15,6 @@
* For a full copy of the GNU General Public License see the LICENSE file.
*/

#pragma once

#include <shlwapi.h>
25 changes: 25 additions & 0 deletions include/mingw-compat/future
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*
* DISTRHO Cardinal Plugin
* Copyright (C) 2021-2022 Filipe Coelho <[email protected]>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 3 of
* the License, or any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* For a full copy of the GNU General Public License see the LICENSE file.
*/

#pragma once
#include_next <future>
#include "mingw.future.h"

#undef IN
#undef OUT
#undef far
#undef near
1 change: 1 addition & 0 deletions plugins/CatroModulo
Submodule CatroModulo added at bf6f96
1 change: 1 addition & 0 deletions plugins/Dintree
Submodule Dintree added at 8d28da
2 changes: 1 addition & 1 deletion plugins/ExpertSleepers-Encoders
2 changes: 1 addition & 1 deletion plugins/JW-Modules
1 change: 1 addition & 0 deletions plugins/LilacLoop
Submodule LilacLoop added at 69d8d6
Loading

0 comments on commit c886aad

Please sign in to comment.