Skip to content

Commit

Permalink
Release 1.0.23
Browse files Browse the repository at this point in the history 
* Updated build scripts and dependencies.
  • Loading branch information
@sadko4u
sadko4u committed Oct 12, 2024
2 parents a30b8b6 + 09c2ba7 commit b48a54c
Show file tree
Hide file tree
Showing 8 changed files with 45 additions and 24 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
* RECENT CHANGES
*******************************************************************************

=== 1.0.23 ===
* Updated build scripts and dependencies.

=== 1.0.22 ===
* Updated build scripts and dependencies.

Expand Down
6 changes: 3 additions & 3 deletions dependencies.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ DEPENDENCIES = \
TEST_DEPENDENCIES = \
LSP_TEST_FW

DEFAULT_FEATURES = clap doc ladspa lv2 ui vst2 vst3 xdg
DEFAULT_FEATURES = clap doc ladspa lv2 ui vst2 vst3

#------------------------------------------------------------------------------
# Linux dependencies
Expand All @@ -60,7 +60,7 @@ LINUX_TEST_DEPENDENCIES =
ifeq ($(PLATFORM),Linux)
DEPENDENCIES += $(LINUX_DEPENDENCIES)
TEST_DEPENDENCIES += $(LINUX_TEST_DEPENDENCIES)
DEFAULT_FEATURES += jack gst
DEFAULT_FEATURES += jack gst xdg
endif

#------------------------------------------------------------------------------
Expand All @@ -85,7 +85,7 @@ BSD_TEST_DEPENDENCIES =
ifeq ($(PLATFORM),BSD)
DEPENDENCIES += $(BSD_DEPENDENCIES)
TEST_DEPENDENCIES += $(BSD_TEST_DEPENDENCIES)
DEFAULT_FEATURES += jack gst
DEFAULT_FEATURES += jack gst xdg
endif


Expand Down
4 changes: 2 additions & 2 deletions make/configure.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ MERGED_DEPENDENCIES := \
$(PLUGIN_SHARED)
UNIQ_MERGED_DEPENDENCIES := $(call uniq, $(MERGED_DEPENDENCIES))
DEPENDENCIES = $(UNIQ_MERGED_DEPENDENCIES)
FEATURES := $(sort $(call subtraction,$(SUB_FEATURES),$(DEFAULT_FEATURES) $(ADD_FEATURES)))
BUILD_FEATURES := $(sort $(call subtraction,$(SUB_FEATURES),$(if $(FEATURES),$(FEATURES),$(DEFAULT_FEATURES)) $(ADD_FEATURES)))

# Determine versions
ifeq ($(findstring -devel,$(ARTIFACT_VERSION)),-devel)
Expand Down Expand Up @@ -320,7 +320,7 @@ $(CONFIG_VARS): prepare
config: $(CONFIG_VARS)
echo "Host architecture: $(HOST_ARCHITECTURE_FAMILY)/$(HOST_ARCHITECTURE) ($(HOST_ARCHITECTURE_CFLAGS))"
echo "Architecture: $(ARCHITECTURE_FAMILY)/$(ARCHITECTURE) ($(ARCHITECTURE_CFLAGS))"
echo "Features: $(FEATURES)"
echo "Features: $(BUILD_FEATURES)"
echo "Configured OK"

help: | pathvars toolvars sysvars
Expand Down
20 changes: 19 additions & 1 deletion make/system.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,17 @@ else
endif
BUILD_ARCH := $(if $(ARCHITECTURE),$(ARCHITECTURE),$(HOST_BUILD_ARCH))

ifeq ($(PLATFORM),Linux)
OBJ_LDFLAGS_X86 = -m elf_i386
OBJ_LDFLAGS_X86_64 = -m elf_x86_64
else ifeq ($(PLATFORM),BSD)
OBJ_LDFLAGS_X86 = -m elf_i386
OBJ_LDFLAGS_X86_64 = -m elf_x86_64
else ifeq ($(PLATFORM),Windows)
OBJ_LDFLAGS_X86 = -m i386pe
OBJ_LDFLAGS_X86_64 = -m i386pep
endif

