Attachment #184414 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
GH_TUPLE+=	jackaudio:tools:8d13c31:t
GH_TUPLE+=	jackaudio:example-clients:7fa0890:e
USE_LDCONFIG=	yes
GNU_CONFIGURE=	yes
USE_LDCONFIG=	yes
USES=		gmake pathfix pkgconfig libtool localbase bdb
USE_RC_SUBR=	jackd

CONFIGURE_ARGS=	--disable-portaudio \

		--with-default-tmpdir=/tmp

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

OPTIONS_DEFINE=	ALSA DOXYGEN READLINE SNDIO COOKEDMODE
OPTIONS_DEFAULT=READLINE COOKEDMODE
OPTIONS_SUB=	yes
COOKEDMODE_DESC=Use OSS COOKEDMODE (OSS driver is broken without it)

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

SNDIO_CONFIGURE_ENABLE=	sndio

post-patch:
	@${MV} ${WRKDIR}/headers-*/* ${WRKSRC}/jack/
	@${MV} ${WRKDIR}/tools-*/* ${WRKSRC}/tools/
	@${MV} ${WRKDIR}/example-clients-*/* ${WRKSRC}/example-clients/
	@${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 1-4 Link Here

(-)audio/jack/files/patch-drivers_oss_oss__driver.c (-11 / +76 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 8-14 Link Here
8	#ifdef USE_BARRIER	8	#ifdef USE_BARRIER
9	/*	9	/*
10	* POSIX conformance level should be globally defined somewhere, possibly	10	* POSIX conformance level should be globally defined somewhere, possibly
11	@@ -172,7 +173,9 @@ static void set_period_size (oss_driver_	11	@@ -77,6 +78,10 @@
		12	#endif /* _SIOWR */
		13	#endif /* SNDCTL_DSP_COOKEDMODE */
		14
		15	+#if !defined(OPTION_COOKEDMODE)
		16	+#define OPTION_COOKEDMODE 0
		17	+#endif
		18	+
		19	#define OSS_DRIVER_N_PARAMS 11
		20	const static jack_driver_param_desc_t oss_params[OSS_DRIVER_N_PARAMS] = {
		21	{ "rate",
		22	@@ -172,7 +177,9 @@ static void set_period_size (oss_driver_
12	((double)driver->period_size /	23	((double)driver->period_size /
13	(double)driver->sample_rate) * 1e6;	24	(double)driver->sample_rate) * 1e6;
14	driver->last_wait_ust = 0;	25	driver->last_wait_ust = 0;
Lines 19-25 Link Here
19	driver->next_periodtime = 0;	30	driver->next_periodtime = 0;
20	driver->iodelay = 0.0F;	31	driver->iodelay = 0.0F;
21	}	32	}
22	@@ -180,7 +183,9 @@ static void set_period_size (oss_driver_	33	@@ -180,7 +187,9 @@ static void set_period_size (oss_driver_
23		34
24	static inline void update_times (oss_driver_t *driver)	35	static inline void update_times (oss_driver_t *driver)
25	{	36	{
Lines 30-36 Link Here
30	if (driver->next_periodtime > 0) {	41	if (driver->next_periodtime > 0) {
31	driver->iodelay = (float)	42	driver->iodelay = (float)
32	((long double)driver->last_periodtime -	43	((long double)driver->last_periodtime -
33	@@ -211,6 +216,7 @@ static void copy_and_convert_in (jack_sa	44	@@ -211,6 +220,7 @@ static void copy_and_convert_in (jack_sa
34	int dstidx;	45	int dstidx;
35	signed short s16src = (signed short)src;	46	signed short s16src = (signed short)src;
36	signed int s32src = (signed int)src;	47	signed int s32src = (signed int)src;
Lines 38-44 Link Here
38	double f64src = (double)src;	49	double f64src = (double)src;
39	jack_sample_t scale;	50	jack_sample_t scale;
40		51
41	@@ -225,10 +231,13 @@ static void copy_and_convert_in (jack_sa	52	@@ -225,10 +235,13 @@ static void copy_and_convert_in (jack_sa
42	}	53	}
43	break;	54	break;
44	case 24:	55	case 24:
Lines 54-60 Link Here
54	srcidx += chcount;	65	srcidx += chcount;
55	}	66	}
56	break;	67	break;
57	@@ -256,6 +265,7 @@ static void copy_and_convert_out (void *	68	@@ -256,6 +269,7 @@ static void copy_and_convert_out (void *
58	int srcidx;	69	int srcidx;
59	int dstidx;	70	int dstidx;
60	signed short s16dst = (signed short)dst;	71	signed short s16dst = (signed short)dst;
Lines 62-68 Link Here
62	signed int s32dst = (signed int)dst;	73	signed int s32dst = (signed int)dst;
63	double f64dst = (double)dst;	74	double f64dst = (double)dst;
64	jack_sample_t scale;	75	jack_sample_t scale;
65	@@ -273,12 +283,15 @@ static void copy_and_convert_out (void *	76	@@ -273,12 +287,15 @@ static void copy_and_convert_out (void *
66	}	77	}
67	break;	78	break;
68	case 24:	79	case 24:
Lines 83-89 Link Here
83	dstidx += chcount;	94	dstidx += chcount;
84	}	95	}
85	break;	96	break;
86	@@ -441,19 +454,7 @@ static int oss_driver_start (oss_driver_	97	@@ -429,7 +446,7 @@ static int oss_driver_detach (oss_driver
		98
		99	static int oss_driver_start (oss_driver_t *driver)
		100	{
		101	- int flags = 0;
		102	+ int cookedmode = OPTION_COOKEDMODE;
		103	int format;
		104	int channels;
		105	int samplerate;
		106	@@ -441,19 +458,7 @@ static int oss_driver_start (oss_driver_
87	const char *indev = driver->indev;	107	const char *indev = driver->indev;
88	const char *outdev = driver->outdev;	108	const char *outdev = driver->outdev;
89		109
Lines 104-110 Link Here
104	driver->trigger = 0;	124	driver->trigger = 0;
105	if (strcmp (indev, outdev) != 0) {	125	if (strcmp (indev, outdev) != 0) {
106	if (driver->capture_channels > 0) {	126	if (driver->capture_channels > 0) {
107	@@ -705,7 +706,9 @@ static int oss_driver_start (oss_driver_	127	@@ -464,7 +469,7 @@ static int oss_driver_start (oss_driver_
		128	indev, __FILE__, __LINE__, errno);
		129	}
		130	#ifndef OSS_NO_COOKED_MODE
		131	- ioctl (infd, SNDCTL_DSP_COOKEDMODE, &flags);
		132	+ ioctl (infd, SNDCTL_DSP_COOKEDMODE, &cookedmode);
		133	#endif
		134	fragsize = driver->period_size *
		135	driver->capture_channels * samplesize;
		136	@@ -479,7 +484,7 @@ static int oss_driver_start (oss_driver_
		137	outdev, __FILE__, __LINE__, errno);
		138	}
		139	#ifndef OSS_NO_COOKED_MODE
		140	- ioctl (outfd, SNDCTL_DSP_COOKEDMODE, &flags);
		141	+ ioctl (outfd, SNDCTL_DSP_COOKEDMODE, &cookedmode);
		142	#endif
		143	fragsize = driver->period_size *
		144	driver->playback_channels * samplesize;
		145	@@ -497,7 +502,7 @@ static int oss_driver_start (oss_driver_
		146	return -1;
		147	}
		148	#ifndef OSS_NO_COOKED_MODE
		149	- ioctl (infd, SNDCTL_DSP_COOKEDMODE, &flags);
		150	+ ioctl (infd, SNDCTL_DSP_COOKEDMODE, &cookedmode);
		151	#endif
		152	} else if (driver->capture_channels == 0 &&
		153	driver->playback_channels != 0) {
		154	@@ -510,7 +515,7 @@ static int oss_driver_start (oss_driver_
		155	return -1;
		156	}
		157	#ifndef OSS_NO_COOKED_MODE
		158	- ioctl (outfd, SNDCTL_DSP_COOKEDMODE, &flags);
		159	+ ioctl (outfd, SNDCTL_DSP_COOKEDMODE, &cookedmode);
		160	#endif
		161	} else {
		162	infd = outfd = open (indev, O_RDWR \| O_EXCL);
		163	@@ -521,7 +526,7 @@ static int oss_driver_start (oss_driver_
		164	return -1;
		165	}
		166	#ifndef OSS_NO_COOKED_MODE
		167	- ioctl (infd, SNDCTL_DSP_COOKEDMODE, &flags);
		168	+ ioctl (infd, SNDCTL_DSP_COOKEDMODE, &cookedmode);
		169	#endif
		170	}
		171	if (infd >= 0 && outfd >= 0) {
		172	@@ -705,7 +710,9 @@ static int oss_driver_start (oss_driver_
108	sem_post (&driver->sem_start);	173	sem_post (&driver->sem_start);
109	}	174	}
110		175
Lines 115-121 Link Here
115	driver->next_periodtime = 0;	180	driver->next_periodtime = 0;
116	driver->iodelay = 0.0F;	181	driver->iodelay = 0.0F;
117		182
118	@@ -1143,6 +1146,23 @@ jack_driver_t * driver_initialize (jack_	183	@@ -1143,6 +1150,23 @@ jack_driver_t * driver_initialize (jack_
119	pnode = jack_slist_next (pnode);	184	pnode = jack_slist_next (pnode);
120	}	185	}
121		186
Lines 139-145 Link Here
139	driver->sample_rate = sample_rate;	204	driver->sample_rate = sample_rate;
140	driver->period_size = period_size;	205	driver->period_size = period_size;
141	driver->nperiods = nperiods;	206	driver->nperiods = nperiods;
142	@@ -1163,58 +1183,6 @@ jack_driver_t * driver_initialize (jack_	207	@@ -1163,58 +1187,6 @@ jack_driver_t * driver_initialize (jack_
143	}	208	}
144	driver->infd = -1;	209	driver->infd = -1;
145	driver->outfd = -1;	210	driver->outfd = -1;




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 (-21 / +17 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-27 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
		26	GH_TUPLE+= jackaudio:tools:8d13c31:t
		27	GH_TUPLE+= jackaudio:example-clients:7fa0890:e
		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 \
Lines 29-40 Link Here
29	--with-default-tmpdir=/tmp	34	--with-default-tmpdir=/tmp
30		35
31	CFLAGS+= -I${BDB_INCLUDE_DIR}	36	CFLAGS+= -I${BDB_INCLUDE_DIR}
		37	COOKEDMODE_CFLAGS+= -DOPTION_COOKEDMODE=1
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_DEFAULT=READLINE COOKEDMODE
37	OPTIONS_SUB= yes	43	OPTIONS_SUB= yes
		44	COOKEDMODE_DESC=Use OSS COOKEDMODE (OSS driver is broken without it)
38		45
39	ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib	46	ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
40	ALSA_CONFIGURE_ENABLE= alsa	47	ALSA_CONFIGURE_ENABLE= alsa
Lines 51-70 Link Here
51	SNDIO_CONFIGURE_ENABLE= sndio	58	SNDIO_CONFIGURE_ENABLE= sndio
52		59
53	post-patch:	60	post-patch:
54	@${REINPLACE_CMD} -e 's\|define USE_MLOCK\|undef USE_MLOCK\|' \	61	@${MV} ${WRKDIR}/headers-/ ${WRKSRC}/jack/
55	-e 's\|alloca.h\|\|' \	62	@${MV} ${WRKDIR}/tools-/ ${WRKSRC}/tools/
56	${WRKSRC}/configure	63	@${MV} ${WRKDIR}/example-clients-/ ${WRKSRC}/example-clients/
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/*	64	@${RM} ${WRKSRC}/doc/reference/html/*
69		65
70	post-build:	66	post-build:

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