zepto-mirrors/meta-musicians
1
0
Fork 0
mirror of https://github.com/schnitzeltony/meta-musicians.git synced 2026-09-13 15:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

lsp-plugins: upgrade 1.1.9 -> 1.1.10

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2019-08-01 12:53:39 +02:00
parent 96d4e830df
commit 80a3855acd
6 changed files with 71 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
recipes-musicians/lsp-plugins/files/0001-Remove-RPATHs.patch
View File

@@ -14,20 +14,20 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/make/tools.mk b/scripts/make/tools.mk
index 0507fbc3..65953201 100644
index 2adb3c56..0d67881b 100644
--- a/scripts/make/tools.mk
+++ b/scripts/make/tools.mk
@@ -6,7 +6,7 @@ export LD ?= ld
@@ -22,7 +22,7 @@ export LD ?= $(TOOL_LD)
export MAKE_OPTS = -s
export CFLAGS += $(CC_ARCH) -std=c++98 -fdata-sections -pthread -ffunction-sections -fno-exceptions -fno-asynchronous-unwind-tables -Wall -pipe -fno-rtti $(CC_FLAGS) -DLSP_MAIN_VERSION=\"$(VERSION)\" -DLSP_INSTALL_PREFIX=\"$(PREFIX)\"
export CXXFLAGS += $(CC_ARCH) -std=c++98 -fdata-sections -pthread -ffunction-sections -fno-exceptions -fno-asynchronous-unwind-tables -Wall -pipe -fno-rtti $(CC_FLAGS) -DLSP_MAIN_VERSION=\"$(VERSION)\" -DLSP_INSTALL_PREFIX=\"$(PREFIX)\"
-export SO_FLAGS = $(CC_ARCH) -Wl,-rpath,$(LD_PATH) -Wl,-z,relro,-z,now -Wl,--gc-sections -shared -Llibrary -lc -fPIC
+export SO_FLAGS = $(CC_ARCH) -Wl,-z,relro,-z,now -Wl,--gc-sections -shared -Llibrary -lc -fPIC
export CXXFLAGS += $(CC_ARCH) -std=c++98 -fdata-sections -pthread -ffunction-sections -fno-exceptions -fno-asynchronous-unwind-tables -Wall -pipe -fno-rtti $(CC_FLAGS) -DLSP_MAIN_VERSION=\"$(VERSION)\" -DLSP_INSTALL_PREFIX=\"$(PREFIX)\"
-export SO_FLAGS = $(CC_ARCH) -Wl,-rpath,$(LD_PATH) $(FLAG_RELRO) -Wl,--gc-sections -shared -Llibrary -lc -fPIC
+export SO_FLAGS = $(CC_ARCH) $(FLAG_RELRO) -Wl,--gc-sections -shared -Llibrary -lc -fPIC
export MERGE_FLAGS = $(LD_ARCH) -r
-export EXE_TEST_FLAGS = $(LDFLAGS) $(CC_ARCH) -Wl,-rpath,$(LD_PATH)
-export EXE_FLAGS = $(LDFLAGS) $(CC_ARCH) -Wl,-rpath,$(LD_PATH) -Wl,-z,relro,-z,now -Wl,--gc-sections
-export EXE_FLAGS = $(LDFLAGS) $(CC_ARCH) -Wl,-rpath,$(LD_PATH) $(FLAG_RELRO) -Wl,--gc-sections
+export EXE_TEST_FLAGS = $(LDFLAGS) $(CC_ARCH)
+export EXE_FLAGS = $(LDFLAGS) $(CC_ARCH) -Wl,-z,relro,-z,now -Wl,--gc-sections
+export EXE_FLAGS = $(LDFLAGS) $(CC_ARCH) $(FLAG_RELRO) -Wl,--gc-sections
--
2.20.1
2.21.0

28
recipes-musicians/lsp-plugins/files/0002-Add-missing-dsp-in-SUBDIRS.patch Normal file
View File

