Skip to content

Commit 5dec384

Browse files
committed
Release 1.0.4
* Updated build scripts and dependencies.
2 parents 66c87a6 + 115da21 commit 5dec384

File tree

7 files changed

+61
-29
lines changed

7 files changed

+61
-29
lines changed

.github/workflows/build.yml

Lines changed: 2 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

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.4 ===
6+
* Updated build scripts and dependencies.
7+
58
=== 1.0.3 ===
69
* Updated build scripts and dependencies.
710

dependencies.mk

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

116+
#------------------------------------------------------------------------------
117+
# MacOS dependencies
118+
MACOS_DEPENDENCIES = \
119+
LIBAUDIOTOOLBOX \
120+
LIBCOREFOUNDATION \
121+
LIBICONV \
122+
LIBJACK
123+
124+
MACOS_TEST_DEPENDENCIES =
125+
126+
ifeq ($(PLATFORM),MacOS)
127+
DEPENDENCIES += $(MACOS_DEPENDENCIES)
128+
TEST_DEPENDENCIES += $(MACOS_TEST_DEPENDENCIES)
129+
endif
130+
116131
#------------------------------------------------------------------------------
117132
# All possible dependencies
118133
ALL_DEPENDENCIES = \
119134
$(DEPENDENCIES) \
120135
$(LINUX_DEPENDENCIES) \
121136
$(BSD_DEPENDENCIES) \
122137
$(WINDOWS_DEPENDENCIES) \
138+
$(MACOS_DEPENDENCIES) \
123139
$(TEST_DEPENDENCIES) \
124140
$(LINUX_TEST_DEPENDENCIES) \
125141
$(BSD_TEST_DEPENDENCIES) \
126-
$(WINDOWS_TEST_DEPENDENCIES)
142+
$(WINDOWS_TEST_DEPENDENCIES) \
143+
$(MACOS_TEST_DEPENDENCIES)
127144

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: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,99 +19,109 @@
1919
#
2020

2121
# Variables that describe dependencies
22-
LSP_3RD_PARTY_VERSION := 1.0.21
22+
LSP_3RD_PARTY_VERSION := 1.0.22
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 := [email protected]:lsp-plugins/$(LSP_3RD_PARTY_NAME).git
2828

29-
LSP_COMMON_LIB_VERSION := 1.0.41
29+
LSP_COMMON_LIB_VERSION := 1.0.42
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 := [email protected]:lsp-plugins/$(LSP_COMMON_LIB_NAME).git
3434

35-
LSP_DSP_LIB_VERSION := 1.0.29
35+
LSP_DSP_LIB_VERSION := 1.0.30
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 := [email protected]:lsp-plugins/$(LSP_DSP_LIB_NAME).git
4040

41-
LSP_DSP_UNITS_VERSION := 1.0.28
41+
LSP_DSP_UNITS_VERSION := 1.0.29
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 := [email protected]:lsp-plugins/$(LSP_DSP_UNITS_NAME).git
4646

47-
LSP_LLTL_LIB_VERSION := 1.0.24
47+
LSP_LLTL_LIB_VERSION := 1.0.25
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 := [email protected]: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.24
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 := [email protected]:lsp-plugins/$(LSP_R3D_BASE_LIB_NAME).git
5858

59-
LSP_R3D_IFACE_VERSION := 1.0.23
59+
LSP_R3D_IFACE_VERSION := 1.0.24
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 := [email protected]: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.24
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 := [email protected]: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.19
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 := [email protected]:lsp-plugins/$(LSP_R3D_WGL_LIB_NAME).git
7676

77-
LSP_RUNTIME_LIB_VERSION := 1.0.27
77+
LSP_RUNTIME_LIB_VERSION := 1.0.28
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 := [email protected]:lsp-plugins/$(LSP_RUNTIME_LIB_NAME).git
8282

83-
LSP_TEST_FW_VERSION := 1.0.30
83+
LSP_TEST_FW_VERSION := 1.0.31
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 := [email protected]:lsp-plugins/$(LSP_TEST_FW_NAME).git
8888

