rpms/jack-audio-connection-kit/F-9 jack-audio-connection-kit-0.109.2-bz451531.patch, NONE, 1.1 jack-audio-connection-kit-README.Fedora, 1.1, 1.2 jack-audio-connection-kit.spec, 1.22, 1.23

[Andy Shevchenko (andriy)]

Author: andriy

Update of /cvs/extras/rpms/jack-audio-connection-kit/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10426

Modified Files:
	jack-audio-connection-kit-README.Fedora 
	jack-audio-connection-kit.spec 
Added Files:
	jack-audio-connection-kit-0.109.2-bz451531.patch 
Log Message:
Fix #455193, #451531

jack-audio-connection-kit-0.109.2-bz451531.patch:

--- NEW FILE jack-audio-connection-kit-0.109.2-bz451531.patch ---
--- config/cpu/powerpc/cycles.h.orig	2006-05-26 04:45:16.000000000 +0200
+++ config/cpu/powerpc/cycles.h	2008-03-08 18:15:19.000000000 +0100
@@ -36,16 +36,8 @@
 {
 	cycles_t ret = 0;
 
-	__asm__ __volatile__(
-		"98:	mftb %0\n"
-		"99:\n"
-		".section __ftr_fixup,\"a\"\n"
-		"	.long %1\n"
-		"	.long 0\n"
-		"	.long 98b\n"
-		"	.long 99b\n"
-		".previous"
-		: "=r" (ret) : "i" (CPU_FTR_601));
+	__asm__ __volatile__("mftbl %0" : "=r" (ret));
+
 	return ret;
 }
 


Index: jack-audio-connection-kit-README.Fedora
===================================================================
RCS file: /cvs/extras/rpms/jack-audio-connection-kit/F-9/jack-audio-connection-kit-README.Fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jack-audio-connection-kit-README.Fedora	26 May 2006 17:15:12 -0000	1.1
+++ jack-audio-connection-kit-README.Fedora	20 Jul 2008 15:34:17 -0000	1.2
@@ -1,4 +1,69 @@
-Running JACK server in realtime mode.
+	INTEGRATE JACK WITH PULSEAUDIO
+
+The original text is placed at:
+    http://www.harald-hoyer.de/linux/pulseaudio-and-jackd
+
+Switch to root account.
+
+Install the required packages:
+    yum install pulseaudio-module-jack alsa-plugins-jack jack-audio-connection-kit 
+
+Add yourself to the pulse-rt and jackuser groups.
+    usermod -a -G pulse-rt,jackaudio "<your username>"
+
+Edit /etc/security/limits.conf:
+
+ at jackuser - rtprio 20
+ at jackuser - memlock 4194304
+ at pulse-rt - rtprio 20
+ at pulse-rt - nice -20
+
+Switch to your normal user account.
+
+Create ~/bin subdirectory if absent:
+    mkdir -p ~/bin
+
+Create the pulseaudio start file ~/bin/jack.pa:
+
+#!/usr/bin/pulseaudio -nF
+
+load-module module-jack-sink
+load-module module-jack-source
+
+load-module module-native-protocol-unix
+load-module module-volume-restore
+load-module module-default-device-restore
+load-module module-rescue-streams
+load-module module-suspend-on-idle
+.ifexists module-gconf.so
+.nofail
+load-module module-gconf
+.fail
+.endif
+.ifexists module-x11-publish.so
+.nofail
+load-module module-x11-publish
+.fail
+.endif
+
+Close all your sessions and relogin to get the new group permissions and
+limits.
+
+Kill the current pulseaudio daemon:
+    killall pulseaudio
+
+Start the jack daemon (your parameters may be different):
+    jackd -R -P4 -dalsa -r44100 -p512 -n4 -D -Chw:0 -Phw:0
+
+Start the pulseaudio daemon:
+    pulseaudio -nF ~/bin/jack.pa
+
+Now everything should work.
+
+Next chapter describes steps for older Fedora vesions.
+
+
+	RUNNING JACK SERVER IN REALTIME MODE
 
 The JACK server jackd has the capability to run in a real-time mode
 which greatly decreases the chance of audio glitches. The real-time mode


Index: jack-audio-connection-kit.spec
===================================================================
RCS file: /cvs/extras/rpms/jack-audio-connection-kit/F-9/jack-audio-connection-kit.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- jack-audio-connection-kit.spec	14 Feb 2008 10:32:27 -0000	1.22
+++ jack-audio-connection-kit.spec	20 Jul 2008 15:34:17 -0000	1.23
@@ -1,11 +1,12 @@
 Summary: The Jack Audio Connection Kit
 Name: jack-audio-connection-kit
 Version: 0.109.2
-Release: 1%{?dist}.1
+Release: 2%{?dist}
 License: GPLv2 and LGPLv2
 Group: System Environment/Daemons
 Source0: http://downloads.sourceforge.net/jackit/%{name}-%{version}.tar.gz
 Source1: %{name}-README.Fedora
+Patch0: jack-audio-connection-kit-0.109.2-bz451531.patch
 URL: http://www.jackaudio.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: alsa-lib-devel
@@ -53,6 +54,9 @@
 
 %prep
 %setup -q
+%ifarch ppc64
+%patch0 -p0 -b .bz451531
+%endif
 
 %build
 # x86_64 issue reported by Rudolf Kastl (not checked, but not bad).
@@ -144,6 +148,10 @@
 %{_bindir}/jack_midisine
 
 %changelog
+* Sun Jul 20 2008 Andy Shevchenko <andy at smile.org.ua> 0.109.2-2
+- apply patch to be work on ppc64 (#451531)
+- update README.Fedora to describe integration jack with pulseaudio (#455193)
+
 * Wed Feb 13 2008 Andy Shevchenko <andy at smile.org.ua> 0.109.2-1.1
 - update to the last official release