From 819d492aa79087e36d0ec9bda5feb896466314e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sat, 19 Jan 2019 23:34:06 +0100 Subject: [PATCH] calf: Fix lv2 detection and build for recent LV2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- ...erdf-commandline-for-later-use-in-qe.patch | 0 ...ate-synth.dynamic-sample-loading-for.patch | 0 ...-Fix-detection-of-LV2-for-latest-git.patch | 36 ++++++++++ ...Find-headers-for-all-versions-of-LV2.patch | 71 +++++++++++++++++++ .../calf-studio-gear/calf_git.bb | 2 + 5 files changed, 109 insertions(+) rename recipes-misc/recipes-multimedia/calf-studio-gear/{files => calf}/0001-Do-store-calfmakerdf-commandline-for-later-use-in-qe.patch (100%) rename recipes-misc/recipes-multimedia/calf-studio-gear/{files => calf}/0002-fluidsynth-Activate-synth.dynamic-sample-loading-for.patch (100%) create mode 100644 recipes-misc/recipes-multimedia/calf-studio-gear/calf/0003-Fix-detection-of-LV2-for-latest-git.patch create mode 100644 recipes-misc/recipes-multimedia/calf-studio-gear/calf/0004-Find-headers-for-all-versions-of-LV2.patch diff --git a/recipes-misc/recipes-multimedia/calf-studio-gear/files/0001-Do-store-calfmakerdf-commandline-for-later-use-in-qe.patch b/recipes-misc/recipes-multimedia/calf-studio-gear/calf/0001-Do-store-calfmakerdf-commandline-for-later-use-in-qe.patch similarity index 100% rename from recipes-misc/recipes-multimedia/calf-studio-gear/files/0001-Do-store-calfmakerdf-commandline-for-later-use-in-qe.patch rename to recipes-misc/recipes-multimedia/calf-studio-gear/calf/0001-Do-store-calfmakerdf-commandline-for-later-use-in-qe.patch diff --git a/recipes-misc/recipes-multimedia/calf-studio-gear/files/0002-fluidsynth-Activate-synth.dynamic-sample-loading-for.patch b/recipes-misc/recipes-multimedia/calf-studio-gear/calf/0002-fluidsynth-Activate-synth.dynamic-sample-loading-for.patch similarity index 100% rename from recipes-misc/recipes-multimedia/calf-studio-gear/files/0002-fluidsynth-Activate-synth.dynamic-sample-loading-for.patch rename to recipes-misc/recipes-multimedia/calf-studio-gear/calf/0002-fluidsynth-Activate-synth.dynamic-sample-loading-for.patch diff --git a/recipes-misc/recipes-multimedia/calf-studio-gear/calf/0003-Fix-detection-of-LV2-for-latest-git.patch b/recipes-misc/recipes-multimedia/calf-studio-gear/calf/0003-Fix-detection-of-LV2-for-latest-git.patch new file mode 100644 index 00000000..a07f990b --- /dev/null +++ b/recipes-misc/recipes-multimedia/calf-studio-gear/calf/0003-Fix-detection-of-LV2-for-latest-git.patch @@ -0,0 +1,36 @@ +From 021850be25992b8a090182a05ad62660414c964f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sat, 19 Jan 2019 21:48:29 +0100 +Subject: [PATCH 1/2] Fix detection of LV2 for latest git +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +LV2 removed lv2-core.pc in [1]. So find lv2 and set required version to 1.1.4 +which was released in September 2016 and should be avalaible on most +environments. This should be compatible to LV2 1.1.14 because from pkg-config +point of view lv2-core.pc and lv2.pc look similar. + +[1] https://github.com/drobilla/lv2/commit/4db67120efca2d4c200d2e1ba5cf3d7b97cab97e + +Signed-off-by: Andreas Müller +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index b9c3d500..a0368773 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -79,7 +79,7 @@ if test "$JACK_FOUND" = "yes"; then + PKG_CHECK_MODULES(JACK_RENAME_PORT, jack >= 1.9.11, JACK_HAS_RENAME="yes", JACK_HAS_RENAME_DUMMY="no") + fi + +-PKG_CHECK_MODULES(LV2_DEPS, lv2core >= 6, LV2_FOUND="yes", LV2_FOUND="no") ++PKG_CHECK_MODULES(LV2_DEPS, lv2 >= 1.1.14, LV2_FOUND="yes", LV2_FOUND="no") + + PKG_CHECK_MODULES(LASH_DEPS, lash-1.0 >= 0.6.0, + AC_CHECK_LIB([lash], [lash_client_is_being_restored], LASH_0_6_FOUND="yes", LASH_0_6_FOUND="no"), +-- +2.20.1 + diff --git a/recipes-misc/recipes-multimedia/calf-studio-gear/calf/0004-Find-headers-for-all-versions-of-LV2.patch b/recipes-misc/recipes-multimedia/calf-studio-gear/calf/0004-Find-headers-for-all-versions-of-LV2.patch new file mode 100644 index 00000000..9fddc3bb --- /dev/null +++ b/recipes-misc/recipes-multimedia/calf-studio-gear/calf/0004-Find-headers-for-all-versions-of-LV2.patch @@ -0,0 +1,71 @@ +From 855cf20b9bb9fec30b72fa05a9b4cd28a1b4d35d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sat, 19 Jan 2019 23:00:49 +0100 +Subject: [PATCH 2/2] Find headers for all versions of LV2 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Andreas Müller +--- + src/calf/lv2_options.h | 2 +- + src/calf/lv2_ui.h | 2 +- + src/calf/lv2wrap.h | 2 +- + src/makerdf.cpp | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/calf/lv2_options.h b/src/calf/lv2_options.h +index 29568b8d..d66153da 100644 +--- a/src/calf/lv2_options.h ++++ b/src/calf/lv2_options.h +@@ -20,7 +20,7 @@ + #include + + #include "lv2_urid.h" +-#include "lv2.h" ++#include "lv2/lv2plug.in/ns/lv2core/lv2.h" + + #define LV2_OPTIONS_URI "http://lv2plug.in/ns/ext/options" + #define LV2_OPTIONS_PREFIX LV2_OPTIONS_URI "#" +diff --git a/src/calf/lv2_ui.h b/src/calf/lv2_ui.h +index b802ec59..c3e60822 100644 +--- a/src/calf/lv2_ui.h ++++ b/src/calf/lv2_ui.h +@@ -27,7 +27,7 @@ + + #include + +-#include "lv2.h" ++#include "lv2/lv2plug.in/ns/lv2core/lv2.h" + + #define LV2_UI_URI "http://lv2plug.in/ns/extensions/ui" + #define LV2_UI_PREFIX LV2_UI_URI "#" +diff --git a/src/calf/lv2wrap.h b/src/calf/lv2wrap.h +index 8d6b13c4..d19eae7b 100644 +--- a/src/calf/lv2wrap.h ++++ b/src/calf/lv2wrap.h +@@ -25,7 +25,7 @@ + + #include + #include +-#include ++#include "lv2/lv2plug.in/ns/lv2core/lv2.h" + #include + #include + #include +diff --git a/src/makerdf.cpp b/src/makerdf.cpp +index 0b6cec5c..9f782534 100644 +--- a/src/makerdf.cpp ++++ b/src/makerdf.cpp +@@ -22,7 +22,7 @@ + #include + #include + #if USE_LV2 +-#include ++#include "lv2/lv2plug.in/ns/lv2core/lv2.h" + #include + #include + #include +-- +2.20.1 + diff --git a/recipes-misc/recipes-multimedia/calf-studio-gear/calf_git.bb b/recipes-misc/recipes-multimedia/calf-studio-gear/calf_git.bb index 59f42dee..f8f5a005 100644 --- a/recipes-misc/recipes-multimedia/calf-studio-gear/calf_git.bb +++ b/recipes-misc/recipes-multimedia/calf-studio-gear/calf_git.bb @@ -10,6 +10,8 @@ SRC_URI = " \ git://github.com/calf-studio-gear/calf.git \ file://0001-Do-store-calfmakerdf-commandline-for-later-use-in-qe.patch \ file://0002-fluidsynth-Activate-synth.dynamic-sample-loading-for.patch \ + file://0003-Fix-detection-of-LV2-for-latest-git.patch \ + file://0004-Find-headers-for-all-versions-of-LV2.patch \ " SRCREV = "e5c08dc2483c444d18d24a37c395274002320f5c" S = "${WORKDIR}/git"