Attachment 73399 Details for Bug 106410 – jack-4.diff

[patch] jack-4.diff

jack-4.diff (text/plain; charset=iso-8859-2), 5.85 KB, created by trasz on 2006-12-06 09:39:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: trasz

Created: 2006-12-06 09:39:57 UTC

Size: 5.85 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/audio/jack/Makefile /home/trasz/jack/Makefile
>--- /usr/ports/audio/jack/Makefile	Fri Jul  7 16:52:52 2006
>+++ /home/trasz/jack/Makefile	Wed Dec  6 10:33:26 2006
>@@ -5,8 +5,7 @@
> # $FreeBSD: ports/audio/jack/Makefile,v 1.30 2006/07/07 14:52:52 ahze Exp $
> 
> PORTNAME=	jackit
>-PORTVERSION=	0.101.1
>-PORTREVISION=	1
>+PORTVERSION=	0.102.20
> CATEGORIES=	audio
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	jackit
>@@ -16,7 +15,8 @@
> COMMENT=	A low-latency audio server
> 
> LIB_DEPENDS=	portaudio.0:${PORTSDIR}/audio/portaudio \
>-		sndfile.1:${PORTSDIR}/audio/libsndfile
>+		sndfile.1:${PORTSDIR}/audio/libsndfile \
>+		FLAC.7:${PORTSDIR}/audio/flac
> 
> OPTIONS=	DOCS "Build HTML documentation. Requires doxygen/TeX." off
> 
>@@ -26,7 +26,7 @@
> 		CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
> GNU_CONFIGURE=	yes
> USE_GETOPT_LONG=	yes
>-INSTALLS_SHLIB=	yes
>+USE_LDCONFIG=	yes
> USE_GNOME=	pkgconfig gnometarget gnomehack
> 
> MAN1=		jackd.1 jackstart.1
>@@ -46,8 +46,12 @@
> PLIST_SUB+=	DOCS="@comment "
> .endif
> 
>-.if (${OSVERSION} > 500000 ) && (${OSVERSION} < 502102 )
>+.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::
>diff -ruN --exclude=CVS /usr/ports/audio/jack/distinfo /home/trasz/jack/distinfo
>--- /usr/ports/audio/jack/distinfo	Wed Jun  7 03:41:53 2006
>+++ /home/trasz/jack/distinfo	Wed Dec  6 09:08:11 2006
>@@ -1,3 +1,3 @@
>-MD5 (jack-audio-connection-kit-0.101.1.tar.gz) = bb25f7c1da5d488b70edcf39ff5a39b2
>-SHA256 (jack-audio-connection-kit-0.101.1.tar.gz) = 4f0e89a83aaaf5b125389135ee4f321b22ffef19003749c138eb54974e2f5533
>-SIZE (jack-audio-connection-kit-0.101.1.tar.gz) = 724598
>+MD5 (jack-audio-connection-kit-0.102.20.tar.gz) = d6881555a8b4c923b4ec706832f0d776
>+SHA256 (jack-audio-connection-kit-0.102.20.tar.gz) = e4506a9f46cd6fa4896e76482f17b7bddeeda3eb35add176d6db479e5c4f8530
>+SIZE (jack-audio-connection-kit-0.102.20.tar.gz) = 761792
>diff -ruN --exclude=CVS /usr/ports/audio/jack/files/patch-config-os-generic-time.h /home/trasz/jack/files/patch-config-os-generic-time.h
>--- /usr/ports/audio/jack/files/patch-config-os-generic-time.h	Thu Jan  1 01:00:00 1970
>+++ /home/trasz/jack/files/patch-config-os-generic-time.h	Wed Dec  6 09:08:11 2006
>@@ -0,0 +1,13 @@
>+--- 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 ();
>+ }
>diff -ruN --exclude=CVS /usr/ports/audio/jack/files/patch-configure /home/trasz/jack/files/patch-configure
>--- /usr/ports/audio/jack/files/patch-configure	Thu Jan  1 01:00:00 1970
>+++ /home/trasz/jack/files/patch-configure	Wed Dec  6 09:08:11 2006
>@@ -0,0 +1,11 @@
>+--- configure.orig	Wed Dec  6 08:33:37 2006
>++++ configure	Wed Dec  6 08:35:19 2006
>+@@ -23296,7 +23296,7 @@
>+ # the cached result to work around this problem.
>+ 
>+ READLINE_DEPS=""
>+-HAVE_READLINE="false"
>++HAVE_READLINE="true"
>+ #AC_CHECK_LIB(readline, readline, [:],
>+ #    [unset ac_cv_lib_readline_readline
>+ #     AC_CHECK_LIB(readline, readline, [READLINE_DEPS="-ltermcap"],
>diff -ruN --exclude=CVS /usr/ports/audio/jack/files/patch-libjack-midiport.c /home/trasz/jack/files/patch-libjack-midiport.c
>--- /usr/ports/audio/jack/files/patch-libjack-midiport.c	Thu Jan  1 01:00:00 1970
>+++ /home/trasz/jack/files/patch-libjack-midiport.c	Wed Dec  6 09:08:10 2006
>@@ -0,0 +1,11 @@
>+--- libjack/midiport.c.orig	Wed Dec  6 08:05:17 2006
>++++ libjack/midiport.c	Wed Dec  6 08:05:56 2006
>+@@ -72,7 +72,7 @@
>+ 		(jack_midi_port_info_private_t *) port_buffer;
>+ 	
>+ 	if (event_idx >= info->info.event_count)
>+-		return ENODATA;
>++		return ENOMSG;
>+ 	
>+ 	port_event = (jack_midi_port_internal_event_t *) (info + 1);
>+ 	port_event += event_idx;
>diff -ruN --exclude=CVS /usr/ports/audio/jack/pkg-plist /home/trasz/jack/pkg-plist
>--- /usr/ports/audio/jack/pkg-plist	Thu Jun  8 00:48:29 2006
>+++ /home/trasz/jack/pkg-plist	Wed Dec  6 09:08:11 2006
>@@ -6,6 +6,8 @@
> bin/jack_load
> bin/jack_lsp
> bin/jack_metro
>+bin/jack_midiseq
>+bin/jack_midisine
> bin/jack_monitor_client
> bin/jack_showtime
> bin/jack_simple_client
>@@ -15,6 +17,7 @@
> bin/jackrec
> include/jack/intclient.h
> include/jack/jack.h
>+include/jack/midiport.h
> include/jack/ringbuffer.h
> include/jack/statistics.h
> include/jack/thread.h
>@@ -79,6 +82,19 @@
> %%DOCS%%share/jack-audio-connection-kit/reference/html/transport_8h.html
> %%DOCS%%share/jack-audio-connection-kit/reference/html/types_8h-source.html
> %%DOCS%%share/jack-audio-connection-kit/reference/html/types_8h.html
>+%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x65.html
>+%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x69.html
>+%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x6a.html
>+%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x6d.html
>+%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x6f.html
>+%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x70.html
>+%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x72.html
>+%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x73.html
>+%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x74.html
>+%%DOCS%%share/jack-audio-connection-kit/reference/html/midiport_8h-source.html
>+%%DOCS%%share/jack-audio-connection-kit/reference/html/midiport_8h.html
>+%%DOCS%%share/jack-audio-connection-kit/reference/html/struct__jack__midi__event.html
>+%%DOCS%%share/jack-audio-connection-kit/reference/html/struct__jack__midi__port__info.html
> %%DOCS%%@dirrm share/jack-audio-connection-kit/reference/html
> %%DOCS%%@dirrm share/jack-audio-connection-kit/reference
> %%DOCS%%@dirrm share/jack-audio-connection-kit

Actions: View | Diff

Attachments on bug 106410: 73398 | 73399