Attachment #73399 for bug #106410




# $FreeBSD: ports/audio/jack/Makefile,v 1.30 2006/07/07 14:52:52 ahze Exp $

PORTNAME=	jackit
PORTVERSION=	0.102.20
PORTREVISION=	1
CATEGORIES=	audio
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	jackit

COMMENT=	A low-latency audio server

LIB_DEPENDS=	portaudio.0:${PORTSDIR}/audio/portaudio \
		sndfile.1:${PORTSDIR}/audio/libsndfile \
		FLAC.7:${PORTSDIR}/audio/flac

OPTIONS=	DOCS "Build HTML documentation. Requires doxygen/TeX." off


		CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
GNU_CONFIGURE=	yes
USE_GETOPT_LONG=	yes
USE_LDCONFIG=	yes
USE_GNOME=	pkgconfig gnometarget gnomehack

MAN1=		jackd.1 jackstart.1

PLIST_SUB+=	DOCS="@comment "
.endif

.if (${OSVERSION} < 502102 )
BROKEN=		Does not compile
.endif

.if ${OSVERSION} < 500018 || exists(${LOCALBASE}/lib/libreadline.so.5)
LIB_DEPENDS+=	readline.5:${PORTSDIR}/devel/readline
.endif

pre-everything::

Lines 1-3 Link Here

(-)/home/trasz/jack/distinfo (-3 / +3 lines)
1	MD5 (jack-audio-connection-kit-0.101.1.tar.gz) = bb25f7c1da5d488b70edcf39ff5a39b2	1	MD5 (jack-audio-connection-kit-0.102.20.tar.gz) = d6881555a8b4c923b4ec706832f0d776
2	SHA256 (jack-audio-connection-kit-0.101.1.tar.gz) = 4f0e89a83aaaf5b125389135ee4f321b22ffef19003749c138eb54974e2f5533	2	SHA256 (jack-audio-connection-kit-0.102.20.tar.gz) = e4506a9f46cd6fa4896e76482f17b7bddeeda3eb35add176d6db479e5c4f8530
3	SIZE (jack-audio-connection-kit-0.101.1.tar.gz) = 724598	3	SIZE (jack-audio-connection-kit-0.102.20.tar.gz) = 761792




--- config/os/generic/time.h.orig	Fri May 26 04:45:16 2006
+++ config/os/generic/time.h	Wed Dec  6 08:22:45 2006
@@ -24,7 +24,9 @@
 
 #include <jack/internal.h>
 
-inline jack_time_t
+jack_time_t jack_get_microseconds_from_system (void);
+
+static inline jack_time_t
 jack_get_microseconds (void) {
 	return jack_get_microseconds_from_system ();
 }

Line 0 Link Here

(-)/home/trasz/jack/files/patch-configure (+11 lines)
	1	--- configure.orig Wed Dec 6 08:33:37 2006
	2	+++ configure Wed Dec 6 08:35:19 2006
	3	@@ -23296,7 +23296,7 @@
	4	# the cached result to work around this problem.
	5
	6	READLINE_DEPS=""
	7	-HAVE_READLINE="false"
	8	+HAVE_READLINE="true"
	9	#AC_CHECK_LIB(readline, readline, [:],
	10	# [unset ac_cv_lib_readline_readline
	11	# AC_CHECK_LIB(readline, readline, [READLINE_DEPS="-ltermcap"],

Line 0 Link Here

(-)/home/trasz/jack/files/patch-libjack-midiport.c (+11 lines)
	1	--- libjack/midiport.c.orig Wed Dec 6 08:05:17 2006
	2	+++ libjack/midiport.c Wed Dec 6 08:05:56 2006
	3	@@ -72,7 +72,7 @@
	4	(jack_midi_port_info_private_t *) port_buffer;
	5
	6	if (event_idx >= info->info.event_count)
	7	- return ENODATA;
	8	+ return ENOMSG;
	9
	10	port_event = (jack_midi_port_internal_event_t *) (info + 1);
	11	port_event += event_idx;

Lines 6-11 Link Here

(-)/home/trasz/jack/pkg-plist (+16 lines)
6	bin/jack_load	6	bin/jack_load
7	bin/jack_lsp	7	bin/jack_lsp
8	bin/jack_metro	8	bin/jack_metro
		9	bin/jack_midiseq
		10	bin/jack_midisine
9	bin/jack_monitor_client	11	bin/jack_monitor_client
10	bin/jack_showtime	12	bin/jack_showtime
11	bin/jack_simple_client	13	bin/jack_simple_client
Lines 15-20 Link Here
15	bin/jackrec	17	bin/jackrec
16	include/jack/intclient.h	18	include/jack/intclient.h
17	include/jack/jack.h	19	include/jack/jack.h
		20	include/jack/midiport.h