89-
LSP_TK_LIB_VERSION := 1.0.27
89+
LSP_TK_LIB_VERSION := 1.0.28
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 := [email protected]:lsp-plugins/$(LSP_TK_LIB_NAME).git
9494

95-
LSP_WS_LIB_VERSION := 1.0.27
95+
LSP_WS_LIB_VERSION := 1.0.28
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 := [email protected]: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.30
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 := [email protected]:lsp-plugins/$(LSP_PLUGIN_FW_NAME).git
107107

108-
LSP_PLUGINS_SHARED_VERSION := 1.0.28
108+
LSP_PLUGINS_SHARED_VERSION := 1.0.29
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 := [email protected]: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+
LIBCOREFOUNDATION_VERSION := system
121+
LIBCOREFOUNDATION_NAME := libcorefoundation
122+
LIBCOREFOUNDATION_TYPE := opt
123+
LIBCOREFOUNDATION_LDFLAGS := -framework CoreFoundation
124+
115125
LIBADVAPI_VERSION := system
116126
LIBADVAPI_NAME := libadvapi32
117127
LIBADVAPI_TYPE := opt

project.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ ARTIFACT_TYPE = plug
2525
ARTIFACT_DESC = LSP Audio Return Plugin
2626
ARTIFACT_HEADERS = lsp-plug.in
2727
ARTIFACT_EXPORT_HEADERS = 0
28-
ARTIFACT_VERSION = 1.0.3
28+
ARTIFACT_VERSION = 1.0.4
2929

3030

3131

src/main/meta/return.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
2-
* Copyright (C) 2024 Linux Studio Plugins Project <https://lsp-plug.in/>
3-
* (C) 2024 Vladimir Sadovnikov <[email protected]>
2+
* Copyright (C) 2025 Linux Studio Plugins Project <https://lsp-plug.in/>
3+
* (C) 2025 Vladimir Sadovnikov <[email protected]>
44
*
55
* This file is part of lsp-plugins-return
66
* Created on: 26 авг 2024 г.
@@ -25,7 +25,7 @@
2525

2626
#define LSP_PLUGINS_RETURN_VERSION_MAJOR 1
2727
#define LSP_PLUGINS_RETURN_VERSION_MINOR 0
28-
#define LSP_PLUGINS_RETURN_VERSION_MICRO 3
28+
#define LSP_PLUGINS_RETURN_VERSION_MICRO 4
2929

3030
#define LSP_PLUGINS_RETURN_VERSION \
3131
LSP_MODULE_VERSION( \
@@ -57,8 +57,8 @@ namespace lsp
5757
BYPASS,
5858
IN_GAIN,
5959
OUT_GAIN,
60-
COMBO("mode", "Return mode", 0, return_mix_mode),
61-
LOG_CONTROL("g_retn", "Return gain", U_GAIN_AMP, Return::RETURN_GAIN),
60+
COMBO("mode", "Return mode", "Mode", 0, return_mix_mode),
61+
LOG_CONTROL("g_retn", "Return gain", "Return gain", U_GAIN_AMP, Return::RETURN_GAIN),
6262
RETURN_NAME("return", "Audio return connection point name"),
6363
AUDIO_RETURN("rin", "Audio return input", 0, "return"),
6464

@@ -77,8 +77,8 @@ namespace lsp
7777
BYPASS,
7878
IN_GAIN,
7979
OUT_GAIN,
80-
COMBO("mode", "Return mode", 0, return_mix_mode),
81-
LOG_CONTROL("g_retn", "Return gain", U_GAIN_AMP, Return::RETURN_GAIN),
80+
COMBO("mode", "Return mode", "Mode", 0, return_mix_mode),
81+
LOG_CONTROL("g_retn", "Return gain", "Return gain", U_GAIN_AMP, Return::RETURN_GAIN),
8282
RETURN_NAME("return", "Audio return connection point name"),
8383
AUDIO_RETURN("rin_l", "Audio return input left", 0, "return"),
8484
AUDIO_RETURN("rin_r", "Audio return input right", 1, "return"),

0 commit comments

Comments
 (0)