# Set actual architecture for HOST and TARGET builds
# The current architecture can be obtained by: gcc -Q --help=target
define detect_architecture =
Expand Down Expand Up @@ -100,30 +111,37 @@ define detect_architecture =
$(2)_NAME = x86_64
$(2)_FAMILY = x86_64
$(2)_CFLAGS := -march=x86-64 -m64
$(2)_LDFLAGS := $(OBJ_LDFLAGS_X86_64)
else ifeq ($(patsubst %amd64%,amd64,$(1)),amd64)
$(2)_NAME = x86_64
$(2)_FAMILY = x86_64
$(2)_CFLAGS := -march=x86-64 -m64
$(2)_LDFLAGS := $(OBJ_LDFLAGS_X86_64)
else ifeq ($(patsubst %AMD64%,AMD64,$(1)),AMD64)
$(2)_NAME = x86_64
$(2)_FAMILY = x86_64
$(2)_CFLAGS := -march=x86-64 -m64
$(2)_LDFLAGS := $(OBJ_LDFLAGS_X86_64)
else ifeq ($(1),i86pc)
$(2)_NAME = x86_64
$(2)_FAMILY = x86_64
$(2)_CFLAGS := -march=x86-64 -m64
$(2)_LDFLAGS := $(OBJ_LDFLAGS_X86_64)
else ifeq ($(patsubst %i686%,i686,$(1)),i686)
$(2)_NAME = i686
$(2)_FAMILY = ia32
$(2)_CFLAGS := -march=i686 -m32
$(2)_LDFLAGS := $(OBJ_LDFLAGS_X86)
else ifeq ($(patsubst i%86,i586,$(1)),i586)
$(2)_NAME = i586
$(2)_FAMILY = ia32
$(2)_CFLAGS := -march=i586 -m32
$(2)_LDFLAGS := $(OBJ_LDFLAGS_X86)
else ifeq ($(1),x86)
$(2)_NAME = i686
$(2)_FAMILY = ia32
$(2)_CFLAGS := -march=i686 -m32
$(2)_LDFLAGS := $(OBJ_LDFLAGS_X86)
else ifeq ($(1),riscv32)
$(2)_NAME = riscv32
$(2)_FAMILY = riscv32
Expand Down Expand Up @@ -191,11 +209,11 @@ COMMON_VARS = \
ARCHITECTURE \
ARCHITECTURE_FAMILY \
ARCHITECTURE_CFLAGS \
BUILD_FEATURES \
CROSS_COMPILE \
DEBUG \
EXECUTABLE_EXT \
EXPORT_SYMBOLS \
FEATURES \
HOST_ARCHITECTURE \
HOST_ARCHITECTURE_FAMILY \
HOST_ARCHITECTURE_CFLAGS \
Expand Down
30 changes: 15 additions & 15 deletions modules.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,93 +19,93 @@
#

# Variables that describe dependencies
LSP_3RD_PARTY_VERSION := 1.0.18
LSP_3RD_PARTY_VERSION := 1.0.19
LSP_3RD_PARTY_NAME := lsp-3rd-party
LSP_3RD_PARTY_TYPE := hdr
LSP_3RD_PARTY_INC_OPT := -idirafter
LSP_3RD_PARTY_URL_RO := https://github.com/lsp-plugins/$(LSP_3RD_PARTY_NAME).git
LSP_3RD_PARTY_URL_RW := [email protected]:lsp-plugins/$(LSP_3RD_PARTY_NAME).git

LSP_COMMON_LIB_VERSION := 1.0.38
LSP_COMMON_LIB_VERSION := 1.0.39
LSP_COMMON_LIB_NAME := lsp-common-lib
LSP_COMMON_LIB_TYPE := src
LSP_COMMON_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_COMMON_LIB_NAME).git
LSP_COMMON_LIB_URL_RW := [email protected]:lsp-plugins/$(LSP_COMMON_LIB_NAME).git

