diff --git a/audacity-1.3.2-jack-api-109.patch b/audacity-1.3.2-jack-api-109.patch new file mode 100644 index 0000000..7d58a2a --- /dev/null +++ b/audacity-1.3.2-jack-api-109.patch @@ -0,0 +1,31 @@ +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 ); + } + } + diff --git a/audacity.spec b/audacity.spec index b529160..e72006d 100644 --- a/audacity.spec +++ b/audacity.spec @@ -19,6 +19,7 @@ Patch6: audacity-1.3.2-FLAC.patch 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 @@ do 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 @@ umask 022 %changelog * Sun Feb 10 2008 Michael Schwendt - 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