Skip to content

Commit 3692cee

Browse files
committed
Merge branch 'devel'
2 parents 1d0cb25 + 24d96a5 commit 3692cee

6 files changed

Lines changed: 76 additions & 23 deletions

File tree

.github/workflows/build.yml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ 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 gstreamer-devel gstreamer-plugins-base-devel
150+
run: zypper --non-interactive --no-gpg-checks in tar gzip gcc gcc-c++ glibc-locale 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
153153
run: make config STRICT=1 VERBOSE=1 FEATURES='clap doc jack gst ladspa lv2 ui vst2 vst3 xdg' PREFIX=/usr
@@ -164,7 +164,7 @@ 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 gstreamer-devel gstreamer-plugins-base-devel
167+
run: zypper --non-interactive --no-gpg-checks in tar gzip gcc gcc-c++ glibc-locale glibc-gconv-modules-extra 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
170170
run: make config CC=clang CXX=clang++ STRICT=1 VERBOSE=1 FEATURES='clap doc jack gst ladspa lv2 ui vst2 vst3 xdg' PREFIX=/usr
@@ -221,3 +221,17 @@ jobs:
221221
shell: msys2 {0}
222222
run: make VERBOSE=1
223223

224+
macos_stable:
225+
runs-on: macos-latest
226+
steps:
227+
- name: Update repositories
228+
run: brew update
229+
- name: Install dependencies
230+
run: brew install make pkgconf cairo freetype
231+
- uses: actions/checkout@v3
232+
- name: Configure project
233+
run: gmake config STRICT=1 VERBOSE=1 FEATURES='lv2 ui'
234+
- name: Fetch project dependencies
235+
run: gmake fetch
236+
- name: Build project
237+
run: gmake VERBOSE=1

dependencies.mk

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,15 +113,36 @@ ifeq ($(PLATFORM),Windows)
113113
TEST_DEPENDENCIES += $(WINDOWS_TEST_DEPENDENCIES)
114114
endif
115115

116+
#------------------------------------------------------------------------------
117+
# MacOS dependencies
118+
MACOS_DEPENDENCIES = \
119+
LIBAUDIOTOOLBOX \
120+
LIBCAIRO \
121+
LIBCOCOA \
122+
LIBCOREFOUNDATION \
123+
LIBFONTCONFIG \
124+
LIBFREETYPE \
125+
LIBICONV \
126+
LIBJACK
127+
128+
MACOS_TEST_DEPENDENCIES =
129+
130+
ifeq ($(PLATFORM),MacOS)
131+
DEPENDENCIES += $(MACOS_DEPENDENCIES)
132+
TEST_DEPENDENCIES += $(MACOS_TEST_DEPENDENCIES)
133+
endif
134+
116135
#------------------------------------------------------------------------------
117136
# All possible dependencies
118137
ALL_DEPENDENCIES = \
119138
$(DEPENDENCIES) \
120139
$(LINUX_DEPENDENCIES) \
121140
$(BSD_DEPENDENCIES) \
122141
$(WINDOWS_DEPENDENCIES) \
142+
$(MACOS_DEPENDENCIES) \
123143
$(TEST_DEPENDENCIES) \
124144
$(LINUX_TEST_DEPENDENCIES) \
125145
$(BSD_TEST_DEPENDENCIES) \
126-
$(WINDOWS_TEST_DEPENDENCIES)
146+
$(WINDOWS_TEST_DEPENDENCIES) \
147+
$(MACOS_TEST_DEPENDENCIES)
127148

