rpms/jack-audio-connection-kit/devel jack-DSO-linking.patch, NONE, 1.1 jack-audio-connection-kit-no_date_footer.patch, NONE, 1.1 jack-celt08.patch, NONE, 1.1 jack-infrastructure.patch, NONE, 1.1 jack-manpages.patch, NONE, 1.1 jack-realtime-compat.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 jack-audio-connection-kit.spec, 1.33, 1.34 sources, 1.9, 1.10 jack-audio-connection-kit-no_date_footer.html, 1.1, NONE
Orcan Ogetbil
oget at fedoraproject.org
Tue Jul 20 05:53:45 UTC 2010
Author: oget
Update of /cvs/pkgs/rpms/jack-audio-connection-kit/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv6206
Modified Files:
.cvsignore jack-audio-connection-kit.spec sources
Added Files:
jack-DSO-linking.patch
jack-audio-connection-kit-no_date_footer.patch
jack-celt08.patch jack-infrastructure.patch
jack-manpages.patch jack-realtime-compat.patch
Removed Files:
jack-audio-connection-kit-no_date_footer.html
Log Message:
* Mon Jul 19 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 1.9.5-1
- Jack 2!
jack-DSO-linking.patch:
wscript | 2 ++
1 file changed, 2 insertions(+)
--- NEW FILE jack-DSO-linking.patch ---
--- jack-1.9.5/wscript~ 2010-02-12 05:58:08.000000000 -0500
+++ jack-1.9.5/wscript 2010-05-18 14:14:27.000000000 -0400
@@ -230,6 +230,8 @@
print Logs.colors.NORMAL,
print
+ conf.env.append_unique('LINKFLAGS', '-lm -lstdc++')
+
if Options.options.mixed == True:
env_variant2 = conf.env.copy()
conf.set_env_name('lib32', env_variant2)
jack-audio-connection-kit-no_date_footer.patch:
doxyfile | 2 +-
no_date_footer.html | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
--- NEW FILE jack-audio-connection-kit-no_date_footer.patch ---
diff -rupN jack-1.9.5.old/doxyfile jack-1.9.5/doxyfile
--- jack-1.9.5.old/doxyfile 2010-02-12 05:57:30.000000000 -0500
+++ jack-1.9.5/doxyfile 2010-07-19 23:18:57.000000000 -0400
@@ -413,7 +413,7 @@ HTML_HEADER =
# each generated HTML page. If it is left blank doxygen will generate a
# standard footer.
-HTML_FOOTER =
+HTML_FOOTER = no_date_footer.html
# The HTML_STYLESHEET tag can be used to specify a user defined cascading
# style sheet that is used by each HTML page. It can be used to
diff -rupN jack-1.9.5.old/no_date_footer.html jack-1.9.5/no_date_footer.html
--- jack-1.9.5.old/no_date_footer.html 1969-12-31 19:00:00.000000000 -0500
+++ jack-1.9.5/no_date_footer.html 2010-07-19 23:19:19.000000000 -0400
@@ -0,0 +1,6 @@
+<hr size="1"><address style="text-align: right;"><small>
+Generated for $projectname by <a href="http://www.doxygen.org/
+index.html"><img src="doxygen.png" alt="doxygen" align="middle" border="0"></a>
+$doxygenversion</small></address>
+</body>
+</html>
jack-celt08.patch:
JackNetOneDriver.cpp | 4 ++--
netjack_packet.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE jack-celt08.patch ---
diff -rupN jack-1.9.5.old/common/JackNetOneDriver.cpp jack-1.9.5/common/JackNetOneDriver.cpp
--- jack-1.9.5.old/common/JackNetOneDriver.cpp 2010-02-12 05:57:48.000000000 -0500
+++ jack-1.9.5/common/JackNetOneDriver.cpp 2010-07-20 01:26:44.000000000 -0400
@@ -709,9 +709,9 @@ JackNetOneDriver::render_payload_to_jack
CELTDecoder *decoder = (CELTDecoder *)src_node->data;
if( !packet_payload )
- celt_decode_float( decoder, NULL, net_period_down, buf );
+ celt_decode_float( decoder, NULL, net_period_down, buf, NULL );
else
- celt_decode_float( decoder, packet_bufX, net_period_down, buf );
+ celt_decode_float( decoder, packet_bufX, net_period_down, buf, NULL );
src_node = jack_slist_next (src_node);
}
diff -rupN jack-1.9.5.old/common/netjack_packet.c jack-1.9.5/common/netjack_packet.c
--- jack-1.9.5.old/common/netjack_packet.c 2010-02-12 05:57:47.000000000 -0500
+++ jack-1.9.5/common/netjack_packet.c 2010-07-20 01:12:42.000000000 -0400
@@ -1428,9 +1428,9 @@ render_payload_to_jack_ports_celt (void
CELTDecoder *decoder = src_node->data;
if( !packet_payload )
- celt_decode_float( decoder, NULL, net_period_down, buf );
+ celt_decode_float( decoder, NULL, net_period_down, buf, NULL );
else
- celt_decode_float( decoder, packet_bufX, net_period_down, buf );
+ celt_decode_float( decoder, packet_bufX, net_period_down, buf, NULL );
src_node = jack_slist_next (src_node);
}
jack-infrastructure.patch:
alsa/JackAlsaDriver.cpp | 19
alsa/JackAlsaDriver.cpp.orig | 2981 +++++++++++++++++++++++++++++++++++++++++++
alsa/port_names.c | 176 ++
alsa/port_names.h | 34
wscript | 3
wscript.orig | 81 +
6 files changed, 3287 insertions(+), 7 deletions(-)
--- NEW FILE jack-infrastructure.patch ---
diff -rupN jack-1.9.5.old/linux/alsa/JackAlsaDriver.cpp jack-1.9.5/linux/alsa/JackAlsaDriver.cpp
--- jack-1.9.5.old/linux/alsa/JackAlsaDriver.cpp 2010-02-12 05:58:07.000000000 -0500
+++ jack-1.9.5/linux/alsa/JackAlsaDriver.cpp 2010-07-20 00:17:44.000000000 -0400
@@ -49,6 +49,7 @@ Foundation, Inc., 675 Mass Ave, Cambridg
#include "generic.h"
#include "memops.h"
#include "JackServerGlobals.h"
+#include "port_names.h"
//#define DEBUG_WAKEUP 1
@@ -2091,6 +2092,8 @@ int JackAlsaDriver::Attach()
alsa_driver_t* alsa_driver = (alsa_driver_t*)fDriver;
+ char **portnames;
+
if (alsa_driver->has_hw_monitoring)
port_flags |= JackPortCanMonitor;
@@ -2100,13 +2103,15 @@ int JackAlsaDriver::Attach()
jack_log("JackAudioDriver::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) - 1, "%s:capture_%u", fAliasName, i + 1);
- snprintf(name, sizeof(name) - 1, "%s:capture_%d", fClientControl.fName, i + 1);
- if ((port_index = fGraphManager->AllocatePort(fClientControl.fRefNum, name, JACK_DEFAULT_AUDIO_TYPE, (JackPortFlags)port_flags, fEngineControl->fBufferSize)) == NO_PORT) {
+ snprintf(alias, sizeof(alias) - 1, "system:%s", portnames[i]);
+ if ((port_index = fGraphManager->AllocatePort(fClientControl.fRefNum, alias, JACK_DEFAULT_AUDIO_TYPE, (JackPortFlags)port_flags, fEngineControl->fBufferSize)) == NO_PORT) {
jack_error("driver: cannot register port for %s", name);
return -1;
}
+ free(portnames[i]);
port = fGraphManager->GetPort(port_index);
port->SetAlias(alias);
port->SetLatency(alsa_driver->frames_per_cycle + alsa_driver->capture_frame_latency);
@@ -2117,12 +2122,12 @@ int JackAlsaDriver::Attach()
port_flags = (unsigned long)PlaybackDriverFlags;
for (int i = 0; i < fPlaybackChannels; i++) {
- snprintf(alias, sizeof(alias) - 1, "%s:playback_%u", fAliasName, i + 1);
- snprintf(name, sizeof(name) - 1, "%s:playback_%d", fClientControl.fName, i + 1);
- if ((port_index = fGraphManager->AllocatePort(fClientControl.fRefNum, name, JACK_DEFAULT_AUDIO_TYPE, (JackPortFlags)port_flags, fEngineControl->fBufferSize)) == NO_PORT) {
+ snprintf(alias, sizeof(alias) - 1, "system:%s", portnames[i+fCaptureChannels]);
+ if ((port_index = fGraphManager->AllocatePort(fClientControl.fRefNum, alias, JACK_DEFAULT_AUDIO_TYPE, (JackPortFlags)port_flags, fEngineControl->fBufferSize)) == NO_PORT) {
jack_error("driver: cannot register port for %s", name);
return -1;
}
+ free(portnames[i+fCaptureChannels]);
port = fGraphManager->GetPort(port_index);
port->SetAlias(alias);
// Add one buffer more latency if "async" mode is used...
@@ -2145,6 +2150,8 @@ int JackAlsaDriver::Attach()
}
}
+ free(portnames);
+
if (alsa_driver->midi) {
int err = (alsa_driver->midi->attach)(alsa_driver->midi);
if (err)
diff -rupN jack-1.9.5.old/linux/alsa/JackAlsaDriver.cpp.orig jack-1.9.5/linux/alsa/JackAlsaDriver.cpp.orig
--- jack-1.9.5.old/linux/alsa/JackAlsaDriver.cpp.orig 1969-12-31 19:00:00.000000000 -0500
+++ jack-1.9.5/linux/alsa/JackAlsaDriver.cpp.orig 2010-02-12 05:58:07.000000000 -0500
@@ -0,0 +1,2981 @@
+/*
+Copyright (C) 2001 Paul Davis
+Copyright (C) 2004 Grame
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#define __STDC_FORMAT_MACROS // For inttypes.h to work in C++
+
+#include <iostream>
+#include <math.h>
+#include <stdio.h>
+#include <memory.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <stdarg.h>
+#include <signal.h>
+#include <sys/types.h>
+#include <sys/time.h>
+#include <regex.h>
+#include <string.h>
+
+#include "JackAlsaDriver.h"
+#include "JackEngineControl.h"
+#include "JackClientControl.h"
+#include "JackPort.h"
+#include "JackGraphManager.h"
+#include "JackLockedEngine.h"
+#include "JackPosixThread.h"
+#include "JackCompilerDeps.h"
+#include "hammerfall.h"
+#include "hdsp.h"
+#include "ice1712.h"
+#include "usx2y.h"
+#include "generic.h"
+#include "memops.h"
+#include "JackServerGlobals.h"
+
+
+//#define DEBUG_WAKEUP 1
+
+namespace Jack
+{
+
+#define jack_get_microseconds GetMicroSeconds
+
+/* Delay (in process calls) before jackd will report an xrun */
+#define XRUN_REPORT_DELAY 0
+
+void
+JackAlsaDriver::alsa_driver_release_channel_dependent_memory (alsa_driver_t *driver)
+{
+ bitset_destroy (&driver->channels_done);
+ bitset_destroy (&driver->channels_not_done);
+
+ if (driver->playback_addr) {
+ free (driver->playback_addr);
+ driver->playback_addr = 0;
+ }
+
+ if (driver->capture_addr) {
+ free (driver->capture_addr);
+ driver->capture_addr = 0;
+ }
+
+ if (driver->playback_interleave_skip) {
+ free (driver->playback_interleave_skip);
+ driver->playback_interleave_skip = NULL;
+ }
+
+ if (driver->capture_interleave_skip) {
+ free (driver->capture_interleave_skip);
+ driver->capture_interleave_skip = NULL;
+ }
+
+ if (driver->silent) {
+ free (driver->silent);
+ driver->silent = 0;
+ }
+
+ if (driver->dither_state) {
+ free (driver->dither_state);
+ driver->dither_state = 0;
+ }
+}
+
+int
+JackAlsaDriver::alsa_driver_check_capabilities (alsa_driver_t *driver)
+{
+ return 0;
+}
+
+static
+char *
+get_control_device_name (const char * device_name)
+{
+ char * ctl_name;
+ regex_t expression;
+
+ regcomp(&expression, "(plug)?hw:[0-9](,[0-9])?", REG_ICASE | REG_EXTENDED);
+
+ if (!regexec(&expression, device_name, 0, NULL, 0)) {
+ /* the user wants a hw or plughw device, the ctl name
+ * should be hw:x where x is the card number */
+
+ char tmp[5];
+ strncpy(tmp, strstr(device_name, "hw"), 4);
+ tmp[4] = '\0';
+ //jack_log("control device %s", tmp);
+ ctl_name = strdup(tmp);
+ } else {
+ ctl_name = strdup(device_name);
+ }
+
+ regfree(&expression);
+
+ if (ctl_name == NULL) {
[...2966 lines suppressed...]
+ char filename[256], *speed;
+ char **buf;
+
+ printf("Using port names patch v0.1 (07.04.2010)\n");
+
+ if (driver->frame_rate > 96000) {
+ speed="qs";
+ } else if (driver->frame_rate > 48000) {
+ speed="ds";
+ } else {
+ speed="ss";
+ }
+
+ snd_ctl_card_info_alloca(&card_info);
+ err = snd_ctl_card_info(driver->ctl_handle, card_info);
+ if (err >= 0) {
+ card_name = snd_ctl_card_info_get_name(card_info);
+ }
+
+ buf = malloc(sizeof(char *)*(driver->capture_nchannels + driver->playback_nchannels));
+ if (NULL==buf) {
+ sprintf(stderr, "ALSA: Not enough memory for %d port names", driver->capture_nchannels + driver->playback_nchannels);
+ return NULL;
+ }
+ bzero(buf, sizeof(char *)*(driver->capture_nchannels + driver->playback_nchannels));
+
+ /* Read port names from special to general:
+ * Begin with user and speed specific port names */
+ snprintf(filename, 255, "%s/.config/jack/cards/%s.%s.ports.in", getenv("HOME"), card_name, speed);
+ (void) port_names_load_portfile(driver, filename, buf, 0, driver->capture_nchannels);
+
+ /* Now user general */
+ snprintf(filename, 255, "%s/.config/jack/cards/%s.ports.in", getenv("HOME"), card_name);
+ (void) port_names_load_portfile(driver, filename, buf, 0, driver->capture_nchannels);
+
+ /* System speed specific */
+ snprintf(filename, 255, "/etc/jack/cards/%s.%s.ports.in", card_name, speed);
+ (void) port_names_load_portfile(driver, filename, buf, 0, driver->capture_nchannels);
+
+ /* System general */
+ snprintf(filename, 255, "/etc/jack/cards/%s.ports.in", card_name);
+ (void) port_names_load_portfile(driver, filename, buf, 0, driver->capture_nchannels);
+
+ /* Fill all still unnamed ports with default names */
+ port_names_default_portnames(buf, 0, driver->capture_nchannels, "capture_%lu");
+
+
+ /* Same procedure for the playback channels */
+ snprintf(filename, 255, "%s/.config/jack/cards/%s.%s.ports.out", getenv("HOME"), card_name, speed);
+ (void) port_names_load_portfile(driver, filename, buf, driver->capture_nchannels, driver->playback_nchannels);
+
+ snprintf(filename, 255, "%s/.config/jack/cards/%s.ports.out", getenv("HOME"), card_name);
+ (void) port_names_load_portfile(driver, filename, buf, driver->capture_nchannels, driver->playback_nchannels);
+
+ snprintf(filename, 255, "/etc/jack/cards/%s.%s.ports.out", card_name, speed);
+ (void) port_names_load_portfile(driver, filename, buf, driver->capture_nchannels, driver->playback_nchannels);
+
+ snprintf(filename, 255, "/etc/jack/cards/%s.ports.out", card_name);
+ (void) port_names_load_portfile(driver, filename, buf, driver->capture_nchannels, driver->playback_nchannels);
+
+ port_names_default_portnames(buf, driver->capture_nchannels, driver->playback_nchannels, "playback_%lu");
+
+ return buf;
+}
diff -rupN jack-1.9.5.old/linux/alsa/port_names.h jack-1.9.5/linux/alsa/port_names.h
--- jack-1.9.5.old/linux/alsa/port_names.h 1969-12-31 19:00:00.000000000 -0500
+++ jack-1.9.5/linux/alsa/port_names.h 2010-07-20 00:17:44.000000000 -0400
@@ -0,0 +1,34 @@
+/*
+ Copyright (C) 2010 Florian Faber, faber at faberman.de
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#ifndef __jack_port_names_h__
+#define __jack_port_names_h__
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+char** port_names_get_portnames(alsa_driver_t *driver);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __jack_port_names_h__ */
diff -rupN jack-1.9.5.old/linux/wscript jack-1.9.5/linux/wscript
--- jack-1.9.5.old/linux/wscript 2010-02-12 05:58:07.000000000 -0500
+++ jack-1.9.5/linux/wscript 2010-07-20 00:17:44.000000000 -0400
@@ -52,7 +52,8 @@ def build(bld):
'alsa/generic_hw.c',
'alsa/hdsp.c',
'alsa/hammerfall.c',
- 'alsa/ice1712.c'
+ 'alsa/ice1712.c',
+ 'alsa/port_names.c'
]
ffado_driver_src = ['firewire/JackFFADODriver.cpp',
diff -rupN jack-1.9.5.old/linux/wscript.orig jack-1.9.5/linux/wscript.orig
--- jack-1.9.5.old/linux/wscript.orig 1969-12-31 19:00:00.000000000 -0500
+++ jack-1.9.5/linux/wscript.orig 2010-02-12 05:58:07.000000000 -0500
@@ -0,0 +1,81 @@
+#! /usr/bin/env python
+# encoding: utf-8
+
+def configure(conf):
+ conf.check_cfg(package='alsa', atleast_version='1.0.18', args='--cflags --libs')
+ conf.env['BUILD_DRIVER_ALSA'] = conf.is_defined('HAVE_ALSA')
+
+ conf. check_cfg(package='libfreebob', atleast_version='1.0.0', args='--cflags --libs')
+ conf.env['BUILD_DRIVER_FREEBOB'] = conf.is_defined('HAVE_LIBFREEBOB')
+
+ conf. check_cfg(package='libffado', atleast_version='1.999.17', args='--cflags --libs')
+ conf.env['BUILD_DRIVER_FFADO'] = conf.is_defined('HAVE_LIBFFADO')
+
+ conf.define('HAVE_PPOLL', 1 )
+
+
+def create_jack_driver_obj(bld, target, sources, uselib = None):
+ driver = bld.new_task_gen('cxx', 'shlib')
+ driver.features.append('cc')
+ driver.env['shlib_PATTERN'] = 'jack_%s.so'
+ driver.defines = ['HAVE_CONFIG_H','SERVER_SIDE', 'HAVE_PPOLL']
+ driver.includes = ['.', '../linux', '../posix', '../common', '../common/jack', '../dbus']
+ driver.target = target
+ driver.source = sources
+ driver.install_path = '${ADDON_DIR}/'
+ if uselib:
+ driver.uselib = uselib
+ driver.uselib_local = 'serverlib'
+ return driver
+
+def build(bld):
+ if bld.env['BUILD_JACKD'] == True:
+ jackd = bld.new_task_gen('cxx', 'program')
+ jackd.includes = ['../linux', '../posix', '../common/jack', '../common', '../dbus']
+ jackd.defines = 'HAVE_CONFIG_H'
+ jackd.source = ['../common/Jackdmp.cpp']
+ if bld.env['IS_LINUX'] and bld.env['BUILD_JACKDBUS']:
+ jackd.source += ['../dbus/reserve.c', '../dbus/audio_reserve.c']
+ jackd.uselib = 'PTHREAD DL RT DBUS-1'
+ else:
+ jackd.uselib = 'PTHREAD DL RT'
+ jackd.uselib_local = 'serverlib'
+ jackd.target = 'jackd'
+
+ create_jack_driver_obj(bld, 'dummy', '../common/JackDummyDriver.cpp')
+
+ alsa_driver_src = ['alsa/JackAlsaDriver.cpp',
+ 'alsa/alsa_rawmidi.c',
+ 'alsa/alsa_seqmidi.c',
+ 'alsa/alsa_midi_jackmp.cpp',
+ '../common/memops.c',
+ 'alsa/generic_hw.c',
+ 'alsa/hdsp.c',
+ 'alsa/hammerfall.c',
+ 'alsa/ice1712.c'
+ ]
+
+ ffado_driver_src = ['firewire/JackFFADODriver.cpp',
+ 'firewire/JackFFADOMidiInput.cpp',
+ 'firewire/JackFFADOMidiOutput.cpp',
+ '../common/JackPhysicalMidiInput.cpp',
+ '../common/JackPhysicalMidiOutput.cpp'
+ ]
+
+ if bld.env['BUILD_DRIVER_ALSA'] == True:
+ create_jack_driver_obj(bld, 'alsa', alsa_driver_src, "ALSA")
+
+ if bld.env['BUILD_DRIVER_FREEBOB'] == True:
+ create_jack_driver_obj(bld, 'freebob', 'freebob/JackFreebobDriver.cpp', "LIBFREEBOB")
+
+ if bld.env['BUILD_DRIVER_FFADO'] == True:
+ create_jack_driver_obj(bld, 'firewire', ffado_driver_src, "LIBFFADO")
+
+ create_jack_driver_obj(bld, 'net', '../common/JackNetDriver.cpp')
+
+ create_jack_driver_obj(bld, 'loopback', '../common/JackLoopbackDriver.cpp')
+
+ create_jack_driver_obj(bld, 'netone', [ '../common/JackNetOneDriver.cpp',
+ '../common/netjack.c',
+ '../common/netjack_packet.c' ], "SAMPLERATE CELT" )
+
jack-manpages.patch:
man/alsa_in.0 | 97 +++++++
man/alsa_out.0 | 1
man/fill_template | 5
man/jack_bufsize.0 | 14 +
man/jack_connect.0 | 11
man/jack_disconnect.0 | 1
man/jack_freewheel.0 | 16 +
man/jack_impulse_grabber.0 | 11
man/jack_load.0 | 28 ++
man/jack_lsp.0 | 47 +++
man/jack_metro.0 | 40 +++
man/jack_monitor_client.0 | 18 +
man/jack_netsource.0 | 109 ++++++++
man/jack_samplerate.0 | 9
man/jack_showtime.0 | 13 +
man/jack_simple_client.0 | 20 +
man/jack_transport.0 | 13 +
man/jack_unload.0 | 19 +
man/jack_wait.0 | 41 +++
man/jackd.0 | 547 +++++++++++++++++++++++++++++++++++++++++++++
man/jackrec.0 | 23 +
man/wscript | 13 +
wscript | 7
23 files changed, 1103 insertions(+)
--- NEW FILE jack-manpages.patch ---
diff -rupN jack-1.9.5.old/man/alsa_in.0 jack-1.9.5/man/alsa_in.0
--- jack-1.9.5.old/man/alsa_in.0 1969-12-31 19:00:00.000000000 -0500
+++ jack-1.9.5/man/alsa_in.0 2010-05-17 05:30:11.000000000 -0400
@@ -0,0 +1,97 @@
+.TH ALSA_IO "1" "!DATE!" "!VERSION!"
+.SH NAME
+\fBalsa_in\fR, \fBalsa_out\fR \- Jack clients that perform I/O with an alternate audio interface
+.SH SYNOPSIS
+\fBalsa_in\fR [\fIoptions\fR]
+.br
+\fBalsa_out\fR [\fIoptions\fR]
+
+.SH DESCRIPTION
+A JACK client that opens a specified audio interface (different to the
+one used by the JACK server, if any) and moves audio data between its
+JACK ports and the interface. alsa_in will provide data from the
+interface (potentially for capture); alsa_out will deliver data to it
+(for playback).
+
+The audio interface used by alsa_in/alsa_out does not need to be
+synchronized with JACK backend (or the hardware it might be using).
+alsa_in/alsa_out tries to resample the output stream in an attempt to
+compensate for drift between the two clocks.
+
+As of jack-0.116.3 this works almost perfectly. It takes some time, to reach
+absolute resample-rate stability. So give it some minutes (its intended to be
+running permanently anyways)
+
+.SH OPTIONS
+.TP
+\fB\-j \fI jack_client_name\fR
+.br
+Set Client Name.
+.TP
+\fB\-d \fI alsa_device\fR
+.br
+Use this Soundcard.
+.TP
+\fB\-v\fR
+.br
+Verbose, prints out resample coefficient and other parameters useful for debugging, every 500ms.
+also reports soft xruns.
+.TP
+\fB\-i\fR
+.br
+Instrumentation. This logs the 4 important parameters of the samplerate control algorithm every 1ms.
+You can pipe this into a file, and plot it. Should only be necessary, if it does not work as
+expected, and we need to adjust some of the obscure parameters, to make it work.
+Find me on irc.freenode.org #jack in order to set this up correctly.
+.TP
+\fB\-c \fI channels\fR
+.br
+Set Number of channels.
+.TP
+\fB\-r \fI sample_rate\fR
+.br
+Set sample_rate. The program resamples as necessary.
+So you can connect a 44k1 jackd to a soundcard only supporting
+48k. (default is jack sample_rate)
+.TP
+\fB\-p \fI period_size\fR
+.br
+Set the period size. It is not related to the jackd period_size.
+Sometimes it affects the quality of the delay measurements.
+Setting this lower than the jackd period_size will only work, if you
+use a higher number of periods.
+.TP
+\fB\-n \fI num_period\fR
+.br
+Set number of periods. See note for period_size.
+.TP
+\fB\-q \fI quality\fR
+.br
+Set the quality of the resampler from 0 to 4. can significanly reduce cpu usage.
+.TP
+\fB\-m \fI max_diff\fR
+.br
+The value when a soft xrun occurs. Basically the window, in which
+the dma pointer may jitter. I don't think its necessary to play with this anymore.
+.TP
+\fB\-t \fI target_delay\fR
+.br
+The delay alsa_io should try to approach. Same as for max_diff. It will be setup based on \-p and \-n
+which is generally sufficient.
+.TP
+\fB\-s \fI smooth_array_size\fR
+.br
+This parameter controls the size of the array used for smoothing the delay measurement. Its default is 256.
+If you use a pretty low period size, you can lower the CPU usage a bit by decreasing this parameter.
+However most CPU time is spent in the resampling so this will not be much.
+.TP
+\fB\-C \fI P Control Clamp\fR
+.br
+If you have a PCI card, then the default value (15) of this parameter is too high for \-p64 \-n2... Setting it to 5 should fix that.
+Be aware that setting this parameter too low, lets the hf noise on the delay measurement come through onto the resamplerate, so this
+might degrade the quality of the output. (but its a threshold value, and it has been chosen, to mask the noise of a USB card,
+which has an amplitude which is 50 times higher than that of a PCI card, so 5 wont loose you any quality on a PCI card)
+
+.SH AUTHOR
+Torben Hohn
+
diff -rupN jack-1.9.5.old/man/alsa_out.0 jack-1.9.5/man/alsa_out.0
--- jack-1.9.5.old/man/alsa_out.0 1969-12-31 19:00:00.000000000 -0500
+++ jack-1.9.5/man/alsa_out.0 2010-05-17 05:30:11.000000000 -0400
@@ -0,0 +1 @@
+.so man1/alsa_in.1
diff -rupN jack-1.9.5.old/man/fill_template jack-1.9.5/man/fill_template
--- jack-1.9.5.old/man/fill_template 1969-12-31 19:00:00.000000000 -0500
+++ jack-1.9.5/man/fill_template 2010-05-17 05:30:11.000000000 -0400
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+for i in *.0 ; do
+ sed -e "s/!VERSION!/${1}/g" -e "s/!DATE!/`date '+%B %Y'`/g" < ${i} > ${i%%0}1
+done
diff -rupN jack-1.9.5.old/man/jack_bufsize.0 jack-1.9.5/man/jack_bufsize.0
--- jack-1.9.5.old/man/jack_bufsize.0 1969-12-31 19:00:00.000000000 -0500
+++ jack-1.9.5/man/jack_bufsize.0 2010-05-17 05:30:11.000000000 -0400
@@ -0,0 +1,14 @@
+.TH JACK_BUFSIZE "1" "!DATE!" "!VERSION!"
+.SH NAME
+jack_bufsize \- JACK toolkit client to change the JACK buffer size
+.SH SYNOPSIS
+.B jack_bufsize bufsize
+.SH DESCRIPTION
+.B jack_bufsize
+jack_bufsize sets the size of the buffer (frames per period) used in JACK.
+This change happens on-line (the JACK server and its clients do not need to be
+restarted).
+.br
+When invoked without arguments, it prints the current bufsize, and exits.
+
+
diff -rupN jack-1.9.5.old/man/jack_connect.0 jack-1.9.5/man/jack_connect.0
--- jack-1.9.5.old/man/jack_connect.0 1969-12-31 19:00:00.000000000 -0500
+++ jack-1.9.5/man/jack_connect.0 2010-05-17 05:30:11.000000000 -0400
@@ -0,0 +1,11 @@
+.TH JACK_CONNECT "1" "!DATE!" "!VERSION!"
+.SH NAME
+\fBjack_connect\fR, \fBjack_disconnect\fR \- JACK toolkit clients for connecting & disconnecting ports
+.SH SYNOPSIS
+\fB jack_connect\fR [ \fI-s\fR | \fI--server servername\fR ] [\fI-h\fR | \fI--help\fR ] port1 port2
+\fB jack_disconnect\fR [ \fI-s\fR | \fI--server servername\fR ] [\fI-h\fR | \fI--help\fR ] port1 port2
+.SH DESCRIPTION
+\fBjack_connect\fR connects the two named ports. \fBjack_connect\fR disconnects the two named ports.
+.SH RETURNS
+The exit status is zero if successful, 1 otherwise
+
diff -rupN jack-1.9.5.old/man/jackd.0 jack-1.9.5/man/jackd.0
--- jack-1.9.5.old/man/jackd.0 1969-12-31 19:00:00.000000000 -0500
+++ jack-1.9.5/man/jackd.0 2010-05-17 05:30:11.000000000 -0400
@@ -0,0 +1,547 @@
+.TH "JACKD" "1" "!VERSION!" "!DATE!" ""
+.SH "NAME"
+jackd \- JACK Audio Connection Kit sound server
+.SH "SYNOPSIS"
+\fBjackd\fR [\fIoptions\fR] \fB\-d\fI backend \fR
+[\fIbackend\-parameters\fR]
+.br
+\fBjackd \-\-help\fR
+.SH "DESCRIPTION"
+\fBjackd\fR is the JACK audio server daemon, a low\-latency audio
+server. Originally written for the
+GNU/Linux operating system, it also supports Mac OS X and various Unix
+platforms. JACK can connect a number of different client applications
+to an audio device and also to each other. Most clients are external,
+running in their own processes as normal applications. JACK also
+supports internal clients, which run within the \fBjackd\fR process
+using a loadable "plugin" interface.
+
+JACK differs from other audio servers in being designed from the
+ground up for professional audio work. It focuses on two key areas:
+synchronous execution of all clients, and low latency operation.
+
+For the latest JACK information, please consult the web site,
+<\fBhttp://www.jackaudio.org\fR>.
+.SH "OPTIONS"
+.TP
+\fB\-d, \-\-driver \fIbackend\fR [\fIbackend\-parameters\fR ]
+.br
+Select the audio interface backend. The current list of supported
+backends is: \fBalsa\fR, \fBcoreaudio\fR, \fBdummy\fR, \fBfreebob\fR,
+\fBoss\fR \fBsun\fR and \fBportaudio\fR. They are not all available
+on all platforms. All \fIbackend\-parameters\fR are optional.
+
+.TP
+\fB\-h, \-\-help\fR
+.br
+Print a brief usage message describing the main \fBjackd\fR options.
+These do not include \fIbackend\-parameters\fR, which are listed using
+the \fB\-\-help\fR option for each specific backend. Examples below
+show how to list them.
+.TP
+\fB\-m, \-\-no\-mlock\fR
+Do not attempt to lock memory, even if \fB\-\-realtime\fR.
+.TP
+\fB\-n, \-\-name\fR \fIserver\-name\fR
+Name this \fBjackd\fR instance \fIserver\-name\fR. If unspecified,
+this name comes from the \fB$JACK_DEFAULT_SERVER\fR environment
+variable. It will be "default" if that is not defined.
+.TP
+\fB\-p, \-\-port\-max \fI n\fR
+Set the maximum number of ports the JACK server can manage.
+The default value is 256.
+.TP
+\fB\-\-replace-registry\fR
+.br
+Remove the shared memory registry used by all JACK server instances
+before startup. This should rarely be used, and is intended only
+for occasions when the structure of this registry changes in ways
+that are incompatible across JACK versions (which is rare).
+.TP
+\fB\-R, \-\-realtime\fR
+.br
+Use realtime scheduling (default = true). This is needed for reliable low\-latency
+performance. On many systems, it requires \fBjackd\fR to run with
+special scheduler and memory allocation privileges, which may be
+obtained in several ways.
+.TP
+\fB\-r, \-\-no-realtime\fR
+.br
+Do not use realtime scheduling.
+.TP
+\fB\-P, \-\-realtime\-priority \fIint\fR
+When running \fB\-\-realtime\fR, set the scheduler priority to
+\fIint\fR.
+.TP
+\fB\-\-silent\fR
+Silence any output during operation.
+.TP
+\fB\-T, \-\-temporary\fR
+Exit once all clients have closed their connections.
+.TP
+\fB\-t, \-\-timeout \fIint\fR
+.br
+Set client timeout limit in milliseconds. The default is 500 msec.
+In realtime mode the client timeout must be smaller than the watchdog timeout (5000 msec).
+.TP
+\fB\-Z, \-\-nozombies\fR
+.br
+Prevent JACK from ever kicking out clients because they were too slow.
+This cancels the effect any specified timeout value, but JACK and its clients are
+still subject to the supervision of the watchdog thread or its equivalent.
+.TP
+\fB\-u, \-\-unlock\fR
+.br
+Unlock libraries GTK+, QT, FLTK, Wine.
+.TP
+\fB\-v, \-\-verbose\fR
+Give verbose output.
+.TP
+\fB\-c, \-\-clocksource\fR (\fI c(ycle)\fR | \fI h(pet) \fR | \fI s(ystem) \fR)
+Select a specific wall clock (Cycle Counter, HPET timer, System timer).
+.TP
+\fB\-V, \-\-version\fR
+Print the current JACK version number and exit.
+.SS ALSA BACKEND OPTIONS
+.TP
+\fB\-C, \-\-capture\fR [ \fIname\fR ]
+Provide only capture ports, unless combined with \-D or \-P. Parameterally set
+capture device name.
+.TP
+\fB\-d, \-\-device \fIname\fR
+.br
+The ALSA pcm device \fIname\fR to use. If none is specified, JACK will
+use "hw:0", the first hardware card defined in \fB/etc/modules.conf\fR.
+.TP
+\fB\-z, \-\-dither [rectangular,triangular,shaped,none]
+Set dithering mode. If \fBnone\fR or unspecified, dithering is off.
+Only the first letter of the mode name is required.
+.TP
+\fB\-D, \-\-duplex\fR
+Provide both capture and playback ports. Defaults to on unless only one
+of \-P or \-C is specified.
+.TP
+\fB\-h, \-\-help\fR Print a brief usage message describing only the
+\fBalsa\fR backend parameters.
+.TP
+\fB\-M, \-\-hwmeter\fR
+.br
+Enable hardware metering for devices that support it. Otherwise, use
+software metering.
+.TP
+\fB\-H, \-\-hwmon\fR
+.br
+Enable hardware monitoring of capture ports. This is a method for
+obtaining "zero latency" monitoring of audio input. It requires
+support in hardware and from the underlying ALSA device driver.
+
+When enabled, requests to monitor capture ports will be satisfied by
+creating a direct signal path between audio interface input and output
+connectors, with no processing by the host computer at all. This
+offers the lowest possible latency for the monitored signal.
+
+Presently (March 2003), only the RME Hammerfall series and cards based
+on the ICE1712 chipset (M\-Audio Delta series, Terratec, and others)
+support \fB\-\-hwmon\fR. In the future, some consumer cards may also
+be supported by modifying their mixer settings.
+
+Without \fB\-\-hwmon\fR, port monitoring requires JACK to read audio
+into system memory, then copy it back out to the hardware again,
+imposing the basic JACK system latency determined by the
+\fB\-\-period\fR and \fB\-\-nperiods\fR parameters.
+.TP
+\fB\-i, \-\-inchannels \fIint\fR
+.br
+Number of capture channels. Default is maximum supported by hardware.
+.TP
+\fB\-n, \-\-nperiods \fIint\fR
+.br
+Specify the number of periods of playback latency. In seconds, this
+corresponds to \fB\-\-nperiods\fR times \fB\-\-period\fR divided by
+\fB\-\-rate\fR. The default is 2, the minimum allowable. For most
+devices, there is no need for any other value with the
+\fB\-\-realtime\fR option. Without realtime privileges or with boards
+providing unreliable interrupts (like ymfpci), a larger value may
+yield fewer xruns. This can also help if the system is not tuned for
+reliable realtime scheduling.
+
+For most ALSA devices, the hardware buffer has exactly
+\fB\-\-period\fR times \fB\-\-nperiods\fR frames. Some devices demand
+a larger buffer. If so, JACK will use the smallest possible buffer
+containing at least \fB\-\-nperiods\fR, but the playback latency does
+not increase.
+
+For USB audio devices it is recommended to use \fB\-n 3\fR. Firewire
+devices supported by FFADO (formerly Freebob) are configured with
+\fB\-n 3\fR by default.
+.TP
+\fB\-o, \-\-outchannels \fIint\fR
+.br
+Number of playback channels. Default is maximum supported by hardware.
+.TP
+\fB\-P, \-\-playback\fR [ \fIname\fR ]
+Provide only playback ports, unless combined with \-D or \-C. Optionally set
+playback device name.
+.TP
+\fB\-p, \-\-period \fIint\fR
+.br
+Specify the number of frames between JACK \fBprocess()\fR calls. This
+value must be a power of 2, and the default is 1024. If you need low
+latency, set \fB\-p\fR as low as you can go without seeing xruns. A larger
+period size yields higher latency, but makes xruns less likely. The JACK
+capture latency in seconds is \fB\-\-period\fR divided by \fB\-\-rate\fR.
+.TP
+\fB\-r, \-\-rate \fIint\fR
+Specify the sample rate. The default is 48000.
+.TP
+\fB\-S, \-\-shorts
+.br
+Try to configure card for 16\-bit samples first, only trying 32\-bits if
+unsuccessful. Default is to prefer 32\-bit samples.
+.TP
+\fB\-s, \-\-softmode\fR
+.br
+Ignore xruns reported by the ALSA driver. This makes JACK less likely
+to disconnect unresponsive ports when running without \fB\-\-realtime\fR.
+.TP
+\fB\-X, \-\-midi \fR[\fIseq\fR|\fIraw\fR]
+.br
+Specify which ALSA MIDI system to provide access to. Using \fBraw\fR
+will provide a set of JACK MIDI ports that correspond to each raw ALSA
+device on the machine. Using \fBseq\fR will provide a set of JACK MIDI
+ports that correspond to each ALSA "sequencer" client (which includes
+each hardware MIDI port on the machine). \fBraw\fR provides slightly
+better performance but does not permit JACK MIDI communication with
+software written to use the ALSA "sequencer" API.
+.SS COREAUDIO BACKEND PARAMETERS
+.TP
+\fB\-c \-\-channel\fR
+Maximum number of channels (default: 2)
+.TP
+\fB\-i \-\-channelin\fR
+Maximum number of input channels (default: 2)
+.TP
+\fB\-o \-\-channelout\fR
+Maximum number of output channels (default: 2)
+.TP
+\fB\-C \-\-capture\fR
+Whether or not to capture (default: true)
+.TP
+\fB\-P \-\-playback\fR
+Whether or not to playback (default: true)
+.TP
+\fB\-D \-\-duplex\fR
+Capture and playback (default: true)
+.TP
+\fB\-r \-\-rate\fR
+Sample rate (default: 44100)
+.TP
+\fB\-p \-\-period\fR
+Frames per period (default: 128). Must be a power of 2.
+.TP
+\fB\-n \-\-name\fR
+Driver name (default: none)
+.TP
+\fB\-I \-\-id\fR
+Audio Device ID (default: 0)
+.SS DUMMY BACKEND PARAMETERS
+.TP
+\fB\-C, \-\-capture \fIint\fR
+Specify number of capture ports. The default value is 2.
+.TP
+\fB\-P, \-\-playback \fIint\fR
+Specify number of playback ports. The default value is 2.
+.TP
+\fB\-r, \-\-rate \fIint\fR
+Specify sample rate. The default value is 48000.
+.TP
+\fB\-p, \-\-period \fIint\fR
+Specify the number of frames between JACK \fBprocess()\fR calls. This
+value must be a power of 2, and the default is 1024. If you need low
+latency, set \fB\-p\fR as low as you can go without seeing xruns. A larger
+period size yields higher latency, but makes xruns less likely. The JACK
+capture latency in seconds is \fB\-\-period\fR divided by \fB\-\-rate\fR.
+.TP
+\fB\-w, \-\-wait \fIint\fR
+Specify number of usecs to wait between engine processes.
+The default value is 21333.
+
+
+.SS NET BACKEND PARAMETERS
+
+.TP
+ \fB\-i, \-\-audio\-ins \fIint\fR
+Number of capture channels (default: 2)
+.TP
+ \fB\-o, \-\-audio\-outs \fIint\fR
+Number of playback channels (default: 2)
+.TP
+ \fB\-I, \-\-midi\-ins \fIint\fR
+Number of midi capture channels (default: 1)
+.TP
+\fB\-O, \-\-midi\-outs \fIint\fR
+Number of midi playback channels (default: 1)
+.TP
+ \fB\-r, \-\-rate \fIint\fR
+Sample rate (default: 48000)
+.TP
+\fB\-p, \-\-period \fIint\fR
+Frames per period (default: 1024)
+.TP
+\fB\-n, \-\-num\-periods \fIint\fR
+Network latency setting in no. of periods (default: 5)
+.TP
+\fB\-l, \-\-listen\-port \fIint\fR
+The socket port we are listening on for sync packets (default: 3000)
+.TP
+\fB\-f, \-\-factor \fIint\fR
+Factor for sample rate reduction (default: 1)
+.TP
+\fB\-u, \-\-upstream\-factor \fIint\fR
+Factor for sample rate reduction on the upstream (default: 0)
+.TP
+\fB\-c, \-\-celt \fIint\fR
+sets celt encoding and number of kbits per channel (default: 0)
+.TP
+\fB\-b, \-\-bit\-depth \fIint\fR
+Sample bit\-depth (0 for float, 8 for 8bit and 16 for 16bit) (default: 0)
+.TP
+\fB\-t, \-\-transport\-sync \fIint\fR
+Whether to slave the transport to the master transport (default: true)
+.TP
+\fB\-a, \-\-autoconf \fIint\fR
+Whether to use Autoconfig, or just start. (default: true)
+.TP
+\fB\-R, \-\-redundancy \fIint\fR
+Send packets N times (default: 1)
+.TP
+\fB\-e, \-\-native\-endian \fIint\fR
+Dont convert samples to network byte order. (default: false)
+.TP
+\fB\-J, \-\-jitterval \fIint\fR
+attempted jitterbuffer microseconds on master (default: 0)
+.TP
+\fB\-D, \-\-always\-deadline \fIint\fR
+always use deadline (default: false)
+
+
+.SS OSS BACKEND PARAMETERS
+.TP
+\fB\-r, \-\-rate \fIint\fR
+Specify the sample rate. The default is 48000.
+.TP
+\fB\-p, \-\-period \fIint\fR
+Specify the number of frames between JACK \fBprocess()\fR calls. This
+value must be a power of 2, and the default is 1024. If you need low
+latency, set \fB\-p\fR as low as you can go without seeing xruns. A larger
+period size yields higher latency, but makes xruns less likely. The JACK
+capture latency in seconds is \fB\-\-period\fR divided by \fB\-\-rate\fR.
+.TP
+\fB\-n, \-\-nperiods \fIint\fR
+Specify the number of periods in the hardware buffer. The default is
+2. The period size (\fB\-p\fR) times \fB\-\-nperiods\fR times four is
+the JACK buffer size in bytes. The JACK output latency in seconds is
+\fB\-\-nperiods\fR times \fB\-\-period\fR divided by \fB\-\-rate\fR.
+.TP
+\fB\-w, \-\-wordlength \fIint\fR
+Specify the sample size in bits. The default is 16.
+.TP
+\fB\-i, \-\-inchannels \fIint\fR
+Specify how many channels to capture (default: 2)
+.TP
+\fB\-o, \-\-outchannels \fIint\fR
+Specify number of playback channels (default: 2)
+.TP
+\fB\-C, \-\-capture \fIdevice_file\fR
+Specify input device for capture (default: /dev/dsp)
+.TP
+\fB\-P, \-\-playback \fIdevice_file\fR
+Specify output device for playback (default: /dev/dsp)
+.TP
+\fB\-b, \-\-ignorehwbuf \fIboolean\fR
+Specify, whether to ignore hardware period size (default: false)
+.SS SUN BACKEND PARAMETERS
+.TP
+\fB\-r, \-\-rate \fIint\fR
+Specify the sample rate. The default is 48000.
+.TP
+\fB\-p, \-\-period \fIint\fR
+Specify the number of frames between JACK \fBprocess()\fR calls. This
+value must be a power of 2, and the default is 1024. If you need low
+latency, set \fB\-p\fR as low as you can go without seeing xruns. A larger
+period size yields higher latency, but makes xruns less likely. The JACK
+capture latency in seconds is \fB\-\-period\fR divided by \fB\-\-rate\fR.
+.TP
+\fB\-n, \-\-nperiods \fIint\fR
+Specify the number of periods in the hardware buffer. The default is
+2. The period size (\fB\-p\fR) times \fB\-\-nperiods\fR times four
+(assuming 2 channels 16-bit samples) is the JACK buffer size in bytes.
+The JACK output latency in seconds is \fB\-\-nperiods\fR times
+\fB\-\-period\fR divided by \fB\-\-rate\fR.
+.TP
+\fB\-w, \-\-wordlength \fIint\fR
+Specify the sample size in bits. The default is 16.
+.TP
+\fB\-i, \-\-inchannels \fIint\fR
+Specify how many channels to capture (default: 2)
+.TP
+\fB\-o, \-\-outchannels \fIint\fR
+Specify number of playback channels (default: 2)
+.TP
+\fB\-C, \-\-capture \fIdevice_file\fR
+Specify input device for capture (default: /dev/audio)
+.TP
+\fB\-P, \-\-playback \fIdevice_file\fR
+Specify output device for playback (default: /dev/audio)
+.TP
+\fB\-b, \-\-ignorehwbuf \fIboolean\fR
+Specify, whether to ignore hardware period size (default: false)
+.SS PORTAUDIO BACKEND PARAMETERS
+.TP
+\fB\-c \-\-channel\fR
+Maximum number of channels (default: all available hardware channels)
+.TP
+\fB\-i \-\-channelin\fR
+Maximum number of input channels (default: all available hardware channels)
+.TP
+\fB\-o \-\-channelout\fR
+Maximum number of output channels (default: all available hardware channels)
+.TP
+\fB\-C \-\-capture\fR
+Whether or not to capture (default: true)
+.TP
+\fB\-P \-\-playback\fR
+Whether or not to playback (default: true)
+.TP
+\fB\-D \-\-duplex\fR
+Capture and playback (default: true)
+.TP
+\fB\-r \-\-rate\fR
+Sample rate (default: 48000)
+.TP
+\fB\-p \-\-period\fR
+Frames per period (default: 1024). Must be a power of 2.
+.TP
+\fB\-n \-\-name\fR
+Driver name (default: none)
+.TP
+\fB\-z \-\-dither\fR
+Dithering mode (default: none)
+.SH "EXAMPLES"
+.PP
+Print usage message for the parameters specific to each backend.
+.IP
+\fBjackd \-d alsa \-\-help\fR
+.br
+\fBjackd \-d coreaudio \-\-help\fR
+.br
+\fBjackd \-d net \-\-help\fR
+.br
+\fBjackd \-d dummy \-\-help\fR
+.br
+\fBjackd \-d firewire \-\-help\fR
+.br
+\fBjackd \-d freebob \-\-help\fR
+.br
+\fBjackd \-d oss \-\-help\fR
+.br
+\fBjackd \-d sun \-\-help\fR
+.br
+\fBjackd \-d portaudio \-\-help\fR
+.PP
+Run the JACK daemon with realtime priority using the first ALSA
+hardware card defined in \fB/etc/modules.conf\fR.
+.IP
+\fBjackstart \-\-realtime \-\-driver=alsa\fR
+.PP
+Run the JACK daemon with low latency giving verbose output, which can
+be helpful for trouble\-shooting system latency problems. A
+reasonably well\-tuned system with a good sound card and a
+low\-latency kernel can handle these values reliably. Some can do
+better. If you get xrun messages, try a larger buffer. Tuning a
+system for low latency can be challenging. The JACK FAQ,
+.I http://jackit.sourceforge.net/docs/faq.php\fR
+has some useful suggestions.
+.IP
+\fBjackstart \-Rv \-d alsa \-p 128 \-n 2 \-r 44100\fR
+.PP
+Run \fBjackd\fR with realtime priority using the "sblive" ALSA device
+defined in ~/.asoundrc. Apply shaped dithering to playback audio.
+.IP
+\fBjackd \-R \-d alsa \-d sblive \-\-dither=shaped\fR
+.PP
+Run \fBjackd\fR with no special privileges using the second ALSA
+hardware card defined in \fB/etc/modules.conf\fR. Any xruns reported
+by the ALSA backend will be ignored. The larger buffer helps reduce
+data loss. Rectangular dithering will be used for playback.
+.IP
+\fBjackd \-d alsa \-d hw:1 \-p2048 \-n3 \-\-softmode \-zr\fR
+.PP
+Run \fBjackd\fR in full\-duplex mode using the ALSA hw:0,0 device for
+playback and the hw:0,2 device for capture.
+.IP
+\fBjackd \-d alsa \-P hw:0,0 \-C hw:0,2\fR
+.PP
+Run \fBjackd\fR in playback\-only mode using the ALSA hw:0,0 device.
+.IP
+\fBjackd \-d alsa \-P hw:0,0\fR
+.SH "ENVIRONMENT"
+.br
+JACK is evolving a mechanism for automatically starting the server
+when needed. Any client started without a running JACK server will
+attempt to start one itself using the command line found in the first
+line of \fB$HOME/.jackdrc\fR if it exists, or \fB/etc/jackdrc\fR if it
+does not. If neither file exists, a built\-in default command will be
+used, including the \fB\-T\fR flag, which causes the server to shut
+down when all clients have exited.
+
+As a transition, this only happens when \fB$JACK_START_SERVER\fR is
+defined in the environment of the calling process. In the future this
+will become normal behavior. In either case, defining
+\fB$JACK_NO_START_SERVER\fR disables this feature.
+
+To change where JACK looks for the backend drivers, set
+\fB$JACK_DRIVER_DIR\fR.
+
+\fB$JACK_DEFAULT_SERVER\fR specifies the default server name. If not
+defined, the string "default" is used. If set in their respective
+environments, this affects \fBjackd\fR unless its \fB\-\-name\fR
+parameter is set, and all JACK clients unless they pass an explicit
+name to \fBjack_client_open()\fR.
+
+.SH "SEE ALSO:"
+.PP
+.I http://www.jackaudio.org
+.br
+The official JACK website with news, docs and a list of JACK clients.
+.PP
+.I http://jackaudio.org/email
+.br
+The JACK developers' mailing list. Subscribe, to take part in
+development of JACK or JACK clients. User questions are also welcome,
+there is no user-specific mailing list.
+.PP
+.I http://www.jackosx.com/
+.br
+Tools specific to the Mac OS X version of JACK.
+.PP
+.I http://www.alsa\-project.org
+.br
+The Advanced Linux Sound Architecture.
+.SH "BUGS"
+Please report bugs to
+.br
+.I http://trac.jackaudio.org/
+.SH "AUTHORS"
+Architect and original implementor: Paul Davis
+.PP
+Original design Group: Paul Davis, David Olofson, Kai Vehmanen, Benno Sennoner,
+Richard Guenther, and other members of the Linux Audio Developers group.
+.PP
+Programming: Paul Davis, Jack O'Quin, Taybin Rutkin, Stephane Letz, Fernando
+Pablo Lopez-Lezcano, Steve Harris, Jeremy Hall, Andy Wingo, Kai
+Vehmanen, Melanie Thielker, Jussi Laako, Tilman Linneweh, Johnny
+Petrantoni, Torben Hohn.
+.PP
+Manpage written by Stefan Schwandter, Jack O'Quin and Alexandre
+Prokoudine.
diff -rupN jack-1.9.5.old/man/jack_disconnect.0 jack-1.9.5/man/jack_disconnect.0
--- jack-1.9.5.old/man/jack_disconnect.0 1969-12-31 19:00:00.000000000 -0500
+++ jack-1.9.5/man/jack_disconnect.0 2010-05-17 05:30:11.000000000 -0400
@@ -0,0 +1 @@
+.so man1/jack_connect.1
diff -rupN jack-1.9.5.old/man/jack_freewheel.0 jack-1.9.5/man/jack_freewheel.0
--- jack-1.9.5.old/man/jack_freewheel.0 1969-12-31 19:00:00.000000000 -0500
+++ jack-1.9.5/man/jack_freewheel.0 2010-05-17 05:30:11.000000000 -0400
@@ -0,0 +1,16 @@
+.TH JACK_FREEWHEEL "1" "!DATE!" "!VERSION!"
+.SH NAME
+jack_freewheel \- JACK toolkit client to control freewheeling mode
+.SH SYNOPSIS
+.B jack_freewheel [y|n]
+.SH DESCRIPTION
+.B jack_freewheel
+Turns freewheeling mode on (y) or off (n). While in freewheeling mode,
+the JACK server does not wait in between process() calls, and does not
+read or write data from/to any audio interface. That results in the JACK graph
+processing data as fast as possible. Freewheeling makes fast exports to
+files possible.
+.PP
+There is no useful reason to use this tool other than testing. JACK
+clients that use freewheeling will turn it on and off themselves.
+
diff -rupN jack-1.9.5.old/man/jack_impulse_grabber.0 jack-1.9.5/man/jack_impulse_grabber.0
--- jack-1.9.5.old/man/jack_impulse_grabber.0 1969-12-31 19:00:00.000000000 -0500
+++ jack-1.9.5/man/jack_impulse_grabber.0 2010-05-17 05:30:11.000000000 -0400
@@ -0,0 +1,11 @@
+.TH JACK_IMPULSE_GRABBER "1" "!DATE!" "!VERSION!"
+.SH NAME
+jack_impulse_grabber \- JACK toolkit client to grab an impulse (response)
+.SH SYNOPSIS
+\fBjack_impulse_grabber\fR \fB-d\fR \fIduration\fR [\fI-f\fR (C|gnuplot)]
+.SH DESCRIPTION
+\fBjack_impulse_grabber\fR is a JACK example client for collecting
+impulses recordings from JACK ports.
+
+
+
diff -rupN jack-1.9.5.old/man/jack_load.0 jack-1.9.5/man/jack_load.0
--- jack-1.9.5.old/man/jack_load.0 1969-12-31 19:00:00.000000000 -0500
+++ jack-1.9.5/man/jack_load.0 2010-05-17 05:30:11.000000000 -0400
@@ -0,0 +1,28 @@
+.TH JACK_LOAD "1" "!DATE!" "!VERSION!"
+.SH NAME
+jack_load \- JACK toolkit client for loading in-process clients
+.SH SYNOPSIS
+\fBjack_load\fR [ \fI-i\fR initstring ] [ \fI-s\fR servername ] [\fI-w\fR ] client-name so-name [ initstring ]
+.SH DESCRIPTION
+\fBjack_load\fR is a JACK toolkit client. It loads the specified plugin and creates an in-process client.
+.SH ARGUMENTS
+.PP
+The client-name must be a currently unused client name.
+.PP
+The so-name is the name of file that client code is stored in (typically, \fIclientname.so\fR)
+.SH OPTIONS
+.TP
+\fB-i\fR, \fB--init\fR init-string
+.br
+initialization string passed to the in-process client. Note that this can also be specified as the last argument on the command line.
+.TP
+\fB-s\fR, \fB--server\fR servername
+.br
+Name of JACK server to connect to
+.TP
+\fB-w\fR, \fB--wait\fR
+Wait for a signal (eg. from Ctrl-c) and then unload the client.
+.SH AUTHOR
+Jeremy Hall
+
+
diff -rupN jack-1.9.5.old/man/jack_lsp.0 jack-1.9.5/man/jack_lsp.0
--- jack-1.9.5.old/man/jack_lsp.0 1969-12-31 19:00:00.000000000 -0500
+++ jack-1.9.5/man/jack_lsp.0 2010-05-17 05:30:11.000000000 -0400
@@ -0,0 +1,47 @@
+.TH JACK_LSP "1" "!DATE!" "!VERSION!"
+.SH NAME
+jack_lsp \- JACK toolkit client to list informtion on ports
+.SH SYNOPSIS
+\fBjack_lsp\fR [ \fI-s\fR | \fI--server\fR servername ] [ \fI-AclLptvh\fR ]
+.SH DESCRIPTION
+\fBjack_lsp\fR lists all known ports associated with a JACK
+server. It can also optionally list various kinds of information about each port.
+.SH OPTIONS
+.TP
+\fB-s\fR, \fB--server\fR \fIservername\fR
+.br
+Connect to the jack server named \fIservername\fR
+.TP
+\fB-A\fR, \fB--aliases\fR
+.br
+List aliases for each port
+.TP
+\fB-c\fR, \fB--connections\fR
+.br
+List connections to/from each port
+.TP
+\fB-l\fR, \fB--latency\fR
+.br
+Display per-port latency in frames at each port
+.TP
+\fB-L\fR, \fI--latency\fR
+.br
+Display total latency in frames at each port
+.TP
+\fB-p\fR, \fB--properties\fR
+.br
+Display port properties. Output may include input|output, can-monitor, physical, terminal
+.TP
+\fB-t\fR, \fB--type\fR
+.br
+Display port type
+.TP
+\fB-h\fR, \fB--help\fR
+.br
+Display help/usage message
+.TP
+\fB-v\fR, \fB--version\fR
+.br
+Output version information and exit
+
+
diff -rupN jack-1.9.5.old/man/jack_metro.0 jack-1.9.5/man/jack_metro.0
--- jack-1.9.5.old/man/jack_metro.0 1969-12-31 19:00:00.000000000 -0500
+++ jack-1.9.5/man/jack_metro.0 2010-05-17 05:30:11.000000000 -0400
@@ -0,0 +1,40 @@
+.TH JACK_METRO "1" "!DATE!" "!VERSION!"
+.SH NAME
+jack_metro \- JACK toolkit metronome
+.SH SYNOPSIS
+\fBjack_metro\fR [ \fI-n\fR name ] [ \fI-f\fR hz ] [ \fI-D\fR msecs ] [\fI-a\fR % ] [ \fI-d\fR % ] \fI-b\fR bpm
+.SH DESCRIPTION
+\fBjack_metro\fR is a simple metronome for JACK. It generates a
+synthetic "tick" sound for every beat. Note that is does \fBnot\fR
+connect its output port by default - to hear the sound it makes you must
+connect them using some other tool.
+.SH OPTIONS
+.TP
+\fB-n\fR, \fB--name\fR
+.br
+Specify a name for this instance of the metronome.
+.TP
+\fB-f\fR, \fB--frequency\fR Hz
+.br
+Define the frequency of the "tick" in Hz.
+.TP
+\fB-D\fR, \fB--duration\fR msecs
+.br
+Define the duration of the "tick" in milliseconds.
+.TP
+\fB-a\fR, \fB--attack\fR %-age
+.br
+Define the duration of the attack phase of the "tick" as a percentage
+of the duration.
+.TP
+\fB-d\fR, \fB--decay\fR %-age
+.br
+Define the duration of the decay phase of the "tick" as a percentage
+of the duration.
+.TP
+\fB--b\fR, \fB--bpm\fR bpm
+.br
+Define the number of beats per minute.
+.SH AUTHOR
+Anthony Van Groningen
+
diff -rupN jack-1.9.5.old/man/jack_monitor_client.0 jack-1.9.5/man/jack_monitor_client.0
--- jack-1.9.5.old/man/jack_monitor_client.0 1969-12-31 19:00:00.000000000 -0500
+++ jack-1.9.5/man/jack_monitor_client.0 2010-05-17 05:30:11.000000000 -0400
@@ -0,0 +1,18 @@
+.TH JACK_CONNECT "1" "!DATE!" "!VERSION!"
+.SH NAME
+jack_monitor_client \- The JACK Audio Connection Kit example client
+.SH SYNOPSIS
+.B jack_monitor_client
+client-name
+.PP
+The client-name must be the name of a existing client that monitoring is
+to be enabled for.
+.SH DESCRIPTION
+.B jack_monitor_client
+is an example client for the JACK Audio Connection Kit. It enables
+monitoring for the specified client.
+.SH AUTHOR
+Jeremy Hall
+.PP
+This manpage was written by Robert Jordens <jordens at debian.org> for Debian.
+
diff -rupN jack-1.9.5.old/man/jack_netsource.0 jack-1.9.5/man/jack_netsource.0
--- jack-1.9.5.old/man/jack_netsource.0 1969-12-31 19:00:00.000000000 -0500
+++ jack-1.9.5/man/jack_netsource.0 2010-05-17 05:30:11.000000000 -0400
@@ -0,0 +1,109 @@
+.TH JACK_NETSOURCE "1" "!DATE!" "!VERSION!"
+.SH NAME
+jack_netsource \- Netjack Master client for one slave
+.SH SYNOPSIS
+\fBjack_netsource\fR [ \fI-H\fR hostname ] [ \fIoptions\fR ]
+
+.SH DESCRIPTION
+\fBjack_netsource\fR The Master side of a netjack connection. Represents the slave jackd -dnet in the master jack graph.
+Most connection parameters are configured via the netsource, and the slave will set itself up according to the commandline
+option given to jack_netsource.
+.br
+Netjack allows low latency audio connections over general IP networks. When using celt for compression, it is even possible
+to establish transatlantic links, with latencies not much over the actual ping time.
+.br
+But the main usecase is of course a LAN, where it can achieve one jack period of latency.
+
+.SH OPTIONS
+.TP
+\fB-h\fR this help text
+.TP
+\fB-H\fR \fIslave host\fR
+.br
+Host name of the slave JACK
+.TP
+\fB-o\fR \fInum channels\fR
+.br
+Number of audio playback channels
+.TP
+\fB-i\fR \fInum channels\fR
+.br
+Number of audio capture channels
+.TP
+\fB-O\fR \fInum channels\fR
+.br
+Number of midi playback channels
+.TP
+\fB-I\fR \fInum channels\fR
+.br
+Number of midi capture channels
+.TP
+\fB-n\fR \fIperiods\fR
+.br
+Network latency in JACK periods
+.TP
+\fB-p\fR \fIport\fR
+.br
+UDP port that the slave is listening on
+.TP
+\fB-r\fR \fIreply port\fR
+.br
+UDP port that we are listening on
+.TP
+\fB-B\fR \fIbind port\fR
+.br
+reply port, for use in NAT environments
+.TP
+\fB-b\fR \fIbitdepth\fR
+.br
+Set transport to use 16bit or 8bit
+.TP
+\fB-c\fR \fIbytes\fR
+.br
+Use CELT encoding with <bytes> per period and channel
+.TP
+\fB-m\fR \fImtu\fR
+.br
+Assume this mtu for the link
+.TP
+\fB-R\fR \fIN\fR
+.br
+Redundancy: send out packets N times.
+.TP
+\fB-e\fR
+.br
+skip host-to-network endianness conversion
+.TP
+\fB-N\fR \fIjack name\fR
+.br
+Reports a different client name to jack
+.TP
+.TP
+\fB-s\fR, \fB--server\fR \fIservername\fR
+.br
+Connect to the jack server named \fIservername\fR
+.TP
+\fB-h\fR, \fB--help\fR
+.br
+Display help/usage message
+.TP
+\fB-v\fR, \fB--version\fR
+.br
+Output version information and exit
+
+
+.SH EXAMPLES
+
+.PP
+run a 4 audio channel bidirectional link with one period of latency and no midi channels. Audio data is flowing uncompressed over the wire:
+.br
+On \fIhostA\fR:
+.IP
+\fBjackd \-d alsa \fR
+.br
+\fBjack_netsource \-H hostB -n1 -i4 -o4 -I0 -O0 \fR
+.PP
+On \fIhostB\fR:
+.IP
+\fBjackd \-d net \fR
+
diff -rupN jack-1.9.5.old/man/jackrec.0 jack-1.9.5/man/jackrec.0
--- jack-1.9.5.old/man/jackrec.0 1969-12-31 19:00:00.000000000 -0500
+++ jack-1.9.5/man/jackrec.0 2010-05-17 05:30:11.000000000 -0400
@@ -0,0 +1,23 @@
+.TH JACKREC "1" "!DATE!" "!VERSION!"
+.SH NAME
+jackrec \- JACK toolkit client for recording audio
+.SH SYNOPSIS
+.B jackrec
+\-f filename \-d seconds [ \-b bitdepth ] port1 [ port2 ... ]
+.SH DESCRIPTION
+.B jackrec is a basic, but useful, audio recorder that will record
+audio from 1 or more JACK ports to a file on disk. The file format is
+always RIFF/WAV, with samples stored as signed integers. The sample
+bit depth can be selected using the \fI-b\fR option. The file will
+have as many channels as there are ports specified on the command line
+- each channel will contain the data recorded from one port. The user
+should generally specify the duration (in seconds) using the \fI-d\fR
+option. If not specified, jackrec will record until terminated by a
+signal (eg. from Ctrl-c).
+.PP
+This application is not intended to be a heavy duty audio recorder,
+and originated as an example client to show how to handle threading
+and disk I/O in a JACK client. However, it is a useful, simple
+recorder and is included in the JACK toolkit as a result.
+
+
diff -rupN jack-1.9.5.old/man/jack_samplerate.0 jack-1.9.5/man/jack_samplerate.0
--- jack-1.9.5.old/man/jack_samplerate.0 1969-12-31 19:00:00.000000000 -0500
+++ jack-1.9.5/man/jack_samplerate.0 2010-05-17 05:30:11.000000000 -0400
@@ -0,0 +1,9 @@
+.TH JACK_SAMPLERATE "1" "!DATE!" "!VERSION!"
+.SH NAME
+jack_samplerate \- JACK toolkit client to print current samplerate
+.SH SYNOPSIS
+.B jack_samplerate
+.SH DESCRIPTION
+.B jack_samplerate prints the current samplerate, and exits.
+
+
diff -rupN jack-1.9.5.old/man/jack_showtime.0 jack-1.9.5/man/jack_showtime.0
--- jack-1.9.5.old/man/jack_showtime.0 1969-12-31 19:00:00.000000000 -0500
+++ jack-1.9.5/man/jack_showtime.0 2010-05-17 05:30:11.000000000 -0400
@@ -0,0 +1,13 @@
+.TH JACK_SHOWTIME "1" "!DATE!" "!VERSION!"
+.SH NAME
+jack_showtime \- The JACK Audio Connection Kit example client
+.SH SYNOPSIS
+.B jack_showtime
+.SH DESCRIPTION
+.B jack_showtime
+prints the current timebase information to stdout
+.SH AUTHOR
+Paul Davis
+.PP
+This manpage was written by Stefan Schwandter <swan at debian.org>
+
diff -rupN jack-1.9.5.old/man/jack_simple_client.0 jack-1.9.5/man/jack_simple_client.0
--- jack-1.9.5.old/man/jack_simple_client.0 1969-12-31 19:00:00.000000000 -0500
+++ jack-1.9.5/man/jack_simple_client.0 2010-05-17 05:30:11.000000000 -0400
@@ -0,0 +1,20 @@
+.TH JACK_CONNECT "1" "!DATE!" "!VERSION!"
+.SH NAME
+jack_simple_client \- The JACK Audio Connection Kit example client
+.SH SYNOPSYS
+.B jack_simple_client
+client-name
+.PP
+The client-name must be a yet unused client name.
+.SH DESCRIPTION
+.B jack_simple_client
+is an example client for the JACK Audio Connection Kit. It creates two
+ports (client-name:input and client-name:output) that pass the data
+unmodified.
+.SH EXAMPLE
+jack_simple_client in_process_test
+.SH AUTHOR
+Jeremy Hall
+.PP
+This manpage was written by Robert Jordens <jordens at debian.org> for Debian.
+
diff -rupN jack-1.9.5.old/man/jack_transport.0 jack-1.9.5/man/jack_transport.0
--- jack-1.9.5.old/man/jack_transport.0 1969-12-31 19:00:00.000000000 -0500
+++ jack-1.9.5/man/jack_transport.0 2010-05-17 05:30:11.000000000 -0400
@@ -0,0 +1,13 @@
+.TH JACK_TRANSPORT "1" "!DATE!" "!VERSION!"
+.SH NAME
+jack_transport \- JACK toolkit client for transport control
+.SH SYNOPSIS
+.B jack_transport
+.SH DESCRIPTION
+.B jack_transport
+is a toolkit client for the JACK Audio Connection Kit. It provides command-line
+control over the JACK transport system. Type help at jack_transport's
+command prompt to see the available commands.
+.SH AUTHOR
+Jeremy Hall
+
diff -rupN jack-1.9.5.old/man/jack_unload.0 jack-1.9.5/man/jack_unload.0
--- jack-1.9.5.old/man/jack_unload.0 1969-12-31 19:00:00.000000000 -0500
+++ jack-1.9.5/man/jack_unload.0 2010-05-17 05:30:11.000000000 -0400
@@ -0,0 +1,19 @@
+.TH JACK_UNLOAD "1" "!DATE!" "!VERSION!"
+.SH NAME
+jack_unload \- The JACK Audio Connection Kit example client
+.SH SYNOPSIS
+.B jack_unload
+client-name
+.PP
+The client-name must be the name of a loaded client that can be unloaded.
+.SH DESCRIPTION
+.B jack_unload
+is the counterpart to
+.B jack_load
+and unloads the specified client.
+.SH EXAMPLE
+.B jack_unload in_process_test
+.SH AUTHOR
+Jeremy Hall
+.PP
+This manpage was written by Robert Jordens <jordens at debian.org> for Debian.
diff -rupN jack-1.9.5.old/man/jack_wait.0 jack-1.9.5/man/jack_wait.0
--- jack-1.9.5.old/man/jack_wait.0 1969-12-31 19:00:00.000000000 -0500
+++ jack-1.9.5/man/jack_wait.0 2010-05-17 05:30:11.000000000 -0400
@@ -0,0 +1,41 @@
+.TH JACK_WAIT "1" "!DATE!" "!VERSION!"
+.SH NAME
+jack_wait \- JACK toolkit client to check and wait for existence/exit of jackd.
+.SH SYNOPSIS
+\fBjack_wait\fR [ \fI-s\fR | \fI--server\fR servername ] [ \fI-t\fR | \fI--timeout\fR timeout_seconds [ \fI-cqwhv\fR ]
+.SH DESCRIPTION
+\fBjack_wait\fR When invoked with \fI-c\fR it only checks for the existence of a jack server. When invoked with \fI-w\fR the
+program will wait for a jackd to be available.
+The \fI-q\fR makes it wait for the jackd to exit.
+
+.SH OPTIONS
+.TP
+\fB-w\fR, \fB--wait\fR
+.br
+Wait for jackd to be available.
+.TP
+\fB-q\fR, \fB--quit\fR
+.br
+Wait for jackd quit.
+.TP
+\fB-c\fR, \fB--check\fR
+.br
+Only check for existence of jackd, and exit.
+.TP
+\fB-s\fR, \fB--server\fR \fIservername\fR
+.br
+Connect to the jack server named \fIservername\fR
+.TP
+\fB-t\fR, \fB--timeout\fR \fItimeout_seconds\fR
+.br
+Only wait \fItimeout_seconds\fR.
+.TP
+\fB-h\fR, \fB--help\fR
+.br
+Display help/usage message
+.TP
+\fB-v\fR, \fB--version\fR
+.br
+Output version information and exit
+
+
diff -rupN jack-1.9.5.old/man/wscript jack-1.9.5/man/wscript
--- jack-1.9.5.old/man/wscript 1969-12-31 19:00:00.000000000 -0500
+++ jack-1.9.5/man/wscript 2010-05-17 05:30:11.000000000 -0400
@@ -0,0 +1,13 @@
+#! /usr/bin/env python
+# encoding: utf-8
+
+import Build
+import re
+import os
+import misc
+
+
+def build(bld):
+ bld.exec_command("cd man ; sh fill_template %s" % bld.env['JACK_VERSION'])
+ bld.install_files(bld.env['MANDIR'], '*.1')
+
diff -rupN jack-1.9.5.old/wscript jack-1.9.5/wscript
--- jack-1.9.5.old/wscript 2010-02-12 05:58:08.000000000 -0500
+++ jack-1.9.5/wscript 2010-06-04 22:00:04.000000000 -0400
@@ -62,6 +62,7 @@ def set_options(opt):
opt.add_option('--libdir', type='string', help="Library directory [Default: <prefix>/lib]")
opt.add_option('--libdir32', type='string', help="32bit Library directory [Default: <prefix>/lib32]")
+ opt.add_option('--mandir', type='string', help="Manpage directory [Default: <prefix>/share/man/man1]")
opt.add_option('--dbus', action='store_true', default=False, help='Enable D-Bus JACK (jackdbus)')
opt.add_option('--classic', action='store_true', default=False, help='Force enable standard JACK (jackd) even if D-Bus JACK (jackdbus) is enabled too')
opt.add_option('--doxygen', action='store_true', default=False, help='Enable build of doxygen documentation')
@@ -150,6 +151,11 @@ def configure(conf):
conf.env['LIBDIR'] = conf.env['PREFIX'] + Options.options.libdir
else:
conf.env['LIBDIR'] = conf.env['PREFIX'] + '/lib'
+
+ if Options.options.mandir:
+ conf.env['MANDIR'] = conf.env['PREFIX'] + Options.options.mandir
+ else:
+ conf.env['MANDIR'] = conf.env['PREFIX'] + '/share/man/man1'
if conf.env['BUILD_DEBUG']:
conf.env.append_unique('CXXFLAGS', '-g')
@@ -255,6 +261,7 @@ def build(bld):
bld.add_subdirs('linux')
bld.add_subdirs('example-clients')
bld.add_subdirs('tests')
+ bld.add_subdirs('man')
if bld.env['BUILD_JACKDBUS'] == True:
bld.add_subdirs('dbus')
jack-realtime-compat.patch:
JackControlAPI.cpp | 9 ++++++++-
JackServerGlobals.cpp | 11 ++++++++++-
2 files changed, 18 insertions(+), 2 deletions(-)
--- NEW FILE jack-realtime-compat.patch ---
diff -rupN jack-1.9.5.old/common/JackControlAPI.cpp jack-1.9.5/common/JackControlAPI.cpp
--- jack-1.9.5.old/common/JackControlAPI.cpp 2010-02-12 05:57:47.000000000 -0500
+++ jack-1.9.5/common/JackControlAPI.cpp 2010-07-20 00:42:55.000000000 -0400
@@ -32,6 +32,7 @@
#include <stdio.h>
#include <assert.h>
#include <signal.h>
+#include <sys/utsname.h>
#include "jslist.h"
#include "driver_interface.h"
@@ -675,7 +676,13 @@ EXPORT jackctl_server_t * jackctl_server
goto fail_free_parameters;
}
- value.i = 10;
+ struct utsname utsname;
+ int success;
+ success = uname( &utsname );
+ if( success == 0 && strstr( utsname.version, "ccrma" ) )
+ value.i = 60;
+ else
+ value.i = 20;
if (jackctl_add_parameter(
&server_ptr->parameters,
"realtime-priority",
diff -rupN jack-1.9.5.old/common/JackServerGlobals.cpp jack-1.9.5/common/JackServerGlobals.cpp
--- jack-1.9.5.old/common/JackServerGlobals.cpp 2010-02-12 05:57:47.000000000 -0500
+++ jack-1.9.5/common/JackServerGlobals.cpp 2010-07-20 00:40:43.000000000 -0400
@@ -22,6 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridg
#include "shm.h"
#include <getopt.h>
#include <errno.h>
+#include <sys/utsname.h>
static char* server_name = NULL;
@@ -67,9 +68,17 @@ void JackServerGlobals::Delete()
bool JackServerGlobals::Init()
{
+ struct utsname utsname;
+ int success;
+ success = uname( &utsname );
+
int realtime = 0;
int client_timeout = 0; /* msecs; if zero, use period size. */
- int realtime_priority = 10;
+ int realtime_priority;
+ if( success == 0 && strstr( utsname.version, "ccrma" ) )
+ realtime_priority = 60;
+ else
+ realtime_priority = 20;
int verbose_aux = 0;
int do_mlock = 1;
unsigned int port_max = 128;
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jack-audio-connection-kit/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore 21 Nov 2009 19:50:01 -0000 1.8
+++ .cvsignore 20 Jul 2010 05:53:43 -0000 1.9
@@ -1 +1 @@
-jack-audio-connection-kit-0.118.0.tar.gz
+jack-1.9.5.tar.bz2
Index: jack-audio-connection-kit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jack-audio-connection-kit/devel/jack-audio-connection-kit.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- jack-audio-connection-kit.spec 21 Nov 2009 19:50:01 -0000 1.33
+++ jack-audio-connection-kit.spec 20 Jul 2010 05:53:44 -0000 1.34
@@ -1,42 +1,56 @@
-Summary: The Jack Audio Connection Kit
-Name: jack-audio-connection-kit
-Version: 0.118.0
-Release: 1%{?dist}
-License: GPLv2 and LGPLv2
-Group: System Environment/Daemons
-Source0: http://www.jackaudio.org/downloads/%{name}-%{version}.tar.gz
-Source1: %{name}-README.Fedora
-Source2: %{name}-script.pa
-Source3: %{name}-no_date_footer.html
-Source4: %{name}-limits.conf
-URL: http://www.jackaudio.org
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%global groupname jackuser
+%global pagroup pulse-rt
+
+Summary: The Jack Audio Connection Kit
+Name: jack-audio-connection-kit
+Version: 1.9.5
+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
+URL: http://www.jackaudio.org
+Source0: http://www.grame.fr/~letz/jack-%{version}.tar.bz2
+Source1: %{name}-README.Fedora
+Source2: %{name}-script.pa
+Source3: %{name}-limits.conf
+# No-date-footer hack to remove dates from doxygen documentation
+Patch0: jack-audio-connection-kit-no_date_footer.patch
+# Enables renaming of the jack ports based on a configuration file
+# Under discussion upstream. We need it for CCRMA compatibility
+Patch1: jack-infrastructure.patch
+# Fix DSO linking
+Patch2: jack-DSO-linking.patch
+# Manpages. From ustream trunk
+Patch3: jack-manpages.patch
+# Make jack compatible with both the Fedora kernel and the realtime kernel
+Patch4: jack-realtime-compat.patch
+# Compile against celt-0.8.0
+Patch5: jack-celt08.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel
-BuildRequires: libsndfile-devel >= 1.0.0
-BuildRequires: pkgconfig
+BuildRequires: dbus-devel
+BuildRequires: celt-devel
BuildRequires: doxygen
-BuildRequires: readline-devel, ncurses-devel
-BuildRequires: autoconf >= 2.59, automake >= 1.9.3, libtool
-%ifnarch s390 s390x
-BuildRequires: libfreebob-devel >= 1.0.0
-%endif
-
-%define groupname jackuser
-%define pagroup pulse-rt
+BuildRequires: expat-devel
+BuildRequires: libffado-devel
+BuildRequires: libfreebob-devel
+BuildRequires: libsamplerate-devel
+BuildRequires: libsndfile-devel
+BuildRequires: ncurses-devel
+BuildRequires: pkgconfig
+BuildRequires: python2
+BuildRequires: readline-devel
Requires(pre): shadow-utils
-Requires(post): /sbin/ldconfig
-Requires: pam
-
-# To fix multilib conflicts take a basepoint as following
-%define doxyfile doc/reference.doxygen.in
+Requires: pam
%description
JACK is a low-latency audio server, written primarily for the Linux
operating system. It can connect a number of different applications to
an audio device, as well as allowing them to share audio between
-themselves. Its clients can run in their own processes (ie. as a
-normal application), or can they can run within a JACK server (ie. a
+themselves. Its clients can run in their own processes (i.e. as a
+normal application), or can they can run within a JACK server (i.e. a
"plugin").
JACK is different from other audio server efforts in that it has been
@@ -45,61 +59,58 @@ work. This means that it focuses on two
execution of all clients, and low latency operation.
%package devel
-Summary: Header files for Jack
-Group: Development/Libraries
-Requires: %{name} = %{version}
-Requires: pkgconfig
+Summary: Header files for Jack
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
%description devel
Header files for the Jack Audio Connection Kit.
%package example-clients
-Summary: Example clients that use Jack
-Group: Applications/Multimedia
-Requires: %{name} = %{version}
+Summary: Example clients that use Jack
+Group: Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
%description example-clients
Small example clients that use the Jack Audio Connection Kit.
%prep
-%setup -q
+%setup -q -n jack-%{version}
+%patch0 -p1 -b .nodate
+%patch1 -p1 -b .infra
+%patch2 -p1 -b .linking
+%patch3 -p1
+%patch4 -p1
+%if 0%{?fedora} > 13
+%patch5 -p1 -b .celt08
+%endif
-# 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
-# Fix Doxyfile:
-# - apply custom html footer (#477718, #341621)
-# - avoid font packaging (workaround for #477402, fix will come with #478747)
-sed -e 's,^HTML_FOOTER[ \t]*=.*,HTML_FOOTER = no_date_footer.html,;
- s,^GENERATE_LATEX[ \t]*=.*,GENERATE_LATEX = NO,;' %{doxyfile} > %{doxyfile}.new
-touch -r %{doxyfile} %{doxyfile}.new
-mv -f %{doxyfile}.new %{doxyfile}
+# Fix encoding issues
+for file in ChangeLog README TODO; do
+ sed 's|\r||' $file > $file.tmp
+ iconv -f ISO-8859-1 -t UTF8 $file.tmp > $file.tmp2
+ touch -r $file $file.tmp2
+ mv -f $file.tmp2 $file
+done
%build
-# x86_64 issue reported by Rudolf Kastl (not checked, but not bad).
-autoreconf --force --install
-
-%configure \
- --with-html-dir=%{_docdir} \
-%ifnarch s390 s390x
- --enable-freebob \
-%endif
- --disable-oss \
- --disable-portaudio \
- --with-default-tmpdir=/dev/shm
-make %{?_smp_mflags}
+export CPPFLAGS="$RPM_OPT_FLAGS"
+./waf configure --prefix=%{_prefix} --libdir=/%{_lib} --doxygen --dbus --classic
+./waf build %{?_smp_mflags} -v
%install
rm -rf $RPM_BUILD_ROOT
+./waf --destdir=$RPM_BUILD_ROOT install
-# can't use the makeinstall macro, jack needs DESTDIR and prefix gets
-# added to it and messes up part of the install
-make install DESTDIR=$RPM_BUILD_ROOT
+# move doxygen documentation to the right place
+mv $RPM_BUILD_ROOT%{_datadir}/jack-audio-connection-kit/reference .
+rm -rf $RPM_BUILD_ROOT%{_datadir}/jack-audio-connection-kit
# install our limits to the /etc/security/limits.d
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/limits.d
sed -e 's, at groupname@,%groupname,g; s, at pagroup@,%pagroup,g;' \
- %{SOURCE4} > $RPM_BUILD_ROOT%{_sysconfdir}/security/limits.d/99-jack.conf
+ %{SOURCE3} > $RPM_BUILD_ROOT%{_sysconfdir}/security/limits.d/99-jack.conf
# prepare README.Fedora for documentation including
install -p -m644 %{SOURCE1} README.Fedora
@@ -107,15 +118,11 @@ install -p -m644 %{SOURCE1} README.Fedor
# install pulseaudio script for jack (as documentation part)
install -p -m644 %{SOURCE2} jack.pa
-# remove extra install of the documentation
-rm -fr $RPM_BUILD_ROOT%{_docdir}
-
-# remove *.la files
-rm -f $RPM_BUILD_ROOT%{_libdir}/jack/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+# For compatibility with jack1
+mv $RPM_BUILD_ROOT%{_bindir}/jack_rec $RPM_BUILD_ROOT%{_bindir}/jackrec
-# Fix timestamps to avoid multiarch conflicts
-find doc/reference -type f | xargs touch -r %{doxyfile}
+# Fix permissions of the modules
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/jack/*.so $RPM_BUILD_ROOT%{_libdir}/libjack*.so.*.*.*
%clean
rm -rf $RPM_BUILD_ROOT
@@ -129,37 +136,56 @@ exit 0
%postun -p /sbin/ldconfig
%files
-%defattr(-,root,root)
-%doc AUTHORS TODO COPYING*
+%defattr(-,root,root,-)
+%doc ChangeLog README README_NETJACK2 TODO
%doc README.Fedora
%doc jack.pa
+%{_bindir}/alsa_in
+%{_bindir}/alsa_out
%{_bindir}/jackd
%{_bindir}/jack_load
%{_bindir}/jack_unload
%{_bindir}/jack_freewheel
+%exclude %{_bindir}/jackdbus
+%exclude %{_bindir}/jack_control
+%{_bindir}/jack_cpu
+%{_bindir}/jack_cpu_load
+%{_bindir}/jack_delay
+%{_bindir}/jack_server_control
+%{_bindir}/jack_test
+%{_bindir}/jack_thru
+%{_bindir}/jack_zombie
+%{_datadir}/dbus-1/services/org.jackaudio.service
%{_libdir}/jack/
-%{_mandir}/man1/jack*.1*
%{_libdir}/libjack.so.*
%{_libdir}/libjackserver.so.*
-%{_sysconfdir}/security/limits.d/*.conf
+%config(noreplace) %{_sysconfdir}/security/limits.d/*.conf
+%{_mandir}/man1/alsa_*.1*
+%{_mandir}/man1/jack_freewheel*.1*
+%{_mandir}/man1/jack_load*.1*
+%{_mandir}/man1/jack_unload*.1*
+%{_mandir}/man1/jackd*.1*
+
%files devel
-%defattr(-,root,root)
-%doc doc/reference
+%defattr(-,root,root,-)
+%doc reference/*
%{_includedir}/jack/
%{_libdir}/libjack.so
%{_libdir}/libjackserver.so
%{_libdir}/pkgconfig/jack.pc
%files example-clients
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%{_bindir}/jackrec
%{_bindir}/jack_alias
%{_bindir}/jack_bufsize
%{_bindir}/jack_connect
%{_bindir}/jack_disconnect
%{_bindir}/jack_evmon
-%{_bindir}/jack_impulse_grabber
+# These are not ready yet
+#{_bindir}/jack_impulse_grabber
+%exclude %{_mandir}/man1/jack_impulse_grabber.1*
%{_bindir}/jack_lsp
%{_bindir}/jack_metro
%{_bindir}/jack_netsource
@@ -169,11 +195,28 @@ exit 0
%{_bindir}/jack_wait
%{_bindir}/jack_monitor_client
%{_bindir}/jack_simple_client
-%{_bindir}/jack_transport_client
%{_bindir}/jack_midiseq
%{_bindir}/jack_midisine
+%{_bindir}/jack_multiple_metro
+%{_mandir}/man1/jack_bufsize.1*
+%{_mandir}/man1/jack_connect.1*
+%{_mandir}/man1/jack_disconnect.1*
+%{_mandir}/man1/jack_lsp.1*
+%{_mandir}/man1/jack_metro.1*
+%{_mandir}/man1/jack_monitor_client.1*
+%{_mandir}/man1/jack_netsource.1*
+%{_mandir}/man1/jack_samplerate.1*
+%{_mandir}/man1/jack_showtime.1*
+%{_mandir}/man1/jack_simple_client.1*
+%{_mandir}/man1/jack_transport.1*
+%{_mandir}/man1/jack_wait.1*
+%{_mandir}/man1/jackrec.1*
+
%changelog
+* Mon Jul 19 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 1.9.5-1
+- Jack 2!
+
* Sat Nov 21 2009 Andy Shevchenko <andy at smile.org.ua> - 0.118.0-1
- update to 0.118.0 (should fix #533419)
- remove upstreamed patch
@@ -274,7 +317,7 @@ exit 0
- remove --enable-stripped-jackd and --enable-optimize (use default flags)
* Fri May 19 2006 Andy Shevchenko <andriy at asplinux.com.ua> 0.101.1-8
-- uniform directories items at %files section
+- uniform directories items at %%files section
* Wed May 17 2006 Andy Shevchenko <andriy at asplinux.com.ua> 0.101.1-7
- change License tag to GPL/LGPL
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jack-audio-connection-kit/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources 21 Nov 2009 19:50:01 -0000 1.9
+++ sources 20 Jul 2010 05:53:44 -0000 1.10
@@ -1 +1 @@
-d58e29a55f285d54e75134cec8e02a10 jack-audio-connection-kit-0.118.0.tar.gz
+fdb86434b57255139b72c7f91e827fea jack-1.9.5.tar.bz2
--- jack-audio-connection-kit-no_date_footer.html DELETED ---
More information about the scm-commits
mailing list