View | Details | Raw Unified | Return to bug 220785 | Differences between
and this patch

Collapse All | Expand All

(-)audio/jack/Makefile (-21 / +15 lines)
Lines 3-12 Link Here
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-28 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
31
SUB_FILES=	pkg-message
26
32
27
CONFIGURE_ARGS=	--disable-portaudio \
33
CONFIGURE_ARGS=	--disable-portaudio \
28
		--enable-force-install \
34
		--enable-force-install \
Lines 29-40 Link Here
29
		--with-default-tmpdir=/tmp
35
		--with-default-tmpdir=/tmp
30
36
31
CFLAGS+=	-I${BDB_INCLUDE_DIR}
37
CFLAGS+=	-I${BDB_INCLUDE_DIR}
38
COOKEDMODE_CFLAGS+=	-DOPTION_COOKEDMODE=1
32
LIBS+=	-L${BDB_LIB_DIR}
39
LIBS+=	-L${BDB_LIB_DIR}
33
INSTALL_TARGET=	install-strip
40
INSTALL_TARGET=	install-strip
34
41
35
OPTIONS_DEFINE=	ALSA DOXYGEN READLINE SNDIO
42
OPTIONS_DEFINE=	ALSA DOXYGEN READLINE SNDIO COOKEDMODE
36
OPTIONS_DEFAULT=READLINE
43
OPTIONS_DEFAULT=READLINE COOKEDMODE
37
OPTIONS_SUB=	yes
44
OPTIONS_SUB=	yes
45
COOKEDMODE_DESC=Use OSS COOKEDMODE (OSS driver is broken without it)
38
46
39
ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
47
ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
40
ALSA_CONFIGURE_ENABLE=	alsa
48
ALSA_CONFIGURE_ENABLE=	alsa
Lines 51-70 Link Here
51
SNDIO_CONFIGURE_ENABLE=	sndio
59
SNDIO_CONFIGURE_ENABLE=	sndio
52
60
53
post-patch:
61
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/*
62
	@${RM} ${WRKSRC}/doc/reference/html/*
69
63
70
post-build:
64
post-build:
(-)audio/jack/distinfo (-3 / +9 lines)
Lines 1-3 Link Here
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
(-)audio/jack/files/patch-drivers_oss_oss__driver.c (-5 / +63 lines)
Lines 1-4 Link Here
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;
(-)audio/jack/files/pkg-message.in (+26 lines)
Line 0 Link Here
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
apps and audio hardware. One reason COOKEDMODE=on is because the
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
======================================================================
(-)audio/jack/pkg-plist (+21 lines)
Lines 61-67 Link Here
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

Return to bug 220785