Attachment #184460 for bug #220785





PORTNAME=	jackit
PORTVERSION=	0.125.0
PORTREVISION=	2
CATEGORIES=	audio
MASTER_SITES=	http://jackaudio.org/downloads/
DISTNAME=	jack-audio-connection-kit-${PORTVERSION}

MAINTAINER=	multimedia@FreeBSD.org
COMMENT=	Low latency audio server

		libcelt0.so:audio/celt \
		libuuid.so:misc/e2fsprogs-libuuid

USES=		autoreconf gmake pathfix pkgconfig libtool localbase bdb
USE_GITHUB=	yes
GH_ACCOUNT=	jackaudio
GH_PROJECT=	jack1
GH_TAGNAME=	90f9dd3
GH_TUPLE=	jackaudio:headers:07f1ecf:h/jack
GH_TUPLE+=	jackaudio:tools:8d13c31:t/tools
GH_TUPLE+=	jackaudio:example-clients:7fa0890:e/example-clients
USE_LDCONFIG=	yes
GNU_CONFIGURE=	yes
USE_LDCONFIG=	yes
USES=		gmake pathfix pkgconfig libtool localbase bdb
USE_RC_SUBR=	jackd

CONFIGURE_ARGS=	--disable-portaudio \
		--enable-optimize \
		--enable-force-install \
		--with-default-tmpdir=/tmp

CFLAGS+=		-I${BDB_INCLUDE_DIR}
LIBS+=			-L${BDB_LIB_DIR}
INSTALL_TARGET=		install-strip

OPTIONS_DEFINE=		ALSA DOXYGEN READLINE SNDIO COOKEDMODE
OPTIONS_DEFINE_i386=	DYNSIMD
OPTIONS_DEFINE_amd64=	DYNSIMD
OPTIONS_DEFAULT=	READLINE COOKEDMODE
OPTIONS_DEFAULT_i386=	DYNSIMD
OPTIONS_DEFAULT_amd64=	DYNSIMD
OPTIONS_SUB=		yes
COOKEDMODE_DESC=	Use OSS COOKEDMODE (OSS driver is broken without it)
DYNSIMD_DESC=		Use dynamic SIMD selection (only i386/amd64)

ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
ALSA_CONFIGURE_ENABLE=	alsa

SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
SNDIO_CONFIGURE_ENABLE=	sndio

COOKEDMODE_CFLAGS+=	-DOPTION_COOKEDMODE

DYNSIMD_CONFIGURE_ENABLE=dynsimd