@@ -0,0 +1,28 @@
From 3266ddbdd170cd7ce3847a5cb578131f3b7a9d68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Thu, 1 Aug 2019 12:23:59 +0200
Subject: [PATCH] Add missing dsp in SUBDIRS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
src/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Makefile b/src/Makefile
index a246ebda..17f390eb 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,4 +1,4 @@
-SUBDIRS = core metadata utils rendering
+SUBDIRS = core dsp metadata utils rendering
MODULES = $(SUBDIRS)
CONTAINER_DEPS = $(OBJ_METADATA) $(OBJ_CORE) $(UTL_FILES)
UTL_DEPS = $(OBJ_CORE) $(OBJ_DSP) $(OBJ_METADATA)
--
2.21.0

18
recipes-musicians/lsp-plugins/lsp-plugins-native/0001-Adjust-native-build.patch
View File

@@ -10,16 +10,16 @@ Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
src/utils/Makefile | 24 ++++++++----------------
2 files changed, 11 insertions(+), 19 deletions(-)
src/utils/Makefile | 26 +++++++++-----------------
1 file changed, 9 insertions(+), 17 deletions(-)
diff --git a/src/utils/Makefile b/src/utils/Makefile
index 0d9b57f9..c372c850 100644
index 37383b05..3cc76ca8 100644
--- a/src/utils/Makefile
+++ b/src/utils/Makefile
@@ -5,22 +5,14 @@ SUBDIRS =
OBJ_FILES = $(OBJ_CORE) $(OBJ_METADATA)
OBJ_LIBS = $(PTHREAD_LIBS) $(MATH_LIBS)
@@ -14,22 +14,14 @@ ifeq ($(LSP_TESTING),1)
OBJ_EXTRA += $(OBJ_TEST_CORE)
endif
-ifeq ($(findstring lv2,$(BUILD_MODULES)),lv2)
- MODULES += $(UTL_GENTTL)
@@ -42,12 +42,12 @@ index 0d9b57f9..c372c850 100644
+MODULES += $(UTL_VSTMAKE)
+FILELIST += vst_genmake.o
+MODULES += $(UTL_JACKMAKE)
+FILELIST += jack_genmake.o
+FILELIST += jack_genmake.o
+MODULES += $(UTL_GENPHP)
+FILELIST += gen_php.o
+FILELIST += gen_php.o
FILES = $(addprefix $(OBJDIR)/, $(FILELIST))
--
2.20.1
2.21.0

5
recipes-musicians/lsp-plugins/lsp-plugins.inc
View File

@@ -6,9 +6,10 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3000208d539ec061b899bce1d9ce9404"
SRC_URI = " \
gitsm://github.com/sadko4u/lsp-plugins.git \
file://0001-Remove-RPATHs.patch \
file://0002-Add-missing-dsp-in-SUBDIRS.patch \
"
SRCREV = "04cc45a4aee3bd3a46ecbd0a9160d0d87f8f8a32"
SRCREV = "543e17e9de3b8dc9de6e31438d1223d792054626"
S = "${WORKDIR}/git"
PV = "1.1.9"
PV = "1.1.10"
do_configure[noexec] = "1"

25
recipes-musicians/lsp-plugins/lsp-plugins/0001-Makefile-align-for-oe-cross-build.patch
View File

