diff -ruN /usr/ports/audio/jack/Makefile jack/Makefile --- /usr/ports/audio/jack/Makefile 2010-03-29 04:10:28.000000000 -0400 +++ jack/Makefile 2010-04-07 04:50:51.000000000 -0400 @@ -6,8 +6,7 @@ # PORTNAME= jackit -PORTVERSION= 0.116.2 -PORTREVISION= 4 +PORTVERSION= 0.118.0 CATEGORIES= audio MASTER_SITES= http://jackaudio.org/downloads/ DISTNAME= jack-audio-connection-kit-${PORTVERSION} diff -ruN /usr/ports/audio/jack/distinfo jack/distinfo --- /usr/ports/audio/jack/distinfo 2009-03-30 14:21:20.000000000 -0400 +++ jack/distinfo 2010-04-07 05:01:02.000000000 -0400 @@ -1,3 +1,3 @@ -MD5 (jack-audio-connection-kit-0.116.2.tar.gz) = 9c0ae9880e9b6e081f1a238fe6a28bd5 -SHA256 (jack-audio-connection-kit-0.116.2.tar.gz) = ce6e1f61a3b003137af56b749e5ed4274584167c0877ea9ef2d83f47b11c8d3d -SIZE (jack-audio-connection-kit-0.116.2.tar.gz) = 944106 +MD5 (jack-audio-connection-kit-0.118.0.tar.gz) = d58e29a55f285d54e75134cec8e02a10 +SHA256 (jack-audio-connection-kit-0.118.0.tar.gz) = 6aadf38ca98104772fd675bba7adecf72d2a600e17cccfc5d1f7c50f19b722c2 +SIZE (jack-audio-connection-kit-0.118.0.tar.gz) = 992374 diff -ruN /usr/ports/audio/jack/files/patch-drivers-netjack-net_driver.c jack/files/patch-drivers-netjack-net_driver.c --- /usr/ports/audio/jack/files/patch-drivers-netjack-net_driver.c 2010-01-05 15:20:30.000000000 -0500 +++ jack/files/patch-drivers-netjack-net_driver.c 1969-12-31 19:00:00.000000000 -0500 @@ -1,39 +0,0 @@ ---- drivers/netjack/net_driver.c.orig 2009-02-06 11:34:50.000000000 +0100 -+++ drivers/netjack/net_driver.c 2009-11-13 10:04:27.282082404 +0100 -@@ -497,7 +497,7 @@ net_driver_write (net_driver_t* driver, - { - int r; - --#ifdef __APPLE__ -+#if !defined(MSG_CONFIRM) - static const int flag = 0; - #else - static const int flag = MSG_CONFIRM; -@@ -548,13 +548,13 @@ net_driver_attach (net_driver_t *driver) - - if( driver->bitdepth == 1000 ) { - #if HAVE_CELT -- celt_int32_t lookahead; -+ celt_int32 lookahead; - // XXX: memory leak -- CELTMode *celt_mode = celt_mode_create( driver->sample_rate, 1, driver->period_size, NULL ); -+ CELTMode *celt_mode = celt_mode_create( driver->sample_rate, driver->period_size, NULL ); - celt_mode_info( celt_mode, CELT_GET_LOOKAHEAD, &lookahead ); - driver->codec_latency = 2*lookahead; - -- driver->capture_srcs = jack_slist_append(driver->capture_srcs, celt_decoder_create( celt_mode ) ); -+ driver->capture_srcs = jack_slist_append(driver->capture_srcs, celt_decoder_create( celt_mode, 1, NULL ) ); - #endif - } else { - #if HAVE_SAMPLERATE -@@ -596,8 +596,8 @@ net_driver_attach (net_driver_t *driver) - if( driver->bitdepth == 1000 ) { - #if HAVE_CELT - // XXX: memory leak -- CELTMode *celt_mode = celt_mode_create( driver->sample_rate, 1, driver->period_size, NULL ); -- driver->playback_srcs = jack_slist_append(driver->playback_srcs, celt_encoder_create( celt_mode ) ); -+ CELTMode *celt_mode = celt_mode_create( driver->sample_rate, driver->period_size, NULL ); -+ driver->playback_srcs = jack_slist_append(driver->playback_srcs, celt_encoder_create( celt_mode, 1, NULL ) ); - #endif - } else { - #if HAVE_SAMPLERATE diff -ruN /usr/ports/audio/jack/files/patch-tools-netsource.c jack/files/patch-tools-netsource.c --- /usr/ports/audio/jack/files/patch-tools-netsource.c 2009-11-13 04:39:34.000000000 -0500 +++ jack/files/patch-tools-netsource.c 1969-12-31 19:00:00.000000000 -0500 @@ -1,24 +0,0 @@ ---- tools/netsource.c.orig 2009-11-13 09:59:11.301019727 +0100 -+++ tools/netsource.c 2009-11-13 09:59:42.991223929 +0100 -@@ -124,8 +124,8 @@ alloc_ports (int n_capture_audio, int n_ - if( bitdepth == 1000 ) { - #if HAVE_CELT - // XXX: memory leak -- CELTMode *celt_mode = celt_mode_create( jack_get_sample_rate( client ), 1, jack_get_buffer_size(client), NULL ); -- capture_srcs = jack_slist_append(capture_srcs, celt_decoder_create( celt_mode ) ); -+ CELTMode *celt_mode = celt_mode_create( jack_get_sample_rate( client ), jack_get_buffer_size(client), NULL ); -+ capture_srcs = jack_slist_append(capture_srcs, celt_decoder_create( celt_mode, 1, NULL ) ); - #endif - } else { - #if HAVE_SAMPLERATE -@@ -163,8 +163,8 @@ alloc_ports (int n_capture_audio, int n_ - if( bitdepth == 1000 ) { - #if HAVE_CELT - // XXX: memory leak -- CELTMode *celt_mode = celt_mode_create( jack_get_sample_rate (client), 1, jack_get_buffer_size(client), NULL ); -- playback_srcs = jack_slist_append(playback_srcs, celt_encoder_create( celt_mode ) ); -+ CELTMode *celt_mode = celt_mode_create( jack_get_sample_rate (client), jack_get_buffer_size(client), NULL ); -+ playback_srcs = jack_slist_append(playback_srcs, celt_encoder_create( celt_mode, 1, NULL ) ); - #endif - } else { - #if HAVE_SAMPLERATE diff -ruN /usr/ports/audio/jack/pkg-plist jack/pkg-plist --- /usr/ports/audio/jack/pkg-plist 2009-05-11 15:08:02.000000000 -0400 +++ jack/pkg-plist 2010-04-07 22:19:15.000000000 -0400 @@ -1,4 +1,5 @@ bin/jack_alias +bin/jack_bufsize bin/jack_connect bin/jack_disconnect bin/jack_evmon @@ -10,12 +11,14 @@ bin/jack_midiseq bin/jack_midisine bin/jack_monitor_client +bin/jack_netsource +bin/jack_samplerate bin/jack_showtime bin/jack_simple_client bin/jack_transport -bin/jack_unload bin/jack_transport_client -bin/jack_netsource +bin/jack_unload +bin/jack_wait bin/jackd bin/jackrec include/jack/intclient.h @@ -33,12 +36,12 @@ lib/jack/intime.so lib/jack/jack_dummy.la lib/jack/jack_dummy.so +lib/jack/jack_net.la +lib/jack/jack_net.so lib/jack/jack_oss.la lib/jack/jack_oss.so lib/jack/jack_portaudio.la lib/jack/jack_portaudio.so -lib/jack/jack_net.la -lib/jack/jack_net.so lib/libjack.la lib/libjack.so lib/libjack.so.0 @@ -99,8 +102,8 @@ %%PORTDOCS%%share/jack-audio-connection-kit/reference/html/simple__client_8c.html %%PORTDOCS%%share/jack-audio-connection-kit/reference/html/statistics_8h.html %%PORTDOCS%%share/jack-audio-connection-kit/reference/html/statistics_8h_source.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/structPOST__PACKED__STRUCTURE.html %%PORTDOCS%%share/jack-audio-connection-kit/reference/html/struct__jack__midi__event.html +%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/structjack__position__t.html %%PORTDOCS%%share/jack-audio-connection-kit/reference/html/structjack__ringbuffer__data__t.html %%PORTDOCS%%share/jack-audio-connection-kit/reference/html/structjack__ringbuffer__t.html %%PORTDOCS%%share/jack-audio-connection-kit/reference/html/structjack__transport__info__t.html