From 6202400b470ae1fa6794b1ed621c075a21c42112 Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: Sat, 29 Nov 2014 00:06:56 -0500 Subject: [PATCH] update to 1.9.10 --- .gitignore | 1 + ...io-connection-kit-alpha_ia64-sigsegv.patch | 30 -- jack-audio-connection-kit.spec | 25 +- jack-doxygen-buildfix.patch | 39 --- jack-portnames.patch | 302 +++++------------- sources | 2 +- 6 files changed, 88 insertions(+), 311 deletions(-) delete mode 100644 jack-audio-connection-kit-alpha_ia64-sigsegv.patch delete mode 100644 jack-doxygen-buildfix.patch diff --git a/.gitignore b/.gitignore index b0a228b..aa0298d 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ jack-1.9.5.tar.bz2 /jack-1.9.7.tar.bz2 /jack-1.9.8.tgz /jack-1.9.9.5.tar.bz2 +/jack-1.9.10.tar.bz2 diff --git a/jack-audio-connection-kit-alpha_ia64-sigsegv.patch b/jack-audio-connection-kit-alpha_ia64-sigsegv.patch deleted file mode 100644 index 24ea844..0000000 --- a/jack-audio-connection-kit-alpha_ia64-sigsegv.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d11bb095291d8880508c87adfe625bf2bcab1456 Mon Sep 17 00:00:00 2001 -From: Alexander Graf -Date: Tue, 5 Mar 2013 01:38:10 +0100 -Subject: [PATCH] Add support for aarch64 - -When compiling jack on aarch64, compilation fails because NGREGS is not -defined. Since this is only for debug output on segmentation faults, stub -the debug print out like it's been done for other platforms before. - -Signed-off-by: Alexander Graf ---- - dbus/sigsegv.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dbus/sigsegv.c b/dbus/sigsegv.c -index d41091c..64c3986 100644 ---- a/dbus/sigsegv.c -+++ b/dbus/sigsegv.c -@@ -104,7 +104,7 @@ static void signal_segv(int signum, siginfo_t* info, void*ptr) { - jack_error("info.si_errno = %d", info->si_errno); - jack_error("info.si_code = %d (%s)", info->si_code, si_code_str); - jack_error("info.si_addr = %p", info->si_addr); --#if !defined(__alpha__) && !defined(__ia64__) && !defined(__FreeBSD_kernel__) && !defined(__arm__) && !defined(__hppa__) && !defined(__sh__) -+#if !defined(__alpha__) && !defined(__ia64__) && !defined(__FreeBSD_kernel__) && !defined(__arm__) && !defined(__hppa__) && !defined(__sh__) && !defined(__aarch64__) - for(i = 0; i < NGREG; i++) - jack_error("reg[%02d] = 0x" REGFORMAT, i, - #if defined(__powerpc64__) --- -1.9.1 - diff --git a/jack-audio-connection-kit.spec b/jack-audio-connection-kit.spec index 409eaf4..afdd7bd 100644 --- a/jack-audio-connection-kit.spec +++ b/jack-audio-connection-kit.spec @@ -10,8 +10,8 @@ Summary: The Jack Audio Connection Kit Name: jack-audio-connection-kit -Version: 1.9.9.5 -Release: 8%{?dist} +Version: 1.9.10 +Release: 1%{?dist} # The entire source (~500 files) is a mixture of these three licenses License: GPLv2 and GPLv2+ and LGPLv2+ Group: System Environment/Daemons @@ -26,16 +26,12 @@ Patch0: jack-audio-connection-kit-no_date_footer.patch Patch1: jack-doxygen-output-dir-fix.patch # We don't want the internal API documentation Patch2: jack-apidoc-only.patch -# Fix doxygen doc build regression. From upstream trunk 95a1162d6aecc91 -Patch3: jack-doxygen-buildfix.patch # Adjust default priority. RHBZ#795094 -Patch4: jack-realtime-compat.patch +Patch3: jack-realtime-compat.patch # Enable renaming and reordering the jack ports RHBZ#887408 -Patch5: jack-portnames.patch +Patch4: jack-portnames.patch # Fix ppc64 mpd startup issue RHBZ#799552 -Patch6: jack-ppc64-long.patch -# Fix aarch64 arm - see https://github.com/jackaudio/jack2/commit/d11bb09 -Patch7: jack-audio-connection-kit-alpha_ia64-sigsegv.patch +Patch5: jack-ppc64-long.patch BuildRequires: alsa-lib-devel BuildRequires: dbus-devel @@ -100,11 +96,9 @@ Small example clients that use the Jack Audio Connection Kit. %patch0 -p1 -b .nodate %patch1 -p1 -b .outdir %patch2 -p1 -b .nointernalapi -%patch3 -p1 -b .doxyfix -%patch4 -p1 -b .priority -%patch5 -p1 -b .portnames -%patch6 -p1 -b .mpd -%patch7 -p1 -b .armsigsegv +%patch3 -p1 -b .priority +%patch4 -p1 -b .portnames +%patch5 -p1 -b .mpd # Fix encoding issues for file in ChangeLog README TODO; do @@ -261,6 +255,9 @@ exit 0 %changelog +* Fri Nov 28 2014 Orcan Ogetbil - 1.9.10-1 +- update to 1.9.10 + * Sat Aug 16 2014 Fedora Release Engineering - 1.9.9.5-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/jack-doxygen-buildfix.patch b/jack-doxygen-buildfix.patch deleted file mode 100644 index bfb5098..0000000 --- a/jack-doxygen-buildfix.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -rupN jack-1.9.9.5.old/wscript jack-1.9.9.5/wscript ---- jack-1.9.9.5.old/wscript 2012-12-10 04:26:57.000000000 -0500 -+++ jack-1.9.9.5/wscript 2012-12-16 23:29:44.629292671 -0500 -@@ -356,10 +356,11 @@ def build(bld): - bld.add_subdirs('dbus') - - if bld.env['BUILD_DOXYGEN_DOCS'] == True: -- share_dir = bld.env.get_destdir() + bld.env['PREFIX'] + '/share/jack-audio-connection-kit' - html_docs_source_dir = "build/default/html" -- html_docs_install_dir = share_dir + '/reference/html/' -- if Options.commands['install']: -+ if bld.cmd == 'install': -+ share_dir = bld.options.destdir + bld.env['PREFIX'] + '/share/jack-audio-connection-kit' -+ html_docs_install_dir = share_dir + '/reference/html/' -+ - if os.path.isdir(html_docs_install_dir): - Logs.pprint('CYAN', "Removing old doxygen documentation installation...") - shutil.rmtree(html_docs_install_dir) -@@ -367,17 +368,17 @@ def build(bld): - Logs.pprint('CYAN', "Installing doxygen documentation...") - shutil.copytree(html_docs_source_dir, html_docs_install_dir) - Logs.pprint('CYAN', "Installing doxygen documentation done.") -- elif Options.commands['uninstall']: -+ elif bld.cmd =='uninstall': - Logs.pprint('CYAN', "Uninstalling doxygen documentation...") - if os.path.isdir(share_dir): - shutil.rmtree(share_dir) - Logs.pprint('CYAN', "Uninstalling doxygen documentation done.") -- elif Options.commands['clean']: -+ elif bld.cmd =='clean': - if os.access(html_docs_source_dir, os.R_OK): - Logs.pprint('CYAN', "Removing doxygen generated documentation...") - shutil.rmtree(html_docs_source_dir) - Logs.pprint('CYAN', "Removing doxygen generated documentation done.") -- elif Options.commands['build']: -+ elif bld.cmd =='build': - if not os.access(html_docs_source_dir, os.R_OK): - os.popen("doxygen").read() - else: diff --git a/jack-portnames.patch b/jack-portnames.patch index 0534045..b9b70bb 100644 --- a/jack-portnames.patch +++ b/jack-portnames.patch @@ -1,18 +1,70 @@ - 1.) Human-readable portnames on larger cards where "playback_56" is - simply to cumbersome to figure out what's actually connected - 2.) People who travel with ADAT-ADCs/DACs, but connect them via - different interfaces in different locations, e.g. a Multiface - when on the road and a RayDat when in the studio. Despite the - different cards, the port names and hence any ardour session - would remain intact. - http://adi.loris.tv/jackd2-portnames.png - alsa_pcm:hw:1,0:out1 - system:capture_1 - alsa_pcm:hw:1,0:out2 - system:capture_2 ---- /dev/null -+++ b/linux/alsa/port_names.c -@@ -0,0 +1,179 @@ +diff -rupN jack-1.9.10.org/linux/alsa/JackAlsaDriver.cpp jack-1.9.10/linux/alsa/JackAlsaDriver.cpp +--- jack-1.9.10.org/linux/alsa/JackAlsaDriver.cpp 2014-07-18 08:28:12.000000000 -0400 ++++ jack-1.9.10/linux/alsa/JackAlsaDriver.cpp 2014-11-28 23:32:47.637032593 -0500 +@@ -46,6 +46,7 @@ Foundation, Inc., 675 Mass Ave, Cambridg + #endif + #include "JackCompilerDeps.h" + #include "JackServerGlobals.h" ++#include "port_names.h" + + static struct jack_constraint_enum_str_descriptor midi_constraint_descr_array[] = + { +@@ -118,6 +119,8 @@ int JackAlsaDriver::Attach() + unsigned long port_flags = (unsigned long)CaptureDriverFlags; + char name[REAL_JACK_PORT_NAME_SIZE]; + char alias[REAL_JACK_PORT_NAME_SIZE]; ++ char old_name[REAL_JACK_PORT_NAME_SIZE]; ++ char **portnames; + + assert(fCaptureChannels < DRIVER_PORT_NUM); + assert(fPlaybackChannels < DRIVER_PORT_NUM); +@@ -133,13 +136,17 @@ int JackAlsaDriver::Attach() + + jack_log("JackAlsaDriver::Attach fBufferSize %ld fSampleRate %ld", fEngineControl->fBufferSize, fEngineControl->fSampleRate); + ++ portnames = port_names_get_portnames(alsa_driver); ++ + for (int i = 0; i < fCaptureChannels; i++) { + snprintf(alias, sizeof(alias), "%s:%s:out%d", fAliasName, fCaptureDriverName, i + 1); +- snprintf(name, sizeof(name), "%s:capture_%d", fClientControl.fName, i + 1); ++ snprintf(old_name, sizeof(old_name), "%s:capture_%d", fClientControl.fName, i + 1); ++ snprintf(name, sizeof(name), "%s:%s", fClientControl.fName, portnames[i]); + if (fEngine->PortRegister(fClientControl.fRefNum, name, JACK_DEFAULT_AUDIO_TYPE, (JackPortFlags)port_flags, fEngineControl->fBufferSize, &port_index) < 0) { + jack_error("driver: cannot register port for %s", name); + return -1; + } ++ free(portnames[i]); + port = fGraphManager->GetPort(port_index); + port->SetAlias(alias); + fCapturePortList[i] = port_index; +@@ -150,11 +157,13 @@ int JackAlsaDriver::Attach() + + for (int i = 0; i < fPlaybackChannels; i++) { + snprintf(alias, sizeof(alias), "%s:%s:in%d", fAliasName, fPlaybackDriverName, i + 1); +- snprintf(name, sizeof(name), "%s:playback_%d", fClientControl.fName, i + 1); ++ snprintf(old_name, sizeof(old_name), "%s:playback_%d", fClientControl.fName, i + 1); ++ snprintf(name, sizeof(name), "%s:%s", fClientControl.fName, portnames[i+fCaptureChannels]); + if (fEngine->PortRegister(fClientControl.fRefNum, name, JACK_DEFAULT_AUDIO_TYPE, (JackPortFlags)port_flags, fEngineControl->fBufferSize, &port_index) < 0) { + jack_error("driver: cannot register port for %s", name); + return -1; + } ++ free(portnames[i+fCaptureChannels]); + port = fGraphManager->GetPort(port_index); + port->SetAlias(alias); + fPlaybackPortList[i] = port_index; +@@ -172,6 +181,8 @@ int JackAlsaDriver::Attach() + } + } + ++ free(portnames); ++ + UpdateLatencies(); + + if (alsa_driver->midi) { +diff -rupN jack-1.9.10.org/linux/alsa/port_names.c jack-1.9.10/linux/alsa/port_names.c +--- jack-1.9.10.org/linux/alsa/port_names.c 1969-12-31 19:00:00.000000000 -0500 ++++ jack-1.9.10/linux/alsa/port_names.c 2014-11-28 23:32:47.636032597 -0500 +@@ -0,0 +1,179 @@ +/* -*- mode: c; c-file-style: "linux"; -*- */ +/* + Copyright (C) 2010 Florian Faber, faber@faberman.de @@ -192,9 +244,10 @@ + + return buf; +} ---- /dev/null -+++ b/linux/alsa/port_names.h -@@ -0,0 +1,34 @@ +diff -rupN jack-1.9.10.org/linux/alsa/port_names.h jack-1.9.10/linux/alsa/port_names.h +--- jack-1.9.10.org/linux/alsa/port_names.h 1969-12-31 19:00:00.000000000 -0500 ++++ jack-1.9.10/linux/alsa/port_names.h 2014-11-28 23:32:47.637032593 -0500 +@@ -0,0 +1,34 @@ +/* + Copyright (C) 2010 Florian Faber, faber@faberman.de + @@ -229,71 +282,10 @@ +#endif + +#endif /* __jack_port_names_h__ */ ---- a/linux/alsa/JackAlsaDriver.cpp -+++ b/linux/alsa/JackAlsaDriver.cpp -@@ -42,6 +42,7 @@ - #include "JackPosixThread.h" - #include "JackCompilerDeps.h" - #include "JackServerGlobals.h" -+#include "port_names.h" - - namespace Jack - { -@@ -97,6 +98,8 @@ - unsigned long port_flags = (unsigned long)CaptureDriverFlags; - char name[REAL_JACK_PORT_NAME_SIZE]; - char alias[REAL_JACK_PORT_NAME_SIZE]; -+ char old_name[REAL_JACK_PORT_NAME_SIZE]; -+ char **portnames; - - assert(fCaptureChannels < DRIVER_PORT_NUM); - assert(fPlaybackChannels < DRIVER_PORT_NUM); -@@ -112,13 +115,17 @@ - - jack_log("JackAlsaDriver::Attach fBufferSize %ld fSampleRate %ld", fEngineControl->fBufferSize, fEngineControl->fSampleRate); - -+ portnames = port_names_get_portnames(alsa_driver); -+ - for (int i = 0; i < fCaptureChannels; i++) { - snprintf(alias, sizeof(alias), "%s:%s:out%d", fAliasName, fCaptureDriverName, i + 1); -- snprintf(name, sizeof(name), "%s:capture_%d", fClientControl.fName, i + 1); -+ snprintf(old_name, sizeof(old_name), "%s:capture_%d", fClientControl.fName, i + 1); -+ snprintf(name, sizeof(name), "%s:%s", fClientControl.fName, portnames[i]); - if (fEngine->PortRegister(fClientControl.fRefNum, name, JACK_DEFAULT_AUDIO_TYPE, (JackPortFlags)port_flags, fEngineControl->fBufferSize, &port_index) < 0) { - jack_error("driver: cannot register port for %s", name); - return -1; - } -+ free(portnames[i]); - port = fGraphManager->GetPort(port_index); - port->SetAlias(alias); - fCapturePortList[i] = port_index; -@@ -129,11 +136,13 @@ - - for (int i = 0; i < fPlaybackChannels; i++) { - snprintf(alias, sizeof(alias), "%s:%s:in%d", fAliasName, fPlaybackDriverName, i + 1); -- snprintf(name, sizeof(name), "%s:playback_%d", fClientControl.fName, i + 1); -+ snprintf(old_name, sizeof(old_name), "%s:playback_%d", fClientControl.fName, i + 1); -+ snprintf(name, sizeof(name), "%s:%s", fClientControl.fName, portnames[i+fCaptureChannels]); - if (fEngine->PortRegister(fClientControl.fRefNum, name, JACK_DEFAULT_AUDIO_TYPE, (JackPortFlags)port_flags, fEngineControl->fBufferSize, &port_index) < 0) { - jack_error("driver: cannot register port for %s", name); - return -1; - } -+ free(portnames[i+fCaptureChannels]); - port = fGraphManager->GetPort(port_index); - port->SetAlias(alias); - fPlaybackPortList[i] = port_index; -@@ -151,6 +160,8 @@ - } - } - -+ free(portnames); -+ - UpdateLatencies(); - - if (alsa_driver->midi) { ---- a/linux/wscript -+++ b/linux/wscript -@@ -55,6 +55,7 @@ +diff -rupN jack-1.9.10.org/linux/wscript jack-1.9.10/linux/wscript +--- jack-1.9.10.org/linux/wscript 2014-07-18 08:28:13.000000000 -0400 ++++ jack-1.9.10/linux/wscript 2014-11-28 23:32:47.637032593 -0500 +@@ -62,6 +62,7 @@ def build(bld): 'alsa/hdsp.c', 'alsa/alsa_driver.c', 'alsa/hammerfall.c', @@ -301,147 +293,3 @@ 'alsa/ice1712.c' ] - alsa_pcm:hw:1,0:out1 - system:capture_1 - alsa_pcm:hw:1,0:out2 - system:capture_2 - alsa_pcm:hw:1,0:out3 - system:capture_3 - alsa_pcm:hw:1,0:out4 - system:capture_4 - alsa_pcm:hw:1,0:out5 - system:capture_5 - alsa_pcm:hw:1,0:out6 - system:capture_6 - alsa_pcm:hw:1,0:out7 - system:capture_7 - alsa_pcm:hw:1,0:out8 - system:capture_8 - alsa_pcm:hw:1,0:out9 - system:capture_9 - alsa_pcm:hw:1,0:out10 - system:capture_10 - alsa_pcm:hw:1,0:out11 - system:capture_11 - alsa_pcm:hw:1,0:out12 - system:capture_12 - alsa_pcm:hw:1,0:out13 - system:capture_13 - alsa_pcm:hw:1,0:out14 - system:capture_14 - alsa_pcm:hw:1,0:out15 - system:capture_15 - alsa_pcm:hw:1,0:out16 - system:capture_16 - alsa_pcm:hw:1,0:out17 - system:capture_17 - alsa_pcm:hw:1,0:out18 - system:capture_18 - alsa_pcm:hw:1,0:out19 - system:capture_19 - alsa_pcm:hw:1,0:out20 - system:capture_20 - alsa_pcm:hw:1,0:out21 - system:capture_21 - alsa_pcm:hw:1,0:out22 - system:capture_22 - alsa_pcm:hw:1,0:out23 - system:capture_23 - alsa_pcm:hw:1,0:out24 - system:capture_24 - alsa_pcm:hw:1,0:out25 - system:capture_25 - alsa_pcm:hw:1,0:out26 - system:capture_26 - alsa_pcm:hw:1,0:out27 - system:capture_27 - alsa_pcm:hw:1,0:out28 - system:capture_28 - alsa_pcm:hw:1,0:out29 - system:capture_29 - alsa_pcm:hw:1,0:out30 - system:capture_30 - alsa_pcm:hw:1,0:out31 - system:capture_31 - alsa_pcm:hw:1,0:out32 - system:capture_32 - alsa_pcm:hw:1,0:out33 - system:capture_33 - alsa_pcm:hw:1,0:out34 - system:capture_34 - alsa_pcm:hw:1,0:out35 - system:capture_35 - alsa_pcm:hw:1,0:out36 - system:capture_36 - alsa_pcm:hw:1,0:in1 - system:playback_1 - alsa_pcm:hw:1,0:in2 - system:playback_2 - alsa_pcm:hw:1,0:in3 - system:playback_3 - alsa_pcm:hw:1,0:in4 - system:playback_4 - alsa_pcm:hw:1,0:in5 - system:playback_5 - alsa_pcm:hw:1,0:in6 - system:playback_6 - alsa_pcm:hw:1,0:in7 - system:playback_7 - alsa_pcm:hw:1,0:in8 - system:playback_8 - alsa_pcm:hw:1,0:in9 - system:playback_9 - alsa_pcm:hw:1,0:in10 - system:playback_10 - alsa_pcm:hw:1,0:in11 - system:playback_11 - alsa_pcm:hw:1,0:in12 - system:playback_12 - alsa_pcm:hw:1,0:in13 - system:playback_13 - alsa_pcm:hw:1,0:in14 - system:playback_14 - alsa_pcm:hw:1,0:in15 - system:playback_15 - alsa_pcm:hw:1,0:in16 - system:playback_16 - alsa_pcm:hw:1,0:in17 - system:playback_17 - alsa_pcm:hw:1,0:in18 - system:playback_18 - alsa_pcm:hw:1,0:in19 - system:playback_19 - alsa_pcm:hw:1,0:in20 - system:playback_20 - alsa_pcm:hw:1,0:in21 - system:playback_21 - alsa_pcm:hw:1,0:in22 - system:playback_22 - alsa_pcm:hw:1,0:in23 - system:playback_23 - alsa_pcm:hw:1,0:in24 - system:playback_24 - alsa_pcm:hw:1,0:in25 - system:playback_25 - alsa_pcm:hw:1,0:in26 - system:playback_26 - alsa_pcm:hw:1,0:in27 - system:playback_27 - alsa_pcm:hw:1,0:in28 - system:playback_28 - alsa_pcm:hw:1,0:in29 - system:playback_29 - alsa_pcm:hw:1,0:in30 - system:playback_30 - alsa_pcm:hw:1,0:in31 - system:playback_31 - alsa_pcm:hw:1,0:in32 - system:playback_32 - alsa_pcm:hw:1,0:in33 - system:playback_33 - alsa_pcm:hw:1,0:in34 - system:playback_34 - alsa_pcm:hw:1,0:in35 - system:playback_35 - alsa_pcm:hw:1,0:in36 - system:playback_36 diff --git a/sources b/sources index 3d602e9..9e300b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6c9de6b89db9d7076fa2ce222816cf4c jack-1.9.9.5.tar.bz2 +4aeb91d7ae0cabce98355436ed4f217a jack-1.9.10.tar.bz2