commit 8002b920a4e3e4329347f6115c054c56aef06833
Author: Jacek Konieczny <[email protected]>
Date: Sun Dec 6 19:00:16 2015 +0100
release ALSA device on init error
Fixes:
ERROR: cannot register object path
"/org/freedesktop/ReserveDevice1/Audio0": A handler is already registered for
/org/freedesktop/ReserveDevice1/Audio0
Release: 5
jack-audio-connection-kit.spec | 4 +++-
release_device_on_error.patch | 23 +++++++++++++++++++++++
2 files changed, 26 insertions(+), 1 deletion(-)
---
diff --git a/jack-audio-connection-kit.spec b/jack-audio-connection-kit.spec
index 5143366..161b78d 100644
--- a/jack-audio-connection-kit.spec
+++ b/jack-audio-connection-kit.spec
@@ -9,7 +9,7 @@ Summary: The JACK Audio Connection Kit
Summary(pl.UTF-8): JACK - zestaw do połączeń audio
Name: jack-audio-connection-kit
Version: 1.9.10
-Release: 4
+Release: 5
License: LGPL v2.1+ (libjack), GPL v2+ (the rest)
Group: Daemons
#Source0Download: http://jackaudio.org/downloads/
@@ -17,6 +17,7 @@ Source0:
https://dl.dropboxusercontent.com/u/28869550/jack-%{version}.tar.bz2
#Source0: http://jackaudio.org/downloads/jack-%{version}.tar.bz2
# Source0-md5: 4aeb91d7ae0cabce98355436ed4f217a
Patch0: jack-doxygen-output-dirs.patch
+Patch1: release_device_on_error.patch
URL: http://jackaudio.org/
BuildRequires: alsa-lib-devel >= 1.0.18
BuildRequires: autoconf >= 2.50
@@ -174,6 +175,7 @@ wymaga biblioteki libsndfile.
%prep
%setup -q -n jack-%{version}
%patch0 -p1
+%patch1 -p1
%build
export CFLAGS="%{rpmcflags} -I/usr/include/ncurses"
diff --git a/release_device_on_error.patch b/release_device_on_error.patch
new file mode 100644
index 0000000..25791e2
--- /dev/null
+++ b/release_device_on_error.patch
@@ -0,0 +1,23 @@
+diff -dur jack-1.9.10.orig/linux/alsa/JackAlsaDriver.cpp
jack-1.9.10/linux/alsa/JackAlsaDriver.cpp
+--- jack-1.9.10.orig/linux/alsa/JackAlsaDriver.cpp 2014-07-18
14:28:12.000000000 +0200
++++ jack-1.9.10/linux/alsa/JackAlsaDriver.cpp 2015-12-06 18:30:36.000000000
+0100
+@@ -346,7 +346,7 @@
+ fPlaybackChannels = ((alsa_driver_t *)fDriver)->playback_nchannels;
+ return 0;
+ } else {
+- JackAudioDriver::Close();
++ Close();
+ return -1;
+ }
+ }
+@@ -356,7 +356,9 @@
+ // Generic audio driver close
+ int res = JackAudioDriver::Close();
+
+- alsa_driver_delete((alsa_driver_t*)fDriver);
++ if (fDriver) {
++ alsa_driver_delete((alsa_driver_t*)fDriver);
++ }
+
+ if (JackServerGlobals::on_device_release != NULL)
+ {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/jack-audio-connection-kit.git/commitdiff/8002b920a4e3e4329347f6115c054c56aef06833
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
