From e9f2a5f3c6eb8dd5411f43156eb3e30799d3bb54 Mon Sep 17 00:00:00 2001 From: Vladimir Sadovnikov Date: Tue, 8 Oct 2024 11:35:39 +0300 Subject: [PATCH 1/5] Version up --- CHANGELOG | 3 +++ project.mk | 2 +- src/main/meta/send.cpp | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 00e0849..8f0070b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,9 @@ * RECENT CHANGES ******************************************************************************* +=== 1.0.1 === + + === 1.0.0 === * Initial release. * Updated build scripts and dependencies. diff --git a/project.mk b/project.mk index 7e9d964..3c1758c 100644 --- a/project.mk +++ b/project.mk @@ -25,7 +25,7 @@ ARTIFACT_TYPE = plug ARTIFACT_DESC = LSP Audio Send Plugin ARTIFACT_HEADERS = lsp-plug.in ARTIFACT_EXPORT_HEADERS = 0 -ARTIFACT_VERSION = 1.0.0 +ARTIFACT_VERSION = 1.0.1-devel diff --git a/src/main/meta/send.cpp b/src/main/meta/send.cpp index c6b3cde..70826d9 100644 --- a/src/main/meta/send.cpp +++ b/src/main/meta/send.cpp @@ -25,7 +25,7 @@ #define LSP_PLUGINS_SEND_VERSION_MAJOR 1 #define LSP_PLUGINS_SEND_VERSION_MINOR 0 -#define LSP_PLUGINS_SEND_VERSION_MICRO 0 +#define LSP_PLUGINS_SEND_VERSION_MICRO 1 #define LSP_PLUGINS_SEND_VERSION \ LSP_MODULE_VERSION( \ From e96b86e7b84c9ac57ddd963b65eb9dfad12ee18b Mon Sep 17 00:00:00 2001 From: Vladimir Sadovnikov Date: Thu, 10 Oct 2024 14:57:54 +0300 Subject: [PATCH 2/5] Updated build scripts and dependencies --- CHANGELOG | 2 +- make/configure.mk | 7 +++++-- make/system.mk | 20 +++++++++++++++++++- src/Makefile | 2 +- 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 8f0070b..b2185ff 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,7 +3,7 @@ ******************************************************************************* === 1.0.1 === - +* Updated build scripts and dependencies. === 1.0.0 === * Initial release. diff --git a/make/configure.mk b/make/configure.mk index b1e9a87..d1d9fe8 100644 --- a/make/configure.mk +++ b/make/configure.mk @@ -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) @@ -69,6 +69,9 @@ else ) endif +$(info PKG_CONFIG = $(PKG_CONFIG)) +$(info HOST_PKG_CONFIG = $(HOST_PKG_CONFIG)) + define pkgconfig = $(eval name=$(1)) @@ -320,7 +323,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 diff --git a/make/system.mk b/make/system.mk index c28e827..6c23354 100644 --- a/make/system.mk +++ b/make/system.mk @@ -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 = @@ -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 @@ -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 \ diff --git a/src/Makefile b/src/Makefile index f05a8ae..d459ca9 100644 --- a/src/Makefile +++ b/src/Makefile @@ -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) From d0e59d5ec4be9d466820ab2e2ef2237a44b69e6a Mon Sep 17 00:00:00 2001 From: Vladimir Sadovnikov Date: Thu, 10 Oct 2024 19:28:09 +0300 Subject: [PATCH 3/5] Updated build scripts and dependencies --- make/configure.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/make/configure.mk b/make/configure.mk index d1d9fe8..a30e88b 100644 --- a/make/configure.mk +++ b/make/configure.mk @@ -69,9 +69,6 @@ else ) endif -$(info PKG_CONFIG = $(PKG_CONFIG)) -$(info HOST_PKG_CONFIG = $(HOST_PKG_CONFIG)) - define pkgconfig = $(eval name=$(1)) From 2428f7f8708fad9099df7db09b7a5e98bdbb5a7a Mon Sep 17 00:00:00 2001 From: Vladimir Sadovnikov Date: Sat, 12 Oct 2024 01:04:28 +0300 Subject: [PATCH 4/5] Updated build scripts and dependencies --- dependencies.mk | 6 +++--- modules.mk | 30 +++++++++++++++--------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dependencies.mk b/dependencies.mk index fa8fcc7..ebd9838 100644 --- a/dependencies.mk +++ b/dependencies.mk @@ -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 @@ -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 #------------------------------------------------------------------------------ @@ -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 diff --git a/modules.mk b/modules.mk index 6a75d42..56c1ea6 100644 --- a/modules.mk +++ b/modules.mk @@ -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 := git@github.com: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 := git@github.com: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 := git@github.com: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 := git@github.com: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 := git@github.com: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 := git@github.com: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 := git@github.com: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 := git@github.com: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 := git@github.com: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 := git@github.com: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 := git@github.com: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 := git@github.com: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 := git@github.com: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 := git@github.com: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 From 46b5757eca3993a3a091a6efc38d7ef12d949d55 Mon Sep 17 00:00:00 2001 From: Vladimir Sadovnikov Date: Sat, 12 Oct 2024 13:10:19 +0300 Subject: [PATCH 5/5] Preparing for release --- project.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.mk b/project.mk index 3c1758c..918b444 100644 --- a/project.mk +++ b/project.mk @@ -25,7 +25,7 @@ ARTIFACT_TYPE = plug ARTIFACT_DESC = LSP Audio Send Plugin ARTIFACT_HEADERS = lsp-plug.in ARTIFACT_EXPORT_HEADERS = 0 -ARTIFACT_VERSION = 1.0.1-devel +ARTIFACT_VERSION = 1.0.1