Skip to content

Commit 4369ed5

Browse files
sadko4usadko4u
committed
Release 1.0.24
* Updated build scripts and dependencies.
2 parents baf192a + 26311ec commit 4369ed5

File tree

9 files changed

+152
-110
lines changed

9 files changed

+152
-110
lines changed

‎.cproject

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<listOptionValue builtIn="false" value="USE_LIBSNDFILE"/>
5454
</option>
5555
<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"/>
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 gstreamer-audio-1.0)" valueType="string"/>
5757
<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"/>
5858
<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"/>
5959
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.449118389" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
@@ -73,7 +73,7 @@
7373
<listOptionValue builtIn="false" value="LSP_IDE_DEBUG"/>
7474
<listOptionValue builtIn="false" value="USE_LIBSNDFILE"/>
7575
</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"/>
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 gstreamer-audio-1.0)" valueType="string"/>
7777
<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">
7878
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/include}&quot;"/>
7979
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/modules/lsp-plugins-shared/include}&quot;"/>
@@ -95,7 +95,7 @@
9595
</tool>
9696
<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.debug.2125987081" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.debug"/>
9797
<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"/>
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 gstreamer-audio-1.0)" valueType="string"/>
9999
<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">
100100
<listOptionValue builtIn="false" value="pthread"/>
101101
<listOptionValue builtIn="false" value="rt"/>

‎.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

‎CHANGELOG

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
* RECENT CHANGES
33
*******************************************************************************
44

5+
=== 1.0.24 ===
6+
* Updated build scripts and dependencies.
7+
58
=== 1.0.23 ===
69
* Updated build scripts and dependencies.
710

‎dependencies.mk

Lines changed: 5 additions & 3 deletions
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 vst3 xdg
40+
DEFAULT_FEATURES = clap doc ladspa lv2 ui vst2 vst3 xdg
4141

4242
#------------------------------------------------------------------------------
4343
# Linux dependencies
@@ -51,6 +51,7 @@ LINUX_DEPENDENCIES = \
5151
LIBX11 \
5252
LIBXRANDR \
5353
LIBGL \
54+
LIBGSTREAMER_AUDIO \
5455
LIBJACK \
5556
LSP_R3D_GLX_LIB
5657

@@ -59,7 +60,7 @@ LINUX_TEST_DEPENDENCIES =
5960
ifeq ($(PLATFORM),Linux)
6061
DEPENDENCIES += $(LINUX_DEPENDENCIES)
6162
TEST_DEPENDENCIES += $(LINUX_TEST_DEPENDENCIES)
62-
DEFAULT_FEATURES += jack
63+
DEFAULT_FEATURES += jack gst
6364
endif
6465

6566
#------------------------------------------------------------------------------
@@ -75,6 +76,7 @@ BSD_DEPENDENCIES = \
7576
LIBX11 \
7677
LIBXRANDR \
7778
LIBGL \
79+
LIBGSTREAMER_AUDIO \
7880
LIBJACK \
7981
LSP_R3D_GLX_LIB
8082

@@ -83,7 +85,7 @@ BSD_TEST_DEPENDENCIES =
8385
ifeq ($(PLATFORM),BSD)
8486
DEPENDENCIES += $(BSD_DEPENDENCIES)
8587
TEST_DEPENDENCIES += $(BSD_TEST_DEPENDENCIES)
86-
DEFAULT_FEATURES += jack
88+
DEFAULT_FEATURES += jack gst
8789
endif
8890

8991

‎make/modules.mk

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,15 @@ $(ALL_SRC_MODULES) $(ALL_HDR_MODULES) $(ALL_BIN_MODULES) $(ALL_PLUG_MODULES):
8888
$(GIT) -C "$($(@)_PATH)" reset --hard
8989
$(GIT) -C "$($(@)_PATH)" fetch origin --force --prune --prune-tags
9090
$(GIT) -C "$($(@)_PATH)" fetch origin 'refs/tags/*:refs/tags/*' --force
91-
$(GIT) -c advice.detachedHead=false -C "$($(@)_PATH)" checkout -B "$($(@)_BRANCH)" "origin/$($(@)_BRANCH)" || \
92-
$(GIT) -c advice.detachedHead=false -C "$($(@)_PATH)" checkout "refs/tags/$($(@)_BRANCH)" || \
93-
$(GIT) -c advice.detachedHead=false -C "$($(@)_PATH)" checkout -B "$($(@)_NAME)-$($(@)_BRANCH)" "origin/$($(@)_NAME)-$($(@)_BRANCH)" || \
94-
$(GIT) -c advice.detachedHead=false -C "$($(@)_PATH)" checkout "refs/tags/$($(@)_NAME)-$($(@)_BRANCH)"
91+
if $(GIT) -C "$($(@)_PATH)" rev-parse -q --verify "origin/$($(@)_BRANCH)" >/dev/null; then \
92+
$(GIT) -c advice.detachedHead=false -C "$($(@)_PATH)" checkout -B "$($(@)_BRANCH)" "origin/$($(@)_BRANCH)" >/dev/null; \
93+
elif $(GIT) -C "$($(@)_PATH)" rev-parse -q --verify "refs/tags/$($(@)_BRANCH)" >/dev/null; then \
94+
$(GIT) -c advice.detachedHead=false -C "$($(@)_PATH)" checkout "refs/tags/$($(@)_BRANCH)"; \
95+
elif $(GIT) -C "$($(@)_PATH)" rev-parse -q --verify "origin/$($(@)_NAME)-$($(@)_BRANCH)" >/dev/null; then \
96+
$(GIT) -c advice.detachedHead=false -C "$($(@)_PATH)" checkout -B "$($(@)_NAME)-$($(@)_BRANCH)" "origin/$($(@)_NAME)-$($(@)_BRANCH)"; \
97+
else \
98+
$(GIT) -c advice.detachedHead=false -C "$($(@)_PATH)" checkout "refs/tags/$($(@)_NAME)-$($(@)_BRANCH)"; \
99+
fi
95100

96101
fetch: $(SRC_MODULES) $(HDR_MODULES) $(BIN_MODULES) $(PLUG_MODULES)
97102

0 commit comments

Comments
 (0)