Index: Makefile =================================================================== RCS file: /home/pcvs/ports/audio/jack/Makefile,v retrieving revision 1.60 diff -u -p -r1.60 Makefile --- Makefile 11 Aug 2011 19:19:01 -0000 1.60 +++ Makefile 18 Sep 2011 20:21:57 -0000 @@ -6,8 +6,7 @@ # PORTNAME= jackit -PORTVERSION= 0.118.0 -PORTREVISION= 4 +PORTVERSION= 0.121.2 CATEGORIES= audio MASTER_SITES= http://jackaudio.org/downloads/ DISTNAME= jack-audio-connection-kit-${PORTVERSION} @@ -21,9 +20,11 @@ LIB_DEPENDS= portaudio.0:${PORTSDIR}/aud celt0.2:${PORTSDIR}/audio/celt LATEST_LINK= jack -CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}" LDFLAGS="-L${LOCALBASE}/lib" \ - CPPFLAGS="-I${LOCALBASE}/include" \ - CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" +LIBS+= ${PTHREAD_LIBS} +LDFLAGS+= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +CFLAGS+= ${PTHREAD_CFLAGS} +CONFIGURE_ENV= LIBS="${LIBS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS+=--enable-portaudio \ --with-default-tmpdir=/tmp GNU_CONFIGURE= yes @@ -33,14 +34,17 @@ USE_GNOME= pkgconfig gnomehack MAN1= jackd.1 jackstart.1 -OPTIONS= ALSA "Build with ALSA compatibility library" off +OPTIONS= ALSA "Build with ALSA compatibility library" off \ + DOCS "Build documentation" off .include -.if !defined(NOPORTDOCS) +.if defined(WITH_DOCS) && !defined(NOPORTDOCS) BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen +PLIST_SUB+= DOCS="" .else CONFIGURE_ENV+= ac_cv_prog_HAVE_DOXYGEN="false" +PLIST_SUB+= DOCS="@comment " .endif .if exists(${LOCALBASE}/lib/libreadline.so.6) Index: distinfo =================================================================== RCS file: /home/pcvs/ports/audio/jack/distinfo,v retrieving revision 1.13 diff -u -p -r1.13 distinfo --- distinfo 16 Dec 2010 17:34:13 -0000 1.13 +++ distinfo 18 Sep 2011 15:24:49 -0000 @@ -1,2 +1,2 @@ -SHA256 (jack-audio-connection-kit-0.118.0.tar.gz) = 6aadf38ca98104772fd675bba7adecf72d2a600e17cccfc5d1f7c50f19b722c2 -SIZE (jack-audio-connection-kit-0.118.0.tar.gz) = 992374 +SHA256 (jack-audio-connection-kit-0.121.2.tar.gz) = b1ebc255b4c331d436fdb62b1875105a1e1f454757c28dd5adfc0706172e64dc +SIZE (jack-audio-connection-kit-0.121.2.tar.gz) = 1083421 Index: pkg-descr =================================================================== RCS file: /home/pcvs/ports/audio/jack/pkg-descr,v retrieving revision 1.2 diff -u -p -r1.2 pkg-descr --- pkg-descr 7 Dec 2006 19:41:59 -0000 1.2 +++ pkg-descr 16 Sep 2011 18:42:25 -0000 @@ -9,4 +9,4 @@ JACK was designed from the ground up for its design focuses on two key areas: synchronous execution of all clients, and low latency operation. -WWW: http://jackit.sourceforge.net/ +WWW: http://jackaudio.org/ Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/audio/jack/pkg-plist,v retrieving revision 1.24 diff -u -p -r1.24 pkg-plist --- pkg-plist 16 Dec 2010 17:34:13 -0000 1.24 +++ pkg-plist 18 Sep 2011 17:24:15 -0000 @@ -7,14 +7,22 @@ bin/jack_disconnect bin/jack_evmon bin/jack_freewheel bin/jack_impulse_grabber +bin/jack_iodelay +bin/jack_latent_client bin/jack_load +bin/jack_load_test bin/jack_lsp bin/jack_metro bin/jack_midiseq bin/jack_midisine +bin/jack_midi_dump bin/jack_monitor_client bin/jack_netsource +bin/jack_rec bin/jack_samplerate +bin/jack_session_notify +bin/jack_server_control +bin/jack_simple_session_client bin/jack_showtime bin/jack_simple_client bin/jack_transport @@ -22,16 +30,19 @@ bin/jack_transport_client bin/jack_unload bin/jack_wait bin/jackd -bin/jackrec +include/jack/control.h include/jack/intclient.h include/jack/jack.h include/jack/midiport.h include/jack/ringbuffer.h +include/jack/session.h include/jack/statistics.h include/jack/thread.h include/jack/timestamps.h include/jack/transport.h include/jack/types.h +include/jack/weakmacros.h +include/jack/weakjack.h lib/jack/inprocess.la lib/jack/inprocess.so lib/jack/intime.la @@ -53,75 +64,91 @@ lib/libjackserver.la lib/libjackserver.so lib/libjackserver.so.0 libdata/pkgconfig/jack.pc -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/annotated.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/classes.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/deprecated.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/doxygen.css -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/doxygen.png -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/files.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/fsm.png -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/functions.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/functions_vars.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/globals.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/globals_0x65.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/globals_0x69.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/globals_0x6a.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/globals_0x6d.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/globals_0x6f.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/globals_0x70.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/globals_0x73.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/globals_0x74.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/globals_defs.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/globals_enum.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/globals_eval.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/globals_func.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/globals_type.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/globals_vars.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/group__ClientCallbacks.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/group__ClientFunctions.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/group__ClientThreads.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/group__ErrorOutput.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/group__MIDIAPI.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/group__NonCallbackAPI.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/group__PortFunctions.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/group__PortSearching.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/group__ServerControl.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/group__TimeFunctions.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/group__TransportControl.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/index.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/inprocess_8c.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/intclient_8h.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/intclient_8h_source.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/jack_8h.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/jack_8h_source.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/mainpage_8dox.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/midiport_8h.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/midiport_8h_source.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/modules.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/pages.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/porting-guide.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/porting_8dox.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/ringbuffer_8h.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/ringbuffer_8h_source.html -%%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/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 -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/structport__pair__t.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/thread_8h.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/thread_8h_source.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/transport-design.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/transport_8dox.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/transport_8h.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/transport_8h_source.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/types_8h.html -%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/types_8h_source.html -%%PORTDOCS%%@dirrm share/jack-audio-connection-kit/reference/html -%%PORTDOCS%%@dirrm share/jack-audio-connection-kit/reference -%%PORTDOCS%%@dirrm share/jack-audio-connection-kit +%%DOCS%%share/jack-audio-connection-kit/reference/html/annotated.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/classes.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/control_8h.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/control_8h_source.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/deprecated.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/doxygen.css +%%DOCS%%share/jack-audio-connection-kit/reference/html/doxygen.png +%%DOCS%%share/jack-audio-connection-kit/reference/html/files.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/fsm.png +%%DOCS%%share/jack-audio-connection-kit/reference/html/functions.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/functions_vars.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/globals.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x65.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x69.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x6a.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x6d.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x6f.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x70.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x74.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_defs.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_enum.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_eval.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_func.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_type.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_vars.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/group__ClientCallbacks.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/group__ClientFunctions.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/group__ClientThreads.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/group__ControlAPI.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/group__ErrorOutput.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/group__JackSessionManagerAPI.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/group__LatencyFunctions.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/group__MIDIAPI.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/group__NonCallbackAPI.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/group__PortFunctions.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/group__PortSearching.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/group__ServerControl.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/group__SessionClientFunctions.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/group__TimeFunctions.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/group__TransportControl.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/group__WeakLinkage.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/index.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/inprocess_8c.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/intclient_8h.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/intclient_8h_source.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/jack_8h.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/jack_8h_source.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/mainpage_8dox.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/midiport_8h.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/midiport_8h_source.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/modules.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/pages.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/porting-guide.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/porting_8dox.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/ringbuffer_8h.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/ringbuffer_8h_source.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/session_8h.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/session_8h_source.html + + +%%DOCS%%share/jack-audio-connection-kit/reference/html/simple__client_8c.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/statistics_8h.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/statistics_8h_source.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/struct__jack__latency__range.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/struct__jack__midi__event.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/struct__jack__session__event.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/structjack__position__t.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/structjack__ringbuffer__data__t.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/structjack__ringbuffer__t.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/structjack__transport__info__t.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/structport__pair__t.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/structjack__session__command__t.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/thread_8h.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/thread_8h_source.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/transport-design.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/transport_8dox.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/transport_8h.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/transport_8h_source.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/types_8h.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/types_8h_source.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/unionjackctl__parameter__value.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/weakjack_8h.html +%%DOCS%%share/jack-audio-connection-kit/reference/html/weakjack_8h_source.html +%%DOCS%%@dirrm share/jack-audio-connection-kit/reference/html +%%DOCS%%@dirrm share/jack-audio-connection-kit/reference +%%DOCS%%@dirrm share/jack-audio-connection-kit @dirrm lib/jack @dirrm include/jack Index: files/patch-drivers-oss-oss_driver.c =================================================================== RCS file: /home/pcvs/ports/audio/jack/files/patch-drivers-oss-oss_driver.c,v retrieving revision 1.1 diff -u -p -r1.1 patch-drivers-oss-oss_driver.c --- files/patch-drivers-oss-oss_driver.c 1 Jun 2004 09:23:47 -0000 1.1 +++ files/patch-drivers-oss-oss_driver.c 18 Sep 2011 17:57:03 -0000 @@ -1,5 +1,5 @@ ---- drivers/oss/oss_driver.c.orig Sat May 1 10:53:47 2004 -+++ drivers/oss/oss_driver.c Sat May 1 10:58:57 2004 +--- drivers/oss/oss_driver.c.orig ++++ drivers/oss/oss_driver.c @@ -23,6 +23,7 @@ #include @@ -8,3 +8,36 @@ #ifdef USE_BARRIER /* * POSIX conformance level should be globally defined somewhere, possibly +@@ -181,7 +182,9 @@ static void set_period_size (oss_driver_ + ((double) driver->period_size / + (double) driver->sample_rate) * 1e6; + driver->last_wait_ust = 0; +- driver->last_periodtime = driver->engine->get_microseconds(); ++ driver->last_periodtime = driver->engine ? ++ driver->engine->get_microseconds() : ++ jack_get_microseconds(); + driver->next_periodtime = 0; + driver->iodelay = 0.0F; + } +@@ -189,7 +192,9 @@ static void set_period_size (oss_driver_ + + static inline void update_times (oss_driver_t *driver) + { +- driver->last_periodtime = driver->engine->get_microseconds(); ++ driver->last_periodtime = driver->engine ? ++ driver->engine->get_microseconds() : ++ jack_get_microseconds(); + if (driver->next_periodtime > 0) + { + driver->iodelay = (float) +@@ -759,7 +764,9 @@ static int oss_driver_start (oss_driver_ + if (driver->threads & 1) sem_post(&driver->sem_start); + if (driver->threads & 2) sem_post(&driver->sem_start); + +- driver->last_periodtime = driver->engine->get_microseconds(); ++ driver->last_periodtime = driver->engine ? ++ driver->engine->get_microseconds() : ++ jack_get_microseconds(); + driver->next_periodtime = 0; + driver->iodelay = 0.0F; + Index: files/patch-drivers__netjack__netjack_packet.c =================================================================== RCS file: /home/pcvs/ports/audio/jack/files/patch-drivers__netjack__netjack_packet.c,v retrieving revision 1.1 diff -u -p -r1.1 patch-drivers__netjack__netjack_packet.c --- files/patch-drivers__netjack__netjack_packet.c 12 Apr 2011 10:36:15 -0000 1.1 +++ files/patch-drivers__netjack__netjack_packet.c 30 Aug 2011 17:10:40 -0000 @@ -1,23 +0,0 @@ ---- ./drivers/netjack/netjack_packet.c.orig 2009-11-12 22:09:39.000000000 +0100 -+++ ./drivers/netjack/netjack_packet.c 2011-04-12 11:31:54.221162522 +0200 -@@ -1427,9 +1427,9 @@ - - 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); - } -@@ -1471,7 +1471,7 @@ - float *floatbuf = alloca (sizeof(float) * nframes ); - memcpy( floatbuf, buf, nframes*sizeof(float) ); - CELTEncoder *encoder = 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 != 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: files/patch-jack.h =================================================================== RCS file: /home/pcvs/ports/audio/jack/files/patch-jack.h,v retrieving revision 1.1 diff -u -p -r1.1 patch-jack.h --- files/patch-jack.h 9 Mar 2004 20:27:51 -0000 1.1 +++ files/patch-jack.h 30 Aug 2011 17:12:01 -0000 @@ -1,17 +0,0 @@ ---- jack/types.h.org Tue Mar 9 20:12:17 2004 -+++ jack/types.h Tue Mar 9 20:12:22 2004 -@@ -22,6 +22,14 @@ - #define __jack_types_h__ - - #include -+#ifndef PRIu32 -+#define PRIi32 "i" /* int32_t */ -+#define PRIu32 "u" /* uint32_t */ -+#define PRIu64 "llu" /* uint64_t */ -+#define SCNu64 "llu" /* uint64_t */ -+#define PRId32 "d" /* int32_t */ -+#define PRIx64 "llx" /* uint64_t */ -+#endif - - typedef char shm_name_t[32]; - typedef int32_t jack_shmsize_t;