post-patch:
	@${REINPLACE_CMD} -e 's|define USE_MLOCK|undef USE_MLOCK|' \
		-e 's|alloca.h||' \
		${WRKSRC}/configure
	@${REINPLACE_CMD} -e "s,-lpthread,-pthread," \
		${WRKSRC}/configure ${WRKSRC}/libjack/Makefile.in \
		${WRKSRC}/jackd/Makefile.in \
		${WRKSRC}/example-clients/Makefile.in ${WRKSRC}/jack.pc.in
	@${REINPLACE_CMD} -e "s,-lrt,," ${WRKSRC}/libjack/Makefile.in \
		${WRKSRC}/jackd/Makefile.in \
		${WRKSRC}/example-clients/Makefile.in
	@${REINPLACE_CMD} -e "s,-ldl,," ${WRKSRC}/jackd/Makefile.in \
		${WRKSRC}/example-clients/Makefile.in
	@${REINPLACE_CMD} -e 's|md5sum|md5 -q|g' \
		${WRKSRC}/jackd/Makefile.in
	@${RM} ${WRKSRC}/doc/reference/html/*

post-build:

Lines 1-3 Link Here

(-)audio/jack/distinfo (-3 / +9 lines)
1	TIMESTAMP = 1491234945	1	TIMESTAMP = 1500250305
2	SHA256 (jack-audio-connection-kit-0.125.0.tar.gz) = 3517b5bff82139a76b2b66fe2fd9a3b34b6e594c184f95a988524c575b11d444	2	SHA256 (jackaudio-jack1-0.125.0-90f9dd3_GH0.tar.gz) = e0ba7dcf58fa934af51329cd329f466fe8d2bc180d07e4ab8be21ed80c60aa8a
3	SIZE (jack-audio-connection-kit-0.125.0.tar.gz) = 1217977	3	SIZE (jackaudio-jack1-0.125.0-90f9dd3_GH0.tar.gz) = 392822
		4	SHA256 (jackaudio-headers-07f1ecf_GH0.tar.gz) = 04a3bb87d278923985ba44045b7a27439c90776cc5d4a6016d062fc7a6aa5023
		5	SIZE (jackaudio-headers-07f1ecf_GH0.tar.gz) = 36704
		6	SHA256 (jackaudio-tools-8d13c31_GH0.tar.gz) = 23e6bc60c8cef4283677206f2687a408367203a725c091c923f48554ae6e8cc8
		7	SIZE (jackaudio-tools-8d13c31_GH0.tar.gz) = 45544
		8	SHA256 (jackaudio-example-clients-7fa0890_GH0.tar.gz) = 79e2ac1d38d7d77b1afb71aa97414c339e8c00613a5d9b725861232b5c995223
		9	SIZE (jackaudio-example-clients-7fa0890_GH0.tar.gz) = 16174

Lines 27-34 Link Here

(-)audio/jack/files/jackd.in (-1 / +3 lines)
27	if [ $jackd_rtprio = "YES" ]; then	27	if [ $jackd_rtprio = "YES" ]; then
28	local rt="rtprio 1"	28	local rt="rtprio 1"
29	fi	29	fi
		30	# log the date and parameters
		31	echo -e "\n[`date`] Starting the daemon, user=$jackd_user rtprio=$jackd_rtprio args=\"$jackd_args\"" >> /var/log/${name}.log
30	# daemon(8) should be able to set the realtime priority, but it isn't	32	# daemon(8) should be able to set the realtime priority, but it isn't
31	$rt daemon -p /var/run/${name}.pid -u ${jackd_user} %%PREFIX%%/bin/jackd ${jackd_args} >/var/log/${name}.log 2>&1	33	$rt daemon -p /var/run/${name}.pid -o /var/log/${name}.log -u "${jackd_user}" %%PREFIX%%/bin/jackd ${jackd_args}
32	}	34	}
33		35
34	load_rc_config ${name}	36	load_rc_config ${name}

Line 0 Link Here

(-)audio/jack/files/patch-configure.ac (+10 lines)
	1	--- configure.ac.orig 2017-01-10 10:20:51 UTC
	2	+++ configure.ac
	3	@@ -172,6 +172,7 @@ case "${host_os}" in
	4	# barrier code, this may be fixed in 5.3, stay tuned.
	5	USE_BARRIER="no"
	6	USE_MD5SUM=0
	7	+ JACK_DO_NOT_MLOCK=0
	8	;;
	9	openbsd*)
	10	# pthread_barrier* not implemented

Lines 1-4 Link Here

(-)audio/jack/files/patch-drivers_oss_oss__driver.c (-5 / +63 lines)
1	--- drivers/oss/oss_driver.c.orig 2016-02-23 15:13:53 UTC	1	--- drivers/oss/oss_driver.c.orig 2017-01-10 10:20:51 UTC
2	+++ drivers/oss/oss_driver.c	2	+++ drivers/oss/oss_driver.c
3	@@ -23,6 +23,7 @@	3	@@ -23,6 +23,7 @@
4		4
Lines 83-89 Link Here
83	dstidx += chcount;	83	dstidx += chcount;
84	}	84	}
85	break;	85	break;
86	@@ -441,19 +454,7 @@ static int oss_driver_start (oss_driver_	86	@@ -429,7 +442,11 @@ static int oss_driver_detach (oss_driver
		87
		88	static int oss_driver_start (oss_driver_t *driver)
		89	{
		90	- int flags = 0;
		91	+#if defined(OPTION_COOKEDMODE)
		92	+ int cookedmode = 1;
		93	+#else
		94	+ int cookedmode = 0;
		95	+#endif
		96	int format;
		97	int channels;
		98	int samplerate;
		99	@@ -441,19 +458,7 @@ static int oss_driver_start (oss_driver_
87	const char *indev = driver->indev;	100	const char *indev = driver->indev;
88	const char *outdev = driver->outdev;	101	const char *outdev = driver->outdev;
89		102
Lines 104-110 Link Here
104	driver->trigger = 0;	117	driver->trigger = 0;
105	if (strcmp (indev, outdev) != 0) {	118	if (strcmp (indev, outdev) != 0) {
106	if (driver->capture_channels > 0) {	119	if (driver->capture_channels > 0) {
107	@@ -705,7 +706,9 @@ static int oss_driver_start (oss_driver_	120	@@ -464,7 +469,7 @@ static int oss_driver_start (oss_driver_
		121	indev, __FILE__, __LINE__, errno);
		122	}
		123	#ifndef OSS_NO_COOKED_MODE
		124	- ioctl (infd, SNDCTL_DSP_COOKEDMODE, &flags);
		125	+ ioctl (infd, SNDCTL_DSP_COOKEDMODE, &cookedmode);
		126	#endif
		127	fragsize = driver->period_size *
		128	driver->capture_channels * samplesize;
		129	@@ -479,7 +484,7 @@ static int oss_driver_start (oss_driver_
		130	outdev, __FILE__, __LINE__, errno);
		131	}
		132	#ifndef OSS_NO_COOKED_MODE
		133	- ioctl (outfd, SNDCTL_DSP_COOKEDMODE, &flags);
		134	+ ioctl (outfd, SNDCTL_DSP_COOKEDMODE, &cookedmode);
		135	#endif
		136	fragsize = driver->period_size *
		137	driver->playback_channels * samplesize;
		138	@@ -497,7 +502,7 @@ static int oss_driver_start (oss_driver_
		139	return -1;
		140	}
		141	#ifndef OSS_NO_COOKED_MODE
		142	- ioctl (infd, SNDCTL_DSP_COOKEDMODE, &flags);
		143	+ ioctl (infd, SNDCTL_DSP_COOKEDMODE, &cookedmode);
		144	#endif
		145	} else if (driver->capture_channels == 0 &&
		146	driver->playback_channels != 0) {
		147	@@ -510,7 +515,7 @@ static int oss_driver_start (oss_driver_
		148	return -1;
		149	}
		150	#ifndef OSS_NO_COOKED_MODE
		151	- ioctl (outfd, SNDCTL_DSP_COOKEDMODE, &flags);
		152	+ ioctl (outfd, SNDCTL_DSP_COOKEDMODE, &cookedmode);
		153	#endif
		154	} else {
		155	infd = outfd = open (indev, O_RDWR \| O_EXCL);
		156	@@ -521,7 +526,7 @@ static int oss_driver_start (oss_driver_
		157	return -1;
		158	}
		159	#ifndef OSS_NO_COOKED_MODE
		160	- ioctl (infd, SNDCTL_DSP_COOKEDMODE, &flags);
		161	+ ioctl (infd, SNDCTL_DSP_COOKEDMODE, &cookedmode);
		162	#endif
		163	}
		164	if (infd >= 0 && outfd >= 0) {
		165	@@ -705,7 +710,9 @@ static int oss_driver_start (oss_driver_
108	sem_post (&driver->sem_start);	166	sem_post (&driver->sem_start);
109	}	167	}
110		168
Lines 115-121 Link Here
115	driver->next_periodtime = 0;	173	driver->next_periodtime = 0;
116	driver->iodelay = 0.0F;	174	driver->iodelay = 0.0F;
117		175
118	@@ -1143,6 +1146,23 @@ jack_driver_t * driver_initialize (jack_	176	@@ -1143,6 +1150,23 @@ jack_driver_t * driver_initialize (jack_
119	pnode = jack_slist_next (pnode);	177	pnode = jack_slist_next (pnode);
120	}	178	}
121		179
Lines 139-145 Link Here
139	driver->sample_rate = sample_rate;	197	driver->sample_rate = sample_rate;
140	driver->period_size = period_size;	198	driver->period_size = period_size;
141	driver->nperiods = nperiods;	199	driver->nperiods = nperiods;
142	@@ -1163,58 +1183,6 @@ jack_driver_t * driver_initialize (jack_	200	@@ -1163,58 +1187,6 @@ jack_driver_t * driver_initialize (jack_
143	}	201	}
144	driver->infd = -1;	202	driver->infd = -1;
145	driver->outfd = -1;	203	driver->outfd = -1;




--- jackd/jackd.c.orig	2017-07-17 17:10:09 UTC
+++ jackd/jackd.c
@@ -521,11 +521,17 @@ jack_drivers_load ()
 
 static void copyright (FILE* file)
 {
-	fprintf (file, "jackd " VERSION "\n"
+	fprintf (file, "jackd " VERSION " (COOKEDMODE=%s)\n"
 		 "Copyright 2001-2009 Paul Davis, Stephane Letz, Jack O'Quinn, Torben Hohn and others.\n"
 		 "jackd comes with ABSOLUTELY NO WARRANTY\n"
 		 "This is free software, and you are welcome to redistribute it\n"
-		 "under certain conditions; see the file COPYING for details\n\n");
+		 "under certain conditions; see the file COPYING for details\n\n",
+#if defined(OPTION_COOKEDMODE)
+                 "on"
+#else
+                 "off"
+#endif
+                 );
 }
 
 static void usage (FILE *file)




--- libjack/client.c.orig	2017-01-10 10:20:51 UTC
+++ libjack/client.c
@@ -68,6 +68,30 @@
 static pthread_mutex_t client_lock;
 static pthread_cond_t client_ready;
 

 static int
 jack_client_close_aux(jack_client_t *client);
 
@@ -251,7 +275,7 @@ oop_client_deliver_request (void *ptr, j
 	int wok, rok;
 	jack_client_t *client = (jack_client_t*)ptr;
 

 	       == sizeof(*req));
 
 	/* if necessary, add variable length key data after a PropertyChange request
@@ -259,7 +283,7 @@ oop_client_deliver_request (void *ptr, j
 
 	if (req->type == PropertyChangeNotify) {
 		if (req->x.property.keylen) {

 				jack_error ("cannot send property key of length %d to server",
 					    req->x.property.keylen);
 				req->status = -1;
@@ -268,7 +292,7 @@ oop_client_deliver_request (void *ptr, j
 		}
 	}
 

 	       == sizeof(*req));
 
 	if (wok && rok) {               /* everything OK? */
