Skip to content

Commit e31089f

Browse files
committed
Merge branch 'devel'
2 parents 6e10fd1 + 32883f2 commit e31089f

3 files changed

Lines changed: 12 additions & 8 deletions

File tree

.github/workflows/build.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
run: pacman --noconfirm -Syu alsa-lib base-devel cairo carla git glibc-debug hicolor-icon-theme jack jq libglvnd libsndfile libx11 libxrandr lv2lint php valgrind
3131
- uses: actions/checkout@v3
3232
- name: Configure project
33-
run: make config STRICT=1 VERBOSE=1 FEATURES='clap doc jack ladspa lv2 vst2 xdg' PREFIX=/usr
33+
run: make config STRICT=1 VERBOSE=1 FEATURES='clap doc jack ladspa lv2 vst2 vst3 xdg' PREFIX=/usr
3434
- name: Fetch project dependencies
3535
run: make fetch
3636
- name: Build project
@@ -75,7 +75,7 @@ jobs:
7575
run: pacman --noconfirm -Syu alsa-lib base-devel cairo carla git glibc-debug hicolor-icon-theme jack jq libglvnd libsndfile libx11 libxrandr php valgrind
7676
- uses: actions/checkout@v3
7777
- name: Configure project
78-
run: make config STRICT=1 DEBUG=1 VERBOSE=1 ASAN=1 FEATURES='clap jack ladspa lv2 vst2' PREFIX=/usr
78+
run: make config STRICT=1 DEBUG=1 VERBOSE=1 ASAN=1 FEATURES='clap jack ladspa lv2 vst2 vst3' PREFIX=/usr
7979
- name: Fetch project dependencies
8080
run: make fetch
8181
- name: Build project
@@ -116,7 +116,7 @@ jobs:
116116
run: pacman --noconfirm -Syu alsa-lib base-devel cairo carla git glibc-debug hicolor-icon-theme jack jq libglvnd libsndfile libx11 libxrandr php valgrind
117117
- uses: actions/checkout@v3
118118
- name: Configure project
119-
run: make config STRICT=1 DEBUG=1 VERBOSE=1 FEATURES='clap jack ladspa lv2 vst2' PREFIX=/usr
119+
run: make config STRICT=1 DEBUG=1 VERBOSE=1 FEATURES='clap jack ladspa lv2 vst2 vst3' PREFIX=/usr
120120
- name: Fetch project dependencies
121121
run: make fetch
122122
- name: Build project
@@ -150,7 +150,7 @@ jobs:
150150
run: zypper --non-interactive --no-gpg-checks in tar gzip gcc gcc-c++ git make php valgrind libX11-devel libXrandr-devel Mesa-libGL-devel libjack-devel cairo-devel freetype2-devel libsndfile-devel
151151
- uses: actions/checkout@v3
152152
- name: Configure project
153-
run: make config STRICT=1 VERBOSE=1 FEATURES='clap doc jack ladspa lv2 vst2 xdg' PREFIX=/usr
153+
run: make config STRICT=1 VERBOSE=1 FEATURES='clap doc jack ladspa lv2 vst2 vst3 xdg' PREFIX=/usr
154154
- name: Fetch project dependencies
155155
run: make fetch
156156
- name: Build project
@@ -167,7 +167,7 @@ jobs:
167167
run: zypper --non-interactive --no-gpg-checks in tar gzip gcc gcc-c++ clang lld git make php8-cli valgrind libstdc++-devel libX11-devel libXrandr-devel Mesa-libGL-devel libjack-devel cairo-devel freetype2-devel libsndfile-devel
168168
- uses: actions/checkout@v3
169169
- name: Configure project
170-
run: make config CC=clang CXX=clang++ STRICT=1 VERBOSE=1 FEATURES='clap doc jack ladspa lv2 vst2 xdg' PREFIX=/usr
170+
run: make config CC=clang CXX=clang++ STRICT=1 VERBOSE=1 FEATURES='clap doc jack ladspa lv2 vst2 vst3 xdg' PREFIX=/usr
171171
- name: Fetch project dependencies
172172
run: make fetch
173173
- name: Build project
@@ -186,7 +186,7 @@ jobs:
186186
run: apt-get -y install gcc g++ git make php-cli pkg-config valgrind libx11-dev libxrandr-dev libjack-dev libcairo2-dev libgl-dev libfreetype6-dev libsndfile1-dev
187187
- uses: actions/checkout@v3
188188
- name: Configure project
189-
run: make config STRICT=1 VERBOSE=1 FEATURES='clap doc jack ladspa lv2 vst2 xdg' PREFIX=/usr
189+
run: make config STRICT=1 VERBOSE=1 FEATURES='clap doc jack ladspa lv2 vst2 vst3 xdg' PREFIX=/usr
190190
- name: Fetch project dependencies
191191
run: make fetch
192192
- name: Build project
@@ -213,7 +213,7 @@ jobs:
213213
- uses: actions/checkout@v3
214214
- name: Configure project
215215
shell: msys2 {0}
216-
run: make config STRICT=1 VERBOSE=1 FEATURES='clap ladspa lv2 vst2'
216+
run: make config STRICT=1 VERBOSE=1 FEATURES='clap ladspa lv2 vst2 vst3'
217217
- name: Fetch project dependencies
218218
shell: msys2 {0}
219219
run: make fetch

dependencies.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ DEPENDENCIES = \
3737
TEST_DEPENDENCIES = \
3838
LSP_TEST_FW
3939

40-
DEFAULT_FEATURES = clap doc ladspa lv2 vst2 xdg
40+
DEFAULT_FEATURES = clap doc ladspa lv2 vst2 vst3 xdg
4141

4242
#------------------------------------------------------------------------------
4343
# Linux dependencies

src/main/meta/plugin_template.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,8 @@ namespace lsp
109109
LSP_LV2_URI("plugin_template_mono"),
110110
LSP_LV2UI_URI("plugin_template_mono"),
111111
"xxxx", // TODO: fill valid VST2 ID (4 letters/digits)
112+
LSP_VST3_UID("ps1m xxxx"),
113+
LSP_VST3UI_UID("ps1m xxxx"),
112114
1, // TODO: fill valid LADSPA identifier (positive decimal integer)
113115
LSP_LADSPA_URI("plugin_template_mono"),
114116
LSP_CLAP_URI("plugin_template_mono"),
@@ -134,6 +136,8 @@ namespace lsp
134136
LSP_LV2_URI("plugin_template_stereo"),
135137
LSP_LV2UI_URI("plugin_template_stereo"),
136138
"yyyy", // TODO: fill valid VST2 ID (4 letters/digits)
139+
LSP_VST3_UID("ps1s yyyy"),
140+
LSP_VST3UI_UID("ps1s yyyy"),
137141
2, // TODO: fill valid LADSPA identifier (positive decimal integer)
138142
LSP_LADSPA_URI("plugin_template_stereo"),
139143
LSP_CLAP_URI("plugin_template_stereo"),

0 commit comments

Comments
 (0)