From b99db57abe04d6fdeb363186d587e3f9a680b305 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Thu, 24 Jun 2021 21:33:04 +0200
Subject: [PATCH] lsp-plugins: upgrade 1.1.26 -> 1.1.30
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
(cherry picked from commit 03afb76dc600ec211ece6603cdb754b2d6f8a0a1)
---
 .../0001-Adjust-native-build.patch             | 18 ++++++++++--------
 recipes-musicians/lsp-plugins/lsp-plugins.inc  |  4 ++--
 ...001-Makefile-align-for-oe-cross-build.patch | 14 +++++++-------
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/recipes-musicians/lsp-plugins/lsp-plugins-native/0001-Adjust-native-build.patch b/recipes-musicians/lsp-plugins/lsp-plugins-native/0001-Adjust-native-build.patch
index 647d6a7..3c840b8 100644
--- a/recipes-musicians/lsp-plugins/lsp-plugins-native/0001-Adjust-native-build.patch
+++ b/recipes-musicians/lsp-plugins/lsp-plugins-native/0001-Adjust-native-build.patch
@@ -10,20 +10,21 @@ Upstream-Status: Inappropriate [embedded specific]
 
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 ---
- src/utils/Makefile | 26 +++++++++-----------------
- 1 file changed, 9 insertions(+), 17 deletions(-)
+ src/utils/Makefile | 28 ++++++++++------------------
+ 1 file changed, 10 insertions(+), 18 deletions(-)
 
 diff --git a/src/utils/Makefile b/src/utils/Makefile
-index 37383b05..3cc76ca8 100644
+index 88b37393..b6d4e7a5 100644
 --- a/src/utils/Makefile
 +++ b/src/utils/Makefile
-@@ -14,22 +14,14 @@ ifeq ($(LSP_TESTING),1)
+@@ -15,23 +15,15 @@ ifeq ($(LSP_TESTING),1)
    OBJ_EXTRA              += $(OBJ_TEST_CORE)
  endif
  
 -ifeq ($(findstring lv2,$(BUILD_MODULES)),lv2)
 -  MODULES                += $(UTL_GENTTL)
 -  FILELIST               += lv2_genttl.o
+-  INCLUDE_EXTRA          += $(LV2_HEADERS)
 -endif
 -ifeq ($(findstring vst,$(BUILD_MODULES)),vst)
 -  MODULES                += $(UTL_VSTMAKE)
@@ -31,20 +32,21 @@ index 37383b05..3cc76ca8 100644
 -endif
 -ifeq ($(findstring jack,$(BUILD_MODULES)),jack)
 -  MODULES                += $(UTL_JACKMAKE)
--  FILELIST               += jack_genmake.o 
+-  FILELIST               += jack_genmake.o
 -endif
 -ifeq ($(findstring doc,$(BUILD_MODULES)),doc)
 -  MODULES                += $(UTL_GENPHP)
--  FILELIST               += gen_php.o 
+-  FILELIST               += gen_php.o
 -endif
 +MODULES                += $(UTL_GENTTL)
 +FILELIST               += lv2_genttl.o
++INCLUDE_EXTRA          += $(LV2_HEADERS)
 +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))
  
diff --git a/recipes-musicians/lsp-plugins/lsp-plugins.inc b/recipes-musicians/lsp-plugins/lsp-plugins.inc
index 8f35a6b..8e4fc11 100644
--- a/recipes-musicians/lsp-plugins/lsp-plugins.inc
+++ b/recipes-musicians/lsp-plugins/lsp-plugins.inc
@@ -7,9 +7,9 @@ SRC_URI = " \
     gitsm://github.com/sadko4u/lsp-plugins.git \
     file://0001-Add-missing-dsp-in-SUBDIRS.patch \
 "
-SRCREV = "ad2720345ce5dffb45f871146de1ae6d16f4c73d"
+SRCREV = "d78befc2faaa6de64050c3c4b662dea429e47c40"
 S = "${WORKDIR}/git"
-PV = "1.1.26"
+PV = "1.1.30"
 
 do_configure[noexec] = "1"
 
diff --git a/recipes-musicians/lsp-plugins/lsp-plugins/0001-Makefile-align-for-oe-cross-build.patch b/recipes-musicians/lsp-plugins/lsp-plugins/0001-Makefile-align-for-oe-cross-build.patch
index 89ca6b8..9cf0995 100644
--- a/recipes-musicians/lsp-plugins/lsp-plugins/0001-Makefile-align-for-oe-cross-build.patch
+++ b/recipes-musicians/lsp-plugins/lsp-plugins/0001-Makefile-align-for-oe-cross-build.patch
@@ -33,10 +33,10 @@ index 189af3f5..52706983 100644
  
  # Files
 diff --git a/scripts/make/configure.mk b/scripts/make/configure.mk
-index e2d3d58a..660c1b5a 100644
+index 09aee9a0..5a796e85 100644
 --- a/scripts/make/configure.mk
 +++ b/scripts/make/configure.mk
-@@ -57,69 +57,6 @@ export INSTALLATIONS
+@@ -58,69 +58,8 @@ export INSTALLATIONS
  export UNINSTALLATIONS
  export RELEASES
  
@@ -66,6 +66,7 @@ index e2d3d58a..660c1b5a 100644
 -endif
 -
 -ifeq ($(BUILD_PLATFORM), BSD)
+-  INCLUDE          += -I/usr/local/include
 -  ifeq ($(BUILD_PROFILE),arm)
 -    CC_ARCH          = -marm
 -    ifneq ($(LD_PATH),)
@@ -97,15 +98,14 @@ index e2d3d58a..660c1b5a 100644
 -ifeq ($(BUILD_PROFILE),aarch64)
 -  CC_ARCH          = -march=armv8-a
 -endif
--
--
+ 
+ 
 -export CC_ARCH
 -export LD_ARCH
 -export LD_PATH
--
- export INCLUDE     = -I"${CURDIR}/include"
+ export INCLUDE
  
  # Dependencies: compile headers and linkage libraries
 -- 
-2.21.0
+2.26.2