Skip to content

Commit 1d0cb25

Browse files
committed
Merge branch 'devel'
2 parents e31089f + 25f9637 commit 1d0cb25

15 files changed

Lines changed: 444 additions & 279 deletions

File tree

.cproject

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,20 @@
4242
</option>
4343
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.preprocessor.def.1754490118" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" useByScannerDiscovery="false" valueType="definedSymbols">
4444
<listOptionValue builtIn="false" value="LSP_TESTING"/>
45-
<listOptionValue builtIn="false" value="USE_LIBJACK"/>
46-
<listOptionValue builtIn="false" value="USE_LIBXRANDR"/>
47-
<listOptionValue builtIn="false" value="USE_LADSPA"/>
48-
<listOptionValue builtIn="false" value="USE_LIBFREETYPE"/>
49-
<listOptionValue builtIn="false" value="USE_LIBCAIRO"/>
50-
<listOptionValue builtIn="false" value="USE_LIBX11"/>
5145
<listOptionValue builtIn="false" value="LSP_TRACE"/>
5246
<listOptionValue builtIn="false" value="LSP_IDE_DEBUG"/>
47+
<listOptionValue builtIn="false" value="USE_LADSPA"/>
48+
<listOptionValue builtIn="false" value="USE_LIBCAIRO"/>
49+
<listOptionValue builtIn="false" value="USE_LIBFONTCONFIG"/>
50+
<listOptionValue builtIn="false" value="USE_LIBFREETYPE"/>
51+
<listOptionValue builtIn="false" value="USE_LIBGL"/>
52+
<listOptionValue builtIn="false" value="USE_LIBJACK"/>
5353
<listOptionValue builtIn="false" value="USE_LIBSNDFILE"/>
54+
<listOptionValue builtIn="false" value="USE_LIBX11"/>
55+
<listOptionValue builtIn="false" value="USE_LIBXRANDR"/>
5456
</option>
5557
<option id="gnu.cpp.compiler.option.dialect.std.197954724" name="Language standard" superClass="gnu.cpp.compiler.option.dialect.std" useByScannerDiscovery="true" value="gnu.cpp.compiler.dialect.c++11" valueType="enumerated"/>
56-
<option id="gnu.cpp.compiler.option.other.other.254051967" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" useByScannerDiscovery="false" value="-c -fmessage-length=0 $(shell pkg-config --cflags jack x11 cairo sndfile gl freetype2 xrandr)" valueType="string"/>
58+
<option id="gnu.cpp.compiler.option.other.other.254051967" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" useByScannerDiscovery="false" value="-c -fmessage-length=0 $(shell pkg-config --cflags jack x11 cairo sndfile gl freetype2 fontconfig xrandr gstreamer-audio-1.0)" valueType="string"/>
5759
<option id="gnu.cpp.compiler.option.warnings.toerrors.525712114" name="Warnings as errors (-Werror)" superClass="gnu.cpp.compiler.option.warnings.toerrors" useByScannerDiscovery="false" value="true" valueType="boolean"/>
5860
<option id="gnu.cpp.compiler.option.debugging.sanitaddress.1693651654" name="Sanitize address (-fsanitize=address)" superClass="gnu.cpp.compiler.option.debugging.sanitaddress" useByScannerDiscovery="false" value="true" valueType="boolean"/>
5961
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.449118389" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
@@ -62,18 +64,20 @@
6264
<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.exe.debug.option.optimization.level.834488426" name="Optimization Level" superClass="gnu.c.compiler.exe.debug.option.optimization.level" useByScannerDiscovery="false" valueType="enumerated"/>
6365
<option defaultValue="gnu.c.debugging.level.max" id="gnu.c.compiler.exe.debug.option.debugging.level.1949011073" name="Debug Level" superClass="gnu.c.compiler.exe.debug.option.debugging.level" useByScannerDiscovery="false" valueType="enumerated"/>
6466
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.c.compiler.option.preprocessor.def.symbols.197520422" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" useByScannerDiscovery="false" valueType="definedSymbols">
67+
<listOptionValue builtIn="false" value="LSP_TESTING"/>
6568
<listOptionValue builtIn="false" value="LSP_TRACE"/>
66-
<listOptionValue builtIn="false" value="USE_LIBJACK"/>
67-
<listOptionValue builtIn="false" value="USE_LIBXRANDR"/>
69+
<listOptionValue builtIn="false" value="LSP_IDE_DEBUG"/>
70+
<listOptionValue builtIn="false" value="USE_LADSPA"/>
6871
<listOptionValue builtIn="false" value="USE_LIBCAIRO"/>
72+
<listOptionValue builtIn="false" value="USE_LIBFONTCONFIG"/>
6973
<listOptionValue builtIn="false" value="USE_LIBFREETYPE"/>
70-
<listOptionValue builtIn="false" value="USE_LADSPA"/>
71-
<listOptionValue builtIn="false" value="USE_LIBX11"/>
72-
<listOptionValue builtIn="false" value="LSP_TESTING"/>
73-
<listOptionValue builtIn="false" value="LSP_IDE_DEBUG"/>
74+
<listOptionValue builtIn="false" value="USE_LIBGL"/>
75+
<listOptionValue builtIn="false" value="USE_LIBJACK"/>
7476
<listOptionValue builtIn="false" value="USE_LIBSNDFILE"/>
77+
<listOptionValue builtIn="false" value="USE_LIBX11"/>
78+
<listOptionValue builtIn="false" value="USE_LIBXRANDR"/>
7579
</option>
76-
<option id="gnu.c.compiler.option.misc.other.1620238063" name="Other flags" superClass="gnu.c.compiler.option.misc.other" useByScannerDiscovery="false" value="-c -fmessage-length=0 $(shell pkg-config --cflags jack x11 cairo sndfile gl freetype2 xrandr)" valueType="string"/>
80+
<option id="gnu.c.compiler.option.misc.other.1620238063" name="Other flags" superClass="gnu.c.compiler.option.misc.other" useByScannerDiscovery="false" value="-c -fmessage-length=0 $(shell pkg-config --cflags jack x11 cairo sndfile gl freetype2 fontconfig xrandr gstreamer-audio-1.0)" valueType="string"/>
7781
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.c.compiler.option.include.paths.398423821" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
7882
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/include}&quot;"/>
7983
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/modules/lsp-plugins-shared/include}&quot;"/>
@@ -95,9 +99,10 @@
9599
</tool>
96100
<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.debug.2125987081" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.debug"/>
97101
<tool commandLinePattern="${COMMAND} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS} ${FLAGS}" id="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug.1192217523" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug">
98-
<option id="gnu.cpp.link.option.flags.372033104" name="Linker flags" superClass="gnu.cpp.link.option.flags" useByScannerDiscovery="false" value="-fsanitize=address $(shell pkg-config --libs jack x11 cairo sndfile gl freetype2 xrandr)" valueType="string"/>
102+
<option id="gnu.cpp.link.option.flags.372033104" name="Linker flags" superClass="gnu.cpp.link.option.flags" useByScannerDiscovery="false" value="-fsanitize=address $(shell pkg-config --libs jack x11 cairo sndfile gl freetype2 fontconfig xrandr gstreamer-audio-1.0)" valueType="string"/>
99103
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.link.option.libs.1822061934" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" useByScannerDiscovery="false" valueType="libs">
100104
<listOptionValue builtIn="false" value="pthread"/>
105+
<listOptionValue builtIn="false" value="rt"/>
101106
<listOptionValue builtIn="false" value="dl"/>
102107
</option>
103108
<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.860802800" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
@@ -124,7 +129,7 @@
124129
</fileInfo>
125130
<fileInfo id="cdt.managedbuild.config.gnu.exe.debug.619973679.1088520346" name="avx512.cpp" rcbsApplicability="disable" resourcePath="modules/lsp-dsp-lib/src/main/x86/avx512.cpp" toolsToInvoke="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.162163419.1096491537">
126131
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.162163419.1096491537" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.162163419">
127-
<option id="gnu.cpp.compiler.option.other.other.1222783802" superClass="gnu.cpp.compiler.option.other.other" useByScannerDiscovery="false" value="-c -fmessage-length=0 -mavx512f -mavx512vl" valueType="string"/>
132+
<option id="gnu.cpp.compiler.option.other.other.1222783802" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" useByScannerDiscovery="false" value="-c -fmessage-length=0 -mavx512f -mavx512vl" valueType="string"/>
128133
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1645353784" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
129134
</tool>
130135
</fileInfo>
@@ -218,7 +223,7 @@
218223
</fileInfo>
219224
<fileInfo id="cdt.managedbuild.config.gnu.exe.release.1298618321.105933045" name="avx512.cpp" rcbsApplicability="disable" resourcePath="modules/lsp-dsp-lib/src/main/x86/avx512.cpp" toolsToInvoke="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.442760585.995431695">
220225
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.442760585.995431695" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.442760585">
221-
<option id="gnu.cpp.compiler.option.other.other.979097834" superClass="gnu.cpp.compiler.option.other.other" value="-c -fmessage-length=0 -mavx512f -mavx512vl" valueType="string"/>
226+
<option id="gnu.cpp.compiler.option.other.other.979097834" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" value="-c -fmessage-length=0 -mavx512f -mavx512vl" valueType="string"/>
222227
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1095124970" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
223228
</tool>
224229
</fileInfo>
@@ -371,7 +376,7 @@
371376
</fileInfo>
372377
<fileInfo id="cdt.managedbuild.config.gnu.exe.debug.619973679.2053448379.347467300" name="avx512.cpp" rcbsApplicability="disable" resourcePath="modules/lsp-dsp-lib/src/main/x86/avx512.cpp" toolsToInvoke="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.1345866888.1739376531">
373378
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.1345866888.1739376531" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.1345866888">
374-
<option id="gnu.cpp.compiler.option.other.other.281150225" superClass="gnu.cpp.compiler.option.other.other" value="-c -fmessage-length=0 -mavx512f -mavx512vl" valueType="string"/>
379+
<option id="gnu.cpp.compiler.option.other.other.281150225" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" value="-c -fmessage-length=0 -mavx512f -mavx512vl" valueType="string"/>
375380
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.878812221" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
376381
</tool>
377382
</fileInfo>