LSP_DSP_LIB_VERSION := 1.0.26
LSP_DSP_LIB_VERSION := 1.0.27
LSP_DSP_LIB_NAME := lsp-dsp-lib
LSP_DSP_LIB_TYPE := src
LSP_DSP_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_DSP_LIB_NAME).git
LSP_DSP_LIB_URL_RW := [email protected]:lsp-plugins/$(LSP_DSP_LIB_NAME).git

LSP_DSP_UNITS_VERSION := 1.0.25
LSP_DSP_UNITS_VERSION := 1.0.26
LSP_DSP_UNITS_NAME := lsp-dsp-units
LSP_DSP_UNITS_TYPE := src
LSP_DSP_UNITS_URL_RO := https://github.com/lsp-plugins/$(LSP_DSP_UNITS_NAME).git
LSP_DSP_UNITS_URL_RW := [email protected]:lsp-plugins/$(LSP_DSP_UNITS_NAME).git

LSP_LLTL_LIB_VERSION := 1.0.21
LSP_LLTL_LIB_VERSION := 1.0.22
LSP_LLTL_LIB_NAME := lsp-lltl-lib
LSP_LLTL_LIB_TYPE := src
LSP_LLTL_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_LLTL_LIB_NAME).git
LSP_LLTL_LIB_URL_RW := [email protected]:lsp-plugins/$(LSP_LLTL_LIB_NAME).git

LSP_R3D_BASE_LIB_VERSION := 1.0.20
LSP_R3D_BASE_LIB_VERSION := 1.0.21
LSP_R3D_BASE_LIB_NAME := lsp-r3d-base-lib
LSP_R3D_BASE_LIB_TYPE := src
LSP_R3D_BASE_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_R3D_BASE_LIB_NAME).git
LSP_R3D_BASE_LIB_URL_RW := [email protected]:lsp-plugins/$(LSP_R3D_BASE_LIB_NAME).git

LSP_R3D_IFACE_VERSION := 1.0.20
LSP_R3D_IFACE_VERSION := 1.0.21
LSP_R3D_IFACE_NAME := lsp-r3d-iface
LSP_R3D_IFACE_TYPE := src
LSP_R3D_IFACE_URL_RO := https://github.com/lsp-plugins/$(LSP_R3D_IFACE_NAME).git
LSP_R3D_IFACE_URL_RW := [email protected]:lsp-plugins/$(LSP_R3D_IFACE_NAME).git

LSP_R3D_GLX_LIB_VERSION := 1.0.20
LSP_R3D_GLX_LIB_VERSION := 1.0.21
LSP_R3D_GLX_LIB_NAME := lsp-r3d-glx-lib
LSP_R3D_GLX_LIB_TYPE := bin
LSP_R3D_GLX_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_R3D_GLX_LIB_NAME).git
LSP_R3D_GLX_LIB_URL_RW := [email protected]:lsp-plugins/$(LSP_R3D_GLX_LIB_NAME).git

LSP_R3D_WGL_LIB_VERSION := 1.0.15
LSP_R3D_WGL_LIB_VERSION := 1.0.16
LSP_R3D_WGL_LIB_NAME := lsp-r3d-wgl-lib
LSP_R3D_WGL_LIB_TYPE := bin
LSP_R3D_WGL_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_R3D_WGL_LIB_NAME).git
LSP_R3D_WGL_LIB_URL_RW := [email protected]:lsp-plugins/$(LSP_R3D_WGL_LIB_NAME).git

LSP_RUNTIME_LIB_VERSION := 1.0.24
LSP_RUNTIME_LIB_VERSION := 1.0.25
LSP_RUNTIME_LIB_NAME := lsp-runtime-lib
LSP_RUNTIME_LIB_TYPE := src
LSP_RUNTIME_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_RUNTIME_LIB_NAME).git
LSP_RUNTIME_LIB_URL_RW := [email protected]:lsp-plugins/$(LSP_RUNTIME_LIB_NAME).git

