[SCM] Debian packaging for jack-audio-connection-kit branch, master, updated. debian/0.116.2+svn3592-2-15-g60234c2

[adiknoth-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit afbe54f605ba24c2592f6d0fd6cedf972f5c122a
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Mon Sep 7 13:51:41 2009 +0200

    Intemediate Patches for #486308 and #539581.
    
    These patches have been sent to upstream and will be removed
    once they hit the upstream repo.
    
    First patch fixes an endian problem on BE CPUs, the second one
    adds the missing documentation about jackd's new realtime default.

diff --git a/debian/patches/20_big_endian_alsa.patch b/debian/patches/20_big_endian_alsa.patch
new file mode 100644
index 0000000..6d97452
--- /dev/null
+++ b/debian/patches/20_big_endian_alsa.patch
@@ -0,0 +1,17 @@
+This patch is a cure for #486308 and has been sent to upstream.
+
+It can be removed when http://trac.jackaudio.org/ticket/135 is closed.
+
+Index: drivers/alsa/memops.c
+===================================================================
+--- drivers/alsa/memops.c	(revision 3637)
++++ drivers/alsa/memops.c	(working copy)
+@@ -347,7 +347,7 @@
+ 		x <<= 8;
+ 		x |= (unsigned char)(src[0]);
+ 		/* correct sign bit and the rest of the top byte */
+-		if (src[0] & 0x80) {
++		if (src[2] & 0x80) {
+ 			x |= 0xff << 24;
+ 		}
+ #endif
diff --git a/debian/patches/25_realtime_is_default.patch b/debian/patches/25_realtime_is_default.patch
new file mode 100644
index 0000000..ced2fc9
--- /dev/null
+++ b/debian/patches/25_realtime_is_default.patch
@@ -0,0 +1,81 @@
+jack defaults to realtime, but the documentation doesn't reflect this,
+yet.
+
+This patch has been sent to upstream, in the meantime, it's a cure for
+debian bug #539581
+
+Index: config/os/gnu-linux/sanitycheck.c
+===================================================================
+--- config/os/gnu-linux/sanitycheck.c	(revision 3637)
++++ config/os/gnu-linux/sanitycheck.c	(working copy)
+@@ -22,6 +22,7 @@
+ 	  errors++;
+ 	  relogin++;
+ 	  fprintf(stderr, "\nJACK is running in realtime mode, but you are not allowed to use realtime scheduling.\n");
++	  fprintf(stderr, "You can switch off realtime mode by passing -L on the command line.\n");
+ 		  
+ 	  if (!system_has_rtprio_limits_conf()) {
+ 		  errors++;
+Index: jackd/jackd.1.in
+===================================================================
+--- jackd/jackd.1.in	(revision 3637)
++++ jackd/jackd.1.in	(working copy)
+@@ -1,4 +1,4 @@
+-.TH "JACKD" "1" "@VERSION@" "April 2006" ""
++.TH "JACKD" "1" "@VERSION@" "September 2009" ""
+ .SH "NAME"
+ jackd, jackstart \- JACK Audio Connection Kit sound server
+ .SH "SYNOPSIS"
+@@ -65,16 +65,26 @@
+ for occasions when the structure of this registry changes in ways
+ that are incompatible across JACK versions (which is rare).
+ .TP
++\fB\-L, \-\-no\-realtime\fR 
++.br
++Disable realtime scheduling. By default, jackd tries to acquire
++realtime priorities to achieve reliable operation. However, if you
++don't need them (read: XRUNs are acceptable), this option tells
++jackd to start without realtime priorities.
++.TP
+ \fB\-R, \-\-realtime\fR 
+ .br
+-Use realtime scheduling.  This is needed for reliable low\-latency
++Use realtime scheduling. This option is the default since 0.116.3,
++you don't need to set it anymore.
++.br
++Realtime scheduling is needed for reliable low\-latency
+ performance.  On most systems, it requires \fBjackd\fR to run with
+ special scheduler and memory allocation privileges, which may be
+ obtained in several ways.  The simplest, and least-secure method is to
+ run \fBjackd\fR with root privileges.  This means that all JACK
+ clients must also run as root.  With a Linux 2.6 kernel, ordinary
+-users can run \fBjackd\fR and its clients using options of the
+-realtime LSM.  Linux 2.4 kernels need "POSIX draft capabilities"
++users can run \fBjackd\fR and its clients using POSIX RT priorities.
++Linux 2.4 kernels need "POSIX draft capabilities"
+ enabled (see the \fB<linux/capability.h>\fR include file).  Using that
+ method, ordinary users who invoke the daemon using \fBjackstart\fR,
+ can later launch JACK clients without running them as root.  See
+@@ -83,7 +93,7 @@
+ .TP
+ \fB\-P, \-\-realtime\-priority \fIint\fR
+ When running \fB\-\-realtime\fR, set the scheduler priority to
+-\fIint\fR.
++\fIint\fR. You usually don't need this option.
+ .TP
+ \fB\-\-silent\fR
+ Silence any output during operation.
+Index: jackd/jackd.c
+===================================================================
+--- jackd/jackd.c	(revision 3637)
++++ jackd/jackd.c	(working copy)
+@@ -362,7 +362,8 @@
+ {
+ 	copyright (file);
+ 	fprintf (file, "\n"
+-"usage: jackd [ --realtime OR -R [ --realtime-priority OR -P priority ] ]\n"
++"usage: jackd [ --no-realtime OR -L ]\n"
++"             [ --realtime-priority OR -P priority ]\n"
+ "             [ --name OR -n server-name ]\n"
+ "             [ --no-mlock OR -m ]\n"
+ "             [ --unlock OR -u ]\n"

-- 
Debian packaging for jack-audio-connection-kit