Hello community, here is the log from the commit of package jack for openSUSE:Factory checked in at Mon May 23 10:09:19 CEST 2011.
-------- --- jack/jack.changes 2010-12-10 19:05:05.000000000 +0100 +++ /mounts/work_src_done/STABLE/jack/jack.changes 2011-05-20 02:37:07.000000000 +0200 @@ -1,0 +2,45 @@ +Thu May 19 14:39:07 UTC 2011 - [email protected] + +- Update to version 1.9.7 +- Upstream changes : + *Sync JackAlsaDriver::alsa_driver_check_card_type with JACK1 backend. + *Improve backend error handling: fatal error returned by Read/Write + now cause a Process failure (so a thread exit for blocking backends). + *Recoverable ones (XRuns..) are now treated internally in ALSA and + FFADO backends. + *In jackdmp.cpp, jackctl_setup_signals moved before jackctl_server_start. + *Correct dummy driver. + *Adrian Knoth jack_lsp patch. + *Remove JackPortIsActive flag. + *New latency API implementation. + *ComputeTotalLatencies now a client/server call. + *Add latent test client for latency API. + *Also print playback and capture latency in jack_lsp. + *jack_client_has_session_callback implementation. + *Check requested buffer size and limit to 1..8192 avoids weird + behaviour caused by jack_bufsize foobar. + *jack_port_type_get_buffer_size implementation. + *Stop using alloca and allocate buffer on the heap for alsa_io. + *Rename jdelay to jack_iodelay as per Fons' request. + *Call buffer size callback in activate (actually this is done on + client side in the RT thread Init method). + *Add jack_midi_dump client. Synchronize net JACK1 with JACK1 version. + *Synchronize jack_connect/jack_disconnect with JACK1 version. + *Correct JackNetMaster::SetBufferSize. + *Use jack_default_audio_sample_t instead of float consistently, + fix ticket #201. -X now allows to add several slave backends, add -I + to load several internal clients. + *Rework internal slave driver management, JackServerGlobals now + handle same parameters as jackdmp. + *Correct JackEngine::NotifyGraphReorder, update JackDebugClient + with latest API. + *Devin Anderson server-ctl-proposal branch merged on trunk: improved + control API, slave backend reworked. + *Implement renaming in JackDriver::Open to avoid name collision. + *Correct alsa_driver_restart (thanks Devin Anderson). + *Correction of jack_connect/jack_disconnect: use of jack_activate + and volatile keyword for thread shared variable. + *Correction of JackNetOneDriver for latest CELT API. + *Synchronize JackWeakAPI.cpp with new APIs. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- jack-1.9.6.tar.bz2 New: ---- _service _service:download_url:jack-1.9.7.tar.bz2 _service:set_version:jack.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _service:set_version:jack.spec ++++++ # # spec file for package jack # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild %if 0%{?suse_version} > 1110 # Switch the --dbus on and off, on = 1 %define wdbus 0 BuildRequires: libffado-devel %else %define wdbus 0 %endif Name: jack BuildRequires: dos2unix doxygen gcc-c++ libcelt-devel >= 0.7.0 libxml2-devel pkg-config python BuildRequires: alsa-devel flac-devel libsndfile-devel pkgconfig readline-devel libvorbis-devel BuildRequires: dbus-1-devel libFLAC8 libexpat-devel libogg-devel libsamplerate-devel Summary: Jack-Audio Connection Kit Version: 1.9.7 #to_be_filled_by_service Release: 0 License: LGPLv2.1+ Group: System/Sound Daemons Source0: http://www.grame.fr/~letz/%{name}-%{version}.tar.bz2 Source1: baselibs.conf Patch1: jack-CAS.diff Patch2: jack-sparcv9.diff Patch3: jack-celt-build-fix.diff Url: http://jackaudio.org/ Provides: jack-audio-connection-kit Provides: jack2 = %{version} Obsoletes: jack2 < %{version} Requires: libjack0 = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %define debug_package_requires %{name} = %{version}-%{release} %description JACK is system for handling real-time, low latency audio (and MIDI). It runs on GNU/Linux, Solaris, FreeBSD, OS X and Windows (and can be ported to other POSIX-conformant platforms). It can connect a number of different applications to an audio device, as well as allowing them to share audio between themselves. Its clients can run in their own processes (ie. as normal applications), or can they can run within the JACK server (ie. as a "plugin"). JACK also has support for distributing audio processing across a network, both fast & reliable LANs as well as slower, less reliable WANs. Authors: -------- [email protected] %package -n libjack0 License: LGPLv2.1+ Summary: Jack Audio Connection Kit Library Group: System/Libraries Provides: libjack = %{version} Obsoletes: libjack < %{version} Provides: libjack2 %description -n libjack0 This package contains the library to access JACK (Jack Audio ConnectionKit). %package -n libjack-devel License: LGPLv2.1+ Summary: Development package for jack Group: Development/Libraries/C and C++ Requires: libjack0 = %{version}, pkgconfig Provides: jack-audio-connection-kit-devel Provides: jack-devel Provides: libjack2-devel = %{version} Obsoletes: libjack2-devel < %{version} %description -n libjack-devel This package contains the files needed to compile programs that communicate with jack clients/servers. %prep %setup -q %patch1 %patch2 %patch3 %build export CFLAGS="%{optflags} -ggdb -fPIC" export CXXFLAGS="$CFLAGS" ./waf -v \ --prefix=%{_prefix} \ --libdir=/%{_lib} \ --classic \ %if 0%{?wdbus} == 1 --dbus \ %endif %if 0%{?suse_version} > 1110 --firewire \ %endif --alsa \ --doxygen \ --profile \ --ports=1024 \ --enable-pkg-config-dbus-service-dir \ --profile \ --mandir=/share/man/man1 \ --doxygen \ configure # waf only understands -j, so do not use smp_mflags ./waf -v build %{?jobs:-j%jobs} %install # This is a workaround because the doc build looks for build/default/html but there isn't one. pushd build/default/ ln -s ../../html html popd ./waf install --destdir=%{buildroot} mkdir -p %{buildroot}%{_docdir}/%{name} mv %{buildroot}%{_datadir}/jack-audio-connection-kit %{buildroot}%{_docdir} dos2unix -k ChangeLog dos2unix -k README dos2unix -k TODO cp ChangeLog README* TODO %{buildroot}%{_docdir}/%{name}/ # Fix wrong-file-end-of-line-encoding dos2unix -k %{buildroot}%{_docdir}/%{name}/ChangeLog dos2unix -k %{buildroot}%{_docdir}/%{name}/README dos2unix -k %{buildroot}%{_docdir}/%{name}/TODO %post -n libjack0 -p /sbin/ldconfig %postun -n libjack0 -p /sbin/ldconfig %clean test "%{buildroot}" != "/" -a -d "%{buildroot}" && rm -rf %{buildroot} %files %defattr(-,root,root) %doc %dir %{_docdir}/%{name} %doc %{_docdir}/%{name}/ChangeLog %doc %{_docdir}/%{name}/README* %doc %{_docdir}/%{name}/TODO %doc %{_mandir}/man1/* %{_bindir}/* %dir %{_libdir}/%{name} %{_libdir}/%{name}/inprocess.so %{_libdir}/%{name}/%{name}_alsa.so %{_libdir}/%{name}/%{name}_dummy.so %{_libdir}/%{name}/%{name}_net.so %{_libdir}/%{name}/netmanager.so* %{_libdir}/%{name}/profiler.so* %{_libdir}/%{name}/netadapter.so* %{_libdir}/%{name}/audioadapter.so* %{_libdir}/%{name}/%{name}_loopback.so* %{_libdir}/%{name}/%{name}_netone.so* %if 0%{?suse_version} > 1110 %{_libdir}/%{name}/%{name}_firewire.so %endif %if 0%{?wdbus} == 1 %{_datadir}/dbus-1/services/org.jackaudio.service %endif %files -n libjack0 %defattr(-, root, root) %{_libdir}/lib*.so.* %files -n libjack-devel %defattr(-, root, root) %doc %dir %{_docdir}/%{name} %{_libdir}/lib*.so %{_libdir}/pkgconfig/* %{_includedir}/%{name} %dir %{_docdir}/jack-audio-connection-kit %doc %{_docdir}/jack-audio-connection-kit/* %changelog ++++++ jack.spec ++++++ --- /var/tmp/diff_new_pack.2Ya1vc/_old 2011-05-23 10:08:05.000000000 +0200 +++ /var/tmp/diff_new_pack.2Ya1vc/_new 2011-05-23 10:08:05.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package jack (Version 1.9.6) +# spec file for package jack # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,11 +30,12 @@ BuildRequires: alsa-devel flac-devel libsndfile-devel libvorbis-devel pkgconfig readline-devel BuildRequires: dbus-1-devel libFLAC8 libexpat-devel libogg-devel libsamplerate-devel Summary: Jack-Audio Connection Kit -Version: 1.9.6 -Release: 2 +Version: to_be_filled_by_service +Release: 1 +#to_be_filled_by_service License: LGPLv2.1+ Group: System/Sound Daemons -Source0: %{name}-%{version}.tar.bz2 +Source0: http://www.grame.fr/~letz/%{name}-%{version}.tar.bz2 Source1: baselibs.conf Patch1: jack-CAS.diff Patch2: jack-sparcv9.diff @@ -92,11 +93,13 @@ %prep %setup -q -%patch -P 1 -P 2 -p1 +%patch1 +%patch2 %patch3 %build -export CFLAGS="$RPM_OPT_FLAGS" + +export CFLAGS="%{optflags} -ggdb -fPIC" export CXXFLAGS="$CFLAGS" ./waf -v \ @@ -116,31 +119,37 @@ --enable-pkg-config-dbus-service-dir \ --profile \ --mandir=/share/man/man1 \ + --doxygen \ configure # waf only understands -j, so do not use smp_mflags -./waf build %{?jobs:-j%jobs} +./waf -v build %{?jobs:-j%jobs} %install +# This is a workaround because the doc build looks for build/default/html but there isn't one. +pushd build/default/ +ln -s ../../html html +popd + ./waf install --destdir=%{buildroot} mkdir -p %{buildroot}%{_docdir}/%{name} mv %{buildroot}%{_datadir}/jack-audio-connection-kit %{buildroot}%{_docdir} dos2unix -k ChangeLog dos2unix -k README dos2unix -k TODO -cp ChangeLog README* TODO $RPM_BUILD_ROOT%{_docdir}/%{name}/ +cp ChangeLog README* TODO %{buildroot}%{_docdir}/%{name}/ # Fix wrong-file-end-of-line-encoding -dos2unix -k $RPM_BUILD_ROOT%{_docdir}/%{name}/ChangeLog -dos2unix -k $RPM_BUILD_ROOT%{_docdir}/%{name}/README -dos2unix -k $RPM_BUILD_ROOT%{_docdir}/%{name}/TODO +dos2unix -k %{buildroot}%{_docdir}/%{name}/ChangeLog +dos2unix -k %{buildroot}%{_docdir}/%{name}/README +dos2unix -k %{buildroot}%{_docdir}/%{name}/TODO %post -n libjack0 -p /sbin/ldconfig %postun -n libjack0 -p /sbin/ldconfig %clean -test "$RPM_BUILD_ROOT" != "/" -a -d "$RPM_BUILD_ROOT" && rm -rf $RPM_BUILD_ROOT +test "%{buildroot}" != "/" -a -d "%{buildroot}" && rm -rf %{buildroot} %files %defattr(-,root,root) @@ -150,19 +159,19 @@ %doc %{_docdir}/%{name}/TODO %doc %{_mandir}/man1/* %{_bindir}/* -%dir %{_libdir}/jack -%{_libdir}/jack/inprocess.so -%{_libdir}/jack/jack_alsa.so -%{_libdir}/jack/jack_dummy.so -%{_libdir}/jack/jack_net.so -%{_libdir}/jack/netmanager.so* -%{_libdir}/jack/profiler.so* -%{_libdir}/jack/netadapter.so* -%{_libdir}/jack/audioadapter.so* -%{_libdir}/jack/jack_loopback.so* -%{_libdir}/jack/jack_netone.so* +%dir %{_libdir}/%{name} +%{_libdir}/%{name}/inprocess.so +%{_libdir}/%{name}/%{name}_alsa.so +%{_libdir}/%{name}/%{name}_dummy.so +%{_libdir}/%{name}/%{name}_net.so +%{_libdir}/%{name}/netmanager.so* +%{_libdir}/%{name}/profiler.so* +%{_libdir}/%{name}/netadapter.so* +%{_libdir}/%{name}/audioadapter.so* +%{_libdir}/%{name}/%{name}_loopback.so* +%{_libdir}/%{name}/%{name}_netone.so* %if 0%{?suse_version} > 1110 -%{_libdir}/jack/jack_firewire.so +%{_libdir}/%{name}/%{name}_firewire.so %endif %if 0%{?wdbus} == 1 %{_datadir}/dbus-1/services/org.jackaudio.service @@ -177,7 +186,7 @@ %doc %dir %{_docdir}/%{name} %{_libdir}/lib*.so %{_libdir}/pkgconfig/* -%{_includedir}/jack +%{_includedir}/%{name} %dir %{_docdir}/jack-audio-connection-kit %doc %{_docdir}/jack-audio-connection-kit/* ++++++ _service ++++++ <services> <service name="download_url"><param name="path">/~letz/jack-1.9.7.tar.bz2</param><param name="host">www.grame.fr</param></service> <service name="set_version"/></services>++++++ jack-CAS.diff ++++++ --- /var/tmp/diff_new_pack.2Ya1vc/_old 2011-05-23 10:08:05.000000000 +0200 +++ /var/tmp/diff_new_pack.2Ya1vc/_new 2011-05-23 10:08:05.000000000 +0200 @@ -15,10 +15,10 @@ linux/JackAtomic_os.h | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) -Index: jack-1.9.5.4046/linux/JackAtomic_os.h +Index: linux/JackAtomic_os.h =================================================================== ---- jack-1.9.5.4046.orig/linux/JackAtomic_os.h -+++ jack-1.9.5.4046/linux/JackAtomic_os.h +--- linux/JackAtomic_os.h.orig 2011-03-30 17:04:29.000000000 +0200 ++++ linux/JackAtomic_os.h 2011-05-20 02:40:33.711970332 +0200 @@ -48,9 +48,7 @@ static inline int CAS(register UInt32 va return result; } @@ -45,4 +45,4 @@ + #endif - #if !defined(__i386__) && !defined(__x86_64__) && !defined(__PPC__) + ++++++ jack-celt-build-fix.diff ++++++ --- /var/tmp/diff_new_pack.2Ya1vc/_old 2011-05-23 10:08:05.000000000 +0200 +++ /var/tmp/diff_new_pack.2Ya1vc/_new 2011-05-23 10:08:05.000000000 +0200 @@ -5,51 +5,51 @@ Index: common/netjack_packet.c =================================================================== ---- common/netjack_packet.c.orig 2010-08-30 12:23:53.000000000 +0200 -+++ common/netjack_packet.c 2010-12-10 17:41:22.000000000 +0200 -@@ -1428,9 +1428,9 @@ render_payload_to_jack_ports_celt (void +--- common/netjack_packet.c.orig 2011-03-30 17:04:07.000000000 +0200 ++++ common/netjack_packet.c 2011-05-20 02:51:05.881970061 +0200 +@@ -1372,9 +1372,9 @@ render_payload_to_jack_ports_celt (void + celt_decode_float( decoder, packet_bufX, net_period_down, buf, nframes ); + #else + if( !packet_payload ) +- celt_decode_float( decoder, NULL, net_period_down, buf ); ++ celt_decode_float( decoder, NULL, net_period_down, buf, 1 ); + else +- celt_decode_float( decoder, packet_bufX, net_period_down, buf ); ++ celt_decode_float( decoder, packet_bufX, net_period_down, buf, 1 ); + #endif - CELTDecoder *decoder = src_node->data; - if( !packet_payload ) -- celt_decode_float( decoder, NULL, net_period_down, buf ); -+ celt_decode_float( decoder, NULL, net_period_down, buf, 1 ); - else -- celt_decode_float( decoder, packet_bufX, net_period_down, buf ); -+ celt_decode_float( decoder, packet_bufX, net_period_down, buf, 1 ); - - src_node = jack_slist_next (src_node); - } -@@ -1472,7 +1472,7 @@ render_jack_ports_to_payload_celt (JSLis - float *floatbuf = alloca (sizeof(float) * nframes ); - memcpy( floatbuf, buf, nframes*sizeof(float) ); - CELTEncoder *encoder = src_node->data; + src_node = jack_slist_next (src_node); +@@ -1420,7 +1420,7 @@ render_jack_ports_to_payload_celt (JSLis + #if HAVE_CELT_API_0_8 || HAVE_CELT_API_0_11 + encoded_bytes = celt_encode_float( encoder, floatbuf, nframes, packet_bufX, net_period_up ); + #else - encoded_bytes = celt_encode_float( encoder, floatbuf, NULL, packet_bufX, net_period_up ); + encoded_bytes = celt_encode_float( encoder, floatbuf, 1, packet_bufX, net_period_up ); + #endif if( encoded_bytes != net_period_up ) printf( "something in celt changed. netjack needs to be changed to handle this.\n" ); - src_node = jack_slist_next( src_node ); Index: common/JackNetOneDriver.cpp =================================================================== ---- common/JackNetOneDriver.cpp.orig 2010-08-30 12:23:53.000000000 +0200 -+++ common/JackNetOneDriver.cpp 2010-12-10 17:41:22.000000000 +0200 -@@ -709,9 +709,9 @@ JackNetOneDriver::render_payload_to_jack - - CELTDecoder *decoder = (CELTDecoder *)src_node->data; - if( !packet_payload ) -- celt_decode_float( decoder, NULL, net_period_down, buf ); -+ celt_decode_float( decoder, NULL, net_period_down, buf, 1 ); - else -- celt_decode_float( decoder, packet_bufX, net_period_down, buf ); -+ celt_decode_float( decoder, packet_bufX, net_period_down, buf, 1 ); +--- common/JackNetOneDriver.cpp.orig 2011-03-30 17:04:07.000000000 +0200 ++++ common/JackNetOneDriver.cpp 2011-05-20 02:54:39.549969965 +0200 +@@ -709,9 +709,9 @@ namespace Jack + celt_decode_float( decoder, packet_bufX, net_period_down, buf, nframes ); + #else + if( !packet_payload ) +- celt_decode_float( decoder, NULL, net_period_down, buf ); ++ celt_decode_float( decoder, NULL, net_period_down, buf, 1 ); + else +- celt_decode_float( decoder, packet_bufX, net_period_down, buf ); ++ celt_decode_float( decoder, packet_bufX, net_period_down, buf, 1 ); + #endif - src_node = jack_slist_next (src_node); - } -@@ -757,7 +757,7 @@ JackNetOneDriver::render_jack_ports_to_p - float *floatbuf = (float *)alloca (sizeof(float) * nframes ); - memcpy( floatbuf, buf, nframes*sizeof(float) ); - CELTEncoder *encoder = (CELTEncoder *)src_node->data; -- encoded_bytes = celt_encode_float( encoder, floatbuf, NULL, packet_bufX, net_period_up ); -+ encoded_bytes = celt_encode_float( encoder, floatbuf, 1, packet_bufX, net_period_up ); - if( encoded_bytes != (int)net_period_up ) - jack_error( "something in celt changed. netjack needs to be changed to handle this." ); - src_node = jack_slist_next( src_node ); + src_node = jack_slist_next (src_node); +@@ -761,7 +761,7 @@ namespace Jack + #if HAVE_CELT_API_0_8 || HAVE_CELT_API_0_11 + encoded_bytes = celt_encode_float( encoder, floatbuf, nframes, packet_bufX, net_period_up ); + #else +- encoded_bytes = celt_encode_float( encoder, floatbuf, NULL, packet_bufX, net_period_up ); ++ encoded_bytes = celt_encode_float( encoder, floatbuf, 1, packet_bufX, net_period_up ); + #endif + if( encoded_bytes != (int)net_period_up ) + jack_error( "something in celt changed. netjack needs to be changed to handle this." ); ++++++ jack-sparcv9.diff ++++++ --- /var/tmp/diff_new_pack.2Ya1vc/_old 2011-05-23 10:08:05.000000000 +0200 +++ /var/tmp/diff_new_pack.2Ya1vc/_new 2011-05-23 10:08:05.000000000 +0200 @@ -5,11 +5,11 @@ linux/cycles.h | 10 ++++++++++ 1 file changed, 10 insertions(+) -Index: jack-1.9.5.4046/linux/cycles.h +Index: linux/cycles.h =================================================================== ---- jack-1.9.5.4046.orig/linux/cycles.h -+++ jack-1.9.5.4046/linux/cycles.h -@@ -63,6 +63,16 @@ static inline unsigned long long get_cyc +--- linux/cycles.h.orig 2011-03-30 17:04:29.000000000 +0200 ++++ linux/cycles.h 2011-05-20 02:43:20.736970261 +0200 +@@ -61,6 +61,16 @@ static inline unsigned long long get_cyc } #endif /* __sparc_v9__ */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
