pool/fluidsynth
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 639128 from home:alois:branches:multimedia:libs

Browse Source 
- Backported fluidsynth-last_client-reuse-fix.patch from master
  (qsynth crashes without it)

OBS-URL: https://build.opensuse.org/request/show/639128
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/fluidsynth?expand=0&rev=51
This commit is contained in:
Tomáš Chvátal 2018-10-04 08:58:46 +00:00 committed by Git OBS Bridge
parent a99051d3e9
commit 2c61f17af3
3 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
fluidsynth-last_client-reuse-fix.patch Normal file
View File

@ -0,0 +1,31 @@
From 99e235e27979e6c132870dc48f45cd9b3fa8dcdf Mon Sep 17 00:00:00 2001
From: rncbc <rncbc@rncbc.org>
Date: Thu, 20 Sep 2018 09:04:21 +0100
Subject: [PATCH] jack_driver: last_client reuse fix.
---
src/drivers/fluid_jack.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/drivers/fluid_jack.c b/src/drivers/fluid_jack.c
index dd40092d..14c5e0c8 100644
--- a/src/drivers/fluid_jack.c
+++ b/src/drivers/fluid_jack.c
@@ -137,7 +137,7 @@ new_fluid_jack_client(fluid_settings_t *settings, int isaudio, void *driver)
* then re-use the client. */
if(last_client &&
(last_client->server != NULL && server != NULL && FLUID_STRCMP(last_client->server, server) == 0) &&
- ((!isaudio && last_client->midi_driver != NULL) || (isaudio && last_client->audio_driver != NULL)))
+ ((!isaudio && last_client->midi_driver == NULL) || (isaudio && last_client->audio_driver == NULL)))
{
client_ref = last_client;
last_client = NULL; /* No more pairing for this client */
@@ -670,7 +670,7 @@ fluid_jack_driver_process(jack_nframes_t nframes, void *arg)
}
else
{
- fluid_audio_func_t callback = (audio_driver->callback != NULL) ? audio_driver->callback : fluid_synth_process;
+ fluid_audio_func_t callback = (audio_driver->callback != NULL) ? audio_driver->callback : (fluid_audio_func_t) fluid_synth_process;
for(i = 0; i < audio_driver->num_output_ports; i++)
{

6
fluidsynth.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Sep 29 11:38:37 UTC 2018 - Luigi Baldoni <aloisio@gmx.com>
- Backported fluidsynth-last_client-reuse-fix.patch from master
(qsynth crashes without it)
-------------------------------------------------------------------
Tue Sep 14 15:24:14 UTC 2018 - tom.mbrt@googlemail.com

6
fluidsynth.spec
View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@ -27,11 +27,12 @@ Name: fluidsynth
Version: 2.0.0
Release: 0
Summary: A Real-Time Software Synthesizer That Uses Soundfont(tm)
License: LGPL-2.1+
License: LGPL-2.1-or-later
Group: Productivity/Multimedia/Sound/Midi
Url: http://www.fluidsynth.org/
Source: https://github.com/FluidSynth/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source1000: baselibs.conf
Patch0: fluidsynth-last_client-reuse-fix.patch
BuildRequires: cmake >= 3.1.0
BuildRequires: ladspa-devel
BuildRequires: pkgconfig
@ -72,6 +73,7 @@ This package contains the shared library for Fluidsynth.
%prep
%setup -q
%patch0 -p1
%build
%cmake \