18	include/jack/ringbuffer.h	21	include/jack/ringbuffer.h
19	include/jack/statistics.h	22	include/jack/statistics.h
20	include/jack/thread.h	23	include/jack/thread.h
Lines 79-84 Link Here
79	%%DOCS%%share/jack-audio-connection-kit/reference/html/transport_8h.html	82	%%DOCS%%share/jack-audio-connection-kit/reference/html/transport_8h.html
80	%%DOCS%%share/jack-audio-connection-kit/reference/html/types_8h-source.html	83	%%DOCS%%share/jack-audio-connection-kit/reference/html/types_8h-source.html
81	%%DOCS%%share/jack-audio-connection-kit/reference/html/types_8h.html	84	%%DOCS%%share/jack-audio-connection-kit/reference/html/types_8h.html
		85	%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x65.html
		86	%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x69.html
		87	%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x6a.html
		88	%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x6d.html
		89	%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x6f.html
		90	%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x70.html
		91	%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x72.html
		92	%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x73.html
		93	%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x74.html
		94	%%DOCS%%share/jack-audio-connection-kit/reference/html/midiport_8h-source.html
		95	%%DOCS%%share/jack-audio-connection-kit/reference/html/midiport_8h.html
		96	%%DOCS%%share/jack-audio-connection-kit/reference/html/struct__jack__midi__event.html
		97	%%DOCS%%share/jack-audio-connection-kit/reference/html/struct__jack__midi__port__info.html
82	%%DOCS%%@dirrm share/jack-audio-connection-kit/reference/html	98	%%DOCS%%@dirrm share/jack-audio-connection-kit/reference/html
83	%%DOCS%%@dirrm share/jack-audio-connection-kit/reference	99	%%DOCS%%@dirrm share/jack-audio-connection-kit/reference
84	%%DOCS%%@dirrm share/jack-audio-connection-kit	100	%%DOCS%%@dirrm share/jack-audio-connection-kit

Return to bug 106410

Lines 5-12 Link Here

(-)/home/trasz/jack/Makefile (-5 / +9 lines)
5	# $FreeBSD: ports/audio/jack/Makefile,v 1.30 2006/07/07 14:52:52 ahze Exp $	5	# $FreeBSD: ports/audio/jack/Makefile,v 1.30 2006/07/07 14:52:52 ahze Exp $
6		6
7	PORTNAME= jackit	7	PORTNAME= jackit
8	PORTVERSION= 0.101.1	8	PORTVERSION= 0.102.20
9	PORTREVISION= 1
10	CATEGORIES= audio	9	CATEGORIES= audio
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	10	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= jackit	11	MASTER_SITE_SUBDIR= jackit
Lines 16-22 Link Here
16	COMMENT= A low-latency audio server	15	COMMENT= A low-latency audio server
17		16
18	LIB_DEPENDS= portaudio.0:${PORTSDIR}/audio/portaudio \	17	LIB_DEPENDS= portaudio.0:${PORTSDIR}/audio/portaudio \
19	sndfile.1:${PORTSDIR}/audio/libsndfile	18	sndfile.1:${PORTSDIR}/audio/libsndfile \
		19	FLAC.7:${PORTSDIR}/audio/flac
20		20
21	OPTIONS= DOCS "Build HTML documentation. Requires doxygen/TeX." off	21	OPTIONS= DOCS "Build HTML documentation. Requires doxygen/TeX." off
22		22
Lines 26-32 Link Here
26	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"	26	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
27	GNU_CONFIGURE= yes	27	GNU_CONFIGURE= yes
28	USE_GETOPT_LONG= yes	28	USE_GETOPT_LONG= yes
29	INSTALLS_SHLIB= yes	29	USE_LDCONFIG= yes
30	USE_GNOME= pkgconfig gnometarget gnomehack	30	USE_GNOME= pkgconfig gnometarget gnomehack
31		31
32	MAN1= jackd.1 jackstart.1	32	MAN1= jackd.1 jackstart.1
Lines 46-53 Link Here
46	PLIST_SUB+= DOCS="@comment "	46	PLIST_SUB+= DOCS="@comment "
47	.endif	47	.endif
48		48
49	.if (${OSVERSION} > 500000 ) && (${OSVERSION} < 502102 )	49	.if (${OSVERSION} < 502102 )
50	BROKEN= Does not compile	50	BROKEN= Does not compile
		51	.endif
		52
		53	.if ${OSVERSION} < 500018 \|\| exists(${LOCALBASE}/lib/libreadline.so.5)
		54	LIB_DEPENDS+= readline.5:${PORTSDIR}/devel/readline
51	.endif	55	.endif
52		56
53	pre-everything::	57	pre-everything::

Line 0 Link Here

(-)/home/trasz/jack/files/patch-config-os-generic-time.h (+13 lines)
	1	--- config/os/generic/time.h.orig Fri May 26 04:45:16 2006
	2	+++ config/os/generic/time.h Wed Dec 6 08:22:45 2006
	3	@@ -24,7 +24,9 @@
	4
	5	#include <jack/internal.h>
	6
	7	-inline jack_time_t
	8	+jack_time_t jack_get_microseconds_from_system (void);
	9	+
	10	+static inline jack_time_t
	11	jack_get_microseconds (void) {
	12	return jack_get_microseconds_from_system ();
	13	}