zepto-forks/meta-qt5-extra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

synthv1: Backport patches to fix build with recent lv2

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2019-01-19 01:17:14 +01:00
parent 7c5318db94
commit aeacb00053
4 changed files with 116 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
recipes-misc/recipes-multimedia/rncbc/synthv1/lv2-backport/0001-Comply-with-next-LV2-headers-location-post-1.14.0git.patch Normal file
View File

@@ -0,0 +1,44 @@
From 7ab340bb6029d8c5daa82b680d56f2242c6da7eb Mon Sep 17 00:00:00 2001
From: rncbc <rncbc@rncbc.org>
Date: Fri, 28 Dec 2018 17:05:50 +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 fb6e775..01a5f9b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -474,11 +474,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

38
recipes-misc/recipes-multimedia/rncbc/synthv1/lv2-backport/0002-Comply-with-next-LV2-headers-location-post-1.14.0git.patch Normal file
View File

@@ -0,0 +1,38 @@
From 954709b6561df3f9590bb1acdd5ce1aaa6aab964 Mon Sep 17 00:00:00 2001
From: rncbc <rncbc@rncbc.org>
Date: Fri, 28 Dec 2018 19:48:20 +0000
Subject: [PATCH 2/3] - Comply with next LV2 headers location post-1.14.0git.
(FIXED)
---
src/synthv1_lv2.h | 1 -
src/synthv1_lv2ui.h | 1 -
2 files changed, 2 deletions(-)
diff --git a/src/synthv1_lv2.h b/src/synthv1_lv2.h
index 2ca7f68..29707eb 100644
--- a/src/synthv1_lv2.h
+++ b/src/synthv1_lv2.h
@@ -24,7 +24,6 @@
#include "synthv1.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/synthv1_lv2ui.h b/src/synthv1_lv2ui.h
index 7887700..923abee 100644
--- a/src/synthv1_lv2ui.h
+++ b/src/synthv1_lv2ui.h
@@ -24,7 +24,6 @@
#include "synthv1_ui.h"
-#include "lv2.h"
#include "lv2/lv2plug.in/ns/extensions/ui/ui.h"
--
2.20.1

30
recipes-misc/recipes-multimedia/rncbc/synthv1/lv2-backport/0003-Comply-with-next-LV2-headers-location-post-1.14.0git.patch Normal file
View File

@@ -0,0 +1,30 @@
From d1a80bf13f17c1113b05a0630bb9391bcccbb116 Mon Sep 17 00:00:00 2001
From: rncbc <rncbc@rncbc.org>
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 01a5f9b..89e917f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -479,11 +479,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

4
recipes-misc/recipes-multimedia/rncbc/synthv1_0.9.4.bb
View File

@@ -20,6 +20,10 @@ SRC_URI = " \
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 \
\
file://synthv1.conf \
"
SRC_URI[md5sum] = "f909bfb55e3d23f7308478ab07477486"