diff options
| author | trasz <trasz@FreeBSD.org> | 2009-11-13 17:39:34 +0800 |
|---|---|---|
| committer | trasz <trasz@FreeBSD.org> | 2009-11-13 17:39:34 +0800 |
| commit | b136c86af1e081f62b8f246d04af594c59e8de6d (patch) | |
| tree | ddad14ae2a8a847972f840a4c86a77ca87e4c16c | |
| parent | 2e197fe92e1942be948063bd8a83567b776c49b1 (diff) | |
| download | freebsd-ports-gnome-b136c86af1e081f62b8f246d04af594c59e8de6d.tar.gz freebsd-ports-gnome-b136c86af1e081f62b8f246d04af594c59e8de6d.tar.zst freebsd-ports-gnome-b136c86af1e081f62b8f246d04af594c59e8de6d.zip | |
Fix build after audio/celt upgrade. PORTREVISION bumped, as the upgrade
also breaks the ABI.
Approved by: portmgr (pav)
| -rw-r--r-- | audio/jack/Makefile | 2 | ||||
| -rw-r--r-- | audio/jack/files/patch-drivers-netjack-net_driver.c | 34 | ||||
| -rw-r--r-- | audio/jack/files/patch-tools-netsource.c | 24 |
3 files changed, 56 insertions, 4 deletions
diff --git a/audio/jack/Makefile b/audio/jack/Makefile index 07d99ff2e6ad..b4fa15a540df 100644 --- a/audio/jack/Makefile +++ b/audio/jack/Makefile @@ -7,7 +7,7 @@ PORTNAME= jackit PORTVERSION= 0.116.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio MASTER_SITES= http://jackaudio.org/downloads/ DISTNAME= jack-audio-connection-kit-${PORTVERSION} diff --git a/audio/jack/files/patch-drivers-netjack-net_driver.c b/audio/jack/files/patch-drivers-netjack-net_driver.c index d8b746cf8507..f9ee64ace927 100644 --- a/audio/jack/files/patch-drivers-netjack-net_driver.c +++ b/audio/jack/files/patch-drivers-netjack-net_driver.c @@ -1,6 +1,6 @@ ---- drivers/netjack/net_driver.c.orig 2009-02-11 20:49:54.000000000 +0100 -+++ drivers/netjack/net_driver.c 2009-02-11 20:50:05.000000000 +0100 -@@ -497,7 +497,7 @@ +--- 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; @@ -9,3 +9,31 @@ 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 --git a/audio/jack/files/patch-tools-netsource.c b/audio/jack/files/patch-tools-netsource.c new file mode 100644 index 000000000000..166a96703e53 --- /dev/null +++ b/audio/jack/files/patch-tools-netsource.c @@ -0,0 +1,24 @@ +--- 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 |