@@ -7,15 +7,15 @@ Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
Makefile | 10 ++++----
scripts/make/configure.mk | 52 ---------------------------------------
3 files changed, 8 insertions(+), 60 deletions(-)
Makefile | 10 +++----
scripts/make/configure.mk | 59 ---------------------------------------
2 files changed, 5 insertions(+), 64 deletions(-)
diff --git a/Makefile b/Makefile
index 314efa06..4f8ad82a 100644
index 189af3f5..52706983 100644
--- a/Makefile
+++ b/Makefile
@@ -61,11 +61,11 @@ export BIN_PROFILE = $(OBJDIR)/$(ARTIFACT_ID)-profile
@@ -60,11 +60,11 @@ export BIN_PROFILE = $(OBJDIR)/$(ARTIFACT_ID)-profile
export BIN_TEST = $(OBJDIR)/$(ARTIFACT_ID)-test
# Utils
@@ -33,10 +33,10 @@ index 314efa06..4f8ad82a 100644
# Files
diff --git a/scripts/make/configure.mk b/scripts/make/configure.mk
index 47aa3bd4..50d0b34b 100644
index ecb208c3..7b3e4a1d 100644
--- a/scripts/make/configure.mk
+++ b/scripts/make/configure.mk
@@ -50,58 +50,6 @@ export INSTALLATIONS
@@ -57,65 +57,6 @@ export INSTALLATIONS
export UNINSTALLATIONS
export RELEASES
@@ -68,6 +68,13 @@ index 47aa3bd4..50d0b34b 100644
- LD_PATH = /usr/lib:/lib:/usr/local/lib
-endif
-
-ifeq ($(BUILD_PLATFORM), BSD)
- ifeq ($(BUILD_PROFILE),arm)
- CC_ARCH = -marm -Wl,-rpath=/usr/local/lib/gcc8
- LD_PATH = /usr/local/lib/gcc8
- endif
-endif
-
-ifeq ($(BUILD_PROFILE),armv6a)
- CC_ARCH = -march=armv6-a -marm
- LD_PATH = /usr/lib64:/lib64:/usr/local/lib64
@@ -92,9 +99,9 @@ index 47aa3bd4..50d0b34b 100644
-export LD_ARCH
-export LD_PATH
-
export INCLUDE = -I"${CURDIR}/include"
# Dependencies: compile headers and linkage libraries
ifeq ($(BUILD_SYSTEM),Windows)
--
2.20.1
2.21.0

14
recipes-musicians/lsp-plugins/lsp-plugins/0002-Pass-LDFLAGS-to-so-lib-builds.patch
View File

@@ -12,18 +12,18 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/make/tools.mk b/scripts/make/tools.mk
index 65953201..cdbed99a 100644
index 0d67881b..18ba73fb 100644
--- a/scripts/make/tools.mk
+++ b/scripts/make/tools.mk
@@ -6,7 +6,7 @@ export LD ?= ld
@@ -22,7 +22,7 @@ export LD ?= $(TOOL_LD)
export MAKE_OPTS = -s
export CFLAGS += $(CC_ARCH) -std=c++98 -fdata-sections -pthread -ffunction-sections -fno-exceptions -fno-asynchronous-unwind-tables -Wall -pipe -fno-rtti $(CC_FLAGS) -DLSP_MAIN_VERSION=\"$(VERSION)\" -DLSP_INSTALL_PREFIX=\"$(PREFIX)\"
export CXXFLAGS += $(CC_ARCH) -std=c++98 -fdata-sections -pthread -ffunction-sections -fno-exceptions -fno-asynchronous-unwind-tables -Wall -pipe -fno-rtti $(CC_FLAGS) -DLSP_MAIN_VERSION=\"$(VERSION)\" -DLSP_INSTALL_PREFIX=\"$(PREFIX)\"
-export SO_FLAGS = $(CC_ARCH) -Wl,-z,relro,-z,now -Wl,--gc-sections -shared -Llibrary -lc -fPIC
+export SO_FLAGS = $(CC_ARCH) -Wl,-z,relro,-z,now -Wl,--gc-sections -shared -Llibrary -lc -fPIC $(LDFLAGS)
export CXXFLAGS += $(CC_ARCH) -std=c++98 -fdata-sections -pthread -ffunction-sections -fno-exceptions -fno-asynchronous-unwind-tables -Wall -pipe -fno-rtti $(CC_FLAGS) -DLSP_MAIN_VERSION=\"$(VERSION)\" -DLSP_INSTALL_PREFIX=\"$(PREFIX)\"
-export SO_FLAGS = $(CC_ARCH) $(FLAG_RELRO) -Wl,--gc-sections -shared -Llibrary -lc -fPIC
+export SO_FLAGS = $(CC_ARCH) $(FLAG_RELRO) -Wl,--gc-sections -shared -Llibrary -lc -fPIC $(LDFLAGS)
export MERGE_FLAGS = $(LD_ARCH) -r
export EXE_TEST_FLAGS = $(LDFLAGS) $(CC_ARCH)
export EXE_FLAGS = $(LDFLAGS) $(CC_ARCH) -Wl,-z,relro,-z,now -Wl,--gc-sections
export EXE_FLAGS = $(LDFLAGS) $(CC_ARCH) $(FLAG_RELRO) -Wl,--gc-sections
--
2.20.1
2.21.0