make/tools.mk

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ INSTALL ?= $(X_INSTALL_TOOL)
8989
FLAG_RELRO := -Wl,-z,relro,-z,now
9090
FLAG_STDLIB :=
9191
FLAG_GC_SECTIONS := -Wl,--gc-sections
92+
FLAG_AS_NEEDED := -Wl,-as-needed
9293
NOARCH_CFLAGS :=
9394
NOARCH_CXXFLAGS :=
9495
NOARCH_EXE_FLAGS :=
@@ -108,7 +109,8 @@ else ifeq ($(PLATFORM),Windows)
108109
NOARCH_LDFLAGS += -T $(CURDIR)/make/ld-windows.script
109110
else ifeq ($(PLATFORM),MacOS)
110111
FLAG_RELRO =
111-
FLAG_GC_SECTIONS =
112+
FLAG_GC_SECTIONS =
113+
FLAG_AS_NEEDED =
112114
NOARCH_CXXFLAGS += -std=c++0x
113115
NOARCH_LDFLAGS += -keep_private_externs
114116
else ifeq ($(PLATFORM),BSD)
@@ -200,11 +202,11 @@ NOARCH_LDFLAGS += -r
200202
LDFLAGS := $(ARCHITECTURE_LDFLAGS) $(NOARCH_LDFLAGS)
201203
HOST_LDFLAGS := $(HOST_ARCHITECTURE_LDFLAGS) $(NOARCH_LDFLAGS)
202204

203-
NOARCH_EXE_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS)
205+
NOARCH_EXE_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) $(FLAG_AS_NEEDED)
204206
EXE_FLAGS := $(ARCHITECTURE_CFLAGS) $(NOARCH_EXE_FLAGS)
205207
HOST_EXE_FLAGS := $(HOST_ARCHITECTURE_CFLAGS) $(NOARCH_EXE_FLAGS)
206208

207-
NOARCH_SO_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) -shared $(FLAG_STDLIB) -fPIC
209+
NOARCH_SO_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) $(FLAG_AS_NEEDED) -shared $(FLAG_STDLIB) -fPIC
208210
SO_FLAGS := $(ARCHITECTURE_CFLAGS) $(NOARCH_SO_FLAGS)
209211
HOST_SO_FLAGS := $(HOST_ARCHITECTURE_CFLAGS) $(NOARCH_SO_FLAGS)
210212

modules.mk

Lines changed: 30 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,99 +19,114 @@
1919
#
2020

2121
# Variables that describe dependencies
22-
LSP_3RD_PARTY_VERSION := 1.0.21
22+
LSP_3RD_PARTY_VERSION := 1.0.23
2323
LSP_3RD_PARTY_NAME := lsp-3rd-party
2424
LSP_3RD_PARTY_TYPE := hdr
2525
LSP_3RD_PARTY_INC_OPT := -idirafter
2626
LSP_3RD_PARTY_URL_RO := https://github.com/lsp-plugins/$(LSP_3RD_PARTY_NAME).git
2727
LSP_3RD_PARTY_URL_RW := git@github.com:lsp-plugins/$(LSP_3RD_PARTY_NAME).git
2828

29-
LSP_COMMON_LIB_VERSION := 1.0.41
29+
LSP_COMMON_LIB_VERSION := 1.0.43
3030
LSP_COMMON_LIB_NAME := lsp-common-lib
3131
LSP_COMMON_LIB_TYPE := src
3232
LSP_COMMON_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_COMMON_LIB_NAME).git
3333
LSP_COMMON_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_COMMON_LIB_NAME).git
3434

35-
LSP_DSP_LIB_VERSION := 1.0.29
35+
LSP_DSP_LIB_VERSION := 1.0.31
3636
LSP_DSP_LIB_NAME := lsp-dsp-lib
3737
LSP_DSP_LIB_TYPE := src
3838
LSP_DSP_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_DSP_LIB_NAME).git
3939
LSP_DSP_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_DSP_LIB_NAME).git
4040

41-
LSP_DSP_UNITS_VERSION := 1.0.28
41+
LSP_DSP_UNITS_VERSION := 1.0.30
4242
LSP_DSP_UNITS_NAME := lsp-dsp-units
4343
LSP_DSP_UNITS_TYPE := src
4444
LSP_DSP_UNITS_URL_RO := https://github.com/lsp-plugins/$(LSP_DSP_UNITS_NAME).git
4545
LSP_DSP_UNITS_URL_RW := git@github.com:lsp-plugins/$(LSP_DSP_UNITS_NAME).git
4646

