drumgizmo: upgrade 0.9.18.1 -> 0.9.19

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2021-01-08 17:09:59 +01:00
parent 7635a95f25
commit e51d616a4c
9 changed files with 50 additions and 83 deletions

View File

@@ -3,7 +3,7 @@ require ${BPN}.inc
inherit native
do_compile() {
${CXX} ${CXXFLAGS} -o ${S}/drumgizmo-rcgen ${S}/plugingui/rcgen.cc $(LDFLAGS)
${CXX} ${CXXFLAGS} -I${S}/getoptpp -o ${S}/drumgizmo-rcgen ${S}/plugingui/rcgen.cc ${LDFLAGS}
}
do_install() {

View File

@@ -20,7 +20,7 @@ SRC_URI += " \
file://0001-automake-enable-subdir-objects.patch \
file://0002-Use-native-rcgen.patch \
file://0003-Do-not-create-Manifest.ttl-with-cross-ttlgen.patch \
file://0004-Fix-build-with-lv2-1.1.18.patch \
file://0004-Do-not-perform-tests-they-don-t-work-cross.patch \
file://drumgizmo.desktop \
"

View File

@@ -4,6 +4,5 @@ LICENSE = "LGPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02"
SRC_URI = "http://www.drumgizmo.org/releases/${BPN}-${PV}/${BPN}-${PV}.tar.gz"
SRC_URI[md5sum] = "fb2340ab61062e0814f4539657dc14ec"
SRC_URI[sha256sum] = "67a2d9d4aa11ee92f000cc8a49710408c2328b2581a5339be3cbfe91d99feb2e"
PV = "0.9.18.1"
SRC_URI[sha256sum] = "7426f38b58fbb82d3eada60c204d74e6c5de31ef424c017e3f890117e146a2a3"
PV = "0.9.19"

View File

@@ -14,18 +14,18 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plugingui/Makefile.am b/plugingui/Makefile.am
index dd36783..ca30e84 100644
index d102024..8a4a677 100644
--- a/plugingui/Makefile.am
+++ b/plugingui/Makefile.am
@@ -28,7 +28,7 @@ RES = \
../COPYING
@@ -71,7 +71,7 @@ BUILT_SOURCES = \
$(NLS_RES)
resource_data.cc : rcgen $(RES)
- ./rcgen $(RES) > resource_data.cc
+ drumgizmo-rcgen $(RES) > resource_data.cc
resource_data.cc: rcgen$(EXEEXT) $(RES) $(NLS_RES)
- $(rcgen_verbose)./rcgen$(EXEEXT) -s $(top_srcdir)/plugingui/ -s $(top_builddir)/plugingui/ -o $@ $(RES) $(NLS_RES)
+ drumgizmo-rcgen -s $(top_srcdir)/plugingui/ -s $(top_builddir)/plugingui/ -o $@ $(RES) $(NLS_RES)
libdggui_la_CPPFLAGS = \
$(GUI_CPPFLAGS) \
CLEANFILES = \
resource_data.cc \
--
2.14.3
2.26.2

View File

@@ -14,18 +14,18 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plugin/Makefile.am b/plugin/Makefile.am
index 6c0d324..5b36f21 100644
index f382acc..2181854 100644
--- a/plugin/Makefile.am
+++ b/plugin/Makefile.am
@@ -66,7 +66,7 @@ UITYPE=CocoaUI
endif
@@ -75,7 +75,7 @@ ttlgen_verbose_ = $(ttlgen_verbose_@AM_DEFAULT_V@)
ttlgen_verbose_0 = @echo " TTLGEN "$@;
manifest.ttl : ttlgen drumgizmo.la
- ./ttlgen .libs/drumgizmo.so manifest.ttl $(UITYPE)
+ echo ./ttlgen .libs/drumgizmo.so manifest.ttl $(UITYPE)
- $(ttlgen_verbose)./ttlgen .libs/drumgizmo.so manifest.ttl $(UITYPE) > /dev/null
+ echo $(ttlgen_verbose)./ttlgen .libs/drumgizmo.so manifest.ttl $(UITYPE) > /dev/null
#######
--
2.21.0
2.26.2

View File

@@ -0,0 +1,31 @@
From 15eefcf7d4db242b1bc00db00194475646d4313d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Fri, 8 Jan 2021 17:00:44 +0100
Subject: [PATCH] Do not perform tests - they don't work cross
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [oe-specific]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 4196db7..87c401e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS = gnu
-SUBDIRS = tools src plugingui plugin drumgizmo man test
-DISTDIRS = tools src plugingui plugin drumgizmo man test
+SUBDIRS = tools src plugingui plugin drumgizmo man
+DISTDIRS = tools src plugingui plugin drumgizmo man
EXTRA_DIST = \
version.h \
--
2.26.2

View File

@@ -1,63 +0,0 @@
From 69a7bfe770436964140d310288991dfb08c42ff9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Thu, 21 May 2020 22:48:18 +0200
Subject: [PATCH] Fix build with lv2 >= 1.1.18
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
plugin/plugingizmo/pluginlv2.cc | 4 ++--
plugin/plugingizmo/pluginlv2.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/plugin/plugingizmo/pluginlv2.cc b/plugin/plugingizmo/pluginlv2.cc
index d12c0e7..afcd7ab 100644
--- a/plugin/plugingizmo/pluginlv2.cc
+++ b/plugin/plugingizmo/pluginlv2.cc
@@ -86,7 +86,7 @@ void PluginLV2::setLatency(float latency)
}
}
-LV2_Handle PluginLV2::instantiate(const struct _LV2_Descriptor* descriptor,
+LV2_Handle PluginLV2::instantiate(const struct LV2_Descriptor* descriptor,
double sample_rate,
const char* bundle_path,
const LV2_Feature *const *features)
@@ -616,7 +616,7 @@ const void* PluginLV2::extensionData(const char *uri)
//
// GUI
//
-LV2UI_Handle PluginLV2::uiInstantiate(const struct _LV2UI_Descriptor*descriptor,
+LV2UI_Handle PluginLV2::uiInstantiate(const struct LV2UI_Descriptor*descriptor,
const char * plugin_uri,
const char * bundle_path,
LV2UI_Write_Function write_function,
diff --git a/plugin/plugingizmo/pluginlv2.h b/plugin/plugingizmo/pluginlv2.h
index 8365de7..3955710 100644
--- a/plugin/plugingizmo/pluginlv2.h
+++ b/plugin/plugingizmo/pluginlv2.h
@@ -192,7 +192,7 @@ public:
void closeWindow() override;
public:
- static LV2_Handle instantiate(const struct _LV2_Descriptor* descriptor,
+ static LV2_Handle instantiate(const struct LV2_Descriptor* descriptor,
double sample_rate,
const char* bundle_path,
const LV2_Feature* const * features);
@@ -222,7 +222,7 @@ public:
uint32_t flags,
const LV2_Feature *const * features);
- static LV2UI_Handle uiInstantiate(const struct _LV2UI_Descriptor * descriptor,
+ static LV2UI_Handle uiInstantiate(const struct LV2UI_Descriptor * descriptor,
const char * plugin_uri,
const char * bundle_path,
LV2UI_Write_Function write_function,
--
2.21.1