rpms/audacity/devel audacity-1.3.2-jack-api-109.patch, NONE, 1.1 audacity.spec, 1.45, 1.46

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/pkgs/rpms/audacity/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10083

Modified Files:
	audacity.spec 
Added Files:
	audacity-1.3.2-jack-api-109.patch 
Log Message:
- patch for JACK 0.109.0 API changes (jack_port_lock/unlock removal).



audacity-1.3.2-jack-api-109.patch:

--- NEW FILE audacity-1.3.2-jack-api-109.patch ---
diff -Nur audacity-src-1.3.2-beta-orig/lib-src/portaudio-v19/src/hostapi/jack/pa_jack.c audacity-src-1.3.2-beta/lib-src/portaudio-v19/src/hostapi/jack/pa_jack.c
--- audacity-src-1.3.2-beta-orig/lib-src/portaudio-v19/src/hostapi/jack/pa_jack.c	2006-10-29 01:05:49.000000000 +0200
+++ audacity-src-1.3.2-beta/lib-src/portaudio-v19/src/hostapi/jack/pa_jack.c	2008-02-11 01:13:04.000000000 +0100
@@ -1669,27 +1669,19 @@
     {
         for( i = 0; i < stream->num_incoming_connections; i++ )
         {
-            UNLESS( !jack_port_lock( stream->jack_client, stream->local_input_ports[i] ),
-                    paUnanticipatedHostError );
             if( jack_port_connected( stream->local_input_ports[i] ) )
             {
                 UNLESS( !jack_port_disconnect( stream->jack_client, stream->local_input_ports[i] ),
                         paUnanticipatedHostError );
             }
-            UNLESS( !jack_port_unlock( stream->jack_client, stream->local_input_ports[i] ),
-                    paUnanticipatedHostError );
         }
         for( i = 0; i < stream->num_outgoing_connections; i++ )
         {
-            UNLESS( !jack_port_lock( stream->jack_client, stream->local_output_ports[i] ),
-                    paUnanticipatedHostError );
             if( jack_port_connected( stream->local_output_ports[i] ) )
             {
                 UNLESS( !jack_port_disconnect( stream->jack_client, stream->local_output_ports[i] ),
                         paUnanticipatedHostError );
             }
-            UNLESS( !jack_port_unlock( stream->jack_client, stream->local_output_ports[i] ),
-                    paUnanticipatedHostError );
         }
     }
 


Index: audacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/devel/audacity.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- audacity.spec	10 Feb 2008 22:28:35 -0000	1.45
+++ audacity.spec	11 Feb 2008 00:12:28 -0000	1.46
@@ -19,6 +19,7 @@
 Patch7:         audacity-1.3.2-expat2.patch
 Patch8:         audacity-1.3.2-gcc43.patch
 Patch9:         audacity-1.3.2-libdir.patch
+Patch10:        audacity-1.3.2-jack-api-109.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  alsa-lib-devel
 BuildRequires:  desktop-file-utils
@@ -72,6 +73,8 @@
 done
 grep -q -s __RPM_LIB * -R && exit 1
 
+%patch10 -p1 -b .jack-api
+
 # Substitute occurences of "libmp3lame.so" with "libmp3lame.so.0".
 for i in help/wxhelp/audacity.hhk help/wxhelp/exportmp3.htm locale/*.po src/export/ExportMP3.cpp
 do
@@ -150,6 +153,7 @@
 
 %changelog
 * Sun Feb 10 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.2-19
+- patch for JACK 0.109.0 API changes (jack_port_lock/unlock removal).
 - rebuilt for GCC 4.3 as requested by Fedora Release Engineering
 - subst _libdir in ladspa plugin loader