[jack-audio-connection-kit] - update to 1.9.6 - update README.Fedora file with more recent information

Sun Nov 7 05:15:01 UTC 2010

commit 6eabaff59160c0e00be776fbd5f3f7551e7ef177
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Sun Nov 7 01:14:46 2010 -0400

    - update to 1.9.6
    - update README.Fedora file with more recent information

 .gitignore                              |    1 +
 jack-audio-connection-kit-README.Fedora |   41 ++++++++++++++++++++++---------
 jack-audio-connection-kit.spec          |   39 ++++++++++++++---------------
 sources                                 |    2 +-
 4 files changed, 50 insertions(+), 33 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 8545362..01a6518 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 jack-1.9.5.tar.bz2
+/jack-1.9.6.tar.bz2
diff --git a/jack-audio-connection-kit-README.Fedora b/jack-audio-connection-kit-README.Fedora
index c2fe63f..dd3f084 100644
--- a/jack-audio-connection-kit-README.Fedora
+++ b/jack-audio-connection-kit-README.Fedora
@@ -1,3 +1,20 @@
+	USING ALSA DIRECTLY
+
+Switch to root account.
+
+Install the required packages:
+    yum install alsa-plugins-jack
+
+Add yourself to the jackuser group.
+    usermod -a -G jackuser "<your username>"
+
+Start the jack daemon (your parameters may be different):
+    jackd -R -P4 -dalsa -r44100 -p512 -n4 -D -Chw:0 -Phw:0
+or use
+    qjackctl -s
+if you have it installed and configured.
+
+
 	INTEGRATE JACK WITH PULSEAUDIO
 
 The original text is placed at:
@@ -6,7 +23,7 @@ The original text is placed at:
 Switch to root account.
 
 Install the required packages:
-    yum install pulseaudio-module-jack alsa-plugins-jack jack-audio-connection-kit 
+    yum install pulseaudio-module-jack alsa-plugins-jack
 
 Add yourself to the pulse-rt and jackuser groups.
     usermod -a -G pulse-rt,jackuser "<your username>"
@@ -38,17 +55,10 @@ Start the pulseaudio daemon:
 Now everything should work.
 
 
-	USING ALSA DIRECTLY
-
-Due to big amount of text lines and a few necessary graphics here is only link
-to very useful article about jack-audio-connection-kit and ALSA. So, go by
-following link:
-    http://www.legg.uklinux.net/rosegarden_sound_howto_fc7.html
-
-
 	RUNNING JACK SERVER IN REALTIME MODE
 
-NOTE: this chapter describes steps for older Fedora vesions.
+NOTE: This chapter explains why you have done the above changes in more detail.
+It is kept for informational purposes.
 
 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
@@ -66,6 +76,13 @@ configuration files can decrease the security of your system.
 Documentation specific to the resource limits PAM module can be found at
 http://www.kernel.org/pub/linux/libs/pam/Linux-PAM-html/pam-6.html#ss6.12
 
+Alternatively, one can create a new file 
+   /etc/security/limits.d/<priority>-<name>.conf
+that contains the resource limits for individual users and/or groups. The
+jack-audio-connection-kit package that comes with Fedora contains the file
+   /etc/security/limits.d/99-jack.conf
+that does this job for you.
+
 The resource limits that need to be changed to allow jackd to run in
 realtime mode are named rtprio and memlock. To increase the limits for a
 specific user named fred you would add the following to
@@ -108,6 +125,6 @@ virtual memory          (kbytes, -v) unlimited
 file locks                      (-x) unlimited
 file locks                      (-x) unlimited
 
-Keep in mind that you may have to re-login before changes to limits.conf
-take effect.
+Keep in mind that you may have to re-login before changes to limits.conf,
+or additions to the limits.d/ directory to take effect.
 
diff --git a/jack-audio-connection-kit.spec b/jack-audio-connection-kit.spec
index 31c633a..f0771ba 100644
--- a/jack-audio-connection-kit.spec
+++ b/jack-audio-connection-kit.spec
@@ -3,8 +3,8 @@
 
 Summary:       The Jack Audio Connection Kit
 Name:          jack-audio-connection-kit
-Version:       1.9.5
-Release:       2%{?dist}
+Version:       1.9.6
+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
@@ -18,21 +18,9 @@ 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
-# Use GCC atomic operation for other arches
-Patch6:        %{name}-1.9.5-atomic.patch
-# Treat s390x as 64-bit arch
-Patch7:        %{name}-1.9.5-64bit.patch
-# Add fallback get_cycles() solution
-Patch8:        %{name}-1.9.5-cycles.patch
-
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: alsa-lib-devel
@@ -88,15 +76,10 @@ Small example clients that use the Jack Audio Connection Kit.
 %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
-%patch6 -p1 -b .atomic
-%patch7 -p1 -b .64bit
-%patch8 -p1 -b .cycles
 
 # Fix encoding issues
 for file in ChangeLog README TODO; do
@@ -108,7 +91,19 @@ done
 
 %build
 export CPPFLAGS="$RPM_OPT_FLAGS"
-./waf configure --prefix=%{_prefix} --libdir=/%{_lib} --doxygen --dbus --classic
+export PREFIX=%{_prefix}
+./waf configure \
+   --mandir=/share/man/man1 \
+   --libdir=/%{_lib} \
+   --doxygen \
+   --dbus \
+   --classic \
+%ifnarch s390 s390x
+   --firewire \
+   --freebob \
+%endif
+   --alsa
+
 ./waf build %{?_smp_mflags} -v
 
 %install
@@ -226,6 +221,10 @@ exit 0
 
 
 %changelog
+* Sat Nov 06 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 1.9.6-1
+- update to 1.9.6
+- update README.Fedora file with more recent information
+
 * Thu Aug 26 2010 Dan Horák <dan[at]danny.cz> - 1.9.5-2
 - no Firewire on s390(x)
 - fix building on other arches than x86 and ppc
diff --git a/sources b/sources
index e545201..287dbe2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fdb86434b57255139b72c7f91e827fea  jack-1.9.5.tar.bz2
+fcd4bdb44f51d71c9e19bc1d0e887902  jack-1.9.6.tar.bz2
