diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2011-04-12 10:36:16 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2011-04-12 10:36:16 +0000 |
| commit | afb5d0b5f2a5db65f0a157dbd8622019ede8a001 (patch) | |
| tree | 1b011bf7378ed0cc0d17c243ba56df1cc281df84 /audio/jack | |
| parent | - update to 0.11.3 (diff) | |
- chase celt library bump
Notes
Notes:
svn path=/head/; revision=272602
Diffstat (limited to 'audio/jack')
| -rw-r--r-- | audio/jack/Makefile | 4 | ||||
| -rw-r--r-- | audio/jack/files/patch-drivers__netjack__netjack_packet.c | 23 |
2 files changed, 25 insertions, 2 deletions
diff --git a/audio/jack/Makefile b/audio/jack/Makefile index cd86227c542f..bba5903e06e4 100644 --- a/audio/jack/Makefile +++ b/audio/jack/Makefile @@ -7,7 +7,7 @@ PORTNAME= jackit PORTVERSION= 0.118.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio MASTER_SITES= http://jackaudio.org/downloads/ DISTNAME= jack-audio-connection-kit-${PORTVERSION} @@ -18,7 +18,7 @@ COMMENT= A low-latency audio server LIB_DEPENDS= portaudio.0:${PORTSDIR}/audio/portaudio \ sndfile.1:${PORTSDIR}/audio/libsndfile \ samplerate.1:${PORTSDIR}/audio/libsamplerate \ - celt.0:${PORTSDIR}/audio/celt + celt0.2:${PORTSDIR}/audio/celt LATEST_LINK= jack CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}" LDFLAGS="-L${LOCALBASE}/lib" \ diff --git a/audio/jack/files/patch-drivers__netjack__netjack_packet.c b/audio/jack/files/patch-drivers__netjack__netjack_packet.c new file mode 100644 index 000000000000..6bdd5ee876d0 --- /dev/null +++ b/audio/jack/files/patch-drivers__netjack__netjack_packet.c @@ -0,0 +1,23 @@ +--- ./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 ); |