47-
LSP_LLTL_LIB_VERSION := 1.0.24
47+
LSP_LLTL_LIB_VERSION := 1.0.26
4848
LSP_LLTL_LIB_NAME := lsp-lltl-lib
4949
LSP_LLTL_LIB_TYPE := src
5050
LSP_LLTL_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_LLTL_LIB_NAME).git
5151
LSP_LLTL_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_LLTL_LIB_NAME).git
5252

53-
LSP_R3D_BASE_LIB_VERSION := 1.0.23
53+
LSP_R3D_BASE_LIB_VERSION := 1.0.25
5454
LSP_R3D_BASE_LIB_NAME := lsp-r3d-base-lib
5555
LSP_R3D_BASE_LIB_TYPE := src
5656
LSP_R3D_BASE_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_R3D_BASE_LIB_NAME).git
5757
LSP_R3D_BASE_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_R3D_BASE_LIB_NAME).git
5858

59-
LSP_R3D_IFACE_VERSION := 1.0.23
59+
LSP_R3D_IFACE_VERSION := 1.0.25
6060
LSP_R3D_IFACE_NAME := lsp-r3d-iface
6161
LSP_R3D_IFACE_TYPE := src
6262
LSP_R3D_IFACE_URL_RO := https://github.com/lsp-plugins/$(LSP_R3D_IFACE_NAME).git
6363
LSP_R3D_IFACE_URL_RW := git@github.com:lsp-plugins/$(LSP_R3D_IFACE_NAME).git
6464

65-
LSP_R3D_GLX_LIB_VERSION := 1.0.23
65+
LSP_R3D_GLX_LIB_VERSION := 1.0.25
6666
LSP_R3D_GLX_LIB_NAME := lsp-r3d-glx-lib
6767
LSP_R3D_GLX_LIB_TYPE := bin
6868
LSP_R3D_GLX_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_R3D_GLX_LIB_NAME).git
6969
LSP_R3D_GLX_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_R3D_GLX_LIB_NAME).git
7070

71-
LSP_R3D_WGL_LIB_VERSION := 1.0.18
71+
LSP_R3D_WGL_LIB_VERSION := 1.0.20
7272
LSP_R3D_WGL_LIB_NAME := lsp-r3d-wgl-lib
7373
LSP_R3D_WGL_LIB_TYPE := bin
7474
LSP_R3D_WGL_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_R3D_WGL_LIB_NAME).git
7575
LSP_R3D_WGL_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_R3D_WGL_LIB_NAME).git
7676

77-
LSP_RUNTIME_LIB_VERSION := 1.0.27
77+
LSP_RUNTIME_LIB_VERSION := 1.0.29
7878
LSP_RUNTIME_LIB_NAME := lsp-runtime-lib
7979
LSP_RUNTIME_LIB_TYPE := src
8080
LSP_RUNTIME_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_RUNTIME_LIB_NAME).git
8181
LSP_RUNTIME_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_RUNTIME_LIB_NAME).git
8282

83-
LSP_TEST_FW_VERSION := 1.0.30
83+
LSP_TEST_FW_VERSION := 1.0.32
8484
LSP_TEST_FW_NAME := lsp-test-fw
8585
LSP_TEST_FW_TYPE := src
8686
LSP_TEST_FW_URL_RO := https://github.com/lsp-plugins/$(LSP_TEST_FW_NAME).git
8787
LSP_TEST_FW_URL_RW := git@github.com:lsp-plugins/$(LSP_TEST_FW_NAME).git
8888

89-
LSP_TK_LIB_VERSION := 1.0.27
89+
LSP_TK_LIB_VERSION := 1.0.29
9090
LSP_TK_LIB_NAME := lsp-tk-lib
9191
LSP_TK_LIB_TYPE := src
9292
LSP_TK_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_TK_LIB_NAME).git
9393
LSP_TK_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_TK_LIB_NAME).git
9494

