From d68fb522d878a0bff2c3751798f55c200ace854f Mon Sep 17 00:00:00 2001 From: Kedar Sovani Date: Mon, 2 Nov 2009 06:40:03 +0100 Subject: [PATCH] Move jack-audio-connection-kit patch to F-12 Signed-off-by: Kedar Sovani --- fix_varargs_to_fix_ftbfs.patch | 30 ++++++++++++++++++++++++++++++ jack-audio-connection-kit.spec | 9 ++++++++- 2 files changed, 38 insertions(+), 1 deletions(-) create mode 100644 fix_varargs_to_fix_ftbfs.patch diff --git a/fix_varargs_to_fix_ftbfs.patch b/fix_varargs_to_fix_ftbfs.patch new file mode 100644 index 0000000..a5f67f4 --- /dev/null +++ b/fix_varargs_to_fix_ftbfs.patch @@ -0,0 +1,30 @@ + +#! /bin/sh /usr/share/dpatch/dpatch-run +## 11_fix_varargs_to_fix_ftbfs_on_alpha.patch.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad jack-audio-connection-kit-0.115.6~/libjack/client.c jack-audio-connection-kit-0.115.6/libjack/client.c +--- jack-audio-connection-kit-0.115.6~/libjack/client.c 2008-11-23 06:27:20.000000000 -0800 ++++ jack-audio-connection-kit-0.115.6/libjack/client.c 2008-12-14 18:47:32.000000000 -0800 +@@ -969,7 +969,7 @@ + } + + /* parse variable arguments */ +- if (ap) ++ if (options & (JackServerName | JackLoadName | JackLoadInit)) + jack_varargs_parse(options, ap, &va); + else + jack_varargs_init(&va); +@@ -1117,7 +1117,7 @@ + jack_options_t options = JackUseExactName; + if (getenv("JACK_START_SERVER") == NULL) + options |= JackNoStartServer; +- return jack_client_open_aux (client_name, options, NULL, NULL); ++ return jack_client_open (client_name, options, NULL); + } + + char * + diff --git a/jack-audio-connection-kit.spec b/jack-audio-connection-kit.spec index 9228289..a7a7f57 100644 --- a/jack-audio-connection-kit.spec +++ b/jack-audio-connection-kit.spec @@ -1,7 +1,7 @@ Summary: The Jack Audio Connection Kit Name: jack-audio-connection-kit Version: 0.116.2 -Release: 1%{?dist} +Release: 1%{?dist}.fa1 License: GPLv2 and LGPLv2 Group: System Environment/Daemons Source0: http://www.jackaudio.org/downloads/%{name}-%{version}.tar.gz @@ -29,6 +29,8 @@ Requires(pre): shadow-utils Requires(post): /sbin/ldconfig Requires: pam +Patch1: fix_varargs_to_fix_ftbfs.patch + # To fix multilib conflicts take a basepoint as following %define doxyfile doc/reference.doxygen.in @@ -67,6 +69,7 @@ Small example clients that use the Jack Audio Connection Kit. %patch0 -p1 -b .cleanup-mb-thread +%patch1 -p1 # Put custom HTML_FOOTER to avoid timestamp inside # (recipe was taken from http://fedoraproject.org/wiki/PackagingDrafts/MultilibTricks) cp %{SOURCE3} doc/no_date_footer.html @@ -173,6 +176,10 @@ exit 0 %{_bindir}/jack_midisine %changelog +* Mon Nov 9 2009 Kedar Sovani +- Move forward jiteshs' patch. +- Applied patch http://patch-tracking.debian.net/patch/series/dl/jack-audio-connection-kit/0.116.1-4/11_fix_varargs_to_fix_ftbfs_on_alpha.patch + * Wed Nov 4 2009 Tom "spot" Callaway - 0.116.2-8 - update to 0.116.2 - make sure we cleanup threads that we open, fixes segfaults (thanks to Ray Strode) -- 1.5.5.6