Skip to content

Commit f46fe2d

Browse files
committed
Release 1.0.26
* Updated build scripts. * Updated module versions in dependencies.
2 parents 274b0b4 + ee52ba4 commit f46fe2d

File tree

6 files changed

+32
-10
lines changed

6 files changed

+32
-10
lines changed

CHANGELOG

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

5+
=== 1.0.26 ===
6+
* Updated build scripts.
7+
* Updated module versions in dependencies.
8+
59
=== 1.0.25 ===
610
* Several updates of the dspu::LoudnessMeter module.
711
* Bugfixes and improvements in shared memory catalog and clients.

include/lsp-plug.in/dsp-units/version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
// Define version of headers
2626
#define LSP_DSP_UNITS_MAJOR 1
2727
#define LSP_DSP_UNITS_MINOR 0
28-
#define LSP_DSP_UNITS_MICRO 25
28+
#define LSP_DSP_UNITS_MICRO 26
2929

3030
#if defined(LSP_DSP_UNITS_PUBLISHER)
3131
#define LSP_DSP_UNITS_PUBLIC LSP_EXPORT_MODIFIER

make/configure.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ MERGED_DEPENDENCIES := \
4949
$(TEST_DEPENDENCIES)
5050
UNIQ_MERGED_DEPENDENCIES := $(call uniq, $(MERGED_DEPENDENCIES))
5151
DEPENDENCIES = $(UNIQ_MERGED_DEPENDENCIES)
52-
FEATURES := $(sort $(call subtraction,$(SUB_FEATURES),$(DEFAULT_FEATURES) $(ADD_FEATURES)))
52+
BUILD_FEATURES := $(sort $(call subtraction,$(SUB_FEATURES),$(if $(FEATURES),$(FEATURES),$(DEFAULT_FEATURES)) $(ADD_FEATURES)))
5353

5454
# Determine versions
5555
ifeq ($(findstring -devel,$(ARTIFACT_VERSION)),-devel)
@@ -270,7 +270,7 @@ $(CONFIG_VARS): prepare
270270
config: $(CONFIG_VARS)
271271
echo "Host architecture: $(HOST_ARCHITECTURE_FAMILY)/$(HOST_ARCHITECTURE) ($(HOST_ARCHITECTURE_CFLAGS))"
272272
echo "Architecture: $(ARCHITECTURE_FAMILY)/$(ARCHITECTURE) ($(ARCHITECTURE_CFLAGS))"
273-
echo "Features: $(FEATURES)"
273+
echo "Features: $(BUILD_FEATURES)"
274274
echo "Configured OK"
275275

276276
help: | pathvars toolvars sysvars

make/system.mk

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,17 @@ else
5353
endif
5454
BUILD_ARCH := $(if $(ARCHITECTURE),$(ARCHITECTURE),$(HOST_BUILD_ARCH))
5555