95-
LSP_WS_LIB_VERSION := 1.0.27
95+
LSP_WS_LIB_VERSION := 1.0.29
9696
LSP_WS_LIB_NAME := lsp-ws-lib
9797
LSP_WS_LIB_TYPE := src
9898
LSP_WS_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_WS_LIB_NAME).git
9999
LSP_WS_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_WS_LIB_NAME).git
100100

101101
# Plugin-related module dependencies
102-
LSP_PLUGIN_FW_VERSION := 1.0.29
102+
LSP_PLUGIN_FW_VERSION := 1.0.31
103103
LSP_PLUGIN_FW_NAME := lsp-plugin-fw
104104
LSP_PLUGIN_FW_TYPE := src
105105
LSP_PLUGIN_FW_URL_RO := https://github.com/lsp-plugins/$(LSP_PLUGIN_FW_NAME).git
106106
LSP_PLUGIN_FW_URL_RW := git@github.com:lsp-plugins/$(LSP_PLUGIN_FW_NAME).git
107107

108-
LSP_PLUGINS_SHARED_VERSION := 1.0.28
108+
LSP_PLUGINS_SHARED_VERSION := 1.0.30
109109
LSP_PLUGINS_SHARED_NAME := lsp-plugins-shared
110110
LSP_PLUGINS_SHARED_TYPE := src
111111
LSP_PLUGINS_SHARED_URL_RO := https://github.com/lsp-plugins/$(LSP_PLUGINS_SHARED_NAME).git
112112
LSP_PLUGINS_SHARED_URL_RW := git@github.com:lsp-plugins/$(LSP_PLUGINS_SHARED_NAME).git
113113

114114
# System libraries
115+
LIBAUDIOTOOLBOX_VERSION := system
116+
LIBAUDIOTOOLBOX_NAME := libaudiotoolbox
117+
LIBAUDIOTOOLBOX_TYPE := opt
118+
LIBAUDIOTOOLBOX_LDFLAGS := -framework AudioToolbox
119+
120+
LIBCOCOA_VERSION := system
121+
LIBCOCOA_NAME := libcocoa
122+
LIBCOCOA_TYPE := opt
123+
LIBCOCOA_LDFLAGS := -framework Cocoa
124+
125+
LIBCOREFOUNDATION_VERSION := system
126+
LIBCOREFOUNDATION_NAME := libcorefoundation
127+
LIBCOREFOUNDATION_TYPE := opt
128+
LIBCOREFOUNDATION_LDFLAGS := -framework CoreFoundation
129+
115130
LIBADVAPI_VERSION := system
116131
LIBADVAPI_NAME := libadvapi32
117132
LIBADVAPI_TYPE := opt

src/doc/manuals/plugins/plugin_template.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
This is a template plugin (<?= ($m == 'm') ? 'mono' : 'stereo' ?> version);
88
</p>
99

10+
<!-- TODO: write documentation here -->
1011
<p><b>Controls:</b></p>
1112
<ul>
1213
<li>

src/main/meta/plugin_template.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ namespace lsp
4949

5050
// Input controls
5151
BYPASS,
52-
INT_CONTROL("d_in", "Delay in samples", U_SAMPLES, plugin_template::SAMPLES),
52+
INT_CONTROL("d_in", "Delay in samples", "Delay", U_SAMPLES, plugin_template::SAMPLES),
5353
DRY_GAIN(0.0f),
5454
WET_GAIN(1.0f),
5555
OUT_GAIN,
@@ -71,7 +71,7 @@ namespace lsp
7171

7272
// Input controls
7373
BYPASS,
74-
INT_CONTROL("d_in", "Delay in samples", U_SAMPLES, plugin_template::SAMPLES),
74+
INT_CONTROL("d_in", "Delay in samples", "Delay", U_SAMPLES, plugin_template::SAMPLES),
7575
DRY_GAIN(0.0f),
7676
WET_GAIN(1.0f),
7777
OUT_GAIN,

0 commit comments

Comments
 (0)