@@ -837,14 +861,14 @@ server_event_connect (jack_client_t *cli
 
 	jack_uuid_copy (&req.client_id, client->control->uuid);
 

 		jack_error ("cannot read event connect result from server (%s)",
 			    strerror (errno));
 		close (fd);
@@ -1109,14 +1133,14 @@ jack_request_client (ClientType type,
 	snprintf (req.object_data, sizeof(req.object_data),
 		  "%s", va->load_init);
 

 
 		if (errno == 0) {
 			/* server shut the socket */
@@ -1512,7 +1536,7 @@ jack_internal_client_close (const char *
 		return;
 	}
 

 		jack_error ("cannot deliver ClientUnload request to JACK "
 			    "server.");
 	}
@@ -1648,7 +1672,7 @@ jack_session_notify (jack_client_t* clie
 
 	request.x.session.type = code;
 

 	      != sizeof(request)) ) {
 		jack_error ("cannot send request type %d to server",
 			    request.type);
@@ -1658,7 +1682,7 @@ jack_session_notify (jack_client_t* clie
 	while ( 1 ) {
 		jack_uuid_t uid;
 

 			jack_error ("cannot read result for request type %d from"
 				    " server (%s)", request.type, strerror (errno));
 			goto out;
@@ -1680,19 +1704,19 @@ jack_session_notify (jack_client_t* clie
 			break;
 		}
 

 		    != sizeof(retval[num_replies - 1].flags) ) {
 			jack_error ("cannot read result for request type %d from"
 				    " server (%s)", request.type, strerror (errno));
@@ -1811,7 +1835,7 @@ jack_client_process_events (jack_client_
 		/* server has sent us an event. process the
 		 * event and reply */
 

 		    != sizeof(event)) {
 			jack_error ("cannot read server event (%s)",
 				    strerror (errno));
@@ -1821,7 +1845,7 @@ jack_client_process_events (jack_client_
 		if (event.type == PropertyChange) {
 			if (event.y.key_size) {
 				key = (char*)malloc (event.y.key_size);

 				    event.y.key_size) {
 					jack_error ("cannot read property change key (%s)",
 						    strerror (errno));
@@ -1940,7 +1964,7 @@ jack_client_process_events (jack_client_
 		DEBUG ("client has dealt with the event, writing "
 		       "response on event fd");
 

 		    != sizeof(status)) {
 			jack_error ("cannot send event response to "
 				    "engine (%s)", strerror (errno));
@@ -1960,7 +1984,7 @@ jack_wake_next_client (jack_client_t* cl
 	int pret = 0;
 	char c = 0;
 

 	    != sizeof(c)) {
 		DEBUG ("cannot write byte to fd %d", client->graph_next_fd);
 		jack_error ("cannot continue execution of the "
@@ -1988,7 +2012,7 @@ jack_wake_next_client (jack_client_t* cl
 	}
 
 	if (pret > 0 && (pfds[0].revents & POLLIN)) {




======================================================================
It is recommended to run Jack with real-time priority (-R).

The recommended way to start Jack is to add the following
lines to /etc/rc.conf:

jackd_enable="YES"
jackd_user="{your-jack-user}"
jackd_rtprio="YES"
jackd_args="-R -doss -r{sample-rate} -p1024 -n3 -w16 \
            --capture /dev/dsp{N} --playback /dev/dsp{N}"

Where:
- your-jack-user: is the user who is going to use jack; currently
                  only one user is supported
- sample-rate: can be 44100, 48000, etc.
- /dev/dsp{N}: your OSS devices, usually /dev/dsp0

Please note that the port option COOKEDMODE is "on" by default, which
makes your system to automatically scale the sample-rate between
Jack and audio hardware. One reason COOKEDMODE=on is because
Jack's OSS driver doesn't support some sample-rate and hardware
combinations when COOKEDMODE=off. To achieve the best sound quality
please make sure your hardware natively supports the sample-rate set
in jackd_args, and set COOKEDMODE=off.
======================================================================




lib/libjackserver.so.0
lib/libjackserver.so.0.0.28
libdata/pkgconfig/jack.pc
man/man1/alsa_in.1.gz
man/man1/alsa_out.1.gz
man/man1/jack_bufsize.1.gz
man/man1/jack_connect.1.gz
man/man1/jack_disconnect.1.gz
man/man1/jack_freewheel.1.gz
man/man1/jack_impulse_grabber.1.gz
man/man1/jack_iodelay.1.gz
man/man1/jack_load.1.gz
man/man1/jack_load_test.1.gz
man/man1/jack_lsp.1.gz
man/man1/jack_metro.1.gz
man/man1/jack_monitor_client.1.gz
man/man1/jack_netsource.1.gz
man/man1/jack_property.1.gz
man/man1/jack_samplerate.1.gz
man/man1/jack_showtime.1.gz
man/man1/jack_transport.1.gz
man/man1/jack_unload.1.gz
man/man1/jack_wait.1.gz
man/man1/jackd.1.gz
man/man1/jackrec.1.gz
man/man1/jackstart.1.gz
%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/annotated.html
%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/classes.html

Return to bug 220785

Lines 3-12 Link Here

(-)audio/jack/Makefile (-25 / +27 lines)
3		3
4	PORTNAME= jackit	4	PORTNAME= jackit
5	PORTVERSION= 0.125.0	5	PORTVERSION= 0.125.0
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= audio	7	CATEGORIES= audio
8	MASTER_SITES= http://jackaudio.org/downloads/
9	DISTNAME= jack-audio-connection-kit-${PORTVERSION}
10		8
11	MAINTAINER= multimedia@FreeBSD.org	9	MAINTAINER= multimedia@FreeBSD.org
12	COMMENT= Low latency audio server	10	COMMENT= Low latency audio server
Lines 19-40 Link Here
19	libcelt0.so:audio/celt \	17	libcelt0.so:audio/celt \
20	libuuid.so:misc/e2fsprogs-libuuid	18	libuuid.so:misc/e2fsprogs-libuuid
21		19
		20	USES= autoreconf gmake pathfix pkgconfig libtool localbase bdb
		21	USE_GITHUB= yes
		22	GH_ACCOUNT= jackaudio
		23	GH_PROJECT= jack1
		24	GH_TAGNAME= 90f9dd3
		25	GH_TUPLE= jackaudio:headers:07f1ecf:h/jack
		26	GH_TUPLE+= jackaudio:tools:8d13c31:t/tools
		27	GH_TUPLE+= jackaudio:example-clients:7fa0890:e/example-clients
		28	USE_LDCONFIG= yes
22	GNU_CONFIGURE= yes	29	GNU_CONFIGURE= yes
23	USE_LDCONFIG= yes
24	USES= gmake pathfix pkgconfig libtool localbase bdb
25	USE_RC_SUBR= jackd	30	USE_RC_SUBR= jackd
26		31
27	CONFIGURE_ARGS= --disable-portaudio \	32	CONFIGURE_ARGS= --disable-portaudio \
		33	--enable-optimize \
28	--enable-force-install \	34	--enable-force-install \
29	--with-default-tmpdir=/tmp	35	--with-default-tmpdir=/tmp
30		36
31	CFLAGS+= -I${BDB_INCLUDE_DIR}	37	CFLAGS+= -I${BDB_INCLUDE_DIR}
32	LIBS+= -L${BDB_LIB_DIR}	38	LIBS+= -L${BDB_LIB_DIR}
33	INSTALL_TARGET= install-strip	39	INSTALL_TARGET= install-strip
34		40
35	OPTIONS_DEFINE= ALSA DOXYGEN READLINE SNDIO	41	OPTIONS_DEFINE= ALSA DOXYGEN READLINE SNDIO COOKEDMODE
36	OPTIONS_DEFAULT=READLINE	42	OPTIONS_DEFINE_i386= DYNSIMD
37	OPTIONS_SUB= yes	43	OPTIONS_DEFINE_amd64= DYNSIMD
		44	OPTIONS_DEFAULT= READLINE COOKEDMODE
		45	OPTIONS_DEFAULT_i386= DYNSIMD
		46	OPTIONS_DEFAULT_amd64= DYNSIMD
		47	OPTIONS_SUB= yes
		48	COOKEDMODE_DESC= Use OSS COOKEDMODE (OSS driver is broken without it)
		49	DYNSIMD_DESC= Use dynamic SIMD selection (only i386/amd64)
38		50
39	ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib	51	ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
40	ALSA_CONFIGURE_ENABLE= alsa	52	ALSA_CONFIGURE_ENABLE= alsa
Lines 50-70 Link Here
50	SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio	62	SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio
51	SNDIO_CONFIGURE_ENABLE= sndio	63	SNDIO_CONFIGURE_ENABLE= sndio
52		64
		65	COOKEDMODE_CFLAGS+= -DOPTION_COOKEDMODE
		66
		67	DYNSIMD_CONFIGURE_ENABLE=dynsimd
		68
53	post-patch:	69	post-patch:
54	@${REINPLACE_CMD} -e 's\|define USE_MLOCK\|undef USE_MLOCK\|' \
55	-e 's\|alloca.h\|\|' \
56	${WRKSRC}/configure
57	@${REINPLACE_CMD} -e "s,-lpthread,-pthread," \
58	${WRKSRC}/configure ${WRKSRC}/libjack/Makefile.in \
59	${WRKSRC}/jackd/Makefile.in \
60	${WRKSRC}/example-clients/Makefile.in ${WRKSRC}/jack.pc.in
61	@${REINPLACE_CMD} -e "s,-lrt,," ${WRKSRC}/libjack/Makefile.in \
62	${WRKSRC}/jackd/Makefile.in \
63	${WRKSRC}/example-clients/Makefile.in
64	@${REINPLACE_CMD} -e "s,-ldl,," ${WRKSRC}/jackd/Makefile.in \
65	${WRKSRC}/example-clients/Makefile.in
66	@${REINPLACE_CMD} -e 's\|md5sum\|md5 -q\|g' \
67	${WRKSRC}/jackd/Makefile.in
68	@${RM} ${WRKSRC}/doc/reference/html/*	70	@${RM} ${WRKSRC}/doc/reference/html/*
69		71
70	post-build:	72	post-build:

Line 0 Link Here

(-)audio/jack/files/patch-jackd_jackd.c (+22 lines)
	1	--- jackd/jackd.c.orig 2017-07-17 17:10:09 UTC
	2	+++ jackd/jackd.c
	3	@@ -521,11 +521,17 @@ jack_drivers_load ()
	4
	5	static void copyright (FILE* file)
	6	{
	7	- fprintf (file, "jackd " VERSION "\n"
	8	+ fprintf (file, "jackd " VERSION " (COOKEDMODE=%s)\n"
	9	"Copyright 2001-2009 Paul Davis, Stephane Letz, Jack O'Quinn, Torben Hohn and others.\n"
	10	"jackd comes with ABSOLUTELY NO WARRANTY\n"
	11	"This is free software, and you are welcome to redistribute it\n"
	12	- "under certain conditions; see the file COPYING for details\n\n");
	13	+ "under certain conditions; see the file COPYING for details\n\n",
	14	+#if defined(OPTION_COOKEDMODE)
	15	+ "on"
	16	+#else
	17	+ "off"
	18	+#endif
	19	+ );
	20	}
	21
	22	static void usage (FILE *file)

Lines 1-6 Link Here

(-)audio/jack/files/patch-libjack_client.c (-16 / +16 lines)
1	--- libjack/client.c.orig 2016-09-14 17:41:53 UTC	1	--- libjack/client.c.orig 2017-01-10 10:20:51 UTC
2	+++ libjack/client.c	2	+++ libjack/client.c
3	@@ -69,6 +69,30 @@	3	@@ -68,6 +68,30 @@
4	static pthread_mutex_t client_lock;	4	static pthread_mutex_t client_lock;
5	static pthread_cond_t client_ready;	5	static pthread_cond_t client_ready;
6		6
Lines 31-37 Link Here
31	static int	31	static int
32	jack_client_close_aux(jack_client_t *client);	32	jack_client_close_aux(jack_client_t *client);
33		33
34	@@ -252,7 +276,7 @@ oop_client_deliver_request (void *ptr, j	34	@@ -251,7 +275,7 @@ oop_client_deliver_request (void *ptr, j
35	int wok, rok;	35	int wok, rok;
36	jack_client_t client = (jack_client_t)ptr;	36	jack_client_t client = (jack_client_t)ptr;
37		37
Lines 40-46 Link Here
40	== sizeof(*req));	40	== sizeof(*req));
41		41
42	/* if necessary, add variable length key data after a PropertyChange request	42	/* if necessary, add variable length key data after a PropertyChange request
43	@@ -260,7 +284,7 @@ oop_client_deliver_request (void *ptr, j	43	@@ -259,7 +283,7 @@ oop_client_deliver_request (void *ptr, j
44		44
45	if (req->type == PropertyChangeNotify) {	45	if (req->type == PropertyChangeNotify) {
46	if (req->x.property.keylen) {	46	if (req->x.property.keylen) {
Lines 49-55 Link Here
49	jack_error ("cannot send property key of length %d to server",	49	jack_error ("cannot send property key of length %d to server",
50	req->x.property.keylen);	50	req->x.property.keylen);
51	req->status = -1;	51	req->status = -1;
52	@@ -269,7 +293,7 @@ oop_client_deliver_request (void *ptr, j	52	@@ -268,7 +292,7 @@ oop_client_deliver_request (void *ptr, j
53	}	53	}
54	}	54	}
55		55
Lines 58-64 Link Here
58	== sizeof(*req));	58	== sizeof(*req));
59		59
60	if (wok && rok) { /* everything OK? */	60	if (wok && rok) { /* everything OK? */
61	@@ -838,14 +862,14 @@ server_event_connect (jack_client_t *cli	61	@@ -837,14 +861,14 @@ server_event_connect (jack_client_t *cli
62		62
63	jack_uuid_copy (&req.client_id, client->control->uuid);	63	jack_uuid_copy (&req.client_id, client->control->uuid);
64		64
Lines 76-82 Link Here
76	jack_error ("cannot read event connect result from server (%s)",	76	jack_error ("cannot read event connect result from server (%s)",
77	strerror (errno));	77	strerror (errno));
78	close (fd);	78	close (fd);
79	@@ -1110,14 +1134,14 @@ jack_request_client (ClientType type,	79	@@ -1109,14 +1133,14 @@ jack_request_client (ClientType type,
80	snprintf (req.object_data, sizeof(req.object_data),	80	snprintf (req.object_data, sizeof(req.object_data),
81	"%s", va->load_init);	81	"%s", va->load_init);
82		82
Lines 93-99 Link Here
93		93
94	if (errno == 0) {	94	if (errno == 0) {
95	/* server shut the socket */	95	/* server shut the socket */
96	@@ -1513,7 +1537,7 @@ jack_internal_client_close (const char *	96	@@ -1512,7 +1536,7 @@ jack_internal_client_close (const char *
97	return;	97	return;
98	}	98	}
99		99
Lines 102-108 Link Here
102	jack_error ("cannot deliver ClientUnload request to JACK "	102	jack_error ("cannot deliver ClientUnload request to JACK "
103	"server.");	103	"server.");
104	}	104	}
105	@@ -1649,7 +1673,7 @@ jack_session_notify (jack_client_t* clie	105	@@ -1648,7 +1672,7 @@ jack_session_notify (jack_client_t* clie
106		106
107	request.x.session.type = code;	107	request.x.session.type = code;
108		108
Lines 111-117 Link Here
111	!= sizeof(request)) ) {	111	!= sizeof(request)) ) {
112	jack_error ("cannot send request type %d to server",	112	jack_error ("cannot send request type %d to server",
113	request.type);	113	request.type);
114	@@ -1659,7 +1683,7 @@ jack_session_notify (jack_client_t* clie	114	@@ -1658,7 +1682,7 @@ jack_session_notify (jack_client_t* clie
115	while ( 1 ) {	115	while ( 1 ) {
116	jack_uuid_t uid;	116	jack_uuid_t uid;
117		117
Lines 120-126 Link Here
120	jack_error ("cannot read result for request type %d from"	120	jack_error ("cannot read result for request type %d from"
121	" server (%s)", request.type, strerror (errno));	121	" server (%s)", request.type, strerror (errno));
122	goto out;	122	goto out;
123	@@ -1681,19 +1705,19 @@ jack_session_notify (jack_client_t* clie	123	@@ -1680,19 +1704,19 @@ jack_session_notify (jack_client_t* clie
124	break;	124	break;
125	}	125	}
126		126
Lines 143-149 Link Here
143	!= sizeof(retval[num_replies - 1].flags) ) {	143	!= sizeof(retval[num_replies - 1].flags) ) {
144	jack_error ("cannot read result for request type %d from"	144	jack_error ("cannot read result for request type %d from"
145	" server (%s)", request.type, strerror (errno));	145	" server (%s)", request.type, strerror (errno));
146	@@ -1812,7 +1836,7 @@ jack_client_process_events (jack_client_	146	@@ -1811,7 +1835,7 @@ jack_client_process_events (jack_client_
147	/* server has sent us an event. process the	147	/* server has sent us an event. process the
148	* event and reply */	148	* event and reply */
149		149
Lines 152-158 Link Here
152	!= sizeof(event)) {	152	!= sizeof(event)) {
153	jack_error ("cannot read server event (%s)",	153	jack_error ("cannot read server event (%s)",
154	strerror (errno));	154	strerror (errno));
155	@@ -1822,7 +1846,7 @@ jack_client_process_events (jack_client_	155	@@ -1821,7 +1845,7 @@ jack_client_process_events (jack_client_
156	if (event.type == PropertyChange) {	156	if (event.type == PropertyChange) {
157	if (event.y.key_size) {	157	if (event.y.key_size) {
158	key = (char*)malloc (event.y.key_size);	158	key = (char*)malloc (event.y.key_size);
Lines 161-167 Link Here
161	event.y.key_size) {	161	event.y.key_size) {
162	jack_error ("cannot read property change key (%s)",	162	jack_error ("cannot read property change key (%s)",
163	strerror (errno));	163	strerror (errno));
164	@@ -1941,7 +1965,7 @@ jack_client_process_events (jack_client_	164	@@ -1940,7 +1964,7 @@ jack_client_process_events (jack_client_
165	DEBUG ("client has dealt with the event, writing "	165	DEBUG ("client has dealt with the event, writing "
166	"response on event fd");	166	"response on event fd");
167		167
Lines 170-176 Link Here
170	!= sizeof(status)) {	170	!= sizeof(status)) {
171	jack_error ("cannot send event response to "	171	jack_error ("cannot send event response to "
172	"engine (%s)", strerror (errno));	172	"engine (%s)", strerror (errno));
173	@@ -1961,7 +1985,7 @@ jack_wake_next_client (jack_client_t* cl	173	@@ -1960,7 +1984,7 @@ jack_wake_next_client (jack_client_t* cl
174	int pret = 0;	174	int pret = 0;
175	char c = 0;	175	char c = 0;
176		176
Lines 179-185 Link Here
179	!= sizeof(c)) {	179	!= sizeof(c)) {
180	DEBUG ("cannot write byte to fd %d", client->graph_next_fd);	180	DEBUG ("cannot write byte to fd %d", client->graph_next_fd);
181	jack_error ("cannot continue execution of the "	181	jack_error ("cannot continue execution of the "
182	@@ -1989,7 +2013,7 @@ jack_wake_next_client (jack_client_t* cl	182	@@ -1988,7 +2012,7 @@ jack_wake_next_client (jack_client_t* cl
183	}	183	}
184		184
185	if (pret > 0 && (pfds[0].revents & POLLIN)) {	185	if (pret > 0 && (pfds[0].revents & POLLIN)) {

Line 0 Link Here

(-)audio/jack/pkg-message (+26 lines)
	1	======================================================================
	2	It is recommended to run Jack with real-time priority (-R).
	3
	4	The recommended way to start Jack is to add the following
	5	lines to /etc/rc.conf:
	6
	7	jackd_enable="YES"
	8	jackd_user="{your-jack-user}"
	9	jackd_rtprio="YES"
	10	jackd_args="-R -doss -r{sample-rate} -p1024 -n3 -w16 \
	11	--capture /dev/dsp{N} --playback /dev/dsp{N}"
	12
	13	Where:
	14	- your-jack-user: is the user who is going to use jack; currently
	15	only one user is supported
	16	- sample-rate: can be 44100, 48000, etc.
	17	- /dev/dsp{N}: your OSS devices, usually /dev/dsp0
	18
	19	Please note that the port option COOKEDMODE is "on" by default, which
	20	makes your system to automatically scale the sample-rate between
	21	Jack and audio hardware. One reason COOKEDMODE=on is because
	22	Jack's OSS driver doesn't support some sample-rate and hardware
	23	combinations when COOKEDMODE=off. To achieve the best sound quality
	24	please make sure your hardware natively supports the sample-rate set
	25	in jackd_args, and set COOKEDMODE=off.
	26	======================================================================

Lines 61-67 Link Here

(-)audio/jack/pkg-plist (+21 lines)
61	lib/libjackserver.so.0	61	lib/libjackserver.so.0
62	lib/libjackserver.so.0.0.28	62	lib/libjackserver.so.0.0.28
63	libdata/pkgconfig/jack.pc	63	libdata/pkgconfig/jack.pc
		64	man/man1/alsa_in.1.gz
		65	man/man1/alsa_out.1.gz
		66	man/man1/jack_bufsize.1.gz
		67	man/man1/jack_connect.1.gz
		68	man/man1/jack_disconnect.1.gz
		69	man/man1/jack_freewheel.1.gz
		70	man/man1/jack_impulse_grabber.1.gz
		71	man/man1/jack_iodelay.1.gz
		72	man/man1/jack_load.1.gz
		73	man/man1/jack_load_test.1.gz
		74	man/man1/jack_lsp.1.gz
		75	man/man1/jack_metro.1.gz
		76	man/man1/jack_monitor_client.1.gz
		77	man/man1/jack_netsource.1.gz
		78	man/man1/jack_property.1.gz
		79	man/man1/jack_samplerate.1.gz
		80	man/man1/jack_showtime.1.gz
		81	man/man1/jack_transport.1.gz
		82	man/man1/jack_unload.1.gz
		83	man/man1/jack_wait.1.gz
64	man/man1/jackd.1.gz	84	man/man1/jackd.1.gz
		85	man/man1/jackrec.1.gz
65	man/man1/jackstart.1.gz	86	man/man1/jackstart.1.gz
66	%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/annotated.html	87	%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/annotated.html
67	%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/classes.html	88	%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/classes.html