Attachment #105146 for bug #145487

View | Details | Raw Unified | Return to bug 145487
Collapse All | Expand All

Lines 6-13 Link Here

(-)jack/Makefile (-2 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= jackit	8	PORTNAME= jackit
9	PORTVERSION= 0.116.2	9	PORTVERSION= 0.118.0
10	PORTREVISION= 4
11	CATEGORIES= audio	10	CATEGORIES= audio
12	MASTER_SITES= http://jackaudio.org/downloads/	11	MASTER_SITES= http://jackaudio.org/downloads/
13	DISTNAME= jack-audio-connection-kit-${PORTVERSION}	12	DISTNAME= jack-audio-connection-kit-${PORTVERSION}

Lines 1-3 Link Here

(-)jack/distinfo (-3 / +3 lines)
1	MD5 (jack-audio-connection-kit-0.116.2.tar.gz) = 9c0ae9880e9b6e081f1a238fe6a28bd5	1	MD5 (jack-audio-connection-kit-0.118.0.tar.gz) = d58e29a55f285d54e75134cec8e02a10
2	SHA256 (jack-audio-connection-kit-0.116.2.tar.gz) = ce6e1f61a3b003137af56b749e5ed4274584167c0877ea9ef2d83f47b11c8d3d	2	SHA256 (jack-audio-connection-kit-0.118.0.tar.gz) = 6aadf38ca98104772fd675bba7adecf72d2a600e17cccfc5d1f7c50f19b722c2
3	SIZE (jack-audio-connection-kit-0.116.2.tar.gz) = 944106	3	SIZE (jack-audio-connection-kit-0.118.0.tar.gz) = 992374




--- 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




--- 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

Lines 1-4 Link Here

(-)jack/pkg-plist (-5 / +8 lines)
1	bin/jack_alias	1	bin/jack_alias
		2	bin/jack_bufsize
2	bin/jack_connect	3	bin/jack_connect
3	bin/jack_disconnect	4	bin/jack_disconnect
4	bin/jack_evmon	5	bin/jack_evmon
Lines 10-21 Link Here
10	bin/jack_midiseq	11	bin/jack_midiseq
11	bin/jack_midisine	12	bin/jack_midisine
12	bin/jack_monitor_client	13	bin/jack_monitor_client
		14	bin/jack_netsource
		15	bin/jack_samplerate
13	bin/jack_showtime	16	bin/jack_showtime
14	bin/jack_simple_client	17	bin/jack_simple_client
15	bin/jack_transport	18	bin/jack_transport
16	bin/jack_unload
17	bin/jack_transport_client	19	bin/jack_transport_client
18	bin/jack_netsource	20	bin/jack_unload
		21	bin/jack_wait
19	bin/jackd	22	bin/jackd
20	bin/jackrec	23	bin/jackrec
21	include/jack/intclient.h	24	include/jack/intclient.h
Lines 33-44 Link Here
33	lib/jack/intime.so	36	lib/jack/intime.so
34	lib/jack/jack_dummy.la	37	lib/jack/jack_dummy.la
35	lib/jack/jack_dummy.so	38	lib/jack/jack_dummy.so
		39	lib/jack/jack_net.la
		40	lib/jack/jack_net.so
36	lib/jack/jack_oss.la	41	lib/jack/jack_oss.la
37	lib/jack/jack_oss.so	42	lib/jack/jack_oss.so
38	lib/jack/jack_portaudio.la	43	lib/jack/jack_portaudio.la
39	lib/jack/jack_portaudio.so	44	lib/jack/jack_portaudio.so
40	lib/jack/jack_net.la
41	lib/jack/jack_net.so
42	lib/libjack.la	45	lib/libjack.la
43	lib/libjack.so	46	lib/libjack.so
44	lib/libjack.so.0	47	lib/libjack.so.0
Lines 99-106 Link Here
99	%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/simple__client_8c.html	102	%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/simple__client_8c.html
100	%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/statistics_8h.html	103	%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/statistics_8h.html
101	%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/statistics_8h_source.html	104	%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/statistics_8h_source.html
102	%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/structPOST__PACKED__STRUCTURE.html
103	%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/struct__jack__midi__event.html	105	%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/struct__jack__midi__event.html
		106	%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/structjack__position__t.html
104	%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/structjack__ringbuffer__data__t.html	107	%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/structjack__ringbuffer__data__t.html
105	%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/structjack__ringbuffer__t.html	108	%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/structjack__ringbuffer__t.html
106	%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/structjack__transport__info__t.html	109	%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/structjack__transport__info__t.html

Return to bug 145487

Lines 1-39 Link Here

(-)jack/files/patch-drivers-netjack-net_driver.c (-39 lines)
1	--- drivers/netjack/net_driver.c.orig 2009-02-06 11:34:50.000000000 +0100
2	+++ drivers/netjack/net_driver.c 2009-11-13 10:04:27.282082404 +0100
3	@@ -497,7 +497,7 @@ net_driver_write (net_driver_t* driver,
4	{
5	int r;
6
7	-#ifdef __APPLE__
8	+#if !defined(MSG_CONFIRM)
9	static const int flag = 0;
10	#else
11	static const int flag = MSG_CONFIRM;
12	@@ -548,13 +548,13 @@ net_driver_attach (net_driver_t *driver)
13
14	if( driver->bitdepth == 1000 ) {
15	#if HAVE_CELT
16	- celt_int32_t lookahead;
17	+ celt_int32 lookahead;
18	// XXX: memory leak
19	- CELTMode *celt_mode = celt_mode_create( driver->sample_rate, 1, driver->period_size, NULL );
20	+ CELTMode *celt_mode = celt_mode_create( driver->sample_rate, driver->period_size, NULL );
21	celt_mode_info( celt_mode, CELT_GET_LOOKAHEAD, &lookahead );
22	driver->codec_latency = 2*lookahead;
23
24	- driver->capture_srcs = jack_slist_append(driver->capture_srcs, celt_decoder_create( celt_mode ) );
25	+ driver->capture_srcs = jack_slist_append(driver->capture_srcs, celt_decoder_create( celt_mode, 1, NULL ) );
26	#endif
27	} else {
28	#if HAVE_SAMPLERATE
29	@@ -596,8 +596,8 @@ net_driver_attach (net_driver_t *driver)
30	if( driver->bitdepth == 1000 ) {
31	#if HAVE_CELT
32	// XXX: memory leak
33	- CELTMode *celt_mode = celt_mode_create( driver->sample_rate, 1, driver->period_size, NULL );
34	- driver->playback_srcs = jack_slist_append(driver->playback_srcs, celt_encoder_create( celt_mode ) );
35	+ CELTMode *celt_mode = celt_mode_create( driver->sample_rate, driver->period_size, NULL );
36	+ driver->playback_srcs = jack_slist_append(driver->playback_srcs, celt_encoder_create( celt_mode, 1, NULL ) );
37	#endif
38	} else {
39	#if HAVE_SAMPLERATE

Lines 1-24 Link Here

(-)jack/files/patch-tools-netsource.c (-24 lines)
1	--- tools/netsource.c.orig 2009-11-13 09:59:11.301019727 +0100
2	+++ tools/netsource.c 2009-11-13 09:59:42.991223929 +0100
3	@@ -124,8 +124,8 @@ alloc_ports (int n_capture_audio, int n_
4	if( bitdepth == 1000 ) {
5	#if HAVE_CELT
6	// XXX: memory leak
7	- CELTMode *celt_mode = celt_mode_create( jack_get_sample_rate( client ), 1, jack_get_buffer_size(client), NULL );
8	- capture_srcs = jack_slist_append(capture_srcs, celt_decoder_create( celt_mode ) );
9	+ CELTMode *celt_mode = celt_mode_create( jack_get_sample_rate( client ), jack_get_buffer_size(client), NULL );
10	+ capture_srcs = jack_slist_append(capture_srcs, celt_decoder_create( celt_mode, 1, NULL ) );
11	#endif
12	} else {
13	#if HAVE_SAMPLERATE
14	@@ -163,8 +163,8 @@ alloc_ports (int n_capture_audio, int n_
15	if( bitdepth == 1000 ) {
16	#if HAVE_CELT
17	// XXX: memory leak
18	- CELTMode *celt_mode = celt_mode_create( jack_get_sample_rate (client), 1, jack_get_buffer_size(client), NULL );
19	- playback_srcs = jack_slist_append(playback_srcs, celt_encoder_create( celt_mode ) );
20	+ CELTMode *celt_mode = celt_mode_create( jack_get_sample_rate (client), jack_get_buffer_size(client), NULL );
21	+ playback_srcs = jack_slist_append(playback_srcs, celt_encoder_create( celt_mode, 1, NULL ) );
22	#endif
23	} else {
24	#if HAVE_SAMPLERATE