fluidsynth-dssi: get sources from my git repo
* It contains sourceforge git (some fixes never made it into release) * Some commits ere added making life easier Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
@@ -1,38 +0,0 @@
|
||||
From a2e4120ec53f5ca9f2a99eb50644b031cf7f8317 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Fri, 30 Dec 2016 21:44:24 +0100
|
||||
Subject: [PATCH] replace missing AM_PATH_GTK by PKG_CHECK_MODULES
|
||||
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@googlemail.com>
|
||||
---
|
||||
configure.ac | 9 +--------
|
||||
1 file changed, 1 insertion(+), 8 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 365957d..c19335c 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -39,14 +39,7 @@ AC_ARG_WITH(gtk2, AC_HELP_STRING([--with-gtk2], [use GTK+ 2.0 default=yes]),
|
||||
[ if test $withval = "yes"; then try_gtk2=yes ;
|
||||
else try_gtk2=no ; fi ], try_gtk2=yes)
|
||||
with_gtk=no
|
||||
-dnl First look for GTK+ 2.x, unless '--without-gtk2' was specified.
|
||||
-if test "x${try_gtk2}" = 'xyes'; then
|
||||
- AM_PATH_GTK_2_0(2.0.0, with_gtk='yes (version 2.0)', with_gtk=no)
|
||||
-fi
|
||||
-dnl No GTK+ 2.x found, look for GTK+ 1.2 instead
|
||||
-if test "x${with_gtk}" = 'xno'; then
|
||||
- AM_PATH_GTK(1.2.0, with_gtk='yes (version 1.2)', AC_MSG_WARN([GUI will not be built because no version of GTK+ was found]))
|
||||
-fi
|
||||
+PKG_CHECK_MODULES(GTK, gtk+-2.0, with_gtk=yes, with_gtk=no)
|
||||
AM_CONDITIONAL(BUILD_GUI, test "x${with_gtk}" != 'xno')
|
||||
echo "GTK support: $with_gtk"
|
||||
|
||||
--
|
||||
2.5.5
|
||||
|
||||
@@ -1,125 +0,0 @@
|
||||
From d62316e8330d8824d4c3939de85656987348f1a8 Mon Sep 17 00:00:00 2001
|
||||
From: Sean Bolton <smbolton@users.sourceforge.net>
|
||||
Date: Sat, 24 Mar 2012 21:40:23 +0000
|
||||
Subject: [PATCH] * fsd_cleanup() bugfix from Rui Nuno Capela * MIDI sysex
|
||||
patch from Albert Graef * Use reentrant strtok_r()
|
||||
|
||||
Upstream-Status: Backport [1]
|
||||
|
||||
[1] https://sourceforge.net/p/dssi/fluidsynth-dssi/commit_browser
|
||||
|
||||
---
|
||||
ChangeLog | 7 +++++++
|
||||
src/FluidSynth-DSSI_gtk.c | 4 ++--
|
||||
src/fluidsynth-dssi.c | 22 ++++++++++++++++++++--
|
||||
src/locate_soundfont.c | 4 ++--
|
||||
4 files changed, 31 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/ChangeLog b/ChangeLog
|
||||
index 230f198..da6cf17 100644
|
||||
--- a/ChangeLog
|
||||
+++ b/ChangeLog
|
||||
@@ -1,3 +1,10 @@
|
||||
+20120324 CVS smbolton
|
||||
+ * Bug fix to fsd_cleanup() from Rui Nuno Capela, allowing eventual
|
||||
+ reinstantiation of FluidSynth (sf.net Tracker ID 1990241).
|
||||
+ * Patch from Albert Graef to pass sysex messages on to FluidSynth,
|
||||
+ allowing the use of MIDI Tuning Standard.
|
||||
+ * Fixed plugin to use reentrant strtok_r().
|
||||
+
|
||||
20090104 FluidSynth-DSSI v1.0.0 release
|
||||
* Version bump to 1.0.0.
|
||||
|
||||
diff --git a/src/FluidSynth-DSSI_gtk.c b/src/FluidSynth-DSSI_gtk.c
|
||||
index a00004f..88cfb38 100644
|
||||
--- a/src/FluidSynth-DSSI_gtk.c
|
||||
+++ b/src/FluidSynth-DSSI_gtk.c
|
||||
@@ -1,6 +1,6 @@
|
||||
/* FluidSynth DSSI software synthesizer GUI
|
||||
*
|
||||
- * Copyright (C) 2004-2008 Sean Bolton and others.
|
||||
+ * Copyright (C) 2004-2008, 2012 Sean Bolton and others.
|
||||
*
|
||||
* Portions of this file may have come from FluidSynth, copyright
|
||||
* (C) 2003 Peter Hanappe and others.
|
||||
@@ -1171,7 +1171,7 @@ main (int argc, char *argv[])
|
||||
gtk_set_locale ();
|
||||
gtk_init (&argc, &argv);
|
||||
|
||||
- if (!strcmp(argv[1], "-test")) {
|
||||
+ if (argc > 1 && !strcmp(argv[1], "-test")) {
|
||||
gui_test_mode = 1;
|
||||
test_argv[0] = argv[0];
|
||||
test_argv[1] = "osc.udp://localhost:9/test/mode";
|
||||
diff --git a/src/fluidsynth-dssi.c b/src/fluidsynth-dssi.c
|
||||
index 9e64e5c..6eea972 100644
|
||||
--- a/src/fluidsynth-dssi.c
|
||||
+++ b/src/fluidsynth-dssi.c
|
||||
@@ -1,6 +1,6 @@
|
||||
/* FluidSynth DSSI software synthesizer plugin
|
||||
*
|
||||
- * Copyright (C) 2004-2008 Sean Bolton and others.
|
||||
+ * Copyright (C) 2004-2008, 2012 Sean Bolton and others.
|
||||
*
|
||||
* Portions of this file may have come from Peter Hanappe's
|
||||
* Fluidsynth, copyright (C) 2003 Peter Hanappe and others.
|
||||
@@ -476,6 +476,8 @@ fsd_cleanup(LADSPA_Handle handle)
|
||||
}
|
||||
delete_fluid_synth(fsd_synth.fluid_synth);
|
||||
delete_fluid_settings(fsd_synth.fluid_settings);
|
||||
+ fsd_synth.fluid_synth = NULL;
|
||||
+ fsd_synth.fluid_settings = NULL;
|
||||
}
|
||||
free(instance);
|
||||
}
|
||||
@@ -771,8 +773,24 @@ fsd_handle_event(fsd_instance_t *instance, snd_seq_event_t *event)
|
||||
fluid_synth_pitch_bend(fsd_synth.fluid_synth, instance->channel,
|
||||
event->data.control.value + 8192);
|
||||
break;
|
||||
+ case SND_SEQ_EVENT_SYSEX: {
|
||||
+ /* sysex support (needed for MTS tuning messages) */
|
||||
+ /* contributed by Albert Graef */
|
||||
+ unsigned char *data = (unsigned char*)event->data.ext.ptr;
|
||||
+ unsigned int len = event->data.ext.len;
|
||||
+#if 0 /* enable for debugging output */
|
||||
+ unsigned int i;
|
||||
+ fprintf(stderr, "SYSEX:");
|
||||
+ for (i = 0; i < len; ++i)
|
||||
+ fprintf(stderr, " %02x", data[i]);
|
||||
+ fprintf(stderr, "\n");
|
||||
+#endif
|
||||
+ /* fluid_synth_sysex() expects the message without the f0 f7 bytes. */
|
||||
+ fluid_synth_sysex(fsd_synth.fluid_synth, data+1, len-2,
|
||||
+ NULL, NULL, NULL, 0);
|
||||
+ break;
|
||||
+ }
|
||||
/* SND_SEQ_EVENT_PGMCHANGE - shouldn't happen */
|
||||
- /* SND_SEQ_EVENT_SYSEX - shouldn't happen */
|
||||
/* SND_SEQ_EVENT_CONTROL14? */
|
||||
/* SND_SEQ_EVENT_NONREGPARAM? */
|
||||
/* SND_SEQ_EVENT_REGPARAM? */
|
||||
diff --git a/src/locate_soundfont.c b/src/locate_soundfont.c
|
||||
index 10747fc..50c4001 100644
|
||||
--- a/src/locate_soundfont.c
|
||||
+++ b/src/locate_soundfont.c
|
||||
@@ -32,7 +32,7 @@ char *
|
||||
fsd_locate_soundfont_file(const char *origpath, const char *projectDirectory)
|
||||
{
|
||||
struct stat statbuf;
|
||||
- char *sf2path, *path, *origPath, *element, *eltpath;
|
||||
+ char *sf2path, *path, *origPath, *element, *context, *eltpath;
|
||||
const char *filename;
|
||||
|
||||
if (stat(origpath, &statbuf) == 0)
|
||||
@@ -64,7 +64,7 @@ fsd_locate_soundfont_file(const char *origpath, const char *projectDirectory)
|
||||
|
||||
origPath = path;
|
||||
|
||||
- while ((element = strtok(path, ":")) != 0) {
|
||||
+ while ((element = strtok_r(path, ":", &context)) != 0) {
|
||||
|
||||
path = 0;
|
||||
|
||||
--
|
||||
2.9.5
|
||||
|
||||
@@ -13,13 +13,10 @@ DEPENDS += " \
|
||||
ladspa-sdk \
|
||||
"
|
||||
|
||||
SRC_URI = " \
|
||||
${SOURCEFORGE_MIRROR}/project/dssi/${BPN}/${PV}/${BPN}-${PV}.tar.gz \
|
||||
file://0001-replace-missing-AM_PATH_GTK-by-PKG_CHECK_MODULES.patch \
|
||||
file://0002-fsd_cleanup-bugfix-from-Rui-Nuno-Capela.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "6c9f660f0df4d2aad5076de75b2a0a67"
|
||||
SRC_URI[sha256sum] = "e734d06d7e6d056a58c611a62e80b7cc6306b810137d9a19e260612e942fe049"
|
||||
SRC_URI = "git://github.com/schnitzeltony/fluidsynth-dssi.git"
|
||||
SRCREV = "e3f4901ec07a957a19c9287a46b2f05da14f1f57"
|
||||
S = "${WORKDIR}/git"
|
||||
PV = "1.0.0+git${SRCPV}"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${libdir}/dssi \
|
||||
|
||||
Reference in New Issue
Block a user