drumkv1: upgrade 0.9.4 -> 0.9.5

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2019-03-05 17:16:35 +01:00
parent fa5d3644fb
commit 51b401d6d8
4 changed files with 2 additions and 118 deletions

View File

@@ -1,44 +0,0 @@
From a975905f5dc8f8135325f59e497787f05801a2c8 Mon Sep 17 00:00:00 2001
From: rncbc <rncbc@rncbc.org>
Date: Fri, 28 Dec 2018 17:06:09 +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 a8c1f32..563ada8 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

View File

@@ -1,38 +0,0 @@
From 24680511adcdf5a9d0ba417bd0bd561c2982920b Mon Sep 17 00:00:00 2001
From: rncbc <rncbc@rncbc.org>
Date: Fri, 28 Dec 2018 19:49:42 +0000
Subject: [PATCH 2/3] - Comply with next LV2 headers location post-1.14.0git.
(FIXED)
---
src/drumkv1_lv2.h | 1 -
src/drumkv1_lv2ui.h | 1 -
2 files changed, 2 deletions(-)
diff --git a/src/drumkv1_lv2.h b/src/drumkv1_lv2.h
index a651fbb..4a28a5e 100644
--- a/src/drumkv1_lv2.h
+++ b/src/drumkv1_lv2.h
@@ -24,7 +24,6 @@
#include "drumkv1.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/drumkv1_lv2ui.h b/src/drumkv1_lv2ui.h
index 4cf9c80..1fcdaf1 100644
--- a/src/drumkv1_lv2ui.h
+++ b/src/drumkv1_lv2ui.h
@@ -24,7 +24,6 @@
#include "drumkv1_ui.h"
-#include "lv2.h"
#include "lv2/lv2plug.in/ns/extensions/ui/ui.h"
--
2.20.1

View File

@@ -1,30 +0,0 @@
From 5414c76cd7e1e9ecb7a9a90b6b3cced49064117c 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 563ada8..fa9175c 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

View File

@@ -19,13 +19,9 @@ SRC_URI = " \
git://github.com/TuriSc/hydrogen2drumkv1.py.git;name=hydrogen2drumkv1;destsuffix=hydrogen2drumkv1 \
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] = "9cab2f1900698f543143675cd03450c7"
SRC_URI[sha256sum] = "c9ff3d10df3def095e07e94188814bf06c5e4ace6c68c7c13fa1f141e104410a"
SRC_URI[md5sum] = "826afa3fea4933f24d7e9988367a64b9"
SRC_URI[sha256sum] = "06151455568eb7de54834ca06ef95ce56ff7e29662459d40c99fe49c1fe6ffab"
SRCREV_hydrogen2drumkv1 = "4ca8af8f1433dce33f675ae68e95429c9eed084e"