LSP_TEST_FW_VERSION := 1.0.27
LSP_TEST_FW_VERSION := 1.0.28
LSP_TEST_FW_NAME := lsp-test-fw
LSP_TEST_FW_TYPE := src
LSP_TEST_FW_URL_RO := https://github.com/lsp-plugins/$(LSP_TEST_FW_NAME).git
LSP_TEST_FW_URL_RW := [email protected]:lsp-plugins/$(LSP_TEST_FW_NAME).git

LSP_TK_LIB_VERSION := 1.0.24
LSP_TK_LIB_VERSION := 1.0.25
LSP_TK_LIB_NAME := lsp-tk-lib
LSP_TK_LIB_TYPE := src
LSP_TK_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_TK_LIB_NAME).git
LSP_TK_LIB_URL_RW := [email protected]:lsp-plugins/$(LSP_TK_LIB_NAME).git

LSP_WS_LIB_VERSION := 1.0.24
LSP_WS_LIB_VERSION := 1.0.25
LSP_WS_LIB_NAME := lsp-ws-lib
LSP_WS_LIB_TYPE := src
LSP_WS_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_WS_LIB_NAME).git
LSP_WS_LIB_URL_RW := [email protected]:lsp-plugins/$(LSP_WS_LIB_NAME).git

# Plugin-related module dependencies
LSP_PLUGIN_FW_VERSION := 1.0.26
LSP_PLUGIN_FW_VERSION := 1.0.27
LSP_PLUGIN_FW_NAME := lsp-plugin-fw
LSP_PLUGIN_FW_TYPE := src
LSP_PLUGIN_FW_URL_RO := https://github.com/lsp-plugins/$(LSP_PLUGIN_FW_NAME).git
LSP_PLUGIN_FW_URL_RW := [email protected]:lsp-plugins/$(LSP_PLUGIN_FW_NAME).git

LSP_PLUGINS_SHARED_VERSION := 1.0.25
LSP_PLUGINS_SHARED_VERSION := 1.0.26
LSP_PLUGINS_SHARED_NAME := lsp-plugins-shared
LSP_PLUGINS_SHARED_TYPE := src
LSP_PLUGINS_SHARED_URL_RO := https://github.com/lsp-plugins/$(LSP_PLUGINS_SHARED_NAME).git
Expand Down
2 changes: 1 addition & 1 deletion project.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ ARTIFACT_TYPE = plug
ARTIFACT_DESC = LSP Artistic Delay Plugin Series
ARTIFACT_HEADERS = lsp-plug.in
ARTIFACT_EXPORT_HEADERS = 0
ARTIFACT_VERSION = 1.0.22
ARTIFACT_VERSION = 1.0.23



2 changes: 1 addition & 1 deletion src/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ ARTIFACT_OBJ = \
$(ARTIFACT_OBJ_META) \
$(ARTIFACT_OBJ_DSP) \
$(ARTIFACT_OBJ_SHARED) \
$(call fcheck,ui,$(FEATURES),$(ARTIFACT_OBJ_UI))
$(call fcheck,ui,$(BUILD_FEATURES),$(ARTIFACT_OBJ_UI))

CXX_SRC_STUB = $(ARTIFACT_BIN)/stub.cpp
CXX_SRC_MAIN_META = $(call rwildcard, main/meta, *.cpp)
Expand Down
2 changes: 1 addition & 1 deletion src/main/meta/art_delay.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

#define LSP_PLUGINS_ART_DELAY_VERSION_MAJOR 1
#define LSP_PLUGINS_ART_DELAY_VERSION_MINOR 0
#define LSP_PLUGINS_ART_DELAY_VERSION_MICRO 22
#define LSP_PLUGINS_ART_DELAY_VERSION_MICRO 23

#define LSP_PLUGINS_ART_DELAY_VERSION \
LSP_MODULE_VERSION( \
Expand Down

0 comments on commit b48a54c

Please sign in to comment.