56+
ifeq ($(PLATFORM),Linux)
57+
OBJ_LDFLAGS_X86 = -m elf_i386
58+
OBJ_LDFLAGS_X86_64 = -m elf_x86_64
59+
else ifeq ($(PLATFORM),BSD)
60+
OBJ_LDFLAGS_X86 = -m elf_i386
61+
OBJ_LDFLAGS_X86_64 = -m elf_x86_64
62+
else ifeq ($(PLATFORM),Windows)
63+
OBJ_LDFLAGS_X86 = -m i386pe
64+
OBJ_LDFLAGS_X86_64 = -m i386pep
65+
endif
66+
5667
# Set actual architecture for HOST and TARGET builds
5768
# The current architecture can be obtained by: gcc -Q --help=target
5869
define detect_architecture =
@@ -100,30 +111,37 @@ define detect_architecture =
100111
$(2)_NAME = x86_64
101112
$(2)_FAMILY = x86_64
102113
$(2)_CFLAGS := -march=x86-64 -m64
114+
$(2)_LDFLAGS := $(OBJ_LDFLAGS_X86_64)
103115
else ifeq ($(patsubst %amd64%,amd64,$(1)),amd64)
104116
$(2)_NAME = x86_64
105117
$(2)_FAMILY = x86_64
106118
$(2)_CFLAGS := -march=x86-64 -m64
119+
$(2)_LDFLAGS := $(OBJ_LDFLAGS_X86_64)
107120
else ifeq ($(patsubst %AMD64%,AMD64,$(1)),AMD64)
108121
$(2)_NAME = x86_64
109122
$(2)_FAMILY = x86_64
110123
$(2)_CFLAGS := -march=x86-64 -m64
124+
$(2)_LDFLAGS := $(OBJ_LDFLAGS_X86_64)
111125
else ifeq ($(1),i86pc)
112126
$(2)_NAME = x86_64
113127
$(2)_FAMILY = x86_64
114128
$(2)_CFLAGS := -march=x86-64 -m64
129+
$(2)_LDFLAGS := $(OBJ_LDFLAGS_X86_64)
115130
else ifeq ($(patsubst %i686%,i686,$(1)),i686)
116131
$(2)_NAME = i686
117132
$(2)_FAMILY = ia32
118133
$(2)_CFLAGS := -march=i686 -m32
134+
$(2)_LDFLAGS := $(OBJ_LDFLAGS_X86)
119135
else ifeq ($(patsubst i%86,i586,$(1)),i586)
120136
$(2)_NAME = i586
121137
$(2)_FAMILY = ia32
122138
$(2)_CFLAGS := -march=i586 -m32
139+
$(2)_LDFLAGS := $(OBJ_LDFLAGS_X86)
123140
else ifeq ($(1),x86)
124141
$(2)_NAME = i686
125142
$(2)_FAMILY = ia32
126143
$(2)_CFLAGS := -march=i686 -m32
144+
$(2)_LDFLAGS := $(OBJ_LDFLAGS_X86)
127145
else ifeq ($(1),riscv32)
128146
$(2)_NAME = riscv32
129147
$(2)_FAMILY = riscv32
@@ -191,11 +209,11 @@ COMMON_VARS = \
191209
ARCHITECTURE \
192210
ARCHITECTURE_FAMILY \
193211
ARCHITECTURE_CFLAGS \
212+
BUILD_FEATURES \
194213
CROSS_COMPILE \
195214
DEBUG \
196215
EXECUTABLE_EXT \
197216
EXPORT_SYMBOLS \
198-
FEATURES \
199217
HOST_ARCHITECTURE \
200218
HOST_ARCHITECTURE_FAMILY \
201219
HOST_ARCHITECTURE_CFLAGS \

modules.mk

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,31 +20,31 @@
2020

2121
#------------------------------------------------------------------------------
2222
# Variables that describe source code dependencies
23-
LSP_COMMON_LIB_VERSION := 1.0.38
23+
LSP_COMMON_LIB_VERSION := 1.0.39
2424
LSP_COMMON_LIB_NAME := lsp-common-lib
2525
LSP_COMMON_LIB_TYPE := src
2626
LSP_COMMON_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_COMMON_LIB_NAME).git
2727
LSP_COMMON_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_COMMON_LIB_NAME).git
2828

29-
LSP_DSP_LIB_VERSION := 1.0.26
29+
LSP_DSP_LIB_VERSION := 1.0.27
3030
LSP_DSP_LIB_NAME := lsp-dsp-lib
3131
LSP_DSP_LIB_TYPE := src
3232
LSP_DSP_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_DSP_LIB_NAME).git
3333
LSP_DSP_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_DSP_LIB_NAME).git
3434

35-
LSP_LLTL_LIB_VERSION := 1.0.21
35+
LSP_LLTL_LIB_VERSION := 1.0.22
3636
LSP_LLTL_LIB_NAME := lsp-lltl-lib
3737
LSP_LLTL_LIB_TYPE := src
3838
LSP_LLTL_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_LLTL_LIB_NAME).git
3939
LSP_LLTL_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_LLTL_LIB_NAME).git
4040

41-
LSP_RUNTIME_LIB_VERSION := 1.0.24
41+
LSP_RUNTIME_LIB_VERSION := 1.0.25
4242
LSP_RUNTIME_LIB_NAME := lsp-runtime-lib
4343
LSP_RUNTIME_LIB_TYPE := src
4444
LSP_RUNTIME_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_RUNTIME_LIB_NAME).git
4545
LSP_RUNTIME_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_RUNTIME_LIB_NAME).git
4646

47-
LSP_TEST_FW_VERSION := 1.0.27
47+
LSP_TEST_FW_VERSION := 1.0.28
4848
LSP_TEST_FW_NAME := lsp-test-fw
4949
LSP_TEST_FW_TYPE := src
5050
LSP_TEST_FW_URL_RO := https://github.com/lsp-plugins/$(LSP_TEST_FW_NAME).git

project.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ ARTIFACT_ID = LSP_DSP_UNITS
2323
ARTIFACT_NAME = lsp-dsp-units
2424
ARTIFACT_DESC = High-level classes for performing DSP
2525
ARTIFACT_HEADERS = lsp-plug.in
26-
ARTIFACT_VERSION = 1.0.25
26+
ARTIFACT_VERSION = 1.0.26
2727

0 commit comments

Comments
 (0)