.github/workflows/build.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ jobs:
2727
printf "[core-debug]\nInclude = /etc/pacman.d/mirrorlist\n[extra-debug]\nInclude = /etc/pacman.d/mirrorlist\n[multilib-debug]\nInclude = /etc/pacman.d/mirrorlist" >> /etc/pacman.conf
2828
printf 'Server = https://geo.mirror.pkgbuild.com/$repo/os/$arch\n%s\n' "$(cat /etc/pacman.d/mirrorlist)" > /etc/pacman.d/mirrorlist
2929
- name: Install dependencies
30-
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
30+
run: pacman --noconfirm -Syu alsa-lib base-devel cairo carla git glibc-debug hicolor-icon-theme jack2 jq libglvnd libsndfile libx11 libxrandr lv2lint php valgrind gstreamer gst-plugins-base
3131
- uses: actions/checkout@v3
3232
- name: Configure project
33-
run: make config STRICT=1 VERBOSE=1 FEATURES='clap doc jack ladspa lv2 vst2 vst3 xdg' PREFIX=/usr
33+
run: make config STRICT=1 VERBOSE=1 FEATURES='clap doc jack gst ladspa lv2 ui vst2 vst3 xdg' PREFIX=/usr
3434
- name: Fetch project dependencies
3535
run: make fetch
3636
- name: Build project
@@ -58,7 +58,7 @@ jobs:
5858
done
5959
- name: VST2 runtime checks
6060
run: |
61-
for _binary in $(ls /usr/lib/vst/lsp-plugins/*.so | grep -v /lsp-plugins-); do \
61+
for _binary in $(ls /usr/lib/vst/lsp-plugins/*.so | grep -v /liblsp-plugins-); do \
6262
valgrind ${{ env.VALGRIND_ARGS }} /usr/lib/carla/carla-bridge-native vst2 "${_binary}" "" 1>/dev/null; \
6363
done
6464
@@ -72,10 +72,10 @@ jobs:
7272
printf "[core-debug]\nInclude = /etc/pacman.d/mirrorlist\n[extra-debug]\nInclude = /etc/pacman.d/mirrorlist\n[multilib-debug]\nInclude = /etc/pacman.d/mirrorlist" >> /etc/pacman.conf
7373
printf 'Server = https://geo.mirror.pkgbuild.com/$repo/os/$arch\n%s\n' "$(cat /etc/pacman.d/mirrorlist)" > /etc/pacman.d/mirrorlist
7474
- name: Install dependencies
75-
run: pacman --noconfirm -Syu alsa-lib base-devel cairo carla git glibc-debug hicolor-icon-theme jack jq libglvnd libsndfile libx11 libxrandr php valgrind
75+
run: pacman --noconfirm -Syu alsa-lib base-devel cairo carla git glibc-debug hicolor-icon-theme jack2 jq libglvnd libsndfile libx11 libxrandr php valgrind gstreamer gst-plugins-base
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 vst3' PREFIX=/usr
78+
run: make config STRICT=1 DEBUG=1 VERBOSE=1 ASAN=1 FEATURES='clap jack gst ladspa ui lv2 vst2 vst3' PREFIX=/usr
7979
- name: Fetch project dependencies
8080
run: make fetch
8181
- name: Build project
@@ -98,7 +98,7 @@ jobs:
9898
done
9999
- name: VST2 runtime checks
100100
run: |
101-
for _binary in $(ls /usr/lib/vst/lsp-plugins/*.so | grep -v /lsp-plugins-); do \
101+
for _binary in $(ls /usr/lib/vst/lsp-plugins/*.so | grep -v /liblsp-plugins-); do \
102102
export ASAN_OPTIONS=verify_asan_link_order=0; \
103103
/usr/lib/carla/carla-bridge-native vst2 "${_binary}" "" 1>/dev/null; \
104104
done
@@ -113,10 +113,10 @@ jobs:
113113
printf "[core-debug]\nInclude = /etc/pacman.d/mirrorlist\n[extra-debug]\nInclude = /etc/pacman.d/mirrorlist\n[multilib-debug]\nInclude = /etc/pacman.d/mirrorlist" >> /etc/pacman.conf
114114
printf 'Server = https://geo.mirror.pkgbuild.com/$repo/os/$arch\n%s\n' "$(cat /etc/pacman.d/mirrorlist)" > /etc/pacman.d/mirrorlist
115115
- name: Install dependencies
116-
run: pacman --noconfirm -Syu alsa-lib base-devel cairo carla git glibc-debug hicolor-icon-theme jack jq libglvnd libsndfile libx11 libxrandr php valgrind
116+
run: pacman --noconfirm -Syu alsa-lib base-devel cairo carla git glibc-debug hicolor-icon-theme jack2 jq libglvnd libsndfile libx11 libxrandr php valgrind gstreamer gst-plugins-base
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 vst3' PREFIX=/usr
119+
run: make config STRICT=1 DEBUG=1 VERBOSE=1 FEATURES='clap jack gst ladspa lv2 ui vst2 vst3' PREFIX=/usr
120120
- name: Fetch project dependencies
121121
run: make fetch
122122
- name: Build project
@@ -137,7 +137,7 @@ jobs:
137137
done
138138
- name: VST2 runtime checks
139139
run: |
140-
for _binary in $(ls /usr/lib/vst/lsp-plugins/*.so | grep -v /lsp-plugins-); do \
140+
for _binary in $(ls /usr/lib/vst/lsp-plugins/*.so | grep -v /liblsp-plugins-); do \
141141
valgrind ${{ env.VALGRIND_DEBUG_ARGS }} /usr/lib/carla/carla-bridge-native vst2 "${_binary}" "" 1>/dev/null; \
142142
done
143143
@@ -147,10 +147,10 @@ jobs:
147147
image: opensuse/leap:latest
148148
steps:
149149
- name: Install dependencies
150-
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
150+
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 gstreamer-devel gstreamer-plugins-base-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 vst3 xdg' PREFIX=/usr
153+
run: make config STRICT=1 VERBOSE=1 FEATURES='clap doc jack gst ladspa lv2 ui vst2 vst3 xdg' PREFIX=/usr
154154
- name: Fetch project dependencies
155155
run: make fetch
156156
- name: Build project
@@ -164,10 +164,10 @@ jobs:
164164
image: opensuse/tumbleweed:latest
165165
steps:
166166
- name: Install dependencies
167-
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
167+
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 gstreamer-devel gstreamer-plugins-base-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 vst3 xdg' PREFIX=/usr
170+
run: make config CC=clang CXX=clang++ STRICT=1 VERBOSE=1 FEATURES='clap doc jack gst ladspa lv2 ui vst2 vst3 xdg' PREFIX=/usr
171171
- name: Fetch project dependencies
172172
run: make fetch
173173
- name: Build project
@@ -183,10 +183,10 @@ jobs:
183183
- name: Update repositories
184184
run: apt-get update
185185
- name: Install dependencies
186-
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
186+
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 libgstreamer1.0-dev libgstreamer-plugins-base1.0-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 vst3 xdg' PREFIX=/usr
189+
run: make config STRICT=1 VERBOSE=1 FEATURES='clap doc jack gst ladspa lv2 ui 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 vst3'
216+
run: make config STRICT=1 VERBOSE=1 FEATURES='clap ladspa lv2 ui vst2 vst3'
217217
- name: Fetch project dependencies
218218
shell: msys2 {0}
219219
run: make fetch

Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,10 +141,13 @@ help:
141141
echo "Available FEATURES:"
142142
echo " clap CLAP plugin format binaries"
143143
echo " doc Generate standalone HTML documentation"
144+
echo " gst GStreamer plugins"
144145
echo " jack Standalone JACK plugins"
145146
echo " ladspa LADSPA plugins"
146147
echo " lv2 LV2 plugins"
148+
echo " ui Build plugins with UI"
147149
echo " vst2 VST 2.x plugin binaries"
150+
echo " vst3 VST 3.x plugin binaries"
148151
echo " xdg Desktop integration icons"
149152

150153

0 commit comments

Comments
 (0)