From f59db75ed40a091ac8e17f01bd91ad516bfba5fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sat, 19 Jan 2019 01:10:05 +0100 Subject: [PATCH] samplv1: Backport patches to fix build with recent lv2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- ...-LV2-headers-location-post-1.14.0git.patch | 44 +++++++++++++++++++ ...-LV2-headers-location-post-1.14.0git.patch | 38 ++++++++++++++++ ...-LV2-headers-location-post-1.14.0git.patch | 30 +++++++++++++ .../recipes-multimedia/rncbc/samplv1_0.9.4.bb | 4 ++ 4 files changed, 116 insertions(+) create mode 100644 recipes-misc/recipes-multimedia/rncbc/samplv1/lv2-backport/0001-Comply-with-next-LV2-headers-location-post-1.14.0git.patch create mode 100644 recipes-misc/recipes-multimedia/rncbc/samplv1/lv2-backport/0002-Comply-with-next-LV2-headers-location-post-1.14.0git.patch create mode 100644 recipes-misc/recipes-multimedia/rncbc/samplv1/lv2-backport/0003-Comply-with-next-LV2-headers-location-post-1.14.0git.patch diff --git a/recipes-misc/recipes-multimedia/rncbc/samplv1/lv2-backport/0001-Comply-with-next-LV2-headers-location-post-1.14.0git.patch b/recipes-misc/recipes-multimedia/rncbc/samplv1/lv2-backport/0001-Comply-with-next-LV2-headers-location-post-1.14.0git.patch new file mode 100644 index 00000000..d0387b63 --- /dev/null +++ b/recipes-misc/recipes-multimedia/rncbc/samplv1/lv2-backport/0001-Comply-with-next-LV2-headers-location-post-1.14.0git.patch @@ -0,0 +1,44 @@ +From 2d1e5bb9364a4badef83680b2fef6a6ab2b9c84e Mon Sep 17 00:00:00 2001 +From: rncbc +Date: Fri, 28 Dec 2018 17:05:54 +0000 +Subject: [PATCH 1/3] - Comply with next LV2 headers location post-1.14.0git. + (EXPERIMENTAL) + +--- + configure.ac | 20 +++++++++++++++----- + 1 file changed, 15 insertions(+), 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 59de619..f25cd69 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -492,11 +492,21 @@ fi + + # Check for LV2 headers. + if test "x$ac_lv2" = "xyes"; then +- AC_CHECK_HEADERS(lv2.h \ +- lv2/lv2plug.in/ns/ext/atom/atom.h \ +- lv2/lv2plug.in/ns/ext/atom/forge.h \ +- lv2/lv2plug.in/ns/ext/atom/util.h, +- [ac_lv2="yes"], [ac_lv2="no"]) ++ PKG_CHECK_MODULES([LV2], [lv2], [ac_lv2="yes"], [ac_lv2="no"]) ++ if test "x$ac_lv2" = "xyes"; then ++ ac_lv2 cflags="$ac_lv2_cflags $LV2_CFLAGS" ++ CFLAGS="$CFLAGS $LV2_CFLAGS" ++ CPPFLAGS="$CPPFLAGS $LV2_CFLAGS" ++ else ++ AC_CHECK_HEADER(lv2/lv2.h, [ac_lv2="yes"], [ac_lv2="no"]) ++ fi ++ if test "x$ac_lv2" = "xyes"; then ++ AC_CHECK_HEADERS( ++ lv2/lv2plug.in/ns/ext/atom/atom.h \ ++ lv2/lv2plug.in/ns/ext/atom/forge.h \ ++ lv2/lv2plug.in/ns/ext/atom/util.h, ++ [ac_lv2="yes"], [ac_lv2="no"]) ++ fi + if test "x$ac_lv2" = "xyes"; then + AC_DEFINE(CONFIG_LV2, 1, [Define if LV2 plug-in build is enabled.]) + ac_all_targets="lv2 $ac_all_targets" +-- +2.20.1 + diff --git a/recipes-misc/recipes-multimedia/rncbc/samplv1/lv2-backport/0002-Comply-with-next-LV2-headers-location-post-1.14.0git.patch b/recipes-misc/recipes-multimedia/rncbc/samplv1/lv2-backport/0002-Comply-with-next-LV2-headers-location-post-1.14.0git.patch new file mode 100644 index 00000000..d1cba787 --- /dev/null +++ b/recipes-misc/recipes-multimedia/rncbc/samplv1/lv2-backport/0002-Comply-with-next-LV2-headers-location-post-1.14.0git.patch @@ -0,0 +1,38 @@ +From 8d5aad3a78f65f737c05900e0027179764d6b42b Mon Sep 17 00:00:00 2001 +From: rncbc +Date: Fri, 28 Dec 2018 19:49:36 +0000 +Subject: [PATCH 2/3] - Comply with next LV2 headers location post-1.14.0git. + (FIXED) + +--- + src/samplv1_lv2.h | 1 - + src/samplv1_lv2ui.h | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/src/samplv1_lv2.h b/src/samplv1_lv2.h +index 2754b5e..76895de 100644 +--- a/src/samplv1_lv2.h ++++ b/src/samplv1_lv2.h +@@ -24,7 +24,6 @@ + + #include "samplv1.h" + +-#include "lv2.h" + #include "lv2/lv2plug.in/ns/ext/urid/urid.h" + #include "lv2/lv2plug.in/ns/ext/atom/atom.h" + #include "lv2/lv2plug.in/ns/ext/atom/forge.h" +diff --git a/src/samplv1_lv2ui.h b/src/samplv1_lv2ui.h +index 74257ab..7ac9751 100644 +--- a/src/samplv1_lv2ui.h ++++ b/src/samplv1_lv2ui.h +@@ -24,7 +24,6 @@ + + #include "samplv1_ui.h" + +-#include "lv2.h" + #include "lv2/lv2plug.in/ns/extensions/ui/ui.h" + + +-- +2.20.1 + diff --git a/recipes-misc/recipes-multimedia/rncbc/samplv1/lv2-backport/0003-Comply-with-next-LV2-headers-location-post-1.14.0git.patch b/recipes-misc/recipes-multimedia/rncbc/samplv1/lv2-backport/0003-Comply-with-next-LV2-headers-location-post-1.14.0git.patch new file mode 100644 index 00000000..05aed582 --- /dev/null +++ b/recipes-misc/recipes-multimedia/rncbc/samplv1/lv2-backport/0003-Comply-with-next-LV2-headers-location-post-1.14.0git.patch @@ -0,0 +1,30 @@ +From 2809cd94274b418e5d5223fe4aaf837e50b42db1 Mon Sep 17 00:00:00 2001 +From: rncbc +Date: Fri, 28 Dec 2018 21:44:57 +0000 +Subject: [PATCH 3/3] - Comply with next LV2 headers location post-1.14.0git. + (FIXED+) + +--- + configure.ac | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index f25cd69..36ac09d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -497,11 +497,10 @@ if test "x$ac_lv2" = "xyes"; then + ac_lv2 cflags="$ac_lv2_cflags $LV2_CFLAGS" + CFLAGS="$CFLAGS $LV2_CFLAGS" + CPPFLAGS="$CPPFLAGS $LV2_CFLAGS" +- else +- AC_CHECK_HEADER(lv2/lv2.h, [ac_lv2="yes"], [ac_lv2="no"]) + fi + if test "x$ac_lv2" = "xyes"; then + AC_CHECK_HEADERS( ++ lv2/lv2plug.in/ns/ext/urid/urid.h \ + lv2/lv2plug.in/ns/ext/atom/atom.h \ + lv2/lv2plug.in/ns/ext/atom/forge.h \ + lv2/lv2plug.in/ns/ext/atom/util.h, +-- +2.20.1 + diff --git a/recipes-misc/recipes-multimedia/rncbc/samplv1_0.9.4.bb b/recipes-misc/recipes-multimedia/rncbc/samplv1_0.9.4.bb index e8ecd657..40ec9177 100644 --- a/recipes-misc/recipes-multimedia/rncbc/samplv1_0.9.4.bb +++ b/recipes-misc/recipes-multimedia/rncbc/samplv1_0.9.4.bb @@ -17,6 +17,10 @@ SRC_URI = " \ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \ file://0001-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \ file://0002-Remove-extra-rpath.patch \ + \ + file://lv2-backport/0001-Comply-with-next-LV2-headers-location-post-1.14.0git.patch \ + file://lv2-backport/0002-Comply-with-next-LV2-headers-location-post-1.14.0git.patch \ + file://lv2-backport/0003-Comply-with-next-LV2-headers-location-post-1.14.0git.patch \ " SRC_URI[md5sum] = "7976e61b9db5fd7acd4a777b81faec1b" SRC_URI[sha256sum] = "8dea62391c207dd1196d4e0aa0866d84f3b3e7f878a03e16091ad21b290d469d"